pact 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3564518bc269d6ebff3e3139b4798378e3d4fb43
-  data.tar.gz: d201c44bdea8884cd85abefb6dbafcd473a6220f
+  metadata.gz: d10f4cf98866584ab730653b049d9bec27845dfd
+  data.tar.gz: 1964e13278474b1343a5f8cd96b2ea58cf60cd35
 SHA512:
-  metadata.gz: 1e1f6c4322879bcd163ce37fb799f0c25b366277466501e64ccd0e47022b305413242cb81f4a72c920b1ef31ace6fa195d1469785e70c709d8d76c8505468158
-  data.tar.gz: 1b8d60f2a005cd7ed2710a5a0d87749927d213f8c31340290186817fadbc71aa7f56e7b91f278dc7c4848cbe910ce6a75261bae61d02e26d9c36e9a1ae129458
+  metadata.gz: 5b937d2e132eff171932150b0cabe8711c6f9af52b7eb964e94c05c257e946c090070083962d503e828b9c9c475a0440cf49c3dff5887f551913d3598d508a4d
+  data.tar.gz: a60dd39b54c749f2dd24952cdc22399812dd029410df2d94f1f9692c4d45ca7cad5580eb7ef3e0e87f728e6e50a5a8bd85198e4a18f6389108b89d192b22aa05

data/CHANGELOG.md

@@ -1,6 +1,12 @@
-Do this to generate your change history
+<a name="v1.19.0"></a>
+### v1.19.0 (2017-10-30)
+
+
+#### Features
+
+* **verifications**
+  * allow provider version tags to be specified	 ([bff4611](/../../commit/bff4611))
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
 
 <a name="v1.18.0"></a>
 ## 1.18.0 (2017-10-30)

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

@@ -5,8 +5,9 @@ module Pact
 
         attr_accessor :application_version
 
-        def initialize application_version, publish_verification_results, &app_block
+        def initialize application_version, tags, publish_verification_results, &app_block
           @application_version = application_version
+          @tags = [*tags]
           @publish_verification_results = publish_verification_results
           @app_block = app_block
         end
@@ -18,6 +19,10 @@ module Pact
         def publish_verification_results?
           @publish_verification_results
         end
+
+        def tags
+          @tags
+        end
       end
     end
   end

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

@@ -13,7 +13,7 @@ module Pact
 
         extend Pact::DSL
 
-        attr_accessor :name, :app_block, :application_version, :publish_verification_results
+        attr_accessor :name, :app_block, :application_version, :tags, :publish_verification_results
 
         CONFIG_RU_APP = lambda {
           unless File.exist? Pact.configuration.config_ru_path
@@ -25,6 +25,7 @@ module Pact
         def initialize name
           @name = name
           @publish_verification_results = false
+          @tags = []
           @app_block = CONFIG_RU_APP
         end
 
@@ -37,6 +38,10 @@ module Pact
             self.application_version = application_version
           end
 
+          def app_version_tags tags
+            self.tags = tags
+          end
+
           def publish_verification_results publish_verification_results
             self.publish_verification_results = publish_verification_results
             Pact::RSpec.with_rspec_2 do
@@ -70,7 +75,7 @@ module Pact
         end
 
         def create_service_provider
-          Pact.configuration.provider = ServiceProviderConfig.new(application_version, publish_verification_results, &@app_block)
+          Pact.configuration.provider = ServiceProviderConfig.new(application_version, tags, publish_verification_results, &@app_block)
         end
       end
     end

data/lib/pact/provider/verification_results/publish.rb

@@ -1,6 +1,9 @@
 require 'json'
 require 'pact/errors'
 
+# TODO move this to the pact broker client
+# TODO retries
+
 module Pact
   module Provider
     module VerificationResults
@@ -20,6 +23,11 @@ module Pact
 
         def call
           if Pact.configuration.provider.publish_verification_results?
+            if tag_url('')
+              tag
+            else
+              Pact.configuration.error_stream.puts "WARN: Cannot tag provider version as there is no link named pb:tag-version in the pact JSON."
+            end
             if publication_url
               publish
             else
@@ -34,11 +42,35 @@ module Pact
           @publication_url ||= pact_source.pact_hash.fetch('_links', {}).fetch('pb:publish-verification-results', {})['href']
         end
 
+        def tag_url tag
+          href = pact_source.pact_hash.fetch('_links', {}).fetch('pb:tag-version', {})['href']
+          href ? href.gsub('{tag}', tag) : nil
+        end
+
+        def tag
+          Pact.configuration.provider.tags.each do | tag |
+            uri = URI(tag_url(tag))
+            request = build_request('Put', uri, nil, "Tagging provider version at")
+            response = nil
+            begin
+              options = {:use_ssl => uri.scheme == 'https'}
+              response = Net::HTTP.start(uri.host, uri.port, options) do |http|
+                http.request request
+              end
+            rescue StandardError => e
+              error_message = "Failed to tag provider version due to: #{e.class} #{e.message}"
+              raise PublicationError.new(error_message)
+            end
+
+            unless response.code.start_with?("2")
+              raise PublicationError.new("Error returned from tagging request #{response.code} #{response.body}")
+            end
+          end
+        end
+
         def publish
-          #TODO https
-          #TODO username/password
           uri = URI(publication_url)
-          request = build_request(uri)
+          request = build_request('Post', uri, verification_result.to_json, "Publishing verification result #{verification_result.to_json} to")
           response = nil
           begin
             options = {:use_ssl => uri.scheme == 'https'}
@@ -55,16 +87,16 @@ module Pact
           end
         end
 
-        def build_request uri
-          request = Net::HTTP::Post.new(uri.path)
+        def build_request meth, uri, body, action
+          request = Net::HTTP.const_get(meth).new(uri.path)
           request['Content-Type'] = "application/json"
-          request.body = verification_result.to_json
+          request.body = body if body
           debug_uri = uri
           if pact_source.uri.basic_auth?
             request.basic_auth pact_source.uri.username, pact_source.uri.password
             debug_uri = URI(uri.to_s).tap { |x| x.userinfo="#{pact_source.uri.username}:*****"}
           end
-          Pact.configuration.output_stream.puts "INFO: Publishing verification result #{verification_result.to_json} to #{debug_uri}"
+          Pact.configuration.output_stream.puts "INFO: #{action} #{debug_uri}"
           request
         end
 

data/lib/pact/provider/verification_results/publish_all.rb

@@ -15,6 +15,7 @@ module Pact
           @rspec_summary = rspec_summary
         end
 
+        # TODO do not publish unless all interactions have been run
         def call
           verification_results.collect do | pair |
             Publish.call(pair.first, pair.last)

data/lib/pact/version.rb

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

data/lib/tasks/pact.rake

@@ -31,5 +31,4 @@ namespace :pact do
     require 'pact/provider/help/console_text'
     puts Pact::Provider::Help::ConsoleText.(args[:reports_dir])
   end
-
 end

data/pact.gemspec

@@ -37,6 +37,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'fakefs', '0.5' # 0.6.0 blows up
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'faraday'
-  gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'faraday', '~> 0.13'
+  gem.add_development_dependency 'appraisal', '~> 2.2'
+  gem.add_development_dependency 'conventional-changelog', '~> 1.3'
+  gem.add_development_dependency 'bump', '~> 0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -240,30 +240,58 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: conventional-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Enables consumer driven contract testing, providing a mock service and
   DSL for the consumer project, and interaction playback and verification for the
   service provider project.
@@ -379,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Enables consumer driven contract testing, providing a mock service and DSL