Skip to content

Commit 501b59b

Browse files
Release 8.0.0.rc.1
* Release 8.0.0.rc.1 * Remove support for Ruby 2.5 * Fix rubocop offenses * Remove useless comment
1 parent 64ead6a commit 501b59b

File tree

13 files changed

+39
-51
lines changed

13 files changed

+39
-51
lines changed

.github/workflows/cucumber-ruby.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, macos-latest, windows-latest]
19-
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
19+
ruby: ['2.6', '2.7', '3.0', '3.1']
2020
include:
21-
- os: ubuntu-latest
22-
ruby: jruby-9.2
2321
- os: ubuntu-latest
2422
ruby: jruby-9.3
25-
exclude:
26-
- ruby: '2.5'
27-
os: windows-latest
28-
- ruby: '3.1'
29-
os: windows-latest
3023

3124
runs-on: ${{ matrix.os }}
3225
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,10 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest, macos-latest, windows-latest]
26-
ruby: ['2.5', '2.6', '2.7', '3.0']
26+
ruby: ['2.6', '2.7', '3.0', '3.1']
2727
include:
28-
- os: ubuntu-latest
29-
ruby: jruby-9.2
3028
- os: ubuntu-latest
3129
ruby: jruby-9.3
32-
exclude:
33-
- ruby: '2.5'
34-
os: windows-latest
3530

3631
runs-on: ${{ matrix.os }}
3732
steps:

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ AllCops:
77
NewCops: disable
88
# Keep this inline with the lowest ruby-* version in circleci/config.yml and
99
# the version in the gemspec
10-
TargetRubyVersion: 2.5
10+
TargetRubyVersion: 2.6
1111
# Cop names are not displayed in offense messages by default. Change behavior
1212
# by overriding DisplayCopNames, or by giving the `-D/--display-cop-names`
1313
# option.

CHANGELOG.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,26 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
1010

1111
---
1212

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

1515
### Added
1616

1717
### Fixed
1818

19+
### Changed
20+
21+
### Removed
22+
23+
### Security fixes
24+
25+
### Deprecated
26+
27+
### Dependencies
28+
29+
## [8.0.0.RC.1](https://github.com/cucumber/cucumber-ruby/compare/v7.1.0...v8.0.0.rc.1)
30+
31+
### Fixed
32+
1933
- Fix TestRunFinished success property in html formatter and all formatters
2034
based on the messages: it now returns true if the run has passed
2135
([PR#1606](https://github.com/cucumber/cucumber-ruby/pull/1606)
@@ -56,7 +70,7 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
5670
([PR#1594](https://github.com/cucumber/cucumber-ruby/pull/1594)
5771
[Issue#1592](https://github.com/cucumber/cucumber-ruby/issues/1592))
5872

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

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

89-
### Security fixes
90-
91-
### Deprecated
92-
93-
### Dependencies
94-
95-
- Updated `cucumber-create-meta` ~> 6.0.2
103+
- Removed support for Ruby 2.5 and JRuby 9.2.
96104

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

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,11 @@ Later in this document, bundler is considered being used so all commands are usi
5050

5151
### Supported platforms
5252

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

cucumber.gemspec

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,36 @@ Gem::Specification.new do |s|
1818
}
1919

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

3434
s.add_development_dependency 'cucumber-compatibility-kit', '~> 9.1', '>= 9.1.2'
35-
s.add_development_dependency 'nokogiri', '~> 1.12', '>= 1.12.5'
35+
s.add_development_dependency 'nokogiri', '~> 1.13', '>= 1.13.1'
3636
s.add_development_dependency 'pry', '~> 0.14', '>= 0.14.1'
3737
s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
3838
s.add_development_dependency 'rspec', '~> 3.10', '>= 3.10.0'
3939
s.add_development_dependency 'simplecov', '~> 0.21', '>= 0.21.2'
4040
s.add_development_dependency 'syntax', '~> 1.2', '>= 1.2.2'
41-
s.add_development_dependency 'test-unit', '~> 3.4', '>= 3.4.8'
41+
s.add_development_dependency 'test-unit', '~> 3.5', '>= 3.5.3'
4242
s.add_development_dependency 'webrick', '~> 1.7', '>= 1.7.0'
4343

4444
# For maintainer scripts
45-
s.add_development_dependency 'octokit', '~> 4.21', '>= 4.21.0'
45+
s.add_development_dependency 'octokit', '~> 4.22', '>= 4.22.0'
4646

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

5352
s.rubygems_version = '>= 1.6.1'
5453
s.files = Dir[

examples/i18n/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ task :cucumber do
44
Dir["#{dir}/*"].sort.each do |f|
55
next unless File.directory?(f)
66

7-
lang = f[dir.length + 1..-1]
7+
lang = f[dir.length + 1..]
88
message = examples_disabled?(lang)
99
unless message.nil?
1010
$stderr.puts(message)

lib/cucumber/cli/profile_loader.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ def ensure_configuration_file_exists
7575
def process_configuration_file_with_erb
7676
require 'erb'
7777
begin
78-
@cucumber_erb = if RUBY_VERSION >= '2.6'
79-
ERB.new(IO.read(cucumber_file), trim_mode: '%').result(binding)
80-
else
81-
ERB.new(IO.read(cucumber_file), nil, '%').result(binding)
82-
end
78+
@cucumber_erb = ERB.new(IO.read(cucumber_file), trim_mode: '%').result(binding)
8379
rescue StandardError
8480
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}")
8581
end

lib/cucumber/cli/rerun_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def self.can_read?(path)
1010
end
1111

1212
def self.real_path(path)
13-
path[1..-1] # remove leading @
13+
path[1..]
1414
end
1515

1616
def initialize(path)

lib/cucumber/formatter/http_io.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def send_content(uri, method, headers, attempt = 10)
131131
end
132132

133133
def build_request(uri, method, headers)
134-
method_class_name = "#{method[0].upcase}#{method[1..-1].downcase}"
134+
method_class_name = "#{method[0].upcase}#{method[1..].downcase}"
135135
req = Net::HTTP.const_get(method_class_name).new(uri)
136136
headers.each do |header, value|
137137
req[header] = value

lib/cucumber/formatter/pretty.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def print_comments(up_to_line, indent_amount)
270270
comments = gherkin_document.comments
271271
return if comments.empty? || comments.length <= @next_comment_to_be_printed
272272

273-
comments[@next_comment_to_be_printed..-1].each do |comment|
273+
comments[@next_comment_to_be_printed..].each do |comment|
274274
if comment.location.line <= up_to_line
275275
@io.puts(indent(format_string(comment.text.strip, :comment), indent_amount))
276276
@next_comment_to_be_printed += 1

lib/cucumber/multiline_argument/data_table.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ def to_json(*args)
453453
def build_hashes
454454
convert_headers!
455455
convert_columns!
456-
cells_rows[1..-1].map(&:to_hash)
456+
cells_rows[1..].map(&:to_hash)
457457
end
458458

459459
def create_cell_matrix(ast_table) # :nodoc:
@@ -477,7 +477,7 @@ def convert_columns! # :nodoc:
477477
cell_matrix.transpose.each do |col|
478478
column_name = col[0].value
479479
conversion_proc = @conversion_procs[column_name][:proc]
480-
col[1..-1].each do |cell|
480+
col[1..].each do |cell|
481481
cell.value = conversion_proc.call(cell.value)
482482
end
483483
end

lib/cucumber/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.0
1+
8.0.0.rc.1

0 commit comments

Comments
 (0)