hydra 0.22.2 → 0.23.0

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Nick Gauthier"]
     gem.add_development_dependency "shoulda", "= 2.10.3"
     gem.add_development_dependency "rspec", "= 2.0.0.beta.19"
-    gem.add_development_dependency "cucumber", "= 0.8.5"
+    gem.add_development_dependency "cucumber", "= 0.9.2"
     gem.add_development_dependency "therubyracer", "= 0.7.4"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.22.2
+0.23.0

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.22.2"
+  s.version = "0.23.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2010-10-22}
   s.default_executable = %q{warmsnake.rb}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
@@ -114,18 +114,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_development_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<cucumber>, ["= 0.8.5"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.9.2"])
       s.add_development_dependency(%q<therubyracer>, ["= 0.7.4"])
     else
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
       s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-      s.add_dependency(%q<cucumber>, ["= 0.8.5"])
+      s.add_dependency(%q<cucumber>, ["= 0.9.2"])
       s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
     end
   else
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
     s.add_dependency(%q<rspec>, ["= 2.0.0.beta.19"])
-    s.add_dependency(%q<cucumber>, ["= 0.8.5"])
+    s.add_dependency(%q<cucumber>, ["= 0.9.2"])
     s.add_dependency(%q<therubyracer>, ["= 0.7.4"])
   end
 end

data/lib/hydra/runner.rb

@@ -138,29 +138,35 @@ module Hydra #:nodoc:
       dev_null = StringIO.new
       hydra_response = StringIO.new
 
-      unless @step_mother
+      unless @cuke_runtime
         require 'cucumber'
         require 'hydra/cucumber/formatter'
-        @step_mother = Cucumber::StepMother.new
+        Cucumber.logger.level = Logger::INFO
+        @cuke_runtime = Cucumber::Runtime.new
         @cuke_configuration = Cucumber::Cli::Configuration.new(dev_null, dev_null)
         @cuke_configuration.parse!(['features']+files)
 
-        @step_mother.options = @cuke_configuration.options
-        @step_mother.log = @cuke_configuration.log
-        @step_mother.load_code_files(@cuke_configuration.support_to_load)
-        @step_mother.after_configuration(@cuke_configuration)
-        @step_mother.load_code_files(@cuke_configuration.step_defs_to_load)
+        support_code = Cucumber::Runtime::SupportCode.new(@cuke_runtime, @cuke_configuration.guess?)
+        support_code.load_files!(@cuke_configuration.support_to_load + @cuke_configuration.step_defs_to_load)
+        support_code.fire_hook(:after_configuration, @cuke_configuration)
+        # i don't like this, but there no access to set the instance of SupportCode in Runtime
+        @cuke_runtime.instance_variable_set('@support_code',support_code)
       end
       cuke_formatter = Cucumber::Formatter::Hydra.new(
-        @step_mother, hydra_response, @cuke_configuration.options
+        @cuke_runtime, hydra_response, @cuke_configuration.options
       )
 
       cuke_runner ||= Cucumber::Ast::TreeWalker.new(
-        @step_mother, [cuke_formatter], @cuke_configuration.options, dev_null
+        @cuke_runtime, [cuke_formatter], @cuke_configuration
       )
-      @step_mother.visitor = cuke_runner
+      @cuke_runtime.visitor = cuke_runner
 
-      features = @step_mother.load_plain_text_features(files)
+      loader = Cucumber::Runtime::FeaturesLoader.new(
+        files,
+        @cuke_configuration.filters,
+        @cuke_configuration.tag_expression
+      )
+      features = loader.features
       tag_excess = tag_excess(features, @cuke_configuration.options[:tag_expression].limits)
       @cuke_configuration.options[:tag_excess] = tag_excess
 

data/test/runner_test.rb

@@ -80,9 +80,6 @@ class RunnerTest < Test::Unit::TestCase
       # we run this in a fork to not contaminate
       # the main test environment
       pid = Process.fork do
-        # need to get into the fixtures directory so cucumber doesn't load up the whole project
-        Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures'))
-
         runner = Hydra::Runner.new(:io => File.new('/dev/null', 'w'))
         runner.run_file(cucumber_feature_file)
         assert File.exists?(target_file)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 22
-  - 2
-  version: 0.22.2
+  - 23
+  - 0
+  version: 0.23.0
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: warmsnake.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,9 +56,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency