Merge branch 'fixes/ruby-2-2-syntax-error'

Author: etagwerker

.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.2.10
   - 2.3.3
 before_install: gem install bundler -v 1.16.1

exe/bundle_report

@@ -9,7 +9,7 @@ at_exit do
 
   options = {}
   option_parser = OptionParser.new do |opts|
-    opts.banner = <<~EOS
+    opts.banner = <<-EOS
       Usage: #{$0} [report-type] [options]
 
       report-type  There are two report types available: `outdated` and `compatibility`

exe/deprecations

@@ -4,7 +4,9 @@ require "colorize"
 require "optparse"
 require "set"
 
-def run_tests(deprecation_warnings, tracker_mode:, next_mode:)
+def run_tests(deprecation_warnings, opts = {})
+  tracker_mode = opts[:tracker_mode]
+  next_mode = opts[:next_mode]
   rspec_command = if next_mode
     "bin/next rspec"
   else
@@ -16,7 +18,8 @@ def run_tests(deprecation_warnings, tracker_mode:, next_mode:)
   exec command
 end
 
-def print_info(deprecation_warnings, verbose: false)
+def print_info(deprecation_warnings, opts = {})
+  verbose = !!opts[:verbose]
   frequency_by_message = deprecation_warnings.each_with_object({}) do |(test_file, messages), hash|
     messages.each do |message|
       hash[message] ||= { test_files: Set.new, occurrences: 0 }
@@ -36,7 +39,7 @@ end
 
 options = {}
 option_parser = OptionParser.new do |opts|
-  opts.banner = <<~MESSAGE
+  opts.banner = <<-MESSAGE
     Usage: #{__FILE__.to_s} [options] [mode]
 
       Parses the deprecation warning shitlist and show info or run tests.

lib/deprecation_tracker.rb

@@ -29,11 +29,24 @@ def warn(*messages)
 
   # There are two forms of the `warn` method: one for class Kernel and one for instances of Kernel (i.e., every Object)
   Object.prepend(KernelWarnTracker)
-  Kernel.singleton_class.prepend(KernelWarnTracker)
 
-  def self.track_rspec(rspec_config, shitlist_path:, mode:, transform_message: nil)
+  # Ruby 2.2 and lower doesn't appear to allow overriding of Kernel.warn using `singleton_class.prepend`.
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.3.0")
+    Kernel.singleton_class.prepend(KernelWarnTracker)
+  else
+    def Kernel.warn(*args, &block)
+      Object.warn(*args, &block)
+    end
+  end
+
+  def self.track_rspec(rspec_config, opts = {})
+    shitlist_path = opts[:shitlist_path]
+    mode = opts[:mode]
+    transform_message = opts[:transform_message]
     deprecation_tracker = DeprecationTracker.new(shitlist_path, transform_message)
-    ActiveSupport::Deprecation.behavior << -> (message, _callstack, _deprecation_horizon, _gem_name) { deprecation_tracker.add(message) }
+    if defined?(ActiveSupport)
+      ActiveSupport::Deprecation.behavior << -> (message, _callstack, _deprecation_horizon, _gem_name) { deprecation_tracker.add(message) }
+    end
     KernelWarnTracker.callbacks << -> (message) { deprecation_tracker.add(message) }
 
     rspec_config.around do |example|
@@ -86,7 +99,7 @@ def compare
     end
 
     if changed_buckets.length > 0
-      message = <<~MESSAGE.red
+      message = <<-MESSAGE.red
         ⚠️  Deprecation warnings have changed!
 
         Code called by the following spec files is now generating different deprecation warnings:
@@ -119,7 +132,7 @@ def save
     new_shitlist = create_temp_shitlist
     FileUtils.cp(new_shitlist.path, shitlist_path)
   ensure
-    new_shitlist&.delete
+    new_shitlist.delete if new_shitlist
   end
 
   def create_temp_shitlist

spec/deprecation_tracker_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe DeprecationTracker do
   let(:shitlist_path) do
-    shitlist_path = Tempfile.new.path
+    shitlist_path = Tempfile.new("tmp").path
     FileUtils.rm(shitlist_path)
     shitlist_path
   end
@@ -92,14 +92,14 @@
 
       subject.save
 
-      expected_json = <<~JSON.chomp
-        {
-          "bucket 1": [
-            "a",
-            "b",
-            "b"
-          ]
-        }
+      expected_json = <<-JSON.chomp
+{
+  "bucket 1": [
+    "a",
+    "b",
+    "b"
+  ]
+}
       JSON
       expect(File.read(shitlist_path)).to eq(expected_json)
     end
@@ -116,15 +116,15 @@
       subject.add("a")
       subject.save
 
-      expected_json = <<~JSON.chomp
-        {
-          "bucket 1": [
-            "a"
-          ],
-          "bucket 2": [
-            "a"
-          ]
-        }
+      expected_json = <<-JSON.chomp
+{
+  "bucket 1": [
+    "a"
+  ],
+  "bucket 2": [
+    "a"
+  ]
+}
       JSON
       expect(File.read(shitlist_path)).to eq(expected_json)
     end
@@ -141,12 +141,12 @@
       subject.add("b")
       subject.save
 
-      expected_json = <<~JSON.chomp
-        {
-          "bucket 1": [
-            "b"
-          ]
-        }
+      expected_json = <<-JSON.chomp
+{
+  "bucket 1": [
+    "b"
+  ]
+}
       JSON
       expect(File.read(shitlist_path)).to eq(expected_json)
     end
@@ -159,15 +159,15 @@
       subject.add("a")
       subject.save
 
-      expected_json = <<~JSON.chomp
-        {
-          "bucket 1": [
-            "a"
-          ],
-          "bucket 2": [
-            "a"
-          ]
-        }
+      expected_json = <<-JSON.chomp
+{
+  "bucket 1": [
+    "a"
+  ],
+  "bucket 2": [
+    "a"
+  ]
+}
       JSON
       expect(File.read(shitlist_path)).to eq(expected_json)
     end
@@ -180,14 +180,14 @@
       subject.add("a")
       subject.save
 
-      expected_json = <<~JSON.chomp
-        {
-          "bucket 1": [
-            "a",
-            "b",
-            "c"
-          ]
-        }
+      expected_json = <<-JSON.chomp
+{
+  "bucket 1": [
+    "a",
+    "b",
+    "c"
+  ]
+}
       JSON
       expect(File.read(shitlist_path)).to eq(expected_json)
     end