pact-mock_service 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207e3adbdfa76860c388e16fc932dfd42eb5e177
-  data.tar.gz: a17b48e942fd043e9fdcf618d1a2d04e9422ab0a
+  metadata.gz: e77168f9641588d6ec47fe593121d77d565343ad
+  data.tar.gz: 044252d86c6ab72a47c6a60fde2d52113ba14a70
 SHA512:
-  metadata.gz: b9c71128f5a6a02e1468ff2272c32628ac3d7dca2891f1d7e30a42aae82af4bea331497b08c0c6578fc10d80e71e413da6cd01f1ca7ff1d524d0c5e369e627f2
-  data.tar.gz: 9c9983c2ae0c8dbd421102b9f8120515ecff87a4624d0227d320b6a8a919bbc840007bc255dd1e10b45165b93f900a3b9a4b3c1bc09dd517cee37e2c549a4097
+  metadata.gz: aae2a208b45ebeac035cce148b288183e1b21cb107c00574a1f93e97e5c20a3cfed8356d6656a8f3683ca3e06987ec57c2dd38a8f62ea3fae483d474211cdc67
+  data.tar.gz: 33f2051b010e0cbab1ed5a85d630eb50a5bde8231bfab08b1ecdd434681ee22e229857f6a6c31ace6ae028f1f2c77b45aa24772d21d9bccd6607b82099b839ab

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
+### 0.10.2 (13 Aug 2016)
+* 9352017 - Update .travis.yml (Beth Skurrie, Mon Aug 8 18:06:41 2016 +1000)
+* f719415 - use ssl when checking if https server is up (Valeriy Kassenbaev, Thu Aug 4 01:37:50 2016 +0300)
+
 ### 0.10.1 (27 Jun 2016)
 * a9fff79 - Add release instructions (Sergei Matheson, Mon Jun 27 10:47:12 2016 +1000)
 * 28c11e7 - Clarify that pact-mock_service will only work with ruby >= 2.0 (Sergei Matheson, Mon Jun 27 10:27:12 2016 +1000)

data/README.md

@@ -1,5 +1,7 @@
 # Pact Mock Service
 
+[![Build Status](https://travis-ci.org/bethesque/pact-mock_service.svg?branch=master)](https://travis-ci.org/bethesque/pact-mock_service)
+
 This codebase provides the mock service used by implementations of [Pact][pact]. It is packaged as a gem, and as a standalone executable for Mac OSX and Linux (Windows coming soon.)
 
 The mock service provides the following endpoints:

data/lib/pact/mock_service/cli.rb

@@ -14,7 +14,7 @@ module Pact
       method_option :port, aliases: "-p", desc: "Port on which to run the service"
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       method_option :log, aliases: "-l", desc: "File to which to log output"
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
@@ -32,7 +32,7 @@ module Pact
       method_option :log_dir, aliases: "-l", desc: "File to which to log output"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
 
       def control
@@ -44,7 +44,7 @@ module Pact
       method_option :port, aliases: "-p", default: '1234', desc: "Port on which to run the service"
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       method_option :log, aliases: "-l", desc: "File to which to log output"
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
@@ -70,7 +70,7 @@ module Pact
       method_option :port, aliases: "-p", default: '1234', desc: "Port on which to run the service"
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       method_option :log, aliases: "-l", desc: "File to which to log output"
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
@@ -87,7 +87,7 @@ module Pact
       desc 'control-start', "Start a Pact mock service control server."
       method_option :port, aliases: "-p", desc: "Port on which to run the service", default: '1234'
       method_option :log_dir, aliases: "-l", desc: "File to which to log output", default: "log"
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
@@ -110,7 +110,7 @@ module Pact
       desc 'control-restart', "Start a Pact mock service control server."
       method_option :port, aliases: "-p", desc: "Port on which to run the service", default: '1234'
       method_option :log_dir, aliases: "-l", desc: "File to which to log output", default: "log"
-      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '1'
@@ -144,14 +144,14 @@ module Pact
 
         def start_server pidfile
           require 'pact/mock_service/server/spawn'
-          Pact::MockService::Server::Spawn.(pidfile, options[:port]) do
+          Pact::MockService::Server::Spawn.(pidfile, options[:port], options[:ssl]) do
             yield
           end
         end
 
         def restart_server pidfile
           require 'pact/mock_service/server/respawn'
-          Pact::MockService::Server::Respawn.(pidfile, options[:port]) do
+          Pact::MockService::Server::Respawn.(pidfile, options[:port], options[:ssl]) do
             yield
           end
         end

data/lib/pact/mock_service/server/respawn.rb

@@ -5,12 +5,12 @@ module Pact
     module Server
       class Respawn
 
-        def self.call pidfile, port
+        def self.call pidfile, port, ssl = false
           if pidfile.file_exists_and_process_running?
             pidfile.kill_process
           end
 
-          Spawn.(pidfile, port) do
+          Spawn.(pidfile, port, ssl) do
             yield
           end
         end

data/lib/pact/mock_service/server/spawn.rb

@@ -7,7 +7,7 @@ module Pact
 
         class PortUnavailableError < StandardError; end
 
-        def self.call pidfile, port
+        def self.call pidfile, port, ssl = false
           if pidfile.can_start?
             if port_available? port
               pid = fork do
@@ -15,7 +15,7 @@ module Pact
               end
               pidfile.pid = pid
               Process.detach(pid)
-              Server::WaitForServerUp.(port)
+              Server::WaitForServerUp.(port, {ssl: ssl})
               pidfile.write
             else
               raise PortUnavailableError.new("ERROR: Port #{port} already in use.")

data/lib/pact/mock_service/server/wait_for_server_up.rb

@@ -1,5 +1,6 @@
 require 'timeout'
 require 'net/http'
+require 'openssl'
 
 module Pact
   module MockService
@@ -17,12 +18,20 @@ module Pact
         end
 
         def self.responsive? port, options
-          res = Net::HTTP.start("localhost", port) do |http|
-            request = Net::HTTP::Get.new "http://localhost:#{port}/"
-            request['X-Pact-Mock-Service'] = 'true'
-            response = http.request request
+          http = Net::HTTP.new('localhost', port)
+          if options[:ssl]
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            scheme = 'https'
+          else
+            scheme = 'http'
           end
-          res.code == '200'
+          http.start {
+            request = Net::HTTP::Get.new "#{scheme}://localhost:#{port}/"
+            request['X-Pact-Mock-Service'] = true
+            response = http.request request
+            response.code == '200'
+          }
         rescue SystemCallError => e
           return false
         rescue EOFError

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "0.10.1"
+    VERSION = "0.10.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact