Skip to content

Commit

Permalink
Release 8.0.0.rc.1
Browse files Browse the repository at this point in the history
* Release 8.0.0.rc.1

* Remove support for Ruby 2.5

* Fix rubocop offenses

* Remove useless comment
  • Loading branch information
aurelien-reeves authored Jan 19, 2022
1 parent 64ead6a commit 501b59b
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 51 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/cucumber-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
ruby: ['2.6', '2.7', '3.0', '3.1']
include:
- os: ubuntu-latest
ruby: jruby-9.2
- os: ubuntu-latest
ruby: jruby-9.3
exclude:
- ruby: '2.5'
os: windows-latest
- ruby: '3.1'
os: windows-latest

runs-on: ${{ matrix.os }}
steps:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,10 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ruby: ['2.5', '2.6', '2.7', '3.0']
ruby: ['2.6', '2.7', '3.0', '3.1']
include:
- os: ubuntu-latest
ruby: jruby-9.2
- os: ubuntu-latest
ruby: jruby-9.3
exclude:
- ruby: '2.5'
os: windows-latest

runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AllCops:
NewCops: disable
# Keep this inline with the lowest ruby-* version in circleci/config.yml and
# the version in the gemspec
TargetRubyVersion: 2.5
TargetRubyVersion: 2.6
# Cop names are not displayed in offense messages by default. Change behavior
# by overriding DisplayCopNames, or by giving the `-D/--display-cop-names`
# option.
Expand Down
26 changes: 17 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,26 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo

---

## [Unreleased](https://github.com/cucumber/cucumber-ruby/compare/v7.1.0...main)
## [Unreleased](https://github.com/cucumber/cucumber-ruby/compare/v8.0.0.rc.1...main)

### Added

### Fixed

### Changed

### Removed

### Security fixes

### Deprecated

### Dependencies

## [8.0.0.RC.1](https://github.com/cucumber/cucumber-ruby/compare/v7.1.0...v8.0.0.rc.1)

### Fixed

- Fix TestRunFinished success property in html formatter and all formatters
based on the messages: it now returns true if the run has passed
([PR#1606](https://github.com/cucumber/cucumber-ruby/pull/1606)
Expand Down Expand Up @@ -56,7 +70,7 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
([PR#1594](https://github.com/cucumber/cucumber-ruby/pull/1594)
[Issue#1592](https://github.com/cucumber/cucumber-ruby/issues/1592))

- Added Ruby 3.1 to the CI matrix.
- Added Ruby 3.1
([PR#1607](https://github.com/cucumber/cucumber-ruby/pull/1607))

### Removed
Expand Down Expand Up @@ -86,13 +100,7 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
([PR#1590](https://github.com/cucumber/cucumber-ruby/pull/1590)
[Issue#1584](https://github.com/cucumber/cucumber-ruby/issues/1584))

### Security fixes

### Deprecated

### Dependencies

- Updated `cucumber-create-meta` ~> 6.0.2
- Removed support for Ruby 2.5 and JRuby 9.2.

## [7.1.0](https://github.com/cucumber/cucumber-ruby/compare/v7.0.0...v7.1.0) (2021-10-12)

Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,11 @@ Later in this document, bundler is considered being used so all commands are usi

### Supported platforms

- Ruby 3.1
- Ruby 3.0
- Ruby 2.7
- Ruby 2.6
- Ruby 2.5
- Ruby 2.4
- Ruby 2.3
- JRuby (with [some limitations](https://github.com/cucumber/cucumber-ruby/blob/main/docs/jruby-limitations.md))
- 9.2
- 9.3 >= 9.3.1 (there is a known issue with JRuby 9.3.0. More info can
be found in the [PR#1571](https://github.com/cucumber/cucumber-ruby/pull/1571).)

Expand Down
21 changes: 10 additions & 11 deletions cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,37 +18,36 @@ Gem::Specification.new do |s|
}

# Keep in sync with .circleci/config.yml & .rubocop.yml
s.required_ruby_version = '>= 2.5'
s.required_ruby_version = '>= 2.6'
s.add_dependency 'builder', '~> 3.2', '>= 3.2.4'
s.add_dependency 'cucumber-ci-environment', '~> 8.0', '>= 8.0.1'
s.add_dependency 'cucumber-core', '~> 10.1', '>= 10.1.0'
s.add_dependency 'cucumber-cucumber-expressions', '~> 14.0', '>= 14.0.0'
s.add_dependency 'cucumber-ci-environment', '~> 8.1', '>= 8.1.0'
s.add_dependency 'cucumber-core', '~> 10.1', '>= 10.1.1'
s.add_dependency 'cucumber-cucumber-expressions', '~> 15.0', '>= 15.0.1'
s.add_dependency 'cucumber-gherkin', '~> 22.0', '>= 22.0.0'
s.add_dependency 'cucumber-html-formatter', '~> 17.0', '>= 17.0.0'
s.add_dependency 'cucumber-messages', '~> 17.1', '>= 17.1.1'
s.add_dependency 'diff-lcs', '~> 1.4', '>= 1.4.4'
s.add_dependency 'mime-types', '~> 3.3', '>= 3.3.1'
s.add_dependency 'diff-lcs', '~> 1.5', '>= 1.5.0'
s.add_dependency 'mime-types', '~> 3.4', '>= 3.4.1'
s.add_dependency 'multi_test', '~> 0.1', '>= 0.1.2'
s.add_dependency 'sys-uname', '~> 1.2', '>= 1.2.2'

s.add_development_dependency 'cucumber-compatibility-kit', '~> 9.1', '>= 9.1.2'
s.add_development_dependency 'nokogiri', '~> 1.12', '>= 1.12.5'
s.add_development_dependency 'nokogiri', '~> 1.13', '>= 1.13.1'
s.add_development_dependency 'pry', '~> 0.14', '>= 0.14.1'
s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
s.add_development_dependency 'rspec', '~> 3.10', '>= 3.10.0'
s.add_development_dependency 'simplecov', '~> 0.21', '>= 0.21.2'
s.add_development_dependency 'syntax', '~> 1.2', '>= 1.2.2'
s.add_development_dependency 'test-unit', '~> 3.4', '>= 3.4.8'
s.add_development_dependency 'test-unit', '~> 3.5', '>= 3.5.3'
s.add_development_dependency 'webrick', '~> 1.7', '>= 1.7.0'

# For maintainer scripts
s.add_development_dependency 'octokit', '~> 4.21', '>= 4.21.0'
s.add_development_dependency 'octokit', '~> 4.22', '>= 4.22.0'

# Needed for examples (rake examples)
s.add_development_dependency 'capybara', '~> 3.36', '>= 3.36.0'
s.add_development_dependency 'rack-test', '~> 1.1', '>= 1.1.0'
s.add_development_dependency 'sinatra', '~> 2.1', '>= 2.1.0'
# Capybara dropped support for Ruby 2.3 in 3.16.0 - keep 3.15.0 while we're still supporting ruby 2.3
s.add_development_dependency 'capybara', '~> 3.35', '>= 3.35.3'

s.rubygems_version = '>= 1.6.1'
s.files = Dir[
Expand Down
2 changes: 1 addition & 1 deletion examples/i18n/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ task :cucumber do
Dir["#{dir}/*"].sort.each do |f|
next unless File.directory?(f)

lang = f[dir.length + 1..-1]
lang = f[dir.length + 1..]
message = examples_disabled?(lang)
unless message.nil?
$stderr.puts(message)
Expand Down
6 changes: 1 addition & 5 deletions lib/cucumber/cli/profile_loader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ def ensure_configuration_file_exists
def process_configuration_file_with_erb
require 'erb'
begin
@cucumber_erb = if RUBY_VERSION >= '2.6'
ERB.new(IO.read(cucumber_file), trim_mode: '%').result(binding)
else
ERB.new(IO.read(cucumber_file), nil, '%').result(binding)
end
@cucumber_erb = ERB.new(IO.read(cucumber_file), trim_mode: '%').result(binding)
rescue StandardError
raise(YmlLoadError, "cucumber.yml was found, but could not be parsed with ERB. Please refer to cucumber's documentation on correct profile usage.\n#{$ERROR_INFO.inspect}")
end
Expand Down
2 changes: 1 addition & 1 deletion lib/cucumber/cli/rerun_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def self.can_read?(path)
end

def self.real_path(path)
path[1..-1] # remove leading @
path[1..]
end

def initialize(path)
Expand Down
2 changes: 1 addition & 1 deletion lib/cucumber/formatter/http_io.rb
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def send_content(uri, method, headers, attempt = 10)
end

def build_request(uri, method, headers)
method_class_name = "#{method[0].upcase}#{method[1..-1].downcase}"
method_class_name = "#{method[0].upcase}#{method[1..].downcase}"
req = Net::HTTP.const_get(method_class_name).new(uri)
headers.each do |header, value|
req[header] = value
Expand Down
2 changes: 1 addition & 1 deletion lib/cucumber/formatter/pretty.rb
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def print_comments(up_to_line, indent_amount)
comments = gherkin_document.comments
return if comments.empty? || comments.length <= @next_comment_to_be_printed

comments[@next_comment_to_be_printed..-1].each do |comment|
comments[@next_comment_to_be_printed..].each do |comment|
if comment.location.line <= up_to_line
@io.puts(indent(format_string(comment.text.strip, :comment), indent_amount))
@next_comment_to_be_printed += 1
Expand Down
4 changes: 2 additions & 2 deletions lib/cucumber/multiline_argument/data_table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ def to_json(*args)
def build_hashes
convert_headers!
convert_columns!
cells_rows[1..-1].map(&:to_hash)
cells_rows[1..].map(&:to_hash)
end

def create_cell_matrix(ast_table) # :nodoc:
Expand All @@ -477,7 +477,7 @@ def convert_columns! # :nodoc:
cell_matrix.transpose.each do |col|
column_name = col[0].value
conversion_proc = @conversion_procs[column_name][:proc]
col[1..-1].each do |cell|
col[1..].each do |cell|
cell.value = conversion_proc.call(cell.value)
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/cucumber/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.0
8.0.0.rc.1

0 comments on commit 501b59b

Please sign in to comment.