aslakhellesoy-cucumber 0.3.94.1 → 0.3.95

data/History.txt

@@ -1,7 +1,7 @@
-== (In Git)
+== 0.3.95 2009-08-13
 
-This release improves Webrat support for table-like HTML markup. This means that you can easily get the
-2-dimensional data from HTML table, dl, ol and ul elements. This is particularly useful for comparing
+This release improves Webrat support for table-like HTML markup. Now you can easily turn the HTML
+elements table, dl, ol and ul elements into a 2D array. This is particularly useful for comparing
 data in your HTML with a Cucumber table using Cucumber::Ast::Table#diff!
 
 This release also fixes several bugs related to --drb (Spork) and profiles (cucumber.yml)

data/Manifest.txt

@@ -321,6 +321,7 @@ lib/cucumber/cli/language_help_formatter.rb
 lib/cucumber/cli/main.rb
 lib/cucumber/cli/options.rb
 lib/cucumber/cli/profile_loader.rb
+lib/cucumber/cli/rb_step_def_loader.rb
 lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb

data/examples/cs/features/step_definitons/calculator_steps.rb

@@ -1,5 +1,5 @@
 require 'spec/expectations'
-$:.unshift(File.dirname(__FILE__) + '/../../lib') # This line is not needed in your own project
+$:.unshift(File.dirname(__FILE__) + '/../../') # This line is not needed in your own project
 require 'Calculator' # Calculator.dll
 
 Before do

data/features/support/env.rb

@@ -4,9 +4,9 @@ require 'spec/expectations'
 require 'fileutils'
 require 'forwardable'
 begin
-  gem "spork", ">= 0.5.1" # Ensure correct spork version number to avoid false-negatives.
+  require 'spork'
 rescue Gem::LoadError => ex
-  warn "WARNING: #{ex.message} You need to have the spork gem installed to run the DRb feature properly!"
+  gem 'spork', '>= 0.5.7' # Ensure correct spork version number to avoid false-negatives.
 end
 
 class CucumberWorld
@@ -92,8 +92,7 @@ class CucumberWorld
       else
         # STDOUT.close
         # STDERR.close
-        spork = `which spork`.strip
-        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{spork} cuc"
+        cmd = "#{Cucumber::RUBY_BINARY} -I #{Cucumber::LIBDIR} #{Spork::BINARY} cuc"
         exec cmd
       end
     end

data/lib/cucumber/cli/configuration.rb

@@ -87,18 +87,18 @@ module Cucumber
         end
       end
 
-      def files_to_require
+      def step_defs_to_load
         requires = @options[:require].empty? ? require_dirs : @options[:require]
         files = requires.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.gsub(/\/$/, '') # Strip trailing slash.
-          File.directory?(path) ? Dir["#{path}/**/*.rb"] : path
+          File.directory?(path) ? Dir["#{path}/**/*"] : path
         end.flatten.uniq
-        sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
-        env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
-        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=> (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
+        env_files = sorted_files.select {|f| f =~ %r{/support/env\..*} }
+        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env\..*} }
         remove_excluded_files_from(files)
-        files.reject! {|f| f =~ %r{/support/env.rb} } if @options[:dry_run]
+        files.reject! {|f| f =~ %r{/support/env\..*} } if @options[:dry_run]
         files
       end
 
@@ -112,6 +112,22 @@ module Cucumber
         potential_feature_files
       end
 
+      def constantize(camel_cased_word)
+        begin
+          names = camel_cased_word.split('::')
+          names.shift if names.empty? || names.first.empty?
+
+          constant = Object
+          names.each do |name|
+            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+          end
+          constant
+        rescue NameError
+          require underscore(camel_cased_word)
+          retry
+        end
+      end
+
     private
 
       def paths
@@ -144,22 +160,6 @@ module Cucumber
         feature_dirs + Dir['vendor/{gems,plugins}/*/cucumber']
       end
 
-      def constantize(camel_cased_word)
-        begin
-          names = camel_cased_word.split('::')
-          names.shift if names.empty? || names.first.empty?
-
-          constant = Object
-          names.each do |name|
-            constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-          end
-          constant
-        rescue NameError
-          require underscore(camel_cased_word)
-          retry
-        end
-      end
-
       # Snagged from active_support
       def underscore(camel_cased_word)
         camel_cased_word.to_s.gsub(/::/, '/').

data/lib/cucumber/cli/main.rb

@@ -51,7 +51,7 @@ module Cucumber
         # features are loaded. If we swap the order, the requires
         # will fail.
         features = load_plain_text_features
-        require_files
+        load_step_defs
         enable_diffing
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
@@ -108,33 +108,56 @@ module Cucumber
         @configuration
       end
 
-      def load_files
-        each_lib{|lib| load(lib)}
+      def verbose_log(string)
+        @out_stream.puts(string) if configuration.verbose?
       end
 
       private
 
-      def require_files
-        each_lib{|lib| require lib}
+      def load_step_defs
+        step_def_files = configuration.step_defs_to_load
+        verbose_log("Step Definitions Files:")
+        step_def_files.each do |step_def_file|
+          load_step_def(step_def_file)
+        end
+      end
+
+      def load_step_def(step_def_file)
+        if loader = step_def_loader_for(step_def_file)
+          verbose_log("  * #{step_def_file}")
+          loader.load_step_def_file(self, step_def_file)
+        end
       end
 
-      def each_lib
-        requires = configuration.files_to_require
-        verbose_log("Ruby files required:")
-        verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
+      def step_def_loader_for(step_def_file)
+        @sted_def_loaders ||= {}
+        if ext = File.extname(step_def_file)[1..-1]
+          loader = @sted_def_loaders[ext]
+          return nil if loader == :missing
+          return loader if loader
+          begin
+            loader_class = configuration.constantize("Cucumber::Cli::#{ext.capitalize}StepDefLoader")
+            return @sted_def_loaders[ext] = loader_class.new
+          rescue LoadError
+            @sted_def_loaders[ext] = :missing
+            nil
+          end
+        end
+        nil
+      end
+
+      def step_def_files
+        main.verbose_log("Ruby files required:")
+        main.verbose_log(requires.map{|lib| "  * #{lib}"}.join("\n"))
         requires.each do |lib|
           begin
-            yield lib
+            require lib
           rescue LoadError => e
             e.message << "\nFailed to load #{lib}"
             raise e
           end
         end
-        verbose_log("\n")
-      end
-
-      def verbose_log(string)
-        @out_stream.puts(string) if configuration.verbose?
+        main.verbose_log("\n")
       end
 
       def enable_diffing

data/lib/cucumber/cli/rb_step_def_loader.rb

@@ -0,0 +1,14 @@
+module Cucumber
+  module Cli
+    class RbStepDefLoader
+      def load_step_def_file(main, step_def_file)
+        begin
+          require step_def_file
+        rescue LoadError => e
+          e.message << "\nFailed to load #{step_def_file}"
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/version.rb

@@ -2,8 +2,8 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 94
-    PATCH = 1 # Set to nil for official release
+    TINY  = 95
+    PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/spec/cucumber/cli/configuration_spec.rb

@@ -38,7 +38,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/bar.rb",
         "/features/step_definitions/foo.rb"
       ]
@@ -49,7 +49,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/env.rb",
         "/features/support/a_file.rb"
       ]
@@ -60,7 +60,7 @@ module Cli
 
       config.parse!(%w{--require /features --dry-run})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/features/support/a_file.rb"
       ]
     end
@@ -71,7 +71,7 @@ module Cli
 
       config.parse!(%w{--require /features})
 
-      config.files_to_require.should == [
+      config.step_defs_to_load.should == [
         "/vendor/plugins/plugin_a/cucumber/foo.rb",
         "/vendor/gems/gem_a/cucumber/bar.rb"
       ]
@@ -84,7 +84,7 @@ module Cli
 
         config.parse!(%w{--require /features --exclude a_file.rb})
 
-        config.files_to_require.should == [
+        config.step_defs_to_load.should == [
           "/features/support/env.rb"
         ]
       end
@@ -96,7 +96,7 @@ module Cli
 
         config.parse!(%w{--require /features --exclude foo[df] --exclude blah})
 
-        config.files_to_require.should == [
+        config.step_defs_to_load.should == [
           "/features/support/bar.rb",
           "/features/support/fooz.rb"
         ]

data/spec/cucumber/cli/main_spec.rb

@@ -23,15 +23,6 @@ module Cucumber
           @empty_feature = Ast::Feature.new(nil, Ast::Comment.new(''), Ast::Tags.new(2, []), "Feature", [])
         end
 
-        it "should show ruby files required" do
-          @cli = Main.new(%w{--verbose --require example.rb}, @out)
-          @cli.stub!(:require)
-
-          @cli.execute!(Object.new.extend(StepMother))
-
-          @out.string.should include('example.rb')
-        end
-
         it "should show feature files parsed" do
           @cli = Main.new(%w{--verbose example.feature}, @out)
           @cli.stub!(:require)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.94.1
+  version: 0.3.95
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -388,6 +388,7 @@ files:
 - lib/cucumber/cli/main.rb
 - lib/cucumber/cli/options.rb
 - lib/cucumber/cli/profile_loader.rb
+- lib/cucumber/cli/rb_step_def_loader.rb
 - lib/cucumber/core_ext/exception.rb
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb