From 698003452aad692041260c624915518ce0190b29 Mon Sep 17 00:00:00 2001 From: Richard Lawrence Date: Thu, 17 Dec 2009 08:50:05 -0700 Subject: [PATCH 1/4] Modified cuke4nuke.feature to match new snippet output. Added to .gitignore files. --- .gitignore | 3 ++- features/cuke4nuke.feature | 6 +++--- gem/dotnet/.gitignore | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index efcdfa1..46f1330 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ examples/self_test gem/pkg/* gem/dotnet/Cuke4NukeLog.txt* *.gem -TestResult.xml \ No newline at end of file +TestResult.xml +.idea \ No newline at end of file diff --git a/features/cuke4nuke.feature b/features/cuke4nuke.feature index fa9b8c4..75c9a81 100644 --- a/features/cuke4nuke.feature +++ b/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) diff --git a/gem/dotnet/.gitignore b/gem/dotnet/.gitignore index 4723eec..1b90635 100644 --- a/gem/dotnet/.gitignore +++ b/gem/dotnet/.gitignore @@ -1,2 +1,4 @@ *.dll -*.exe \ No newline at end of file +*.exe +*.txt +*.config \ No newline at end of file From 97e7ce93e1c3b36e7cbf80fee9969dea5e67c4d0 Mon Sep 17 00:00:00 2001 From: Richard Lawrence Date: Thu, 17 Dec 2009 09:08:24 -0700 Subject: [PATCH 2/4] Bumped version to 0.2.3. Updated Rakefile and gemspec. --- gem/Rakefile | 4 +- gem/VERSION | 2 +- gem/cuke4nuke.gemspec | 133 +++++++++++++++++++++--------------------- 3 files changed, 70 insertions(+), 69 deletions(-) diff --git a/gem/Rakefile b/gem/Rakefile index edd6d37..6cbcadb 100644 --- a/gem/Rakefile +++ b/gem/Rakefile @@ -18,7 +18,7 @@ begin 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 \ No newline at end of file diff --git a/gem/VERSION b/gem/VERSION index ee1372d..7179039 100644 --- a/gem/VERSION +++ b/gem/VERSION @@ -1 +1 @@ -0.2.2 +0.2.3 diff --git a/gem/cuke4nuke.gemspec b/gem/cuke4nuke.gemspec index 938c61d..651348c 100644 --- a/gem/cuke4nuke.gemspec +++ b/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, [">= 0.5.0"]) - s.add_runtime_dependency(%q, [">= 0.6.1"]) - s.add_runtime_dependency(%q, [">= 1.2.0"]) - s.add_runtime_dependency(%q, [">= 1.2.0"]) - s.add_runtime_dependency(%q, [">= 1.2.0"]) - else - s.add_dependency(%q, [">= 0.5.0"]) - s.add_dependency(%q, [">= 0.6.1"]) - s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 1.2.0"]) - end - else - s.add_dependency(%q, [">= 0.5.0"]) - s.add_dependency(%q, [">= 0.6.1"]) - s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 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, [">= 0.5.0"]) + s.add_runtime_dependency(%q, [">= 0.6.1"]) + s.add_runtime_dependency(%q, [">= 1.2.0"]) + s.add_runtime_dependency(%q, [">= 1.2.0"]) + s.add_runtime_dependency(%q, [">= 1.2.0"]) + else + s.add_dependency(%q, [">= 0.5.0"]) + s.add_dependency(%q, [">= 0.6.1"]) + s.add_dependency(%q, [">= 1.2.0"]) + s.add_dependency(%q, [">= 1.2.0"]) + s.add_dependency(%q, [">= 1.2.0"]) + end + else + s.add_dependency(%q, [">= 0.5.0"]) + s.add_dependency(%q, [">= 0.6.1"]) + s.add_dependency(%q, [">= 1.2.0"]) + s.add_dependency(%q, [">= 1.2.0"]) + s.add_dependency(%q, [">= 1.2.0"]) + end +end + From c75402f23bbd0483d4739c07e9df87941f3aeba9 Mon Sep 17 00:00:00 2001 From: Richard Lawrence Date: Thu, 17 Dec 2009 09:26:26 -0700 Subject: [PATCH 3/4] Fixed cucumber dependency to 0.5.0 pending testing with 0.5.1. --- gem/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gem/Rakefile b/gem/Rakefile index 6cbcadb..017d829 100644 --- a/gem/Rakefile +++ b/gem/Rakefile @@ -12,7 +12,7 @@ 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" From e3b8af6069760fcd4eb9008521387bf2d34808c0 Mon Sep 17 00:00:00 2001 From: Richard Lawrence Date: Thu, 17 Dec 2009 11:47:56 -0700 Subject: [PATCH 4/4] Removed unnecessary logging in StepDefinition. --- Cuke4Nuke/Core/StepDefinition.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Cuke4Nuke/Core/StepDefinition.cs b/Cuke4Nuke/Core/StepDefinition.cs index ef21e13..05b21be 100644 --- a/Cuke4Nuke/Core/StepDefinition.cs +++ b/Cuke4Nuke/Core/StepDefinition.cs @@ -86,8 +86,7 @@ public override int GetHashCode() internal List ArgumentsFrom(string stepName) { List 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();