Merge pull request #111 from gocardless/drop-24

Drop support for Ruby 2.4 now that it's EOL

.circleci/config.yml

@@ -29,10 +29,6 @@ jobs:
     docker:
       - image: 'ruby:2.5'
     steps: *steps
-  ruby24:
-    docker:
-      - image: 'ruby:2.4'
-    steps: *steps
 
 workflows:
   version: 2
@@ -42,4 +38,3 @@ workflows:
       - ruby27
       - ruby26
       - ruby25
-      - ruby24

.rubocop.yml

@@ -7,7 +7,7 @@ require:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     - .*/**/*
     - bin/**/*

README.md

@@ -4,7 +4,7 @@ Friendly Postgres migrations for people who don't want to take down their databa
 
 ## Supported
 
-- Ruby 2.4 or above
+- Ruby 2.5 or above
 - Rails 5.2 or above
 - Postgres 11 or above
 

lib/nandi/lockfile.rb

@@ -58,7 +58,7 @@ def persist!
         # worse merge conflict problems (e.g. if we randomised the order on
         # writing the file, the whole thing would conflict pretty much every time
         # it was regenerated).
-        content = Hash[lockfile.to_h.deep_stringify_keys.sort_by do |k,_|
+        content = Hash[lockfile.to_h.deep_stringify_keys.sort_by do |k, _|
           Digest::SHA256.hexdigest(k)
         end].to_yaml
 

lib/nandi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nandi
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

spec/nandi/formatting_spec.rb

@@ -21,12 +21,9 @@
 
       # rubocop:disable Security/Eval
       it "evaluates to the same value" do
-        # Not redundant in Ruby 2.4
-        begin
-          expect(eval(result)).to eq(input)
-        rescue SyntaxError
-          raise StandardError, "not valid ruby: #{result}"
-        end
+        expect(eval(result)).to eq(input)
+      rescue SyntaxError
+        raise StandardError, "not valid ruby: #{result}"
       end
       # rubocop:enable Security/Eval
     end