From eb4a85b6c8114aa751f015e9261670cb84fc9014 Mon Sep 17 00:00:00 2001 From: OKURA Masafumi Date: Wed, 4 Aug 2021 17:02:45 +0900 Subject: [PATCH 1/3] Setup GitHub Actions for CI On ubuntu-latest, the oldest supported Ruby is 1.9.3, so here testing for Ruby 1.8.7 and 1.9.2 is dropped. --- .github/workflows/main.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..95853fe --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,21 @@ +name: CI + +on: [push,pull_request] + +jobs: + build: + strategy: + fail-fast: false + matrix: + ruby: ['1.9.3', 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, head, jruby, truffleruby] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + bundler-cache: true + - name: Run the default task + run: | + bundle exec rake From f559ee1a5fbc625b3a629f64d03f4ce249ea2fa0 Mon Sep 17 00:00:00 2001 From: OKURA Masafumi Date: Wed, 4 Aug 2021 17:19:14 +0900 Subject: [PATCH 2/3] Upgrade RSpec to latest RSpec 2.8 is quite old and its rake task is not compatible to latest Rake. There are some modifications to suppress deprecation warnings. --- middleware.gemspec | 6 +++--- spec/middleware/runner_spec.rb | 2 +- spec/setup.rb | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/middleware.gemspec b/middleware.gemspec index 2a76cc2..9ff0396 100644 --- a/middleware.gemspec +++ b/middleware.gemspec @@ -11,9 +11,9 @@ Gem::Specification.new do |gem| gem.add_development_dependency "rake" gem.add_development_dependency "redcarpet", "~> 2.1.0" - gem.add_development_dependency "rspec-core", "~> 2.8.0" - gem.add_development_dependency "rspec-expectations", "~> 2.8.0" - gem.add_development_dependency "rspec-mocks", "~> 2.8.0" + gem.add_development_dependency "rspec-core", "~> 3.10.0" + gem.add_development_dependency "rspec-expectations", "~> 3.10.0" + gem.add_development_dependency "rspec-mocks", "~> 3.10.0" gem.add_development_dependency "yard", "~> 0.7.5" gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } diff --git a/spec/middleware/runner_spec.rb b/spec/middleware/runner_spec.rb index 9d14a8f..8b5673f 100644 --- a/spec/middleware/runner_spec.rb +++ b/spec/middleware/runner_spec.rb @@ -148,7 +148,7 @@ def initialize(app); @app = app; end env = {} instance = described_class.new([a, b, c]) - expect { instance.call(env) }.to raise_error + expect { instance.call(env) }.to raise_error(RuntimeError) data.should == ["a", "b", "e"] end diff --git a/spec/setup.rb b/spec/setup.rb index 6414e87..709e714 100644 --- a/spec/setup.rb +++ b/spec/setup.rb @@ -1,5 +1,4 @@ require "rubygems" -require "rspec/autorun" # Do not buffer output $stdout.sync = true @@ -7,4 +6,7 @@ # Configure RSpec RSpec.configure do |c| + c.expect_with :rspec do |expectations| + expectations.syntax = [:should, :expect] # Both syntax are used so we need to explicitly set this to suppress warnings + end end From 9f3cca9185df84bd3b6a97a46b9e5e77be4034f3 Mon Sep 17 00:00:00 2001 From: OKURA Masafumi Date: Wed, 4 Aug 2021 17:50:00 +0900 Subject: [PATCH 3/3] Update dev dependencies Yard 0.7.5 with Ruby 3.0.2 prints the error below: ``` /Users/okuramasafumi/.gem/ruby/3.0.2/gems/yard-0.7.5/lib/yard/templates/engine.rb:36:in `require': /Users/okuramasafumi/.gem/ruby/3.0.2/gems/yard-0.7.5/lib/yard/templates/template.rb:279: circular argument reference - section (SyntaxError) ``` RedCarpet gem seems not used and is very old, so it's removed. --- middleware.gemspec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/middleware.gemspec b/middleware.gemspec index 9ff0396..a696bd9 100644 --- a/middleware.gemspec +++ b/middleware.gemspec @@ -10,11 +10,10 @@ Gem::Specification.new do |gem| gem.license = "MIT" gem.add_development_dependency "rake" - gem.add_development_dependency "redcarpet", "~> 2.1.0" gem.add_development_dependency "rspec-core", "~> 3.10.0" gem.add_development_dependency "rspec-expectations", "~> 3.10.0" gem.add_development_dependency "rspec-mocks", "~> 3.10.0" - gem.add_development_dependency "yard", "~> 0.7.5" + gem.add_development_dependency "yard", "~> 0.9" gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } gem.files = `git ls-files`.split("\n")