cucumber 1.2.1 → 1.2.2

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.2.1'
+  VERSION       = '1.2.2'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)
@@ -14,6 +14,7 @@ unless defined?(Cucumber::VERSION)
   WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+  RUBY_2_0      = RUBY_VERSION =~ /^2\.0/
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
   RUBY_1_8_7    = RUBY_VERSION =~ /^1\.8\.7/
 
@@ -21,7 +22,7 @@ unless defined?(Cucumber::VERSION)
     attr_accessor :use_full_backtrace
 
     def file_mode(m, encoding="UTF-8") #:nodoc:
-      RUBY_1_9 ? "#{m}:#{encoding}" : m
+      RUBY_1_8_7 ? m : "#{m}:#{encoding}"
     end
   end
   self.use_full_backtrace = false

data/lib/cucumber/py_support/py_dsl.py

@@ -3,8 +3,8 @@ import py_language
 class Given(object):
   def __init__(self, regexp):
     self.regexp = regexp
-    
+
   def __call__(self, f):
     py_language.register_step_def(self.regexp, f)
     return f
-  
+

data/lib/cucumber/py_support/py_language.py

@@ -5,6 +5,6 @@ step_defs = {}
 def register_step_def(regexp, f):
   print "Got a step def: ", regexp
   step_defs[regexp] = f
-  
+
 def step_matches(step_name, name_to_report):
-  print "WTF: " + step_name
+  print "WTF: " + step_name

data/lib/cucumber/py_support/py_language.rb

@@ -5,7 +5,7 @@ module Cucumber
     class PyLanguage
       include LanguageSupport::LanguageMethods
 
-      def initialize(step_mother)
+      def initialize(runtime)
         @step_def_files = []
         #
         # @python_path = ENV['PYTHONPATH'] ? ENV['PYTHONPATH'].split(':') : []
@@ -77,4 +77,4 @@ class String #:nodoc:
       tail == str
     end
   end
-end
+end

data/lib/cucumber/rake/task.rb

@@ -92,7 +92,8 @@ module Cucumber
 
         def cmd
           if use_bundler
-            [ Cucumber::RUBY_BINARY, '-S', 'bundle', 'exec', 'cucumber', @cucumber_opts,
+            bundle_cmd = Gem.default_exec_format % 'bundle'
+            [ Cucumber::RUBY_BINARY, '-S', bundle_cmd, 'exec', 'cucumber', @cucumber_opts,
             @feature_files ].flatten
           else
             [ Cucumber::RUBY_BINARY, '-I', load_path(@libs), quoted_binary(@cucumber_bin),
@@ -121,7 +122,7 @@ module Cucumber
              quoted_binary(@cucumber_bin), '--', @cucumber_opts, @feature_files].flatten
           end
         end
-        
+
       end
 
       LIB = File.expand_path(File.dirname(__FILE__) + '/../..') #:nodoc:
@@ -143,7 +144,7 @@ module Cucumber
       # true, +fork+ is implicit.
       attr_accessor :rcov
       def rcov=(flag)
-        if(flag && Cucumber::RUBY_1_9)
+        if flag && !Cucumber::RUBY_1_8_7
           raise failed + "RCov only works on Ruby 1.8.x. You may want to use SimpleCov: https://github.com/colszowka/simplecov" + reset
         end
         @rcov = flag

data/lib/cucumber/rb_support/rb_dsl.rb

@@ -6,7 +6,7 @@ module Cucumber
     module RbDsl
       class << self
         attr_writer :rb_language
-        
+
         def alias_adverb(adverb)
           alias_method adverb, :register_rb_step_definition
         end
@@ -20,7 +20,7 @@ module Cucumber
         end
 
         def register_rb_transform(regexp, proc)
-          @rb_language.register_rb_transform(regexp, proc)          
+          @rb_language.register_rb_transform(regexp, proc)
         end
 
         def register_rb_step_definition(regexp, proc_or_sym, options = {})
@@ -33,9 +33,9 @@ module Cucumber
       # Object that the scenario's steps will run within. Any +world_modules+
       # will be mixed into this Object (via Object#extend).
       #
-      # This method is typically called from one or more Ruby scripts under 
-      # <tt>features/support</tt>. You can call this method as many times as you 
-      # like (to register more modules), but if you try to register more than 
+      # This method is typically called from one or more Ruby scripts under
+      # <tt>features/support</tt>. You can call this method as many times as you
+      # like (to register more modules), but if you try to register more than
       # one Proc you will get an error.
       #
       # Cucumber will not yield anything to the +proc+. Examples:
@@ -71,13 +71,13 @@ module Cucumber
         RbDsl.register_rb_hook('around', tag_expressions, proc)
       end
 
-      # Registers a proc that will run after each Step. You can register as 
+      # Registers a proc that will run after each Step. You can register as
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
       def AfterStep(*tag_expressions, &proc)
         RbDsl.register_rb_hook('after_step', tag_expressions, proc)
       end
 
-      # Registers a proc that will be called with a step definition argument if it 
+      # Registers a proc that will be called with a step definition argument if it
       # matches the pattern passed as the first argument to Transform. Alternatively, if
       # the pattern contains captures then they will be yielded as arguments to the
       # provided proc. The return value of the proc is consequently yielded to the
@@ -85,13 +85,13 @@ module Cucumber
       def Transform(regexp, &proc)
         RbDsl.register_rb_transform(regexp, proc)
       end
-      
-      # Registers a proc that will run after Cucumber is configured. You can register as 
+
+      # Registers a proc that will run after Cucumber is configured. You can register as
       # as you want (typically from ruby scripts under <tt>support/hooks.rb</tt>).
       # TODO: Deprecate this
       def AfterConfiguration(&proc)
         RbDsl.register_rb_hook('after_configuration', [], proc)
-      end      
+      end
 
       # Registers a new Ruby StepDefinition. This method is aliased
       # to <tt>Given</tt>, <tt>When</tt> and <tt>Then</tt>, and

data/lib/cucumber/rb_support/rb_language.rb

@@ -5,6 +5,18 @@ require 'cucumber/rb_support/rb_step_definition'
 require 'cucumber/rb_support/rb_hook'
 require 'cucumber/rb_support/rb_transform'
 
+begin
+  require 'rspec/expectations'
+rescue LoadError
+  begin
+    require 'spec/expectations'
+    require 'spec/runner/differs/default'
+    require 'ostruct'
+  rescue LoadError
+    require 'test/unit/assertions'
+  end
+end
+
 module Cucumber
   module RbSupport
     # Raised if a World block returns Nil.
@@ -38,29 +50,25 @@ module Cucumber
         RbWorld.alias_adverb(adverb)
       end
 
-      def initialize(step_mother)
-        @step_mother = step_mother
+      def initialize(runtime)
+        @runtime = runtime
         @step_definitions = []
         RbDsl.rb_language = self
         @world_proc = @world_modules = nil
-        enable_rspec_expectations_if_available
+        @assertions_module = find_best_assertions_module
       end
 
-      def enable_rspec_expectations_if_available
+      def find_best_assertions_module
         begin
-          # RSpec >=2.0
-          require 'rspec/expectations'
-          @rspec_matchers = ::RSpec::Matchers
-        rescue LoadError => try_rspec_1_2_4_or_higher
+          ::RSpec::Matchers
+        rescue NameError
+          # RSpec >=1.2.4
           begin
-            require 'spec/expectations'
-            require 'spec/runner/differs/default'
-            require 'ostruct'
             options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
             Spec::Expectations.differ = Spec::Expectations::Differs::Default.new(options)
-            @rspec_matchers = ::Spec::Matchers
-          rescue LoadError => give_up
-            @rspec_matchers = Module.new{}
+            ::Spec::Matchers
+          rescue NameError
+            ::Test::Unit::Assertions
           end
         end
       end
@@ -93,7 +101,7 @@ module Cucumber
           multiline_class_comment = "# #{multiline_arg_class.default_arg_name} is a #{multiline_arg_class.to_s}\n  "
         end
 
-        "#{code_keyword} /^#{snippet_pattern}$/ do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
+        "#{code_keyword}(/^#{snippet_pattern}$/) do#{block_arg_string}\n  #{multiline_class_comment}pending # express the regexp above with the code you wish you had\nend"
       end
 
       def begin_rb_scenario(scenario)
@@ -128,13 +136,13 @@ module Cucumber
       def load_code_file(code_file)
         load File.expand_path(code_file) # This will cause self.add_step_definition, self.add_hook, and self.add_transform to be called from RbDsl
       end
-      
+
       protected
 
       def begin_scenario(scenario)
         begin_rb_scenario(scenario)
       end
-      
+
       def end_scenario
         @current_world = nil
       end
@@ -152,14 +160,14 @@ module Cucumber
 
       def extend_world
         @current_world.extend(RbWorld)
-        @current_world.extend(@rspec_matchers)
+        @current_world.extend(@assertions_module)
         (@world_modules || []).each do |mod|
           @current_world.extend(mod)
         end
       end
 
       def connect_world(scenario)
-        @current_world.__cucumber_step_mother = @step_mother
+        @current_world.__cucumber_runtime = @runtime
         @current_world.__natural_language = scenario.language
       end
 

data/lib/cucumber/rb_support/rb_step_definition.rb

@@ -23,21 +23,49 @@ module Cucumber
         end
       end
 
-      def initialize(rb_language, regexp, proc_or_sym, options)
-        raise MissingProc if proc_or_sym.nil?
-        if String === regexp
-          p = Regexp.escape(regexp)
+      class << self
+        def new(rb_language, pattern, proc_or_sym, options)
+          raise MissingProc if proc_or_sym.nil?
+          super rb_language, parse_pattern(pattern), create_proc(proc_or_sym, options)
+        end
+
+        private
+
+        def parse_pattern(pattern)
+          return pattern if pattern.is_a?(Regexp)
+          raise ArgumentError unless pattern.is_a?(String)
+          p = Regexp.escape(pattern)
           p = p.gsub(/\\\$\w+/, '(.*)') # Replace $var with (.*)
-          regexp = Regexp.new("^#{p}$") 
+          Regexp.new("^#{p}$")
         end
-        @rb_language, @regexp, @proc = rb_language, regexp, proc_or_sym
-        if @proc.kind_of? Symbol
-          @proc = lambda do |*args|
-            target = options[:on] ? instance_exec(&options[:on]) : self
-            target.send(proc_or_sym, *args)
+
+        def create_proc(proc_or_sym, options)
+          return proc_or_sym if proc_or_sym.is_a?(Proc)
+          raise ArgumentError unless proc_or_sym.is_a?(Symbol)
+          message = proc_or_sym
+          target_proc = parse_target_proc_from(options)
+          lambda do |*args|
+            target = instance_exec(&target_proc)
+            target.send(message, *args)
           end
         end
 
+        def parse_target_proc_from(options)
+          return lambda { self } unless options.key?(:on)
+          target = options[:on]
+          case target
+          when Proc
+            target
+          when Symbol
+            lambda { self.send(target) }
+          else
+            lambda { raise ArgumentError, "Target must be a symbol or a proc" }
+          end
+        end
+      end
+
+      def initialize(rb_language, regexp, proc)
+        @rb_language, @regexp, @proc = rb_language, regexp, proc
         @rb_language.available_step_definition(regexp_source, file_colon_line)
       end
 
@@ -85,7 +113,7 @@ module Cucumber
           ":#{@proc}"
         end
       end
-    
+
       def file
         @file ||= file_colon_line.split(':')[0]
       end

data/lib/cucumber/rb_support/rb_transform.rb

@@ -32,16 +32,16 @@ module Cucumber
           @rb_language.current_world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
         end
       end
-    
+
       def to_s
          convert_captures(strip_anchors(@regexp.source))
       end
-    
+
     private
       def convert_captures(regexp_source)
         regexp_source.gsub(/(\()(?!\?:)/,'(?:')
       end
-      
+
       def strip_captures(regexp_source)
         regexp_source.
           gsub(/(\()/, '').

data/lib/cucumber/rb_support/rb_world.rb

@@ -14,35 +14,35 @@ module Cucumber
 
       # Call a Transform with a string from another Transform definition
       def Transform(arg)
-        rb = @__cucumber_step_mother.load_programming_language('rb')
+        rb = @__cucumber_runtime.load_programming_language('rb')
         rb.execute_transforms([arg]).first
       end
 
-      attr_writer :__cucumber_step_mother, :__natural_language
+      attr_writer :__cucumber_runtime, :__natural_language
 
       def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
         STDERR.puts AnsiEscapes.failed + "WARNING: Using 'Given/When/Then' in step definitions is deprecated, use 'step' to call other steps instead:" + caller[0] + AnsiEscapes.reset
-        @__cucumber_step_mother.invoke(name, multiline_argument)
+        @__cucumber_runtime.invoke(name, multiline_argument)
       end
 
       # Invoke a single step.
       def step(name, multiline_argument=nil)
-        @__cucumber_step_mother.invoke(name, multiline_argument)
+        @__cucumber_runtime.invoke(name, multiline_argument)
       end
 
       # See StepMother#invoke_steps
       def steps(steps_text)
-        @__cucumber_step_mother.invoke_steps(steps_text, @__natural_language, caller[0])
+        @__cucumber_runtime.invoke_steps(steps_text, @__natural_language, caller[0])
       end
 
       # See StepMother#table
       def table(text_or_table, file=nil, line_offset=0)
-        @__cucumber_step_mother.table(text_or_table, file, line_offset)
+        @__cucumber_runtime.table(text_or_table, file, line_offset)
       end
 
       # See StepMother#doc_string
-      def doc_string(string_with_triple_quotes, file=nil, line_offset=0)
-        @__cucumber_step_mother.doc_string(string_with_triple_quotes, file, line_offset)
+      def doc_string(string_without_triple_quotes, content_type='', line_offset=0)
+        @__cucumber_runtime.doc_string(string_without_triple_quotes, content_type, line_offset)
       end
 
       def announce(*messages)
@@ -52,17 +52,17 @@ module Cucumber
 
       # See StepMother#puts
       def puts(*messages)
-        @__cucumber_step_mother.puts(*messages)
+        @__cucumber_runtime.puts(*messages)
       end
 
       # See StepMother#ask
       def ask(question, timeout_seconds=60)
-        @__cucumber_step_mother.ask(question, timeout_seconds)
+        @__cucumber_runtime.ask(question, timeout_seconds)
       end
 
       # See StepMother#embed
       def embed(file, mime_type, label='Screenshot')
-        @__cucumber_step_mother.embed(file, mime_type, label)
+        @__cucumber_runtime.embed(file, mime_type, label)
       end
 
       # Mark the matched step as pending.
@@ -70,7 +70,7 @@ module Cucumber
         if block_given?
           begin
             yield
-          rescue Exception => e
+          rescue Exception
             raise Pending.new(message)
           end
           raise Pending.new("Expected pending '#{message}' to fail. No Error was raised. No longer pending?")
@@ -80,11 +80,11 @@ module Cucumber
       end
 
       # The default implementation of Object#inspect recursively
-      # traverses all instance variables and invokes inspect. 
+      # traverses all instance variables and invokes inspect.
       # This can be time consuming if the object graph is large.
       #
-      # This can cause unnecessary delays when certain exceptions 
-      # occur. For example, MRI internally invokes #inspect on an 
+      # This can cause unnecessary delays when certain exceptions
+      # occur. For example, MRI internally invokes #inspect on an
       # object that raises a NoMethodError. (JRuby does not do this).
       #
       # A World object can have many references created by the user

data/lib/cucumber/rb_support/regexp_argument_matcher.rb

@@ -18,4 +18,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/rspec/disable_option_parser.rb

@@ -8,7 +8,7 @@ module Spec #:nodoc:
     class OptionParser < ::OptionParser #:nodoc:
       NEUTERED_RSPEC = Object.new
       def NEUTERED_RSPEC.method_missing(m, *args); self; end
-      
+
       def self.method_added(m)
         unless @__neutering_rspec
           @__neutering_rspec = true

data/lib/cucumber/rspec/doubles.rb

@@ -13,4 +13,4 @@ After do
   ensure
     RSpec::Mocks::teardown
   end
-end
+end