pact-provider-verifier 1.22.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b5ec2788f09896553d3c835fdce3a287522742bcff5b3a292c4516f10d512d0
-  data.tar.gz: 31445bf106e251363fae9573017fa2618601932a2a69a45665775ed8870e9b6d
+  metadata.gz: 17d3324935c8a29bf63d0f6254f4a48c41eba99c9b0af7cdb9d1db0958bc169a
+  data.tar.gz: 9aa32e0862384b929374bfb5eb517cd3aac2285ca17991a6f37c2c612403d28f
 SHA512:
-  metadata.gz: fc2ed1561f3cda81af513e6c48e60b77a556600190feed59ddb1111c23b72ae51499051143584751a7f96c44974f187c855b4d6f9c1bcb273ace33b8898ee6d0
-  data.tar.gz: 5cc2a20dd2a4e60b749ebcd26567211d629bbaa900c98b91f7cef0e090c28dc64a5e29ea5f0ac49345308a7798660a763fba0287929db210f17d4d831216585d
+  metadata.gz: fdc51f38063e5d4dbbbb89733d5517e51dda440e02b705e03cef9a48b0a8d98d8085afa327791df19dbb445a713afffcb936503273930c6ceb27a75e1a84d572
+  data.tar.gz: a930b5f928f601faa705d2b72c8b6be7130b7030c10e5c348ba06cbc33118ee66995b2c28fa786ad0050b5b2774a2ca97b6f4d5bdf5bb06f4e56b9d24ff29bf8

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v1.23.0-1"></a>
+### v1.23.0-1 (2019-04-28)
+
+
+#### Features
+
+* allow a wait time to be specified to allow the provider to become available	 ([cec8d56](/../../commit/cec8d56))
+
+
 <a name="v1.22.0-1"></a>
 ### v1.22.0-1 (2019-02-21)
 

data/README.md

@@ -55,7 +55,8 @@ Options:
   -v, [--verbose=VERBOSE]                                            # Verbose output
   -f, [--format=FORMATTER]                                           # RSpec formatter. Defaults to custom Pact formatter. Other options are json and RspecJunitFormatter (which outputs xml).
   -o, [--out=FILE]                                                   # Write output to a file instead of $stdout.
-
+  [--wait=SECONDS]                                                   # The number of seconds to wait for the provider to become available before running the verification
+                                                                     # Default: 0
 Verify pact(s) against a provider. Supports local and networked (http-based) files.
 ```
 

data/lib/pact/provider_verifier/app.rb

@@ -1,3 +1,4 @@
+require 'pact/wait_until_server_available'
 require 'pact/provider_verifier/add_header_middlware'
 require 'pact/provider_verifier/provider_states/add_provider_states_header'
 require 'pact/provider_verifier/provider_states/remove_provider_states_header_middleware'
@@ -13,6 +14,7 @@ require 'json'
 module Pact
   module ProviderVerifier
     class App
+      include Pact::WaitUntilServerAvailable
 
       PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
 
@@ -29,7 +31,9 @@ module Pact
       def call
         setup
 
-        exit_statuses = all_pact_urls.collect do |pact_url|
+        pact_urls = all_pact_urls
+        wait_until_provider_available
+        exit_statuses = pact_urls.collect do |pact_url|
           verify_pact pact_url
         end
 
@@ -197,8 +201,20 @@ module Pact
           $stderr.puts "WARN: The --provider-states-url option is deprecated and the URL endpoint can be removed from the application"
         end
       end
+
+      def wait_until_provider_available
+        if options.wait && options.wait != 0
+          uri = URI(options.provider_base_url)
+          $stderr.puts "INFO: Waiting for up to #{options.wait} seconds for provider to become available at #{uri.host}:#{uri.port}..."
+          up = wait_until_server_available(uri.host, uri.port, options.wait)
+          if up
+            $stderr.puts "INFO: Provider available, proceeding with verifications"
+          else
+            $stderr.puts "INFO: Waiting for up to #{options.wait} seconds for provider to become available..."
+            $stderr.puts "WARN: Provider does not appear to be up on #{uri.host}:#{uri.port}... proceeding with verifications anyway"
+          end
+        end
+      end
     end
   end
 end
-
-

data/lib/pact/provider_verifier/cli/verify.rb

@@ -30,6 +30,7 @@ module Pact
         method_option :out, aliases: "-o", banner: "FILE", desc: "Write output to a file instead of $stdout."
         method_option :ignore_failures, type: :boolean, default: false, desc: "If specified, process will always exit with exit code 0", hide: true
         method_option :pact_urls, aliases: "-u", hide: true, :required => false
+        method_option :wait, banner: "SECONDS", required: false, type: :numeric, desc: "The number of seconds to wait for the provider to become available before running the verification", default: 0
 
         def verify(*pact_urls)
           validate_verify

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.22.0"
+    VERSION = "1.23.0"
   end
 end

data/lib/pact/wait_until_server_available.rb

@@ -0,0 +1,24 @@
+require 'socket'
+require 'time'
+
+module Pact
+  module WaitUntilServerAvailable
+    def self.call(host, port, wait_time = 15)
+      end_time = Time.now + wait_time
+      tries = 0
+      begin
+        sleep 2 if tries != 0
+        Socket.tcp(host, port, connect_timeout: 3) {}
+        true
+      rescue => e
+        tries += 1
+        retry if Time.now < end_time
+        return false
+      end
+    end
+
+    def wait_until_server_available *args
+      WaitUntilServerAvailable.call(*args)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -305,6 +305,7 @@ files:
 - lib/pact/provider_verifier/set_up_provider_state.rb
 - lib/pact/provider_verifier/underscored_headers_monkeypatch.rb
 - lib/pact/provider_verifier/version.rb
+- lib/pact/wait_until_server_available.rb
 homepage: https://github.com/pact-foundation/pact-provider-verifier
 licenses:
 - MIT
@@ -324,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides a Pact verification service for use with Pact