Merge branch 'master' into feat/message-contracts

Author: bethesque

.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.1
+  - 2.4.3
+  - 2.5.0
   - jruby-9.1.13.0
 gemfile:
   - gemfiles/default.gemfile
@@ -19,5 +21,9 @@ matrix:
       gemfile: gemfiles/ruby_under_22.gemfile
     - rvm: 2.3.1
       gemfile: gemfiles/ruby_under_22.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/ruby_under_22.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/ruby_under_22.gemfile
     - rvm: jruby-9.1.13.0
       gemfile: gemfiles/ruby_under_22.gemfile

CHANGELOG.md

@@ -1,6 +1,25 @@
-Do this to generate your change history
+<a name="v1.3.1"></a>
+### v1.3.1 (2018-03-19)
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
+#### Bug Fixes
+
+* dynamically load pact/matchers	 ([d80e0ff](/../../commit/d80e0ff))
+
+
+<a name="v1.3.0"></a>
+### v1.3.0 (2018-03-19)
+
+#### Features
+
+* do not automatically create tmp/pacts dir	 ([de9e25e](/../../commit/de9e25e))
+
+
+<a name="v1.2.5"></a>
+### v1.2.5 (2018-02-16)
+
+#### Bug Fixes
+
+* replace backslashes in pact dir path with forward slashes	 ([a1b5013](/../../commit/a1b5013))
 
 ### 1.2.4 (2017-10-30)
 * 80bbdcc - fix: remove unused dependency on rack-test (Beth Skurrie, Mon Oct 30 09:52:22 2017 +1100)

RELEASING.md

@@ -1,15 +1,5 @@
 # Releasing
 
-1. Increment the version in `lib/pact/support/version.rb`
-2. Update the `CHANGELOG.md` using:
+Run
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
-
-3. Add files to git
-
-      $ git add CHANGELOG.md lib/pact/support/version.rb
-      $ git commit -m "chore(release): version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
-
-3. Release:
-
-      $ bundle exec rake release
+    script/release.sh [major|minor|patch] # default is minor

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
@@ -174,11 +174,9 @@ def self.configuration
 
   def self.configure
     yield configuration
-    FileUtils::mkdir_p configuration.tmp_dir
   end
 
   def self.clear_configuration
     @configuration = nil
   end
-
 end

lib/pact/consumer_contract/file_name.rb

@@ -8,11 +8,15 @@ def file_name consumer_name, provider_name, options = {}
     end
 
     def file_path consumer_name, provider_name, pact_dir = Pact.configuration.pact_dir, options = {}
-      File.join(pact_dir, file_name(consumer_name, provider_name, options))
+      File.join(windows_safe(pact_dir), file_name(consumer_name, provider_name, options))
     end
 
     def filenamify name
       name.downcase.gsub(/\s/, '_')
     end
+
+    def windows_safe(pact_dir)
+      pact_dir.gsub("\\", "/")
+    end
   end
 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/helpers.rb

@@ -37,10 +37,12 @@ def like_datetime datetime
       Pact::Term.new(generate: datetime, matcher: /^\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z)$/)
     end
 
-    def like_datetime_with_miliseconds datetime
+    def like_datetime_with_milliseconds datetime
       Pact::Term.new(generate: datetime, matcher: /^\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d{3}([+-][0-2]\d:[0-5]\d|Z)$/)
     end
 
+    alias_method :like_datetime_with_miliseconds, :like_datetime_with_milliseconds
+
     def like_date date
       Pact::Term.new(generate: date, matcher: /^\d{4}-[01]\d-[0-3]\d$/)
     end

lib/pact/matchers/extract_diff_messages.rb

@@ -1,3 +1,4 @@
+# @api public. Used by lib/pact/provider/rspec/pact_broker_formatter.rb
 module Pact
   module Matchers
     class ExtractDiffMessages
@@ -13,17 +14,21 @@ def self.call diff, options = {}
       end
 
       def to_hash
-        diff
+        to_a
       end
 
       def call
-        to_s
+        to_a
       end
 
       def to_s
         diff_messages(diff).join("\n")
       end
 
+      def to_a
+        diff_messages(diff)
+      end
+
       def diff_messages obj, path = [], messages = []
         case obj
         when Hash then handle_hash obj, path, messages
@@ -51,7 +56,7 @@ def handle_array array, path, messages
 
       def handle_difference difference, path, messages
         if difference.message
-          message = "* #{difference.message}"
+          message = difference.message
           message = message.gsub("<path>", path_to_s(path))
           message = message.gsub("<parent_path>", parent_path_to_s(path))
           messages << message

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/matchers/unix_diff_formatter.rb

@@ -17,7 +17,7 @@ def initialize diff, options = {}
         @actual = options.fetch(:actual, {})
         @include_explanation = options.fetch(:include_explanation, true)
         @differ = Pact::Matchers::Differ.new(@colour)
-        @messages = Pact::Matchers::ExtractDiffMessages.call(diff)
+        @messages = Pact::Matchers::ExtractDiffMessages.call(diff).collect{ | message| "* #{message}" }.join("\n")
       end
 
       def self.call diff, options = {}

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,13 +1,11 @@
-require 'pact/matchers/matchers'
 require 'uri'
 
 module Pact
   class FormDiffer
 
-    extend Matchers
-
     def self.call expected, actual, options = {}
-      diff to_hash(expected), to_hash(actual), options
+      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      ::Pact::Matchers.diff to_hash(expected), to_hash(actual), options
     end
 
     def self.to_hash form_body
@@ -19,8 +17,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
 
@@ -30,6 +28,5 @@ def self.decode_www_form string
         hash[key] << value
       end
     end
-
   end
 end

lib/pact/shared/json_differ.rb

@@ -1,15 +1,10 @@
-require 'pact/matchers/matchers'
-
 module Pact
   class JsonDiffer
 
-    extend Matchers
-    
-    # Delegates to https://github.com/bethesque/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
+    # Delegates to https://github.com/pact-foundation/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
     def self.call expected, actual, options = {}
-      diff expected, actual, options
+      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      ::Pact::Matchers.diff expected, actual, options
     end
-
-
   end
 end

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,13 +1,10 @@
-require 'pact/matchers/matchers'
-require 'pact/matchers/difference'
 
 module Pact
   class TextDiffer
 
-    extend Matchers
-
     def self.call expected, actual, options = {}
-      diff expected, actual, options
+      require 'pact/matchers' # avoid recursive loop between this file and pact/matchers
+      ::Pact::Matchers.diff expected, actual, options
     end
 
   end

lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.2.99.alpha.1"
+    VERSION = "1.4.0"
   end
 end

pact-support.gemspec

@@ -28,10 +28,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_print', '~> 1.1'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
-  gem.add_development_dependency 'webmock', '~> 2.0.0'
+  gem.add_development_dependency 'webmock', '~> 3.3'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.11.2'
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'
   gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'conventional-changelog', '~>1.3'
+  gem.add_development_dependency 'bump', '~> 0.5'
 end

script/release.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+git checkout -- lib/pact/support/version.rb
+bundle exec bump ${1:-minor} --no-commit
+bundle exec rake generate_changelog
+git add CHANGELOG.md lib/pact/support/version.rb
+git commit -m "Releasing version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
+bundle exec rake release

spec/lib/pact/consumer_contract/file_name_spec.rb

@@ -3,13 +3,22 @@
 module Pact
   describe FileName do
     describe "file_path" do
-      let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
+
+      subject { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
       it { is_expected.to eq 'tmp/pacts/foo-bar.json' }
 
       context "when unique is true" do
-        let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
+        subject { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
         it { is_expected.to match %r{tmp/pacts/foo-bar-\d+.json} }
       end
+
+      context "when the path includes backslashes" do
+        subject { FileName.file_path 'foo', 'bar', 'c:\tmp\pacts' }
+
+        it "changes them to forward slashes" do
+          expect(subject).to eq "c:/tmp/pacts/foo-bar.json"
+        end
+      end
     end
   end
 end