Merge pull request pact-foundation#53 from iamvery/ruby-2-5-warnings

Fix Ruby 2.5 warnings

Author: bethesque

lib/pact/configuration.rb

@@ -72,8 +72,8 @@ def logger
 
     # Should this be deprecated in favour of register_diff_formatter???
     def diff_formatter= diff_formatter
-      register_diff_formatter /.*/, diff_formatter
-      register_diff_formatter nil, diff_formatter
+      register_diff_formatter(/.*/, diff_formatter)
+      register_diff_formatter(nil, diff_formatter)
     end
 
     def register_diff_formatter content_type, diff_formatter

lib/pact/consumer_contract/consumer_contract.rb

@@ -34,7 +34,7 @@ def self.from_hash(hash)
       new(
         :consumer => ServiceConsumer.from_hash(hash[:consumer]),
         :provider => ServiceProvider.from_hash(hash[:provider]),
-        :interactions => hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
+        :interactions => hash[:interactions].collect { |h| Interaction.from_hash(h)}
       )
     end
 

lib/pact/consumer_contract/query_string.rb

@@ -1,5 +1,4 @@
 require 'pact/shared/active_support_support'
-require 'pact/matchers'
 
 module Pact
   class QueryString

lib/pact/matchers/matchers.rb

@@ -224,7 +224,7 @@ def type_difference_message expected, actual
           expected_desc = class_name_with_value_in_brackets(expected)
           expected_desc.gsub!("(", "(like ")
           actual_desc = class_name_with_value_in_brackets(actual)
-          message = "Expected #{expected_desc} but got #{actual_desc} at <path>"
+          "Expected #{expected_desc} but got #{actual_desc} at <path>"
         end
       end
     end

lib/pact/matching_rules/jsonpath.rb

@@ -13,7 +13,6 @@ class JsonPath
       def initialize(path)
         scanner = StringScanner.new(path)
         @path = []
-        bracket_count = 0
         while not scanner.eos?
           if token = scanner.scan(/\$/)
             @path << token
@@ -49,10 +48,10 @@ def initialize(path)
             @path.last << token
           end
         end
+      end
 
-        def to_s
-          path.join
-        end
+      def to_s
+        path.join
       end
     end
   end

lib/pact/reification.rb

@@ -15,8 +15,8 @@ def self.from_term(term)
       when Pact::Term, Regexp, Pact::SomethingLike, Pact::ArrayLike
         from_term(term.generate)
       when Hash
-        term.inject({}) do |mem, (key,term)|
-          mem[key] = from_term(term)
+        term.inject({}) do |mem, (key,t)|
+          mem[key] = from_term(t)
           mem
         end
       when Array

lib/pact/shared/form_differ.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers/matchers'
 require 'uri'
 
 module Pact
@@ -19,8 +18,8 @@ def self.to_hash form_body
     end
 
     def self.ensure_values_are_arrays hash
-      hash.each_with_object({}) do | (key, value), hash |
-        hash[key.to_s] = [*value]
+      hash.each_with_object({}) do | (key, value), h |
+        h[key.to_s] = [*value]
       end
     end
 

lib/pact/shared/json_differ.rb

@@ -1,5 +1,3 @@
-require 'pact/matchers/matchers'
-
 module Pact
   class JsonDiffer
 

lib/pact/shared/request.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers'
 require 'pact/symbolize_keys'
 require 'pact/consumer_contract/headers'
 require 'pact/consumer_contract/query'

lib/pact/shared/text_differ.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers/matchers'
 require 'pact/matchers/difference'
 
 module Pact