Add ruby 2.7 support (#81)

andrcuns · web-flow · commit 1b6660703e84 · 2020-02-24T12:14:04.000+02:00
* Fix ruby 2.7 deprecation warnings

* Fail fast: false

* Update bundler

* Fix job name

* Revert formatter change

* Fix deprecation warning

* Cache gems

* Add step names

* Reduce bundler output

* Force colors

* Minor step name tweak
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,17 +8,28 @@ jobs:
   release:
     runs-on: ubuntu-16.04
     steps:
-      - uses: actions/checkout@master
+      - name: Checkout
+        uses: actions/checkout@master
       
-      - name: Set up Ruby 2.6
+      - name: Cache gems
+        uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: 2.7-gems-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: 2.7-gems-
+      
+      - name: Set up Ruby
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: '2.7'
 
       - name: Install
         run: |
-          gem install bundler -v 2.0.2 --no-document
+          gem install bundler -v 2.1.2 --no-document
+          bundle config path vendor/bundle
           bundle install -j $(nproc)
+        env:
+          BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: 'true'
       
       - name: Test
         run: bundle exec rake
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,55 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7']
+      fail-fast: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Cache gems
+        uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ matrix.ruby }}-gems-${{ hashFiles('Gemfile.lock') }}
+          restore-keys: ${{ matrix.ruby }}-gems-
+
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Install
+        run: |
+          gem install bundler -v 2.1.2 --no-document
+          bundle config path vendor/bundle
+          bundle install -j $(nproc)
+        env:
+          BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: 'true'
+
+      - name: Lint
+        run: bundle exec rake rubocop
+
+      - name: Test
+        run: bundle exec rake test_with_coverage
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+          CI: "true"
+          CI_NAME: github-ci
+          CI_PULL_REQUEST: ${{ github.event.number }}
+          CONTEXT: ${{ toJson(github) }}
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.0
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,6 +7,7 @@ PATH
     allure-rspec (2.13.3)
       allure-ruby-commons (= 2.13.3)
       rspec-core (~> 3.8)
+      ruby2_keywords (~> 0.0.2)
     allure-ruby (2.13.3)
       allure-cucumber (= 2.13.3)
       allure-rspec (= 2.13.3)
@@ -54,7 +55,7 @@ GEM
     e2mmap (0.1.0)
     gherkin (5.1.0)
     jaro_winkler (1.5.4)
-    json (2.2.0)
+    json (2.3.0)
     lefthook (0.7.1)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
@@ -104,6 +105,7 @@ GEM
     rubocop-performance (1.5.2)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     semantic (1.6.1)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -154,4 +156,4 @@ DEPENDENCIES
   solargraph (~> 0.35)
 
 BUNDLED WITH
-   2.0.2
+   2.1.2
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Allure ruby
 
 [![Yard Docs](https://img.shields.io/badge/yard-docs-blue.svg)](https://rubydoc.info/github/allure-framework/allure-ruby/master)
-![Workflow status](https://github.com/allure-framework/allure-ruby/workflows/Build/badge.svg)
+![Workflow status](https://github.com/allure-framework/allure-ruby/workflows/Test/badge.svg)
 [![Coverage Status](https://coveralls.io/repos/github/allure-framework/allure-ruby/badge.svg?branch=master)](https://coveralls.io/github/allure-framework/allure-ruby?branch=master)  
 Ruby testing framework adaptors for generating allure compatible test reports.
 
diff --git a/allure-rspec/allure-rspec.gemspec b/allure-rspec/allure-rspec.gemspec
@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "allure-ruby-commons", version
   s.add_dependency "rspec-core", "~> 3.8"
+  s.add_dependency "ruby2_keywords", "~> 0.0.2"
 end
diff --git a/allure-rspec/lib/allure_rspec/formatter.rb b/allure-rspec/lib/allure_rspec/formatter.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "ruby2_keywords"
 require "rspec/core"
 require "rspec/core/formatters/base_formatter"
 
@@ -20,7 +21,7 @@ class RSpecFormatter < RSpec::Core::Formatters::BaseFormatter
 
     RSpec::Core::Example.class_eval do
       Allure.singleton_methods.each do |method|
-        define_method(method) { |*args, &block| Allure.__send__(method, *args, &block) }
+        ruby2_keywords define_method(method) { |*args, &block| Allure.__send__(method, *args, &block) }
       end
     end
 
diff --git a/rake/test.rb b/rake/test.rb
@@ -18,15 +18,15 @@ def initialize
   def self.add_rspec_task
     RSpec::Core::RakeTask.new(:test, :tag) do |task, args|
       args[:tag].tap do |tag|
-        task.rspec_opts = "--color --require spec_helper --format documentation #{tag ? "--tag #{tag}" : ''}"
+        task.rspec_opts = "--color --tty --require spec_helper --format documentation #{tag ? "--tag #{tag}" : ''}"
         task.verbose = false
       end
     end
   end
 
   def self.add_rubocop_task
     RuboCop::RakeTask.new(:rubocop) do |task|
-      task.options = %w[--parallel]
+      task.options = %w[--parallel --color]
       task.verbose = false
     end
   end
