Merge pull request #56 from gocardless/deprecate_ruby_2.2

Deprecate support for Ruby 2.2
gocardless · Jun 13, 2019 · 7c0451f · 7c0451f
2 parents 1b5a97b + 66126d1
commit 7c0451f
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,30 +33,6 @@ references:
 
     - run: bundle exec rubocop
 jobs:
-  build-ruby22-rails515:
-    docker:
-      - image: ruby:2.2
-        environment:
-          - RAILS_VERSION=5.1.5
-    steps: *steps
-  build-ruby22-rails4210:
-    docker:
-      - image: ruby:2.2
-        environment:
-          - RAILS_VERSION=4.2.10
-    steps: *steps
-  build-ruby23-rails515:
-    docker:
-      - image: ruby:2.3
-        environment:
-          - RAILS_VERSION=5.1.5
-    steps: *steps
-  build-ruby23-rails4210:
-    docker:
-      - image: ruby:2.3
-        environment:
-          - RAILS_VERSION=4.2.10
-    steps: *steps
   build-ruby24-rails515:
     docker:
       - image: ruby:2.4
@@ -86,10 +62,6 @@ workflows:
   version: 2
   tests:
     jobs:
-      - build-ruby22-rails515
-      - build-ruby22-rails4210
-      - build-ruby23-rails515
-      - build-ruby23-rails4210
       - build-ruby24-rails515
       - build-ruby24-rails4210
       - build-ruby25-rails515

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,7 +4,7 @@ inherit_gem:
   gc_ruboconfig: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
 
 Metrics/MethodLength:
   Max: 15

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,9 @@
   * `coach.handler.finish`
   * `coach.request`
 
+* [#56](https://github.com/gocardless/coach/pull/56) Support for Ruby 2.2 and 2.3 has been
+  dropped. See our [compatibility policy](https://github.com/gocardless/coach/blob/master/docs/COMPATIBILITY.md) for more information.
+
 # 1.0.0 / 2018-04-19
 
 ## Breaking changes

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ To get started, just add Coach to your `Gemfile`, and then run `bundle`:
 gem 'coach'
 ```
 
-Coach works with Ruby versions 2.2 and onwards.
+Coach works with Ruby versions 2.4 and onwards.
 
 ## Coach by example
 

diff --git a/coach.gemspec b/coach.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "coach/version"
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/gocardless/coach"
   spec.email         = %w[[email protected]]
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.2"
+  spec.required_ruby_version = ">= 2.4"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^spec/})

diff --git a/lib/coach.rb b/lib/coach.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support"
 require "action_dispatch"
 

diff --git a/lib/coach/errors.rb b/lib/coach/errors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   module Errors
     class MiddlewareDependencyNotMet < StandardError

diff --git a/lib/coach/handler.rb b/lib/coach/handler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 require "active_support/core_ext/object/try"
 

diff --git a/lib/coach/middleware.rb b/lib/coach/middleware.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/middleware_item"
 
 module Coach

diff --git a/lib/coach/middleware_item.rb b/lib/coach/middleware_item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 require "coach/middleware_validator"
 
@@ -13,7 +15,7 @@ def initialize(middleware, config = {})
     def build_middleware(context, successor)
       @middleware.
         new(context,
-            successor && successor.instrument,
+            successor&.instrument,
             config)
     end
 

diff --git a/lib/coach/middleware_validator.rb b/lib/coach/middleware_validator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 
 module Coach

diff --git a/lib/coach/notifications.rb b/lib/coach/notifications.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "request_benchmark"
 require_relative "request_serializer"
 

diff --git a/lib/coach/request_benchmark.rb b/lib/coach/request_benchmark.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   # This class is built to aggregate data during the course of the request. It relies on
   # 'start_middleware.coach' and 'finish_middleware.coach' events to register the

diff --git a/lib/coach/request_serializer.rb b/lib/coach/request_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   class RequestSerializer
     def self.header_rules

diff --git a/lib/coach/router.rb b/lib/coach/router.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "handler"
 require_relative "errors"
 

diff --git a/lib/coach/rspec.rb b/lib/coach/rspec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/expectations"
 require "coach/middleware"
 

diff --git a/lib/coach/version.rb b/lib/coach/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.0"
 end
diff --git a/spec/lib/coach/handler_spec.rb b/spec/lib/coach/handler_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "coach/handler"

diff --git a/spec/lib/coach/middleware_spec.rb b/spec/lib/coach/middleware_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/middleware"
 
 describe Coach::Middleware do

diff --git a/spec/lib/coach/middleware_validator_spec.rb b/spec/lib/coach/middleware_validator_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/middleware_validator"
 

diff --git a/spec/lib/coach/notifications_spec.rb b/spec/lib/coach/notifications_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/notifications"
 

diff --git a/spec/lib/coach/request_benchmark_spec.rb b/spec/lib/coach/request_benchmark_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/request_benchmark"
 

diff --git a/spec/lib/coach/request_serializer_spec.rb b/spec/lib/coach/request_serializer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "active_support/core_ext/object/try"
 require "coach/request_serializer"

diff --git a/spec/lib/coach/router_spec.rb b/spec/lib/coach/router_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "coach/router"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/its"
 require "pry"
 require "coach"