cucumber 5.1.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef0451fffdd6dc7d18e7b75d248e3e75dee4f15bb328b8c313e4b6a5606741eb
-  data.tar.gz: 9c14ead4ef9845dc3762d8ffb2d53e9d83c0ad6f66898a104ccd602f207a273b
+  metadata.gz: 61cd1181584bcc92134ced753b975cfd74a8501c00bdce0c75695145cf4ceaef
+  data.tar.gz: 57f3dec452665986e5f4916ad78f453e833a9fc94ba2f45124a5643f87b77d0f
 SHA512:
-  metadata.gz: fd5f761cb29cd344974869cb82a4c25f2f648e11418296c3e7fb8a8d91a9934459519c26bdb89ce37ccccfe789965111e513c92a8106c5eccc81eec6b12a9288
-  data.tar.gz: 4adff7878c3433ba0cf48a7a15b0e5b1f007ab22b8cc001c5c751c87d0328c9c86124ac3e3e7c7ea2b793052f021feb8be90bbd2a3d6491413e12080ddf5ba64
+  metadata.gz: f5f971b543114f4baab695a987ed131fe39931a7b644871ce036862a310b9bf17f52f9d4fe80069072864a295d9c31e3254be5f363e87a946ff80733bf33ecb7
+  data.tar.gz: 1c3bb21ce293544c88161cd40460be9e4b12c0dcc3221e50e976a8cc6d5666a982ebde2f5a7bb33d3de65d1423f80d14eaab1b6570a6c03434b568c6cde6e09d

data/CHANGELOG.md

@@ -10,18 +10,60 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 
 ----
 
-## [In GIT](https://github.com/cucumber/cucumber-ruby/compare/v5.1.0...master)
+## [In GIT](https://github.com/cucumber/cucumber-ruby/compare/v5.3.0...master)
 
 ### Added
 
+### Fixed
+
 ### Changed
 
 ### Removed
 
-### Deprecated
+### Security fixes
+
+## [5.3.0](https://github.com/cucumber/cucumber-ruby/compare/v5.2.0...v5.3.0)
+
+### Added
+
+* `fileattribute` cli argument available to attach `file` to junit formatter
+
+### Fixed
+
+* Circle-CI windows build now silently installs MSYS2 using Chocolatey before
+  setting-up the ruby devkit with ridk
+  ([#1503](https://github.com/cucumber/cucumber-ruby/pull/1503)
+   [aurelien-reeves](https://github.com/aurelien-reeves))
+
+* `--publish` and no formatter now uses the pretty formatter per default
+  ([#1468](https://github.com/cucumber/cucumber-ruby/issues/1468)
+   [#1500](https://github.com/cucumber/cucumber-ruby/pull/1500)
+   [aurelien-reeves](https://github.com/aurelien-reeves))
+
+## [5.2.0](https://github.com/cucumber/cucumber-ruby/compare/v5.1.3...v5.2.0)
+
+### Changed
+
+* `--publish` uses the response provided by the server as the banner [#1472](https://github.com/cucumber/cucumber-ruby/issues/1472)
+
+## [5.1.3](https://github.com/cucumber/cucumber-ruby/compare/v5.1.2...v5.1.3)
+
+### Fixed
+
+* The `CUCUMBER_PUBLISH_TOKEN` now sets the correct HTTP header, following a fix in the curl option parser.
+
+## [5.1.2](https://github.com/cucumber/cucumber-ruby/compare/v5.1.1...v5.1.2)
 
 ### Fixed
 
+* Do not send headers after following redirection [#1475](https://github.com/cucumber/cucumber-ruby/pull/1475)
+
+## [5.1.1](https://github.com/cucumber/cucumber-ruby/compare/v5.1.0...v5.1.1)
+
+### Security fixes
+
+* Update `cucumber-create-meta` to 2.0.2
+
 ## [5.1.0](https://github.com/cucumber/cucumber-ruby/compare/v5.0.0...5.1.0)
 
 ### Added

data/CONTRIBUTING.md

@@ -65,7 +65,9 @@ help us to correct style violations reported here:
 * Remove empty sections from `CHANGELOG.md`
 * Now release it:
 
-```
-git commit -am "Release X.Y.Z"
-make release
-```
+  ```
+  git commit -am "Release X.Y.Z"
+  make release
+  ```
+
+* Finally, update the cucumber-ruby version in the [documentation project](https://cucumber.io/docs/installation/) in [versions.yaml](https://github.com/cucumber/docs.cucumber.io/blob/master/data/versions.yaml) file.

data/lib/cucumber/cli/configuration.rb

@@ -126,13 +126,35 @@ module Cucumber
       end
 
       def arrange_formats
-        @options[:formats] << ['pretty', {}, @out_stream] if @options[:formats].empty?
+        add_default_formatter if needs_default_formatter?
+
         @options[:formats] = @options[:formats].sort_by do |f|
           f[2] == @out_stream ? -1 : 1
         end
         @options[:formats].uniq!
         @options.check_formatter_stream_conflicts
       end
+
+      def add_default_formatter
+        @options[:formats] << ['pretty', {}, @out_stream]
+      end
+
+      def needs_default_formatter?
+        formatter_missing? || publish_only?
+      end
+
+      def formatter_missing?
+        @options[:formats].empty?
+      end
+
+      def publish_only?
+        @options[:formats]
+          .uniq
+          .map { |formatter, _, stream| [formatter, stream] }
+          .uniq
+          .reject { |formatter, stream| formatter == 'message' && stream != @out_stream }
+          .empty?
+      end
     end
   end
 end

data/lib/cucumber/cli/options.rb

@@ -22,7 +22,8 @@ module Cucumber
                                                               "#{INDENT}filename instead."],
         'stepdefs'    => ['Cucumber::Formatter::Stepdefs',    "Prints All step definitions with their locations. Same as\n" \
                                                               "#{INDENT}the usage formatter, except that steps are not printed."],
-        'junit'       => ['Cucumber::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
+        'junit'       => ['Cucumber::Formatter::Junit',       "Generates a report similar to Ant+JUnit. Use\n" \
+                                                              "#{INDENT}junit,fileattribute=true to include a file attribute."],
         'json'        => ['Cucumber::Formatter::Json',        '[DEPRECATED] Prints the feature as JSON'],
         'message'     => ['Cucumber::Formatter::Message',     'Outputs protobuf messages'],
         'html'        => ['Cucumber::Formatter::HTML',        'Outputs HTML report'],
@@ -335,7 +336,7 @@ Specify SEED to reproduce the shuffling from a previous run.
           'option is specified; all loading becomes explicit.',
           'Files in directories named "support" are still always',
           'loaded first when their parent directories are',
-          'required or if the "support" directoires themselves are',
+          'required or if the "support" directories themselves are',
           'explicitly required.',
           'This option can be specified multiple times.'
         ]

data/lib/cucumber/formatter/html.rb

@@ -8,7 +8,7 @@ module Cucumber
       include Io
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @html_formatter = Cucumber::HTMLFormatter::Formatter.new(@io)
         @html_formatter.write_pre_message
 

data/lib/cucumber/formatter/http_io.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'tempfile'
+require 'shellwords'
 
 module Cucumber
   module Formatter
@@ -18,48 +19,43 @@ module Cucumber
 
     class CurlOptionParser
       def self.parse(options)
-        chunks = options.split(/\s/).compact
-        http_method = 'PUT'
-        url = chunks[0]
-        headers = ''
-
-        last_flag = nil
-        chunks.each do |chunk|
-          if ['-X', '--request'].include?(chunk)
-            last_flag = '-X'
-            next
-          end
-
-          if chunk == '-H'
-            last_flag = '-H'
-            next
-          end
+        args = Shellwords.split(options)
 
-          if last_flag == '-X'
-            http_method = chunk
-            last_flag = nil
+        url = nil
+        http_method = 'PUT'
+        headers = {}
+
+        until args.empty?
+          arg = args.shift
+          case arg
+          when '-X', '--request'
+            http_method = remove_arg_for(args, arg)
+          when '-H'
+            header_arg = remove_arg_for(args, arg)
+            headers = headers.merge(parse_header(header_arg))
+          else
+            raise StandardError, "#{options} was not a valid curl command. Can't set url to #{arg} it is already set to #{url}" if url
+            url = arg
           end
-
-          headers += chunk if last_flag == '-H'
         end
+        raise StandardError, "#{options} was not a valid curl command" unless url
 
         [
           url,
           http_method,
-          make_headers(headers)
+          headers
         ]
       end
 
-      def self.make_headers(headers)
-        hash_headers = {}
-        str_scanner = /("(?<key>[^":]+)\s*:\s*(?<value>[^":]+)")|('(?<key1>[^':]+)\s*:\s*(?<value1>[^':]+)')/
-
-        headers.scan(str_scanner) do |header|
-          header = header.compact!
-          hash_headers[header[0]] = header[1]&.strip
-        end
+      def self.remove_arg_for(args, arg)
+        return args.shift unless args.empty?
+        raise StandardError, "Missing argument for #{arg}"
+      end
 
-        hash_headers
+      def self.parse_header(header_arg)
+        parts = header_arg.split(':', 2)
+        raise StandardError, "#{header_arg} was not a valid header" unless parts.length == 2
+        { parts[0].strip => parts[1].strip }
       end
     end
 
@@ -76,10 +72,11 @@ module Cucumber
       end
 
       def close
-        resource_uri = send_content(@uri, @method, @headers)
-
-        @reporter.report(resource_uri)
+        response = send_content(@uri, @method, @headers)
+        @reporter.report(response.body)
         @write_io.close
+        return if response.is_a?(Net::HTTPSuccess) || response.is_a?(Net::HTTPRedirection)
+        raise StandardError, "request to #{uri} failed with status #{response.code}"
       end
 
       def write(data)
@@ -121,16 +118,11 @@ module Cucumber
 
         case response
         when Net::HTTPAccepted
-          return uri unless response['Location']
-
-          send_content(URI(response['Location']), 'PUT', headers, attempt - 1)
-        when Net::HTTPSuccess
-          uri
+          send_content(URI(response['Location']), 'PUT', {}, attempt - 1) if response['Location']
         when Net::HTTPRedirection
           send_content(URI(response['Location']), method, headers, attempt - 1)
-        else
-          raise StandardError, "request to #{uri} failed with status #{response.code}"
         end
+        response
       end
 
       def build_request(uri, method, headers)

data/lib/cucumber/formatter/io.rb

@@ -9,13 +9,13 @@ module Cucumber
     module Io
       module_function
 
-      def ensure_io(path_or_url_or_io)
+      def ensure_io(path_or_url_or_io, error_stream)
         return nil if path_or_url_or_io.nil?
         return path_or_url_or_io if io?(path_or_url_or_io)
 
         io = if url?(path_or_url_or_io)
                url = path_or_url_or_io
-               reporter = url.start_with?(Cucumber::Cli::Options::CUCUMBER_PUBLISH_URL) ? URLReporter.new($stderr) : NoReporter.new
+               reporter = url.start_with?(Cucumber::Cli::Options::CUCUMBER_PUBLISH_URL) ? URLReporter.new(error_stream) : NoReporter.new
                HTTPIO.open(url, nil, reporter)
              else
                File.open(path_or_url_or_io, Cucumber.file_mode('w'))
@@ -64,7 +64,7 @@ module Cucumber
         raise "You *must* specify --out FILE for the #{name} formatter" unless String == path.class
         raise "I can't write #{name} to a directory - it has to be a file" if File.directory?(path)
         raise "I can't write #{name} to a file in the non-existing directory #{File.dirname(path)}" unless File.directory?(File.dirname(path))
-        ensure_io(path)
+        ensure_io(path, nil)
       end
 
       def ensure_dir(path, name)

data/lib/cucumber/formatter/json.rb

@@ -22,7 +22,7 @@ module Cucumber
           '6.0.0'
         )
 
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @ast_lookup = AstLookup.new(config)
         @feature_hashes = []
         @step_or_hook_hash = {}

data/lib/cucumber/formatter/junit.rb

@@ -132,9 +132,12 @@ module Cucumber
         duration = ResultBuilder.new(result).test_case_duration
         @current_feature_data[:time] += duration
         classname = @current_feature_data[:feature].name
+        filename = @current_feature_data[:uri]
         name = scenario_designation
 
-        @current_feature_data[:builder].testcase(classname: classname, name: name, time: format('%<duration>.6f', duration: duration)) do
+        testcase_attributes = get_testcase_attributes(classname, name, duration, filename)
+
+        @current_feature_data[:builder].testcase(testcase_attributes) do
           if !result.passed? && result.ok?(@config.strict)
             @current_feature_data[:builder].skipped
             @current_feature_data[:skipped] += 1
@@ -157,6 +160,20 @@ module Cucumber
         @current_feature_data[:tests] += 1
       end
 
+      def get_testcase_attributes(classname, name, duration, filename)
+        { classname: classname, name: name, time: format('%<duration>.6f', duration: duration) }.tap do |attributes|
+          attributes[:file] = filename if add_fileattribute?
+        end
+      end
+
+      def add_fileattribute?
+        return false if @config.formats.nil? || @config.formats.empty?
+
+        !!@config.formats.find do |format|
+          format.first == 'junit' && format.dig(1, 'fileattribute') == 'true'
+        end
+      end
+
       def get_backtrace_object(result)
         if result.failed?
           result.exception

data/lib/cucumber/formatter/message.rb

@@ -10,7 +10,7 @@ module Cucumber
       include Io
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         super(config)
       end
 

data/lib/cucumber/formatter/pretty.rb

@@ -32,7 +32,7 @@ module Cucumber
       private :in_scenario_outline, :print_background_steps
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @config = config
         @options = config.to_hash
         @snippets_input = []

data/lib/cucumber/formatter/progress.rb

@@ -19,7 +19,7 @@ module Cucumber
 
       def initialize(config)
         @config = config
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @snippets_input = []
         @undefined_parameter_types = []
         @total_duration = 0

data/lib/cucumber/formatter/publish_banner_printer.rb

@@ -30,7 +30,9 @@ module Cucumber
             ],
             [
               'Environment variable:   ',
-              highlight('CUCUMBER_PUBLISH_ENABLED=true')
+              highlight('CUCUMBER_PUBLISH_ENABLED'),
+              '=',
+              highlight('true')
             ],
             [
               'cucumber.yml:           ',

data/lib/cucumber/formatter/rerun.rb

@@ -8,7 +8,7 @@ module Cucumber
       include Formatter::Io
 
       def initialize(config)
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @config = config
         @failures = {}
         config.on_event :test_case_finished do |event|

data/lib/cucumber/formatter/steps.rb

@@ -5,7 +5,7 @@ module Cucumber
     # The formatter used for <tt>--format steps</tt>
     class Steps
       def initialize(runtime, path_or_io, options)
-        @io = ensure_io(path_or_io)
+        @io = ensure_io(path_or_io, nil)
         @options = options
         @step_definition_files = collect_steps(runtime)
       end

data/lib/cucumber/formatter/summary.rb

@@ -16,7 +16,7 @@ module Cucumber
 
       def initialize(config)
         @config = config
-        @io = ensure_io(config.out_stream)
+        @io = ensure_io(config.out_stream, config.error_stream)
         @ast_lookup = AstLookup.new(config)
         @counts = ConsoleCounts.new(@config)
         @issues = ConsoleIssues.new(@config, @ast_lookup)

data/lib/cucumber/formatter/url_reporter.rb

@@ -1,30 +1,17 @@
-require 'cucumber/term/banner'
-
 module Cucumber
   module Formatter
     class URLReporter
-      include Term::Banner
-
       def initialize(io)
         @io = io
       end
 
-      def report(url)
-        uri = URI(url)
-        display_banner(
-          [
-            'View your Cucumber Report at:',
-            [["https://reports.cucumber.io#{uri.path}", :cyan, :bold, :underline]],
-            '',
-            [['This report will self-destruct in 24h unless it is claimed or deleted.', :green, :bold]]
-          ],
-          @io
-        )
+      def report(banner)
+        @io.puts(banner)
       end
     end
 
     class NoReporter
-      def report(url); end
+      def report(banner); end
     end
   end
 end

data/lib/cucumber/glue/dsl.rb

@@ -137,4 +137,4 @@ module Cucumber
 end
 
 # TODO: can we avoid adding methods to the global namespace (Kernel)
-extend(Cucumber::Glue::Dsl) # rubocop:disable Style/MixinUsage
+extend(Cucumber::Glue::Dsl)

data/lib/cucumber/version

@@ -1 +1 @@
-5.1.0
+5.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -61,7 +61,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: cucumber-cucumber-expressions
   requirement: !ruby/object:Gem::Requirement
@@ -138,20 +138,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber-wire
   requirement: !ruby/object:Gem::Requirement
@@ -381,7 +381,7 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -391,27 +391,27 @@ dependencies:
         version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.18'
+        version: '4.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 4.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.18'
+        version: '4.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0
+        version: 4.19.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -438,20 +438,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -642,5 +642,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-5.1.0
+summary: cucumber-5.3.0
 test_files: []