diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index d8e9038..dfdbcff 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -1,3 +1,4 @@ +--- # This workflow uses actions that are not certified by GitHub. # They are provided by a third-party and are governed by # separate terms of service, privacy policy, and support @@ -5,34 +6,32 @@ # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby -name: Ruby +name: Tests on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: test: runs-on: ubuntu-latest strategy: matrix: - gemfile: [6,7,8,9,10] - ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2'] + rspec-minor-versions: [6, 7, 8, 9, 10, 11, 12, 13] + ruby-versions: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"] + env: + BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rspec_3.${{ matrix.rspec-minor-versions }}.gemfile steps: - - uses: actions/checkout@v2 - - name: Set up Ruby - # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, - # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby-version }} - - name: install bundle - env: - BUNDLE_GEMFILE: gemfiles/rspec_3.${{matrix.gemfile}}.gemfile - run: bundle install - - name: Run tests - run: bundle exec rake + - uses: actions/checkout@v4 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-versions }} + bundler-cache: true + + - name: Run tests + run: bundle exec rake diff --git a/.rubocop.yml b/.rubocop.yml index c5bb1ae..eff9a44 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -9,9 +9,12 @@ # # See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md # -require: rubocop-rake +require: + - rubocop-rake + # - rubocop-rspec AllCops: + NewCops: enable TargetRubyVersion: 2.6 Exclude: - tmp/**/* @@ -27,62 +30,8 @@ Style/Documentation: Metrics/BlockLength: Exclude: - spec/**/*_spec.rb -Gemspec/DeprecatedAttributeAssignment: - Enabled: true -Layout/SpaceBeforeBrackets: - Enabled: true -Lint/AmbiguousAssignment: - Enabled: true -Lint/DeprecatedConstants: - Enabled: true -Lint/DuplicateBranch: - Enabled: true -Lint/DuplicateRegexpCharacterClassElement: - Enabled: true -Lint/EmptyBlock: - Enabled: true -Lint/EmptyClass: - Enabled: true -Lint/LambdaWithoutLiteralBlock: - Enabled: true -Lint/NoReturnInBeginEndBlocks: - Enabled: true -Lint/NumberedParameterAssignment: - Enabled: true -Lint/OrAssignmentToConstant: - Enabled: true -Lint/RedundantDirGlobSort: - Enabled: true -Lint/SymbolConversion: - Enabled: true -Lint/ToEnumArguments: - Enabled: true -Lint/TripleQuotes: - Enabled: true -Lint/UnexpectedBlockArity: - Enabled: true -Lint/UnmodifiedReduceAccumulator: - Enabled: true -Style/ArgumentsForwarding: - Enabled: true -Style/CollectionCompact: - Enabled: true -Style/DocumentDynamicEvalDefinition: - Enabled: true -Style/EndlessMethod: - Enabled: true -Style/HashConversion: - Enabled: true -Style/HashExcept: - Enabled: true -Style/IfWithBooleanLiteralBranches: - Enabled: true -Style/NegatedIfElseCondition: - Enabled: true -Style/NilLambda: - Enabled: true -Style/RedundantArgument: - Enabled: true -Style/SwapValues: - Enabled: true - +Gemspec/RequiredRubyVersion: + Enabled: false +Gemspec/RequireMFA: + Enabled: false + Severity: warning diff --git a/Appraisals b/Appraisals index 10928c0..466579c 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ # vim: ft=ruby -(6..10).each do |minor| +(6..13).each do |minor| appraise "rspec 3.#{minor}" do gem 'rspec', "3.#{minor}.0" end diff --git a/Gemfile b/Gemfile index e8063f9..abef7a2 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,12 @@ gemspec name: 'flatware-rspec' gemspec name: 'flatware-cucumber' group :development do - gem 'appraisal', '~> 2.4' + gem 'appraisal' gem 'aruba', '~> 0.14' - gem 'pry', '~> 0.14' - gem 'rake', '~> 13.0' - gem 'rubocop', '>= 1.30' - gem 'rubocop-rake', '~> 0.5' - gem 'rubocop-rspec', '~> 2.2' + gem 'pry' + gem 'racc' + gem 'rake' + gem 'rubocop' + gem 'rubocop-rake' + gem 'rubocop-rspec' end diff --git a/features/support/aruba.rb b/features/support/aruba.rb index 51566a5..c982c70 100644 --- a/features/support/aruba.rb +++ b/features/support/aruba.rb @@ -1,5 +1,5 @@ Aruba.configure do |config| - config.working_directory = "tmp/aruba#{ENV['TEST_ENV_NUMBER']}" + config.working_directory = "tmp/aruba#{ENV.fetch('TEST_ENV_NUMBER', nil)}" config.startup_wait_time = 0.1 config.io_wait_timeout = config.exit_timeout = 3 end diff --git a/features/support/env.rb b/features/support/env.rb index 37bd78c..dd2a12b 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -5,7 +5,7 @@ $LOAD_PATH.unshift Pathname.new(__FILE__).dirname.join('../../lib').to_s -ENV['PATH'] = [Pathname('.').expand_path.join('bin'), ENV['PATH']].join(':') +ENV['PATH'] = [Pathname('.').expand_path.join('bin'), ENV.fetch('PATH', nil)].join(':') require 'flatware/pid' require 'aruba/cucumber' diff --git a/flatware-cucumber.gemspec b/flatware-cucumber.gemspec index 75424e2..06aa853 100644 --- a/flatware-cucumber.gemspec +++ b/flatware-cucumber.gemspec @@ -20,8 +20,9 @@ Gem::Specification.new do |s| ) s.homepage = 'http://github.com/briandunn/flatware' s.licenses = ['MIT'] - s.required_ruby_version = ['>= 2.6', '< 3.3'] + s.required_ruby_version = ['>= 2.6', '< 3.4'] s.require_paths = ['lib'] s.add_dependency %(cucumber), '~> 3.0' s.add_dependency %(flatware), Flatware::VERSION + # s.metadata['rubygems_mfa_required'] = 'true' end diff --git a/flatware-rspec.gemspec b/flatware-rspec.gemspec index 17c3a8f..557655f 100644 --- a/flatware-rspec.gemspec +++ b/flatware-rspec.gemspec @@ -21,8 +21,9 @@ Gem::Specification.new do |s| ) s.homepage = 'http://github.com/briandunn/flatware' s.licenses = ['MIT'] - s.required_ruby_version = ['>= 2.6', '< 3.3'] + s.required_ruby_version = ['>= 2.6', '< 3.4'] s.require_paths = ['lib'] s.add_dependency %(flatware), Flatware::VERSION s.add_dependency %(rspec), '>= 3.6' + # s.metadata['rubygems_mfa_required'] = 'true' end diff --git a/flatware.gemspec b/flatware.gemspec index c84b2a7..170f409 100644 --- a/flatware.gemspec +++ b/flatware.gemspec @@ -26,8 +26,9 @@ Gem::Specification.new do |s| s.homepage = 'http://github.com/briandunn/flatware' s.licenses = ['MIT'] - s.required_ruby_version = ['>= 2.6', '< 3.3'] + s.required_ruby_version = ['>= 2.6', '< 3.4'] s.require_paths = ['lib'] s.executables = ['flatware'] s.add_dependency %(thor), '< 2.0' + # s.metadata['rubygems_mfa_required'] = 'true' end diff --git a/gemfiles/rspec_3.10.gemfile b/gemfiles/rspec_3.10.gemfile index 64928c6..0b27a9e 100644 --- a/gemfiles/rspec_3.10.gemfile +++ b/gemfiles/rspec_3.10.gemfile @@ -5,13 +5,14 @@ source "https://rubygems.org" gem "rspec", "3.10.0" group :development do - gem "appraisal", "~> 2.4" + gem "appraisal" gem "aruba", "~> 0.14" - gem "pry", "~> 0.14" - gem "rake", "~> 13.0" - gem "rubocop", ">= 1.30" - gem "rubocop-rake", "~> 0.5" - gem "rubocop-rspec", "~> 2.2" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" end gemspec name: "flatware", path: "../" diff --git a/gemfiles/rspec_3.10.gemfile.lock b/gemfiles/rspec_3.10.gemfile.lock deleted file mode 100644 index de8b40c..0000000 --- a/gemfiles/rspec_3.10.gemfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PATH - remote: .. - specs: - flatware (2.0.0) - thor (< 2.0) - flatware-cucumber (2.0.0) - cucumber (~> 3.0) - flatware (= 2.0.0) - flatware-rspec (2.0.0) - flatware (= 2.0.0) - rspec (>= 3.6) - -GEM - remote: https://rubygems.org/ - specs: - appraisal (2.4.0) - bundler - rake - thor (>= 0.14.0) - aruba (0.14.14) - childprocess (>= 0.6.3, < 4.0.0) - contracts (~> 0.9) - cucumber (>= 1.3.19) - ffi (~> 1.9) - rspec-expectations (>= 2.99) - thor (>= 0.19, < 2.0) - ast (2.4.2) - backports (3.20.2) - builder (3.2.4) - childprocess (3.0.0) - coderay (1.1.3) - contracts (0.16.0) - cucumber (3.2.0) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.4.4) - ffi (1.15.0) - gherkin (5.1.0) - json (2.6.2) - method_source (1.0.0) - multi_json (1.15.0) - multi_test (0.1.2) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.3) - regexp_parser (2.6.0) - rexml (3.2.5) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) - rubocop (1.36.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - unicode-display_width (2.3.0) - -PLATFORMS - arm64-darwin-20 - arm64-darwin-21 - x86_64-darwin-20 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4) - aruba (~> 0.14) - flatware! - flatware-cucumber! - flatware-rspec! - pry (~> 0.14) - rake (~> 13.0) - rspec (= 3.10.0) - rubocop (>= 1.30) - rubocop-rake (~> 0.5) - rubocop-rspec (~> 2.2) - -BUNDLED WITH - 2.2.33 diff --git a/gemfiles/rspec_3.11.gemfile b/gemfiles/rspec_3.11.gemfile new file mode 100644 index 0000000..05e24b2 --- /dev/null +++ b/gemfiles/rspec_3.11.gemfile @@ -0,0 +1,20 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rspec", "3.11.0" + +group :development do + gem "appraisal" + gem "aruba", "~> 0.14" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" +end + +gemspec name: "flatware", path: "../" +gemspec name: "flatware-rspec", path: "../" +gemspec name: "flatware-cucumber", path: "../" diff --git a/gemfiles/rspec_3.12.gemfile b/gemfiles/rspec_3.12.gemfile new file mode 100644 index 0000000..6264d6f --- /dev/null +++ b/gemfiles/rspec_3.12.gemfile @@ -0,0 +1,20 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rspec", "3.12.0" + +group :development do + gem "appraisal" + gem "aruba", "~> 0.14" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" +end + +gemspec name: "flatware", path: "../" +gemspec name: "flatware-rspec", path: "../" +gemspec name: "flatware-cucumber", path: "../" diff --git a/gemfiles/rspec_3.13.gemfile b/gemfiles/rspec_3.13.gemfile new file mode 100644 index 0000000..9a4a683 --- /dev/null +++ b/gemfiles/rspec_3.13.gemfile @@ -0,0 +1,20 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rspec", "3.13.0" + +group :development do + gem "appraisal" + gem "aruba", "~> 0.14" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" +end + +gemspec name: "flatware", path: "../" +gemspec name: "flatware-rspec", path: "../" +gemspec name: "flatware-cucumber", path: "../" diff --git a/gemfiles/rspec_3.6.gemfile b/gemfiles/rspec_3.6.gemfile index 8f26abd..7283dd8 100644 --- a/gemfiles/rspec_3.6.gemfile +++ b/gemfiles/rspec_3.6.gemfile @@ -5,13 +5,14 @@ source "https://rubygems.org" gem "rspec", "3.6.0" group :development do - gem "appraisal", "~> 2.4" + gem "appraisal" gem "aruba", "~> 0.14" - gem "pry", "~> 0.14" - gem "rake", "~> 13.0" - gem "rubocop", ">= 1.30" - gem "rubocop-rake", "~> 0.5" - gem "rubocop-rspec", "~> 2.2" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" end gemspec name: "flatware", path: "../" diff --git a/gemfiles/rspec_3.6.gemfile.lock b/gemfiles/rspec_3.6.gemfile.lock deleted file mode 100644 index f01b91a..0000000 --- a/gemfiles/rspec_3.6.gemfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PATH - remote: .. - specs: - flatware (2.0.0) - thor (< 2.0) - flatware-cucumber (2.0.0) - cucumber (~> 3.0) - flatware (= 2.0.0) - flatware-rspec (2.0.0) - flatware (= 2.0.0) - rspec (>= 3.6) - -GEM - remote: https://rubygems.org/ - specs: - appraisal (2.4.0) - bundler - rake - thor (>= 0.14.0) - aruba (0.14.14) - childprocess (>= 0.6.3, < 4.0.0) - contracts (~> 0.9) - cucumber (>= 1.3.19) - ffi (~> 1.9) - rspec-expectations (>= 2.99) - thor (>= 0.19, < 2.0) - ast (2.4.2) - backports (3.20.2) - builder (3.2.4) - childprocess (3.0.0) - coderay (1.1.3) - contracts (0.16.0) - cucumber (3.2.0) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.4.4) - ffi (1.15.0) - gherkin (5.1.0) - json (2.6.2) - method_source (1.0.0) - multi_json (1.15.0) - multi_test (0.1.2) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.3) - regexp_parser (2.6.0) - rexml (3.2.5) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (1.36.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - unicode-display_width (2.3.0) - -PLATFORMS - arm64-darwin-20 - arm64-darwin-21 - x86_64-darwin-20 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4) - aruba (~> 0.14) - flatware! - flatware-cucumber! - flatware-rspec! - pry (~> 0.14) - rake (~> 13.0) - rspec (= 3.6.0) - rubocop (>= 1.30) - rubocop-rake (~> 0.5) - rubocop-rspec (~> 2.2) - -BUNDLED WITH - 2.2.33 diff --git a/gemfiles/rspec_3.7.gemfile b/gemfiles/rspec_3.7.gemfile index c192968..9fcc482 100644 --- a/gemfiles/rspec_3.7.gemfile +++ b/gemfiles/rspec_3.7.gemfile @@ -5,13 +5,14 @@ source "https://rubygems.org" gem "rspec", "3.7.0" group :development do - gem "appraisal", "~> 2.4" + gem "appraisal" gem "aruba", "~> 0.14" - gem "pry", "~> 0.14" - gem "rake", "~> 13.0" - gem "rubocop", ">= 1.30" - gem "rubocop-rake", "~> 0.5" - gem "rubocop-rspec", "~> 2.2" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" end gemspec name: "flatware", path: "../" diff --git a/gemfiles/rspec_3.7.gemfile.lock b/gemfiles/rspec_3.7.gemfile.lock deleted file mode 100644 index ec0bcbe..0000000 --- a/gemfiles/rspec_3.7.gemfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PATH - remote: .. - specs: - flatware (2.0.0) - thor (< 2.0) - flatware-cucumber (2.0.0) - cucumber (~> 3.0) - flatware (= 2.0.0) - flatware-rspec (2.0.0) - flatware (= 2.0.0) - rspec (>= 3.6) - -GEM - remote: https://rubygems.org/ - specs: - appraisal (2.4.0) - bundler - rake - thor (>= 0.14.0) - aruba (0.14.14) - childprocess (>= 0.6.3, < 4.0.0) - contracts (~> 0.9) - cucumber (>= 1.3.19) - ffi (~> 1.9) - rspec-expectations (>= 2.99) - thor (>= 0.19, < 2.0) - ast (2.4.2) - backports (3.20.2) - builder (3.2.4) - childprocess (3.0.0) - coderay (1.1.3) - contracts (0.16.0) - cucumber (3.2.0) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.4.4) - ffi (1.15.0) - gherkin (5.1.0) - json (2.6.2) - method_source (1.0.0) - multi_json (1.15.0) - multi_test (0.1.2) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.3) - regexp_parser (2.6.0) - rexml (3.2.5) - rspec (3.7.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-core (3.7.1) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.1) - rubocop (1.36.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - unicode-display_width (2.3.0) - -PLATFORMS - arm64-darwin-20 - arm64-darwin-21 - x86_64-darwin-20 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4) - aruba (~> 0.14) - flatware! - flatware-cucumber! - flatware-rspec! - pry (~> 0.14) - rake (~> 13.0) - rspec (= 3.7.0) - rubocop (>= 1.30) - rubocop-rake (~> 0.5) - rubocop-rspec (~> 2.2) - -BUNDLED WITH - 2.2.33 diff --git a/gemfiles/rspec_3.8.gemfile b/gemfiles/rspec_3.8.gemfile index 1a08ca8..a55a9bf 100644 --- a/gemfiles/rspec_3.8.gemfile +++ b/gemfiles/rspec_3.8.gemfile @@ -5,13 +5,14 @@ source "https://rubygems.org" gem "rspec", "3.8.0" group :development do - gem "appraisal", "~> 2.4" + gem "appraisal" gem "aruba", "~> 0.14" - gem "pry", "~> 0.14" - gem "rake", "~> 13.0" - gem "rubocop", ">= 1.30" - gem "rubocop-rake", "~> 0.5" - gem "rubocop-rspec", "~> 2.2" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" end gemspec name: "flatware", path: "../" diff --git a/gemfiles/rspec_3.8.gemfile.lock b/gemfiles/rspec_3.8.gemfile.lock deleted file mode 100644 index fb796a7..0000000 --- a/gemfiles/rspec_3.8.gemfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PATH - remote: .. - specs: - flatware (2.0.0) - thor (< 2.0) - flatware-cucumber (2.0.0) - cucumber (~> 3.0) - flatware (= 2.0.0) - flatware-rspec (2.0.0) - flatware (= 2.0.0) - rspec (>= 3.6) - -GEM - remote: https://rubygems.org/ - specs: - appraisal (2.4.0) - bundler - rake - thor (>= 0.14.0) - aruba (0.14.14) - childprocess (>= 0.6.3, < 4.0.0) - contracts (~> 0.9) - cucumber (>= 1.3.19) - ffi (~> 1.9) - rspec-expectations (>= 2.99) - thor (>= 0.19, < 2.0) - ast (2.4.2) - backports (3.20.2) - builder (3.2.4) - childprocess (3.0.0) - coderay (1.1.3) - contracts (0.16.0) - cucumber (3.2.0) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.4.4) - ffi (1.15.0) - gherkin (5.1.0) - json (2.6.2) - method_source (1.0.0) - multi_json (1.15.0) - multi_test (0.1.2) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.3) - regexp_parser (2.6.0) - rexml (3.2.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.3) - rubocop (1.36.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - unicode-display_width (2.3.0) - -PLATFORMS - arm64-darwin-20 - arm64-darwin-21 - x86_64-darwin-20 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4) - aruba (~> 0.14) - flatware! - flatware-cucumber! - flatware-rspec! - pry (~> 0.14) - rake (~> 13.0) - rspec (= 3.8.0) - rubocop (>= 1.30) - rubocop-rake (~> 0.5) - rubocop-rspec (~> 2.2) - -BUNDLED WITH - 2.2.33 diff --git a/gemfiles/rspec_3.9.gemfile b/gemfiles/rspec_3.9.gemfile index 547b7a8..559951b 100644 --- a/gemfiles/rspec_3.9.gemfile +++ b/gemfiles/rspec_3.9.gemfile @@ -5,13 +5,14 @@ source "https://rubygems.org" gem "rspec", "3.9.0" group :development do - gem "appraisal", "~> 2.4" + gem "appraisal" gem "aruba", "~> 0.14" - gem "pry", "~> 0.14" - gem "rake", "~> 13.0" - gem "rubocop", ">= 1.30" - gem "rubocop-rake", "~> 0.5" - gem "rubocop-rspec", "~> 2.2" + gem "pry" + gem "racc" + gem "rake" + gem "rubocop" + gem "rubocop-rake" + gem "rubocop-rspec" end gemspec name: "flatware", path: "../" diff --git a/gemfiles/rspec_3.9.gemfile.lock b/gemfiles/rspec_3.9.gemfile.lock deleted file mode 100644 index 475ea02..0000000 --- a/gemfiles/rspec_3.9.gemfile.lock +++ /dev/null @@ -1,120 +0,0 @@ -PATH - remote: .. - specs: - flatware (2.0.0) - thor (< 2.0) - flatware-cucumber (2.0.0) - cucumber (~> 3.0) - flatware (= 2.0.0) - flatware-rspec (2.0.0) - flatware (= 2.0.0) - rspec (>= 3.6) - -GEM - remote: https://rubygems.org/ - specs: - appraisal (2.4.0) - bundler - rake - thor (>= 0.14.0) - aruba (0.14.14) - childprocess (>= 0.6.3, < 4.0.0) - contracts (~> 0.9) - cucumber (>= 1.3.19) - ffi (~> 1.9) - rspec-expectations (>= 2.99) - thor (>= 0.19, < 2.0) - ast (2.4.2) - backports (3.20.2) - builder (3.2.4) - childprocess (3.0.0) - coderay (1.1.3) - contracts (0.16.0) - cucumber (3.2.0) - builder (>= 2.1.2) - cucumber-core (~> 3.2.0) - cucumber-expressions (~> 6.0.1) - cucumber-wire (~> 0.0.1) - diff-lcs (~> 1.3) - gherkin (~> 5.1.0) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.2) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-expressions (6.0.1) - cucumber-tag_expressions (1.1.1) - cucumber-wire (0.0.1) - diff-lcs (1.4.4) - ffi (1.15.0) - gherkin (5.1.0) - json (2.6.2) - method_source (1.0.0) - multi_json (1.15.0) - multi_test (0.1.2) - parallel (1.22.1) - parser (3.1.2.1) - ast (~> 2.4.1) - pry (0.14.0) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.3) - regexp_parser (2.6.0) - rexml (3.2.5) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.3) - rspec-support (~> 3.9.3) - rspec-expectations (3.9.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.4) - rubocop (1.36.0) - json (~> 2.3) - parallel (~> 1.10) - parser (>= 3.1.2.1) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-rake (0.5.1) - rubocop - rubocop-rspec (2.2.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) - ruby-progressbar (1.11.0) - thor (1.1.0) - unicode-display_width (2.3.0) - -PLATFORMS - arm64-darwin-20 - arm64-darwin-21 - x86_64-darwin-20 - x86_64-linux - -DEPENDENCIES - appraisal (~> 2.4) - aruba (~> 0.14) - flatware! - flatware-cucumber! - flatware-rspec! - pry (~> 0.14) - rake (~> 13.0) - rspec (= 3.9.0) - rubocop (>= 1.30) - rubocop-rake (~> 0.5) - rubocop-rspec (~> 2.2) - -BUNDLED WITH - 2.2.33 diff --git a/spec/flatware/cucumber_spec.rb b/spec/flatware/cucumber_spec.rb index ef03f31..9fbcb11 100644 --- a/spec/flatware/cucumber_spec.rb +++ b/spec/flatware/cucumber_spec.rb @@ -3,7 +3,7 @@ describe Flatware::Cucumber do describe '.configure' do - it 'coppies the arguments into each job' do + it 'copies the arguments into each job' do config = described_class.configure %w[-t@javascript] expect(config.jobs.map(&:args).uniq).to eq [%w[-t@javascript]] end diff --git a/spec/flatware/rspec/checkpoint_spec.rb b/spec/flatware/rspec/checkpoint_spec.rb index 5b17323..1d1bc09 100644 --- a/spec/flatware/rspec/checkpoint_spec.rb +++ b/spec/flatware/rspec/checkpoint_spec.rb @@ -6,9 +6,9 @@ context 'when summed and some have errors' do it 'has errors' do failure_notification = instance_double( - ::RSpec::Core::Example, + RSpec::Core::Example, full_description: 'bad news', - execution_result: instance_double(::RSpec::Core::Example::ExecutionResult, exception: nil).as_null_object, + execution_result: instance_double(RSpec::Core::Example::ExecutionResult, exception: nil).as_null_object, location: nil, location_rerun_argument: nil, metadata: {} @@ -16,13 +16,13 @@ bad_news = described_class.new( dump_summary: Flatware::RSpec::Marshalable::SummaryNotification.from_rspec( - ::RSpec::Core::Notifications::SummaryNotification.new(0, [], [failure_notification], [], 0, 0) + RSpec::Core::Notifications::SummaryNotification.new(0, [], [failure_notification], [], 0, 0) ) ) good_news = described_class.new( dump_summary: Flatware::RSpec::Marshalable::SummaryNotification.from_rspec( - ::RSpec::Core::Notifications::SummaryNotification.new(0, [], [], [], 0, 0) + RSpec::Core::Notifications::SummaryNotification.new(0, [], [], [], 0, 0) ) ) @@ -33,7 +33,7 @@ it 'accrues deprecations' do add_deprecation = lambda do |checkpoint| - checkpoint.deprecation(instance_double(::RSpec::Core::Notifications::DeprecationNotification)) + checkpoint.deprecation(instance_double(RSpec::Core::Notifications::DeprecationNotification)) end checkpoint1 = described_class.new diff --git a/spec/flatware/rspec/job_builder_spec.rb b/spec/flatware/rspec/job_builder_spec.rb index 0838dc6..6e35d14 100644 --- a/spec/flatware/rspec/job_builder_spec.rb +++ b/spec/flatware/rspec/job_builder_spec.rb @@ -5,11 +5,11 @@ describe Flatware::RSpec::JobBuilder do before do - allow(::RSpec::Core::ExampleStatusPersister).to( + allow(RSpec::Core::ExampleStatusPersister).to( receive(:load_from).and_return(persisted_examples) ) - allow(::RSpec.configuration).to( + allow(RSpec.configuration).to( receive(:files_to_run).and_return(files_to_run) ) end diff --git a/spec/flatware/rspec/marshalable/example_spec.rb b/spec/flatware/rspec/marshalable/example_spec.rb index 3ac06fc..2bb7764 100644 --- a/spec/flatware/rspec/marshalable/example_spec.rb +++ b/spec/flatware/rspec/marshalable/example_spec.rb @@ -3,7 +3,7 @@ describe Flatware::RSpec::Marshalable::Example do def stub_execution_result(exception) instance_double( - ::RSpec::Core::Example::ExecutionResult, + RSpec::Core::Example::ExecutionResult, exception: exception, finished_at: Time.now, run_time: 0, @@ -14,11 +14,11 @@ def stub_execution_result(exception) it 'caries what is needed to format a backtrace' do exception = Exception.new - ::RSpec::Core::Formatters::ExceptionPresenter.new( + RSpec::Core::Formatters::ExceptionPresenter.new( exception, described_class.new( instance_double( - ::RSpec::Core::Example, + RSpec::Core::Example, execution_result: stub_execution_result(exception), full_description: nil, location: nil, @@ -33,7 +33,7 @@ def stub_execution_result(exception) const = stub_const('A::Constant::Not::Likely::Loaded::In::Sink', Class.new(RuntimeError)) message = described_class.new( instance_double( - ::RSpec::Core::Example, + RSpec::Core::Example, execution_result: stub_execution_result(const.new), full_description: nil, location: nil, diff --git a/spec/flatware/rspec/marshalable/examples_notification_spec.rb b/spec/flatware/rspec/marshalable/examples_notification_spec.rb index 163d7bf..98bc1fb 100644 --- a/spec/flatware/rspec/marshalable/examples_notification_spec.rb +++ b/spec/flatware/rspec/marshalable/examples_notification_spec.rb @@ -4,8 +4,8 @@ describe Flatware::RSpec::Marshalable::ExamplesNotification do it 'can be added together' do failed_example = instance_double( - ::RSpec::Core::Example, - execution_result: instance_double(::RSpec::Core::Example::ExecutionResult, exception: nil).as_null_object, + RSpec::Core::Example, + execution_result: instance_double(RSpec::Core::Example::ExecutionResult, exception: nil).as_null_object, full_description: 'the example', location_rerun_argument: nil, location: nil, @@ -15,9 +15,9 @@ notifications = [[], [failed_example]].map do |failed_examples| described_class.from_rspec( instance_double( - ::RSpec::Core::Notifications::ExamplesNotification, + RSpec::Core::Notifications::ExamplesNotification, instance_variable_get: instance_double( - ::RSpec::Core::Reporter, + RSpec::Core::Reporter, examples: [], failed_examples: failed_examples, pending_examples: [] diff --git a/spec/flatware/rspec/marshalable/summary_notification_spec.rb b/spec/flatware/rspec/marshalable/summary_notification_spec.rb index a3a0506..f827a89 100644 --- a/spec/flatware/rspec/marshalable/summary_notification_spec.rb +++ b/spec/flatware/rspec/marshalable/summary_notification_spec.rb @@ -14,7 +14,7 @@ def args end it 'plays nice with the rspec formatting stuff' do - notification = ::RSpec::Core::Notifications::SummaryNotification.new(*args) + notification = RSpec::Core::Notifications::SummaryNotification.new(*args) summary = described_class.from_rspec(notification) expect(summary.fully_formatted).to match(/Finished/) end