Merge branch 'master' into snippets

.gitignore

@@ -16,4 +16,5 @@ examples/self_test
 gem/pkg/*
 gem/dotnet/Cuke4NukeLog.txt*
 *.gem
-TestResult.xml
+TestResult.xml
+.idea

Cuke4Nuke/Core/StepDefinition.cs

@@ -86,8 +86,7 @@ public override int GetHashCode()
         internal List<StepArgument> ArgumentsFrom(string stepName)
         {
             List<StepArgument> arguments = null;
-            Match match = _regex.Match(stepName);
-            log.Debug((match.Success) ? "Match" : "No match");
+            Match match = _regex.Match(stepName);
             if(match.Success)
             {
                 arguments = new List<StepArgument>();

features/cuke4nuke.feature

@@ -84,14 +84,14 @@ Feature: Run .NET step definitions from Cucumber
         }
       }
       """
-    When I run cucumber -f pretty features
+    When I run cucumber --no-source -f pretty features
     Then STDERR should be empty
     And it should pass with
       """
       Feature: So wired
 
-        Scenario: Wired         # features/wired.feature:2
-          Given we're all wired # FIXME:0
+        Scenario: Wired
+          Given we're all wired
 
       1 scenario (1 passed)
       1 step (1 passed)

gem/Rakefile

@@ -12,13 +12,13 @@ begin
     gem.authors = ["Richard Lawrence"]
     gem.executables = ["cuke4nuke"]
 
-    gem.add_dependency "cucumber", ">=0.5.0"
+    gem.add_dependency "cucumber", "0.5.0"
     gem.add_dependency "win32-process", ">=0.6.1"
     gem.add_dependency "systemu", ">=1.2.0"
     gem.add_dependency "json", ">=1.2.0"
     gem.add_dependency "win32console", ">=1.2.0"
 
-    gem.files += FileList['dotnet/*.{dll,exe}']
+    gem.files += FileList['dotnet/*.{dll,exe,config}']
     gem.test_files = []
   end
   Jeweler::GemcutterTasks.new
@@ -30,6 +30,6 @@ task :gemspec => :copy_binaries
 
 task :copy_binaries do
   Dir[File.dirname(__FILE__) + '/../Cuke4Nuke/Server/bin/Release/*.{dll,exe,config}'].each do |file|
-    cp file, 'dotnet'
+    cp file, 'dotnet' unless file =~ /vshost/
   end
 end

gem/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

gem/cuke4nuke.gemspec

@@ -1,66 +1,67 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{cuke4nuke}
-  s.version = "0.2.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Richard Lawrence"]
-  s.date = %q{2009-12-16}
-  s.default_executable = %q{cuke4nuke}
-  s.description = %q{Runs Cucumber with .NET step definitions.}
-  s.email = %q{richard@humanizingwork.com}
-  s.executables = ["cuke4nuke"]
-  s.files = [
-    "Rakefile",
-     "VERSION",
-     "bin/cuke4nuke",
-     "cuke4nuke.gemspec",
-     "dotnet/.gitignore",
-     "dotnet/Castle.Core.dll",
-     "dotnet/Castle.MicroKernel.dll",
-     "dotnet/Cuke4Nuke.Core.dll",
-     "dotnet/Cuke4Nuke.Framework.dll",
-     "dotnet/Cuke4Nuke.Server.exe",
-     "dotnet/Cuke4Nuke.TestStepDefinitions.dll",
-     "dotnet/LitJson.dll",
-     "dotnet/NDesk.Options.dll",
-     "dotnet/Newtonsoft.Json.dll",
-     "dotnet/log4net.dll",
-     "lib/cuke4nuke/main.rb"
-  ]
-  s.homepage = %q{http://github.com/richardlawrence/Cuke4Nuke}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Cucumber for .NET}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.5.0"])
-      s.add_runtime_dependency(%q<win32-process>, [">= 0.6.1"])
-      s.add_runtime_dependency(%q<systemu>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<win32console>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<cucumber>, [">= 0.5.0"])
-      s.add_dependency(%q<win32-process>, [">= 0.6.1"])
-      s.add_dependency(%q<systemu>, [">= 1.2.0"])
-      s.add_dependency(%q<json>, [">= 1.2.0"])
-      s.add_dependency(%q<win32console>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<cucumber>, [">= 0.5.0"])
-    s.add_dependency(%q<win32-process>, [">= 0.6.1"])
-    s.add_dependency(%q<systemu>, [">= 1.2.0"])
-    s.add_dependency(%q<json>, [">= 1.2.0"])
-    s.add_dependency(%q<win32console>, [">= 1.2.0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{cuke4nuke}
+  s.version = "0.2.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Richard Lawrence"]
+  s.date = %q{2009-12-17}
+  s.default_executable = %q{cuke4nuke}
+  s.description = %q{Runs Cucumber with .NET step definitions.}
+  s.email = %q{richard@humanizingwork.com}
+  s.executables = ["cuke4nuke"]
+  s.files = [
+    "Rakefile",
+     "VERSION",
+     "bin/cuke4nuke",
+     "cuke4nuke.gemspec",
+     "dotnet/.gitignore",
+     "dotnet/Castle.Core.dll",
+     "dotnet/Castle.MicroKernel.dll",
+     "dotnet/Cuke4Nuke.Core.dll",
+     "dotnet/Cuke4Nuke.Framework.dll",
+     "dotnet/Cuke4Nuke.Server.exe",
+     "dotnet/Cuke4Nuke.Server.exe.config",
+     "dotnet/Cuke4Nuke.TestStepDefinitions.dll",
+     "dotnet/LitJson.dll",
+     "dotnet/NDesk.Options.dll",
+     "dotnet/Newtonsoft.Json.dll",
+     "dotnet/log4net.dll",
+     "lib/cuke4nuke/main.rb"
+  ]
+  s.homepage = %q{http://github.com/richardlawrence/Cuke4Nuke}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Cucumber for .NET}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cucumber>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<win32-process>, [">= 0.6.1"])
+      s.add_runtime_dependency(%q<systemu>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<win32console>, [">= 1.2.0"])
+    else
+      s.add_dependency(%q<cucumber>, [">= 0.5.0"])
+      s.add_dependency(%q<win32-process>, [">= 0.6.1"])
+      s.add_dependency(%q<systemu>, [">= 1.2.0"])
+      s.add_dependency(%q<json>, [">= 1.2.0"])
+      s.add_dependency(%q<win32console>, [">= 1.2.0"])
+    end
+  else
+    s.add_dependency(%q<cucumber>, [">= 0.5.0"])
+    s.add_dependency(%q<win32-process>, [">= 0.6.1"])
+    s.add_dependency(%q<systemu>, [">= 1.2.0"])
+    s.add_dependency(%q<json>, [">= 1.2.0"])
+    s.add_dependency(%q<win32console>, [">= 1.2.0"])
+  end
+end
+

gem/dotnet/.gitignore

@@ -1,2 +1,4 @@
 *.dll
-*.exe
+*.exe
+*.txt
+*.config