cucumber 2.99.0 → 3.0.0

data/gem_tasks/examples.rake

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 desc 'Run all exmples'
 task :examples do
   Dir['examples/*'].each do |example_dir|
@@ -5,7 +6,7 @@ task :examples do
     puts "Running #{example_dir}"
     Dir.chdir(example_dir) do
       raise "No Rakefile in #{Dir.pwd}" unless File.file?('Rakefile')
-      sh "rake cucumber"
+      sh 'rake cucumber'
     end
   end
-end
+end

data/gem_tasks/fix_cr_lf.rake

@@ -1,10 +1,22 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
 desc 'Make all files use UNIX (\n) line endings'
 task :fix_cr_lf do
-  files = FileList['**/*']
-  files.each do |f|
-    next if File.directory?(f) || f =~ /dos/
-    s = IO.read(f)
-    s.gsub!(/\r?\n/, "\n")
-    File.open(f, "w") { |io| io.write(s) }
+  iso_8859_1_files = FileList.new(
+    'features/docs/iso-8859-1.feature',
+    'features/lib/step_definitions/iso-8859-1_steps.rb'
+  )
+
+  utf8_files = FileList.new('**/*') do |fl|
+    fl.exclude { |f| File.directory?(f) }
   end
-end
+
+  paths = (utf8_files - iso_8859_1_files).map { |f| Pathname(f) }
+
+  paths.each do |path|
+    content = path.read.gsub(/\r?\n/, "\n")
+    path.write(content)
+  end
+end

data/gem_tasks/flog.rake

@@ -1,4 +1,5 @@
-desc "Run flog over significant files"
+# frozen_string_literal: true
+desc 'Run flog over significant files'
 task :flog do
-  sh "find lib/cucumber -name \\*.rb | grep -v parser\/feature\\.rb | xargs flog"
-end
+  sh 'find lib/cucumber -name \\*.rb | grep -v parser/feature\\.rb | xargs flog'
+end

data/gem_tasks/rspec.rake

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 require 'rspec/core/rake_task'
 
-desc "Run RSpec"
+desc 'Run RSpec'
 RSpec::Core::RakeTask.new do |t|
   t.verbose = true
 end

data/gem_tasks/sass.rake

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 desc 'Generate the css for the html formatter from sass'
 task :sass do
   sh 'sass -t expanded lib/cucumber/formatter/cucumber.sass > lib/cucumber/formatter/cucumber.css'
-end
+end

data/lib/autotest/cucumber.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest'
 require 'autotest/cucumber_mixin'
 

data/lib/autotest/cucumber_mixin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest'
 require 'tempfile'
 require 'cucumber'
@@ -46,7 +47,7 @@ module Autotest::CucumberMixin
   end
 
   def all_features_good
-    features_to_run == ""
+    features_to_run == ''
   end
 
   def get_to_green
@@ -70,27 +71,27 @@ module Autotest::CucumberMixin
     hook :run_features
     Tempfile.open('autotest-cucumber') do |dirty_features_file|
       cmd = self.make_cucumber_cmd(self.features_to_run, dirty_features_file.path)
-      return if cmd.empty?
+      break if cmd.empty?
       puts cmd unless $q
       old_sync = $stdout.sync
       $stdout.sync = true
       self.results = []
       line = []
       begin
-        open("| #{cmd}", "r") do |f|
-          until f.eof? do
-            c = f.getc or break
-            if RUBY_VERSION >= "1.9" then
+        open("| #{cmd}", 'r') do |f|
+          until f.eof?
+            c = f.getc || break
+            if RUBY_VERSION >= '1.9' then
               print c
             else
               putc c
             end
             line << c
             if c == ?\n then
-              self.results << if RUBY_VERSION >= "1.9" then
+              self.results << if RUBY_VERSION >= '1.9' then
                                 line.join
                               else
-                                line.pack "c*"
+                                line.pack 'c*'
                               end
               line.clear
             end
@@ -110,18 +111,18 @@ module Autotest::CucumberMixin
 
     profile_loader = Cucumber::Cli::ProfileLoader.new
 
-    profile ||= "autotest-all" if profile_loader.has_profile?("autotest-all") && features_to_run == :all
-    profile ||= "autotest"     if profile_loader.has_profile?("autotest")
+    profile ||= 'autotest-all' if profile_loader.has_profile?('autotest-all') && features_to_run == :all
+    profile ||= 'autotest'     if profile_loader.has_profile?('autotest')
     profile ||= nil
 
-    if profile
-      args = ["--profile", profile]
-    else
-      args = %w{--format} << (features_to_run == :all ? "progress" : "pretty")
-    end
+    args = if profile
+             ['--profile', profile]
+           else
+             %w{--format} << (features_to_run == :all ? 'progress' : 'pretty')
+           end
     # No --color option as some IDEs (Netbeans) don't output them very well (1 failed step)
     args += %w{--format rerun --out} << dirty_features_filename
-    args << (features_to_run == :all ? "" : features_to_run)
+    args << (features_to_run == :all ? '' : features_to_run)
 
     # Unless I do this, all the steps turn up undefined during the rerun...
     unless features_to_run == :all

data/lib/autotest/cucumber_rails.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest/rails'
 require 'autotest/cucumber_mixin'
 

data/lib/autotest/cucumber_rails_rspec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest/cucumber_mixin'
 require 'autotest/rails_rspec'
 

data/lib/autotest/cucumber_rails_rspec2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest/cucumber_mixin'
 require 'autotest/rails_rspec2'
 

data/lib/autotest/cucumber_rspec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest/cucumber_mixin'
 require 'autotest/rspec'
 

data/lib/autotest/cucumber_rspec2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'autotest/cucumber_mixin'
 require 'autotest/rspec2'
 

data/lib/autotest/discover.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
 Autotest.add_discovery do
   if File.directory?('features')
     if ENV['AUTOFEATURE'] =~ /true/i
-      "cucumber"
+      'cucumber'
     elsif ENV['AUTOFEATURE'] =~ /false/i
       # noop
     else
-      puts "(Not running features.  To run features in autotest, set AUTOFEATURE=true.)"
+      puts '(Not running features.  To run features in autotest, set AUTOFEATURE=true.)'
     end
   end
 end

data/lib/cucumber/cli/configuration.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require 'logger'
 require 'cucumber/cli/options'
 require 'cucumber/cli/rerun_file'
 require 'cucumber/constantize'
-require 'cucumber/core/gherkin/tag_expression'
+require 'cucumber'
 
 module Cucumber
   module Cli
@@ -25,9 +26,7 @@ module Cucumber
         @args = args
         @options.parse!(args)
         arrange_formats
-        raise("You can't use both --strict and --wip") if strict? && wip?
-        # todo: remove
-        @options[:tag_expression] = Cucumber::Core::Gherkin::TagExpression.new(@options[:tag_expressions])
+        raise("You can't use both --strict and --wip") if strict.strict? && wip?
         set_environment_variables
       end
 
@@ -43,7 +42,7 @@ module Cucumber
         Integer(@options[:seed] || rand(0xFFFF))
       end
 
-      def strict?
+      def strict
         @options[:strict]
       end
 
@@ -72,7 +71,7 @@ module Cucumber
       end
 
       def snippet_type
-        @options[:snippet_type] || :regexp
+        @options[:snippet_type] || :cucumber_expression
       end
 
       def log
@@ -83,13 +82,8 @@ module Cucumber
         logger
       end
 
-      # todo: remove
-      def tag_expression
-        Cucumber::Core::Gherkin::TagExpression.new(@options[:tag_expressions])
-      end
-
       def tag_limits
-        tag_expression.limits.to_hash
+        @options[:tag_limits]
       end
 
       def tag_expressions
@@ -108,23 +102,18 @@ module Cucumber
         @options[:formats]
       end
 
-      def options
-        warn("Deprecated: Configuration#options will be removed from the next release of Cucumber. Please use the configuration object directly instead.")
-        @options
-      end
-
       def paths
         @options[:paths]
       end
 
       def to_hash
-        Cucumber::Hash(@options).merge(out_stream: @out_stream, error_stream: @error_stream)
+        Hash(@options).merge(out_stream: @out_stream, error_stream: @error_stream)
       end
 
       private
 
       class LogFormatter < ::Logger::Formatter
-        def call(severity, time, progname, msg)
+        def call(_severity, _time, _progname, msg)
           msg
         end
       end
@@ -136,8 +125,10 @@ module Cucumber
       end
 
       def arrange_formats
-        @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
-        @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
+        @options[:formats] << ['pretty', {}, @out_stream] if @options[:formats].empty?
+        @options[:formats] = @options[:formats].sort_by do |f|
+          f[2] == @out_stream ? -1 : 1
+        end
         @options[:formats].uniq!
         @options.check_formatter_stream_conflicts()
       end

data/lib/cucumber/cli/main.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'optparse'
 require 'cucumber'
 require 'logger'
@@ -23,11 +24,11 @@ module Cucumber
         trap_interrupt
 
         runtime = if existing_runtime
-          existing_runtime.configure(configuration)
-          existing_runtime
-        else
-          Runtime.new(configuration)
-        end
+                    existing_runtime.configure(configuration)
+                    existing_runtime
+                  else
+                    Runtime.new(configuration)
+                  end
 
         runtime.run!
         if Cucumber.wants_to_quit
@@ -46,7 +47,7 @@ module Cucumber
         @err.puts("Couldn't open #{e.path}")
         exit_unable_to_finish
       rescue FeatureFolderNotFoundException => e
-        @err.puts(e.message + ". You can use `cucumber --init` to get started.")
+        @err.puts(e.message + '. You can use `cucumber --init` to get started.')
         exit_unable_to_finish
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @err.puts(e.message)
@@ -96,4 +97,4 @@ module Cucumber
       end
     end
   end
-end
+end