cucumber 2.0.0.beta.3 → 2.0.0

data/lib/cucumber/cli/configuration.rb

@@ -66,10 +66,6 @@ module Cucumber
         @options[:snippet_type] || :regexp
       end
 
-      def build_tree_walker(runtime)
-        Ast::TreeWalker.new(runtime, formatters(runtime), self)
-      end
-
       def formatter_class(format)
         if(builtin = Options::BUILTIN_FORMATS[format])
           constantize(builtin[0])
@@ -111,7 +107,7 @@ module Cucumber
             Dir["#{path}/**/*.feature"].sort
           elsif path[0..0] == '@' and # @listfile.txt
               File.file?(path[1..-1]) # listfile.txt is a file
-            IO.read(path[1..-1]).split
+            IO.read(path[1..-1]).split(/(.*?\.feature.*?) /).collect(&:strip).reject(&:empty?)
           else
             path
           end
@@ -151,7 +147,6 @@ module Cucumber
         @options[:name_regexps]
       end
 
-      # todo: remove as unused
       def filters
         @options.filters
       end
@@ -169,13 +164,13 @@ module Cucumber
         @options[:paths]
       end
 
-      def formatters(runtime)
+      def formatter_factories
         @options[:formats].map do |format_and_out|
           format = format_and_out[0]
           path_or_io = format_and_out[1]
           begin
-            formatter_class = formatter_class(format)
-            formatter_class.new(runtime, path_or_io, @options)
+            factory = formatter_class(format)
+            yield factory, path_or_io, @options
           rescue Exception => e
             e.message << "\nError creating formatter: #{format}"
             raise e
@@ -183,7 +178,8 @@ module Cucumber
         end
       end
 
-    private
+      private
+
       def with_default_features_path(paths)
         return ['features'] if paths.empty?
         paths
@@ -195,7 +191,6 @@ module Cucumber
         end
       end
 
-
       def set_environment_variables
         @options[:env_vars].each do |var, value|
           ENV[var] = value

data/lib/cucumber/cli/main.rb

@@ -36,14 +36,14 @@ module Cucumber
         end
 
         runtime.run!
-        failure = runtime.results.failure? || Cucumber.wants_to_quit
+        failure = runtime.failure? || Cucumber.wants_to_quit
         @kernel.exit(failure ? 1 : 0)
       rescue FileNotFoundException => e
         @err.puts(e.message)
         @err.puts("Couldn't open #{e.path}")
         @kernel.exit(1)
       rescue FeatureFolderNotFoundException => e
-        @err.puts(e.message + ". Please create a #{e.path} directory to get started.")
+        @err.puts(e.message + ". You can use `cucumber --init` to get started.")
         @kernel.exit(1)
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @err.puts(e.message)

data/lib/cucumber/cli/options.rb

@@ -1,6 +1,7 @@
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
 require 'cucumber/rb_support/rb_language'
+require 'cucumber/project_initializer'
 
 module Cucumber
   module Cli
@@ -126,6 +127,12 @@ module Cucumber
             *FORMAT_HELP) do |v|
             @options[:formats] << [v, @out_stream]
           end
+          opts.on('--init',
+            'Initializes folder structure and generates conventional files for',
+            'a Cucumber project.') do |v|
+            ProjectInitializer.new.run
+            Kernel.exit(0)
+          end
           opts.on("-o", "--out [FILE|DIR]",
             "Write output to a file/directory instead of STDOUT. This option",
             "applies to the previously specified --format, or the",
@@ -266,7 +273,7 @@ TEXT
       end
 
       def filters
-        @options.values_at(:name_regexps, :tag_expressions).select{|v| !v.empty?}.first || []
+        @options[:filters] ||= []
       end
 
     protected

data/lib/cucumber/cli/profile_loader.rb

@@ -60,7 +60,7 @@ Defined profiles in cucumber.yml:
         require 'erb'
         require 'yaml'
         begin
-          @cucumber_erb = ERB.new(IO.read(cucumber_file)).result(binding)
+          @cucumber_erb = ERB.new(IO.read(cucumber_file), nil, '%').result(binding)
         rescue Exception => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed with ERB.  Please refer to cucumber's documentation on correct profile usage.\n#{$!.inspect}")
         end

data/lib/cucumber/core_ext/instance_exec.rb

@@ -47,7 +47,7 @@ class Object #:nodoc:
     end
   end
 
-  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_2_1 || Cucumber::RUBY_2_0 || Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4
+  INSTANCE_EXEC_OFFSET = -3
 
   def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)
     return if Cucumber.use_full_backtrace

data/lib/cucumber/encoding.rb

@@ -0,0 +1,5 @@
+# See https://github.com/cucumber/cucumber/issues/693
+if defined? Encoding
+  Encoding.default_external = 'utf-8'
+  Encoding.default_internal = 'utf-8'
+end

data/lib/cucumber/errors.rb

@@ -20,6 +20,14 @@ module Cucumber
     end
   end
 
+  # Raised when there is no matching StepDefinition for a step called
+  # from within another step definition.
+  class UndefinedDynamicStep < StandardError
+    def initialize(step_name)
+      super %(Undefined dynamic step: "#{step_name}")
+    end
+  end
+
   # Raised when a StepDefinition's block invokes World#pending
   class Pending < Core::Test::Result::Pending
   end

data/lib/cucumber/file_specs.rb

@@ -1,4 +1,6 @@
+require 'cucumber'
 require 'cucumber/core/ast/location'
+
 module Cucumber
   class FileSpecs
     FILE_COLON_LINE_PATTERN = /^([\w\W]*?)(?::([\d:]+))?$/ #:nodoc:
@@ -14,7 +16,7 @@ module Cucumber
     end
 
     def files
-      @file_specs.map(&:file)
+      @file_specs.map(&:file).uniq
     end
 
     class FileSpec

data/lib/cucumber/filters/activate_steps.rb

@@ -0,0 +1,33 @@
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ActivateSteps < Core::Filter.new(:step_definitions)
+
+      def test_case(test_case)
+        CaseFilter.new(test_case, step_definitions).test_case.describe_to receiver
+      end
+
+      class CaseFilter
+        def initialize(test_case, step_definitions)
+          @original_test_case = test_case
+          @step_definitions = step_definitions
+        end
+
+        def test_case
+          @original_test_case.with_steps(new_test_steps)
+        end
+
+        private
+
+        def new_test_steps
+          @original_test_case.test_steps.map(&self.method(:attempt_to_activate))
+        end
+
+        def attempt_to_activate(test_step)
+          @step_definitions.find_match(test_step).activate(test_step)
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_after_hooks.rb

@@ -0,0 +1,9 @@
+module Cucumber
+  module Filters
+    class ApplyAfterHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        hooks.apply_after_hooks(test_case).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_after_step_hooks.rb

@@ -0,0 +1,12 @@
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ApplyAfterStepHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        test_steps = hooks.find_after_step_hooks(test_case).apply(test_case.test_steps)
+        test_case.with_steps(test_steps).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_around_hooks.rb

@@ -0,0 +1,12 @@
+require 'cucumber/core/filter'
+
+module Cucumber
+  module Filters
+    class ApplyAroundHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        around_hooks = hooks.find_around_hooks(test_case)
+        test_case.with_around_hooks(around_hooks).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/filters/apply_before_hooks.rb

@@ -0,0 +1,9 @@
+module Cucumber
+  module Filters
+    class ApplyBeforeHooks < Core::Filter.new(:hooks)
+      def test_case(test_case)
+        hooks.apply_before_hooks(test_case).describe_to(receiver)
+      end
+    end
+  end
+end

data/lib/cucumber/{runtime → filters}/gated_receiver.rb

@@ -1,5 +1,6 @@
 module Cucumber
-  class Runtime
+  module Filters
+
     class GatedReceiver
       def initialize(receiver)
         @receiver = receiver
@@ -8,6 +9,7 @@ module Cucumber
 
       def test_case(test_case)
         @test_cases << test_case
+        self
       end
 
       def done
@@ -15,7 +17,9 @@ module Cucumber
           test_case.describe_to(@receiver)
         end
         @receiver.done
+        self
       end
     end
+
   end
 end

data/lib/cucumber/filters/prepare_world.rb

@@ -0,0 +1,45 @@
+require 'cucumber/core/filter'
+require 'cucumber/running_test_case'
+require 'cucumber/hooks'
+
+module Cucumber
+  module Filters
+
+    class PrepareWorld < Core::Filter.new(:runtime)
+
+      def test_case(test_case)
+        CaseFilter.new(runtime, test_case).test_case.describe_to receiver
+      end
+
+      class CaseFilter
+        def initialize(runtime, original_test_case)
+          @runtime, @original_test_case = runtime, original_test_case
+        end
+
+        def test_case
+          init_scenario = Cucumber::Hooks.around_hook(@original_test_case.source) do |continue|
+            @runtime.begin_scenario(scenario)
+            continue.call
+            @runtime.end_scenario(scenario)
+          end
+          around_hooks = [init_scenario] + @original_test_case.around_hooks
+
+          default_hook = Cucumber::Hooks.before_hook(@original_test_case.source) do
+            #no op - legacy format adapter expects a before hooks
+          end
+          steps = [default_hook] + @original_test_case.test_steps
+
+          @original_test_case.with_around_hooks(around_hooks).with_steps(steps)
+        end
+
+        private
+
+        def scenario
+          @scenario ||= RunningTestCase.new(test_case)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/cucumber/filters/quit.rb

@@ -0,0 +1,28 @@
+module Cucumber
+  module Filters
+
+    class Quit
+      def initialize(receiver=nil)
+        @receiver = receiver
+      end
+
+      def test_case(test_case)
+        unless Cucumber.wants_to_quit
+          test_case.describe_to @receiver
+        end
+        self
+      end
+
+      def done
+        @receiver.done
+        self
+      end
+
+      def with_receiver(receiver)
+        self.class.new(receiver)
+      end
+    end
+
+  end
+end
+

data/lib/cucumber/filters/randomizer.rb

@@ -0,0 +1,40 @@
+module Cucumber
+  module Filters
+
+    # Batches up all test cases, randomizes them, and then sends them on
+    class Randomizer
+      def initialize(seed, receiver=nil)
+        @receiver = receiver
+        @test_cases = []
+        @seed = seed
+      end
+
+      def test_case(test_case)
+        @test_cases << test_case
+        self
+      end
+
+      def done
+        shuffled_test_cases.each do |test_case|
+          test_case.describe_to(@receiver)
+        end
+        @receiver.done
+        self
+      end
+
+      def with_receiver(receiver)
+        self.class.new(@seed, receiver)
+      end
+
+      private
+
+      def shuffled_test_cases
+        @test_cases.shuffle(random: Random.new(seed))
+      end
+
+      attr_reader :seed
+      private :seed
+    end
+
+  end
+end

data/lib/cucumber/{runtime → filters}/tag_limits/test_case_index.rb

@@ -1,6 +1,7 @@
 module Cucumber
-  class Runtime
-    module TagLimits
+  module Filters
+    class TagLimits
+
       class TestCaseIndex
         def initialize
           @index = Hash.new { |hash, key| hash[key] = [] }
@@ -24,6 +25,7 @@ module Cucumber
 
         attr_accessor :index
       end
+
     end
   end
 end

data/lib/cucumber/{runtime → filters}/tag_limits/verifier.rb

@@ -1,6 +1,7 @@
 module Cucumber
-  class Runtime
-    module TagLimits
+  module Filters
+    class TagLimits
+
       class Verifier
         def initialize(tag_limits)
           @tag_limits = tag_limits
@@ -51,6 +52,7 @@ module Cucumber
           attr_reader :limit
           attr_reader :locations
         end
+
       end
     end
   end

data/lib/cucumber/filters/tag_limits.rb

@@ -0,0 +1,45 @@
+require "cucumber/filters/gated_receiver"
+require "cucumber/filters/tag_limits/test_case_index"
+require "cucumber/filters/tag_limits/verifier"
+
+module Cucumber
+  module Filters
+    class TagLimitExceededError < StandardError
+      def initialize(*limit_breaches)
+        super(limit_breaches.map(&:to_s).join("\n"))
+      end
+    end
+
+    class TagLimits
+      def initialize(tag_limits, receiver=nil)
+        @tag_limits = tag_limits
+        @gated_receiver = GatedReceiver.new(receiver)
+        @test_case_index = TestCaseIndex.new
+        @verifier = Verifier.new(@tag_limits)
+      end
+
+      def test_case(test_case)
+        gated_receiver.test_case(test_case)
+        test_case_index.add(test_case)
+        self
+      end
+
+      def done
+        verifier.verify!(test_case_index)
+        gated_receiver.done
+        self
+      end
+
+      def with_receiver(receiver)
+        self.class.new(@tag_limits, receiver)
+      end
+
+      private
+
+      attr_reader :gated_receiver
+      attr_reader :test_case_index
+      attr_reader :verifier
+    end
+
+  end
+end

data/lib/cucumber/filters.rb

@@ -0,0 +1,9 @@
+require 'cucumber/filters/activate_steps'
+require 'cucumber/filters/apply_after_step_hooks'
+require 'cucumber/filters/apply_before_hooks'
+require 'cucumber/filters/apply_after_hooks'
+require 'cucumber/filters/apply_around_hooks'
+require 'cucumber/filters/prepare_world'
+require 'cucumber/filters/quit'
+require 'cucumber/filters/randomizer'
+require 'cucumber/filters/tag_limits'

data/lib/cucumber/formatter/ansicolor.rb

@@ -1,14 +1,6 @@
 require 'cucumber/platform'
 require 'cucumber/term/ansicolor'
 
-if Cucumber::IRONRUBY
-  begin
-    require 'iron-term-ansicolor'
-  rescue LoadError
-    STDERR.puts %{*** WARNING: You must "igem install iron-term-ansicolor" to get coloured ouput in on IronRuby}
-  end
-end
-
 if Cucumber::WINDOWS_MRI
   unless ENV['ANSICON']
     STDERR.puts %{*** WARNING: You must use ANSICON 1.31 or higher (https://github.com/adoxa/ansicon/) to get coloured output on Windows}

data/lib/cucumber/formatter/console.rb

@@ -97,8 +97,8 @@ module Cucumber
 
       def collect_failing_scenarios(runtime)
         # TODO: brittle - stop coupling to types
-        scenario_class = Cucumber::Reports::Legacy::Ast::Scenario
-        example_table_class = Cucumber::Core::Ast::ExamplesTable
+        scenario_class = LegacyApi::Ast::Scenario
+        example_table_class = Core::Ast::ExamplesTable
 
         runtime.scenarios(:failed).select do |s|
           [scenario_class, example_table_class].include?(s.class)
@@ -118,7 +118,7 @@ module Cucumber
       end
 
       def print_exception(e, status, indent)
-        message = "#{e.message} (#{e.class})"
+        message = "#{e.message} (#{e.class})".force_encoding("UTF-8")
         if ENV['CUCUMBER_TRUNCATE_OUTPUT']
           message = linebreaks(message, ENV['CUCUMBER_TRUNCATE_OUTPUT'].to_i)
         end
@@ -132,18 +132,24 @@ module Cucumber
         s.gsub(/.{1,#{max}}(?:\s|\Z)/){($& + 5.chr).gsub(/\n\005/,"\n").gsub(/\005/,"\n")}.rstrip
       end
 
+      def collect_snippet_data(test_step, result)
+        # collect snippet data for undefined steps
+        unless hook?(test_step)
+          keyword = test_step.source.last.actual_keyword(@previous_step_keyword)
+          @previous_step_keyword = keyword
+          if result.undefined?
+            @snippets_input << Console::SnippetData.new(keyword, test_step.source.last)
+          end
+        end
+      end
+
       def print_snippets(options)
         return unless options[:snippets]
-        undefined = runtime.steps(:undefined)
-        return if undefined.empty?
+        return if runtime.steps(:undefined).empty?
 
-        unknown_programming_language = runtime.unknown_programming_language?
-        snippets = undefined.map do |step|
-          # step_name = Undefined === step.exception ? step.exception.step_name : step.name
-          # TODO: This probably won't work for nested steps :( See above for old code. 
-          step_name = step.name
-          @runtime.snippet_text(step.actual_keyword, step_name, step.multiline_arg)
-        end.compact.uniq
+        snippets = @snippets_input.map do |data|
+          @runtime.snippet_text(data.actual_keyword, data.step.name, data.step.multiline_arg)
+        end.uniq
 
         text = "\nYou can implement step definitions for undefined steps with these snippets:\n\n"
         text += snippets.join("\n\n")
@@ -215,16 +221,27 @@ module Cucumber
         @io.puts "Using the #{profiles_sentence} profile#{'s' if profiles.size> 1}..."
       end
 
-    private
+      private
 
-    FORMATS = Hash.new{ |hash, format| hash[format] = method(format).to_proc }
+      FORMATS = Hash.new{ |hash, format| hash[format] = method(format).to_proc }
 
-    def format_for(*keys)
-      key = keys.join('_').to_sym
-      fmt = FORMATS[key]
-      raise "No format for #{key.inspect}: #{FORMATS.inspect}" if fmt.nil?
-      fmt
-    end
+      def format_for(*keys)
+        key = keys.join('_').to_sym
+        fmt = FORMATS[key]
+        raise "No format for #{key.inspect}: #{FORMATS.inspect}" if fmt.nil?
+        fmt
+      end
+
+      def hook?(test_step)
+        not test_step.source.last.respond_to?(:actual_keyword)
+      end
+
+      class SnippetData
+        attr_reader :actual_keyword, :step
+        def initialize(actual_keyword, step)
+          @actual_keyword, @step = actual_keyword, step
+        end
+      end
 
     end
   end

data/lib/cucumber/formatter/debug.rb

@@ -6,7 +6,6 @@ module Cucumber
     class Debug
       def initialize(runtime, io, options)
         @io = io
-        @indent = 0
       end
 
       def log(message)
@@ -19,9 +18,7 @@ module Cucumber
       end
 
       def method_missing(name, *args)
-        @indent -= 2 if name.to_s =~ /^after/
         print(name)
-        @indent += 2 if name.to_s =~ /^before/
       end
 
       def puts(*args)
@@ -31,11 +28,7 @@ module Cucumber
     private
 
       def print(text)
-        @io.puts "#{indent}#{text}"
-      end
-
-      def indent
-        (' ' * @indent)
+        @io.puts text
       end
     end
   end

data/lib/cucumber/formatter/fanout.rb

@@ -0,0 +1,27 @@
+module Cucumber
+  module Formatter
+
+    # Forwards any messages sent to this object to all recipients
+    # that respond to that message.
+    class Fanout < BasicObject
+      attr_reader :recipients
+      private :recipients
+
+      def initialize(recipients)
+        @recipients = recipients
+      end
+
+      def method_missing(message, *args)
+        recipients.each do |recipient|
+          recipient.send(message, *args) if recipient.respond_to?(message)
+        end
+      end
+
+      def respond_to_missing?(name, include_private = false)
+        recipients.any? { |recipient| recipient.respond_to?(name, include_private) }
+      end
+
+    end
+
+  end
+end