Merge pull request #2 from runtastic/support-ruby-3

Support ruby 3
runtastic · Jan 17, 2023 · d604c63 · d604c63
2 parents c4404e0 + 1801468
commit d604c63
Show file tree

Hide file tree

Showing 30 changed files with 508 additions and 1,177 deletions.
diff --git a/.github/workflows/matrix.yml b/.github/workflows/matrix.yml
@@ -12,23 +12,21 @@ permissions:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu]
-        ruby:
-        # - ruby-2.4
-        # - ruby-2.5
-        - ruby-2.6
-        - ruby-2.7
-        - jruby-9.3.9.0
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+        experimental: [false]
+        ruby-version: ["2.7", "3.0", "3.1", "3.2", "jruby-9.3"]
+        include:
+          - ruby-version: jruby-9.4
+            experimental: true
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
-      - run: bundle exec rake test
-      # - run: bundle exec rubocop
+      - run: bundle exec rspec
+      - run: bundle exec rubocop
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 /tmp/
 
 .ruby-version
+.rspec_status
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,19 +1,15 @@
 require: rt_rubocop_defaults
 
 AllCops:
-  TargetRubyVersion: 2.4
-  SuggestExtensions: false
+  TargetRubyVersion: 2.6
+  # vendor directory is used by github actions and causes issues if not excluded here
   Exclude:
-    - vendor/**/*.rb
-
-Layout/LineLength:
-  Max: 99
-  Exclude:
-    - test/*
+    - vendor/bundle/**/*
 
 Metrics/BlockLength:
   Exclude:
     - '*.gemspec'
+    - 'spec/*'
 
 Metrics/AbcSize:
   Exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,46 +1,47 @@
-Changelog
-===
+# Changelog
 
-master
----
+All notable changes to this project will be documented in this file.
 
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [2.0.0] - 2023-01-17
+### Changed
 * switch CI to github actions
 * remove danger
 * remove codecov
+* Support for ruby 3
+* The wrapper interface has been redesigned (breaking change, see [upgrade notes](./upgrade_notes.md))
 
-1.0.0
----
 
+## [1.0.0]
+### Changed
 * repackage 0.3.1 as 1.0.0
 * setup circleci
 * drop ruby < 2.4
 
 
-0.3.1
----
-
+## [0.3.1]
+### Fixed
 * fix after wrapper ordering bug [PR#6](https://github.com/andreaseger/receptacle/pull/6)
 
-0.3.0
----
-
+## [0.3.0}
+### Added 
 * add danger
 * also support higher arity methods (== method with more than one argument)
 
-0.2.0
----
-
+## [0.2.0]
+### Changed
 * update documentation
 * enable ruby 2.1+
 
-0.1.1
----
-
+## [0.1.1]
+## Added 
 * add changelog, update copyright
 * add test helper method `ensure_method_delegators` to make rspec stubs/mocks work as expected
 
-0.1.0
----
-
+## [0.1.0]
+## Added
 * initial release
-
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,45 +1,19 @@
 PATH
   remote: .
   specs:
-    receptacle (1.0.0)
+    receptacle (2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     coderay (1.1.3)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    ffi (1.15.5)
     ffi (1.15.5-java)
-    formatador (1.1.0)
-    guard (2.18.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.6)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
-    guard-rubocop (1.5.0)
-      guard (~> 2.0)
-      rubocop (< 2.0)
     json (2.6.2)
     json (2.6.2-java)
-    listen (3.7.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.16.3)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -51,12 +25,24 @@ GEM
       method_source (~> 1.0)
       spoon (~> 0.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
+    rake (10.5.0)
     regexp_parser (2.6.0)
     rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rt_rubocop_defaults (2.4.0)
       rubocop (~> 1.25)
     rubocop (1.38.0)
@@ -71,9 +57,10 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
+    rubocop-rspec (2.14.2)
+      rubocop (~> 1.33)
     rubocop_runner (2.2.1)
     ruby-progressbar (1.11.0)
-    shellany (0.0.1)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -82,7 +69,6 @@ GEM
     simplecov_json_formatter (0.1.4)
     spoon (0.0.6)
       ffi
-    thor (1.2.1)
     unicode-display_width (2.3.0)
 
 PLATFORMS
@@ -91,16 +77,16 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.13, < 3)
-  guard
-  guard-minitest
-  guard-rubocop
-  minitest (~> 5.0)
   pry
-  rake (~> 13.0)
+  rake (~> 10.0)
   receptacle!
+  rspec (~> 3.11)
+  rspec_junit_formatter
   rt_rubocop_defaults (~> 2.4)
-  rubocop_runner (~> 2.0)
+  rubocop (~> 1.37)
+  rubocop-rspec (~> 2.14)
+  rubocop_runner (~> 2.2)
   simplecov (~> 0.13)
 
 BUNDLED WITH
-   2.2.19
+   2.3.26
diff --git a/Guardfile b/Guardfile