pact-provider-verifier 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe859de3341bb504332b88634b34907c208c323
-  data.tar.gz: bc1ee8f1710026e71fcbaced5e4e790db51bb664
+  metadata.gz: b6f803b67f6c2e40c3636186097eb862e53814af
+  data.tar.gz: eb081c6bb9e3d2710f63907a3351048793b8260e
 SHA512:
-  metadata.gz: 4a25d8ad37bfcd0256213d67c426dc5abfba121cc6bed31b957c6ff97d75867e0bf4a8b9b4d8853f32180c7f8f675fcb1c6351881d33407dc4a1aa99acffd5d8
-  data.tar.gz: d74adfcb49eb183135fe885dcd63811d65ff7bcae34971c21a220b69b686ed8ced21249572a1bcd159082b3b0f935f8ef96bb4062172d8ead61650a2a3d8f332
+  metadata.gz: f185f8a2311076f35701c7da298df0fe1daa75bc22470893e6b80d83b7346551785478af24c478be9ea113bd71a4c71bdc3e9b78b007d763148ef57d8e44e5b3
+  data.tar.gz: bdd2c52ee950a99b0aac25a1a0d2301fd450d9b08a4c9bdcd117820ae6e3e6d52de947cb0be04b88366292f2c1d6cffecbdb67300796ce525abd1e093c86be03

data/CHANGELOG.md

@@ -2,6 +2,12 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 1.1.2 (02 June 2017)
+* da958c0 - Only set up state if a provider-states-setup-url is provided. Add tests for SetUpProviderState. (Beth Skurrie, Fri Jun 2 14:31:27 2017 +1000)
+* 36ef2eb - Remove .java, .class, .gitignore and .travis.yml files from package (Beth Skurrie, Fri Jun 2 10:32:55 2017 +1000)
+* 7902674 - Add rake tasks to generate and upload release notes. (Beth Skurrie, Fri Jun 2 10:12:17 2017 +1000)
+* 01e811e - Add integration specs for command (Beth Skurrie, Fri Jun 2 05:51:30 2017 +1000)
+
 ### 1.1.0 (01 June 2017)
 * 7106832 - chore(docs): update docs for provider states URL (Matt Fellows, Fri May 26 22:45:09 2017 +1000)
 * 8f787e6 - Add deprecation warning for --provider-states-url (Beth Skurrie, Fri May 26 20:51:48 2017 +1000)

data/lib/pact/provider_verifier/app.rb

@@ -27,18 +27,11 @@ module Pact
         "#{@name} #{super.to_s}"
       end
 
-      def get_pact_consumer_name pact_url
-        json = get_json(pact_url)
-        json['consumer']['name']
-      end
-
       def verify_pacts
         print_deprecation_note
         pacts = @options.pact_urls.split(',')
         proxy_pact_helper = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
-        ENV['provider_states_setup_url'] = @options.provider_states_setup_url
-        ENV['PACT_BROKER_USERNAME'] = @options.broker_username if @options.broker_username
-        ENV['PACT_BROKER_PASSWORD'] = @options.broker_password if @options.broker_password
+        ENV['PROVIDER_STATES_SETUP_URL'] = @options.provider_states_setup_url
         ENV['VERBOSE_LOGGING'] = @options.verbose if @options.verbose
         provider_base_url = @options.provider_base_url
 

data/lib/pact/provider_verifier/set_up_provider_state.rb

@@ -1,3 +1,5 @@
+require 'faraday'
+
 module Pact
   module ProviderVerifier
 
@@ -5,35 +7,63 @@ module Pact
 
     class SetUpProviderState
 
+      def initialize provider_state, consumer, options
+        @provider_state = provider_state
+        @consumer = consumer
+        @options = options
+      end
+
       def self.call provider_state, consumer, options
-        if verbose?
-          puts "Setting up provider state '#{provider_state}' for consumer '#{consumer}' using provider state server at #{provider_states_setup_url}"
-        end
+        new(provider_state, consumer, options).call
+      end
 
-        conn = Faraday.new(:url => provider_states_setup_url) do |faraday|
-          if ENV['PACT_BROKER_USERNAME'] && ENV['PACT_BROKER_PASSWORD']
-            faraday.use Faraday::Request::BasicAuthentication, ENV['PACT_BROKER_USERNAME'], ENV['PACT_BROKER_PASSWORD']
-          end
-          faraday.adapter  Faraday.default_adapter
+      def call
+        if provider_states_setup_url.nil?
+          warn_if_provider_state_set
+          return
         end
-        response = conn.post do |req|
+
+        log_request
+        response = post_to_provider_state
+        check_for_error response
+      end
+
+      private
+
+      attr_reader :provider_state, :consumer
+
+      def post_to_provider_state
+        connection = Faraday.new(:url => provider_states_setup_url)
+        connection.post do |req|
           req.headers["Content-Type"] = "application/json"
           req.body = {consumer: consumer, state: provider_state }.to_json
         end
+      end
+
+      def provider_states_setup_url
+        ENV['PROVIDER_STATES_SETUP_URL']
+      end
+
+      def verbose?
+        ENV['VERBOSE_LOGGING']
+      end
 
-        # Not sure about this?
+      def check_for_error response
         if response.status >= 300
-          raise SetUpProviderStateError.new("Error setting up provider state '#{provider_state}' for consumer '#{consumer}' at #{provider_states_setup_url}. response status=#{response.status} response.body=#{response.body}")
+          raise SetUpProviderStateError.new("Error setting up provider state '#{provider_state}' for consumer '#{consumer}' at #{provider_states_setup_url}. response status=#{response.status} response body=#{response.body}")
         end
-
       end
 
-      def self.provider_states_setup_url
-        ENV['provider_states_setup_url']
+      def log_request
+        if verbose?
+          $stdout.puts "DEBUG: Setting up provider state '#{provider_state}' for consumer '#{consumer}' using provider state server at #{provider_states_setup_url}"
+        end
       end
 
-      def self.verbose?
-        ENV['VERBOSE_LOGGING']
+      def warn_if_provider_state_set
+        if provider_state
+          $stderr.puts "WARN: Skipping set up for provider state '#{provider_state}' for consumer '#{consumer}' as there is no --provider-states-setup-url specified."
+        end
       end
     end
   end

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -134,6 +134,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: |-
   A cross-platform Pact verification tool to validate API Providers.
                         Used in the pact-js-provider project to simplify development