pact 1.27.0 → 1.28.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863f88ef054fb71549db6134a969beaf7ded3f35
-  data.tar.gz: 444f03ebae284db7197842e7be35008a976d5779
+  metadata.gz: ab681c832d6b149fbb741fe2e371104213de90ba
+  data.tar.gz: b4d6d007778f40bca100d30487405a763169bec2
 SHA512:
-  metadata.gz: 248b0ed165715ea29e49f74ed98990020908b5f56b08b22bb2b9744c4e0e18066fabb064629883d95bc462e4e2239032a17528a2172e0502efe54ec788cc3f3d
-  data.tar.gz: 848fb4bb48b346947d787843a0b84613063bfb1d2bfeac6f575a3d35a14b9db8ac5bf398f16bf73c478f4764df11feb3bf7451f9fe4b1e25ece2f18b708d4c1a
+  metadata.gz: 47aeced718b4ba58d79f0398daffd9ddd7fedd6202638b396c7c989014af6af886e8e0e41acef3cf60c3ec86b1c7d1c57bdadce47499c12a595d8bbae1802f76
+  data.tar.gz: 3cbef7b20bb39ee771b4ecb393cb344415be862952b115c867c1e24356701f870c1e1ffe6faa7f744c4ae02dd5e6ae2a4d62b7ec20cc016f23341e4277044e17

data/lib/pact/hal/entity.rb

@@ -68,6 +68,14 @@ module Pact
     end
 
     class ErrorEntity < Entity
+
+      def initialize(data, http_client, response = nil)
+        @data = data
+        @links = {}
+        @client = http_client
+        @response = response
+      end
+
       def success?
         false
       end

data/lib/pact/hal/http_client.rb

@@ -3,11 +3,12 @@ require 'pact/retry'
 module Pact
   module Hal
     class HttpClient
-      attr_accessor :username, :password
+      attr_accessor :username, :password, :verbose
 
       def initialize options
         @username = options[:username]
         @password = options[:password]
+        @verbose = options[:verbose]
       end
 
       def get href, params = {}, headers = {}
@@ -41,9 +42,11 @@ module Pact
       end
 
       def perform_request request, uri
-        options = {:use_ssl => uri.scheme == 'https'}
         response = Retry.until_true do
-          Net::HTTP.start(uri.host, uri.port, :ENV, options) do |http|
+          http = Net::HTTP.new(uri.host, uri.port, :ENV)
+          http.set_debug_output(Pact.configuration.output_stream) if verbose
+          http.use_ssl = (uri.scheme == 'https')
+          http.start do |http|
             http.request request
           end
         end
@@ -52,7 +55,7 @@ module Pact
 
       class Response < SimpleDelegator
         def body
-          bod = __getobj__().body
+          bod = raw_body
           if bod && bod != ''
             JSON.parse(bod)
           else
@@ -60,6 +63,10 @@ module Pact
           end
         end
 
+        def raw_body
+          __getobj__().body
+        end
+
         def success?
           __getobj__().code.start_with?("2")
         end

data/lib/pact/hal/link.rb

@@ -49,7 +49,7 @@ module Pact
         if http_response.success?
           Entity.new(http_response.body, @http_client, http_response)
         else
-          ErrorEntity.new(http_response.body, @http_client, http_response)
+          ErrorEntity.new(http_response.raw_body, @http_client, http_response)
         end
       end
 

data/lib/pact/pact_broker/fetch_pacts.rb

@@ -1,74 +1,76 @@
 require 'pact/hal/entity'
 require 'pact/hal/http_client'
+require 'pact/provider/pact_uri'
 
 module Pact
   module PactBroker
     class FetchPacts
-      attr_reader :provider, :tags, :broker_base_url, :basic_auth_options, :http_client, :index_entity, :all_pacts
+      attr_reader :provider, :tags, :broker_base_url, :http_client_options, :http_client, :index_entity
 
       ALL_PROVIDER_TAG_RELATION = 'pb:provider-pacts-with-tag'.freeze
       LATEST_PROVIDER_TAG_RELATION = 'pb:latest-provider-pacts-with-tag'.freeze
-      ALL_PROVIDER_RELATION = 'pb:provider-pacts'.freeze
       LATEST_PROVIDER_RELATION = 'pb:latest-provider-pacts'.freeze
       PACTS = 'pacts'.freeze
       HREF = 'href'.freeze
 
-      def initialize(provider, tags, broker_base_url, basic_auth_options, all_pacts)
+      def initialize(provider, tags, broker_base_url, http_client_options)
         @provider = provider
-        @tags = tags
+        @tags = (tags || []).collect do |tag|
+          if tag.is_a?(String)
+            { name: tag, all: false, fallback: nil }
+          else
+            tag
+          end
+        end
+        @http_client_options = http_client_options
         @broker_base_url = broker_base_url
-        @http_client = Pact::Hal::HttpClient.new(basic_auth_options)
-        @all_pacts = all_pacts
+        @http_client = Pact::Hal::HttpClient.new(http_client_options)
       end
 
-      def self.call(provider, tags, broker_base_url, basic_auth_options, all_pacts)
-        new(provider, tags, broker_base_url, basic_auth_options, all_pacts).call
+      def self.call(provider, tags, broker_base_url, http_client_options)
+        new(provider, tags, broker_base_url, http_client_options).call
       end
 
       def call
-        get_index
-        if tags && tags.any?
-          get_tagged_pacts_for_provider
+        log_message
+        if get_index.success?
+          if any_tags?
+            get_tagged_pacts_for_provider
+          else
+            get_latest_pacts_for_provider
+          end
         else
-          get_pacts_for_provider
+          raise Pact::Error.new("Error retrieving #{broker_base_url} status=#{index_entity.response.code} #{index_entity.response.raw_body}")
         end
       end
 
       private
 
-      def get_pacts_for_provider
-        if all_pacts
-          get_all_pacts_for_provider
-        else
-          get_latest_pacts_for_provider
-        end
+      def any_tags?
+        tags && tags.any?
       end
 
       def get_tagged_pacts_for_provider
-        if all_pacts
-          get_all_tagged_pacts_for_provider
+        tags.collect do |tag|
+          link = get_link(tag)
+          urls = get_pact_urls(link.expand(provider: provider, tag: tag[:name]).get)
+          if urls == [] && tag[:fallback]
+            urls = get_pact_urls(link.expand(provider: provider, tag: tag[:fallback]).get)
+          end
+          urls
+        end.flatten
+      end
+
+      def get_link(tag)
+        if !tag[:all]
+          index_entity._link(LATEST_PROVIDER_TAG_RELATION)
         else
-          get_latest_tagged_pacts_for_provider
+          index_entity._link(ALL_PROVIDER_TAG_RELATION)
         end
       end
 
       def get_index
-        response = http_client.get(broker_base_url)
-        @index_entity = Pact::Hal::Entity.new(response.body, http_client)
-      end
-
-      def get_latest_tagged_pacts_for_provider
-        link = index_entity._link(LATEST_PROVIDER_TAG_RELATION)
-        tags.collect do | tag |
-          get_pact_urls(link.expand(provider: provider, tag: tag).get)
-        end.flatten
-      end
-
-      def get_all_tagged_pacts_for_provider
-        link = index_entity._link(ALL_PROVIDER_TAG_RELATION)
-        tags.collect do |tag|
-          get_pact_urls(link.expand(provider: provider, tag: tag).get)
-        end.flatten
+        @index_entity = Pact::Hal::Link.new({ "href" => broker_base_url }, http_client).get
       end
 
       def get_latest_pacts_for_provider
@@ -76,14 +78,24 @@ module Pact
         get_pact_urls(link.expand(provider: provider).get)
       end
 
-      def get_all_pacts_for_provider
-        link = index_entity._link(ALL_PROVIDER_RELATION)
-        get_pact_urls(link.expand(provider: provider).get)
+      def get_pact_urls(link_by_provider)
+        link_by_provider.fetch(PACTS).collect do |pact|
+          Pact::Provider::PactURI.new(pact[HREF], http_client_options)
+        end
       end
 
-      def get_pact_urls(link_by_provider)
-        link_by_provider.fetch(PACTS).collect{ |pact | pact[HREF] }
+      def log_message
+        message = "INFO: Fetching pacts for #{provider} from #{broker_base_url}"
+        if tags.any?
+          desc = tags.collect do |tag|
+            all_or_latest = tag[:all] ? "all" : "latest"
+            name = tag[:fallback] ? "#{tag[:name]} (or #{tag[:fallback]} if not found)" : tag[:name]
+            "#{all_or_latest} #{name}"
+          end.join(", ")
+          message << " for tags: #{desc}"
+        end
+        Pact.configuration.output_stream.puts message
       end
     end
   end
-end
+end

data/lib/pact/provider/configuration/pact_verification_from_broker.rb

@@ -0,0 +1,57 @@
+require 'pact/shared/dsl'
+require 'pact/provider/world'
+require 'pact/pact_broker/fetch_pacts'
+
+module Pact
+  module Provider
+    module Configuration
+      class PactVerificationFromBroker
+
+        extend Pact::DSL
+
+        # If user declares a variable with the same name as one of these attributes
+        # in parent scope, it will clash with these ones,
+        # so put an underscore in front of the name to be safer.
+
+        attr_accessor :_provider_name, :_pact_broker_base_url, :_consumer_version_tags, :_basic_auth_options, :_verbose
+
+        def initialize(provider_name)
+          @_provider_name = provider_name
+          @_consumer_version_tags = []
+          @_verbose = false
+        end
+
+        dsl do
+          def pact_broker_base_url pact_broker_base_url, basic_auth_options = {}
+            self._pact_broker_base_url = pact_broker_base_url
+            self._basic_auth_options = basic_auth_options
+          end
+
+          def consumer_version_tags consumer_version_tags
+            self._consumer_version_tags = *consumer_version_tags
+          end
+
+          def verbose verbose
+            self._verbose = verbose
+          end
+        end
+
+        def finalize
+          validate
+          create_pact_verification
+        end
+
+        private
+
+        def create_pact_verification
+          fetch_pacts = Pact::PactBroker::FetchPacts.new(_provider_name, _consumer_version_tags, _pact_broker_base_url, _basic_auth_options.merge(verbose: _verbose))
+          Pact.provider_world.add_pact_uri_source fetch_pacts
+        end
+
+        def validate
+          raise Pact::Error.new("Please provide a pact_broker_base_url from which to retrieve the pacts") unless _pact_broker_base_url
+        end
+      end
+    end
+  end
+end

data/lib/pact/provider/configuration/service_provider_dsl.rb

@@ -1,4 +1,5 @@
 require 'pact/provider/configuration/pact_verification'
+require 'pact/provider/configuration/pact_verification_from_broker'
 require 'pact/provider/configuration/service_provider_config'
 require 'pact/errors'
 
@@ -53,12 +54,20 @@ module Pact
           def honours_pact_with consumer_name, options = {}, &block
             create_pact_verification consumer_name, options, &block
           end
+
+          def honours_pacts_from_pact_broker &block
+            create_pact_verification_from_broker &block
+          end
         end
 
         def create_pact_verification consumer_name, options, &block
           PactVerification.build(consumer_name, options, &block)
         end
 
+        def create_pact_verification_from_broker(&block)
+          PactVerificationFromBroker.build(name, &block)
+        end
+
         def finalize
           validate
           create_service_provider

data/lib/pact/provider/pact_verification.rb

@@ -1,17 +1,17 @@
 module Pact::Provider
-   class PactVerification
-      attr_reader :consumer_name, :uri, :ref
-      def initialize consumer_name, uri, ref
-         @consumer_name = consumer_name
-         @uri = uri
-         @ref = ref
-      end
+  class PactVerification
+    attr_reader :consumer_name, :uri, :ref
+    def initialize consumer_name, uri, ref
+      @consumer_name = consumer_name
+      @uri = uri
+      @ref = ref
+    end
 
-      def == other
-        other.is_a?(PactVerification) &&
-          consumer_name == other.consumer_name &&
-          uri == other.uri &&
-          ref == other.ref
-      end
-   end
+    def == other
+      other.is_a?(PactVerification) &&
+        consumer_name == other.consumer_name &&
+        uri == other.uri &&
+        ref == other.ref
+    end
+  end
 end

data/lib/pact/provider/world.rb

@@ -29,8 +29,22 @@ module Pact
       end
 
       def pact_urls
-        pact_verifications.collect(&:uri)
+        (pact_verifications.collect(&:uri) + pact_uris_from_pact_uri_sources).compact
+      end
+
+      def add_pact_uri_source pact_uri_source
+        pact_uri_sources << pact_uri_source
+      end
+
+      private
+
+      def pact_uri_sources
+        @pact_uri_sources ||= []
+      end
+
+      def pact_uris_from_pact_uri_sources
+        pact_uri_sources.collect{| pact_uri_source| pact_uri_source.call }.flatten
       end
     end
   end
-end
+end

data/lib/pact/version.rb

@@ -1,4 +1,4 @@
 # Remember to bump pact-provider-proxy when this changes major version
 module Pact
-  VERSION = "1.27.0"
+  VERSION = "1.28.0.rc1"
 end

data/pact.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
   gem.add_development_dependency 'webmock', '~> 3.0'
-  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'pry-byebug'
   gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0.rc1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -175,7 +175,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -342,6 +342,7 @@ files:
 - lib/pact/provider/configuration/configuration_extension.rb
 - lib/pact/provider/configuration/dsl.rb
 - lib/pact/provider/configuration/pact_verification.rb
+- lib/pact/provider/configuration/pact_verification_from_broker.rb
 - lib/pact/provider/configuration/service_provider_config.rb
 - lib/pact/provider/configuration/service_provider_dsl.rb
 - lib/pact/provider/context.rb
@@ -402,9 +403,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11