pact-mock_service 2.1.0 → 2.1.1.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c3b3cd0d4b633ce3a95b86f9e32f7ffa3111ee
-  data.tar.gz: c7664be7b98c9a003312d5386756b06f2e3d2b30
+  metadata.gz: 5693645528ece7ef91958e2598f64bba38215104
+  data.tar.gz: 3a57c015eb730e45150a23a0b63b818461e61cbc
 SHA512:
-  metadata.gz: d13741f947caeb81921a90156acdb4ef41813908d3da83c293f57693af92cd28aebe521ea21a55047a45dde1a7146fcbce4d37d4c31ee499e9e0e2859938c51d
-  data.tar.gz: 935a0c04938be72338e03e797e810a0c1190c6207be120240a1495f8db27d0b95723003f4f650edc86546ef2cc0eacb94814ca03e767e47377bfe311ae5ae857
+  metadata.gz: e64fe9e5ed774d2bef6f2a2b8746b5dbb9f6e46ff586ebc37957c0bd9719444b31972dbb5aaf43b52046b85752bd0d2cc628102233d486387a97d07d26a362f1
+  data.tar.gz: 9713fb5b520bcff76a6e45aafb88dd17835e311a907e88288f4a3b6502c702a287af7cf6acb9af8b7f670371e8000f33aaed214db7d57555bf753bfa79936046

data/Gemfile

@@ -5,4 +5,4 @@ gemspec
 
 if ENV['X_PACT_DEVELOPMENT']
   gem 'pact-support', path: '../pact-support'
-end
+end

data/README.md

@@ -1,8 +1,8 @@
 # Pact Mock Service
 
-[![Build Status](https://travis-ci.org/bethesque/pact-mock_service.svg?branch=master)](https://travis-ci.org/bethesque/pact-mock_service)
+[![Build Status](https://travis-ci.org/pact-foundation/pact-mock_service.svg?branch=master)](https://travis-ci.org/pact-foundation/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.)
+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 and Windows.
 
 The mock service provides the following endpoints:
 
@@ -11,12 +11,20 @@ The mock service provides the following endpoints:
 * GET /interactions/verification - determine whether the expected interactions have taken place
 * POST /pact - write the pact file
 
-As the Pact mock service can be used as a standalone executable and administered via HTTP, it can be used for testing with any language. All that is required is a library in the native language to create the HTTP calls listed above. Currently there are binding for [Ruby][pact] and [Javascript][javascript]. If you are interested in creating bindings in a new langauge, and have a chat to one of us on the [pact-dev Google group][pact-dev].
+As the Pact mock service can be used as a standalone executable and administered via HTTP, it can be used for testing with any language. All that is required is a library in the native language to create the HTTP calls listed above. Check out [docs.pact.io](https://docs.pact.io) for a list of implemented languages. If you are interested in creating bindings in a new langauge, and have a chat to one of us on the [pact-dev Google group][pact-dev].
+
+## Documentation
+
+You can find documentation for the mock service in the repository [wiki][wiki].
 
 ## Usage
 
 For some examples of the HTTP requests that occur under the hood when using either the Ruby client or the Javascript client, see this [gist](https://gist.github.com/bethesque/9d81f21d6f77650811f4).
 
+### Mac OSX, Linux and Windows, without Ruby
+
+See the [releases][releases] page for the latest standalone executables.
+
 ### With Ruby on Mac OSX and Linux
 
     $ gem install pact-mock_service
@@ -38,22 +46,14 @@ If you need to provide your own certificate and key, use the following syntax.
 
     $ pact-mock-service --port 1234 --ssl --sslcert PATH_TO_CERT --sslkey PATH_TO_KEY
 
-### Mac OSX and Linux, without Ruby
-
-See the [releases][releases] page for the latest standalone executables.
-
-### Windows, without Ruby
-
-See the [releases][releases] page for the latest standalone executables.
-
 ## Contributing
 
 See [CONTRIBUTING.md](/CONTRIBUTING.md)
 
 [pact]: https://github.com/realestate-com-au/pact
-[releases]: https://github.com/bethesque/pact-mock_service/releases
+[releases]: https://github.com/pact-foundation/pact-mock_service/releases
 [javascript]: https://github.com/DiUS/pact-consumer-js-dsl
 [pact-dev]: https://groups.google.com/forum/#!forum/pact-dev
-[windows]: https://github.com/bethesque/pact-mock_service/wiki/Building-a-Windows-standalone-executable
 [install-windows]: https://github.com/bethesque/pact-mock_service/wiki/Installing-the-pact-mock_service-gem-on-Windows
 [why-generated]: https://github.com/realestate-com-au/pact/wiki/FAQ#why-are-the-pacts-generated-and-not-static
+[wiki]: https://github.com/pact-foundation/pact-mock_service/wiki

data/lib/pact/mock_service/cli.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pact/mock_service/server/wait_for_server_up'
 require 'pact/mock_service/cli/pidfile'
 require 'socket'
+require 'rake/file_utils'
 
 module Pact
   module MockService
@@ -59,9 +60,7 @@ module Pact
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
 
       def start
-        start_server(mock_service_pidfile) do
-          service
-        end
+        spawn_mock_service
       end
 
       desc 'stop', "Stop a Pact mock service"
@@ -174,6 +173,34 @@ module Pact
             yield
           end
         end
+
+        def spawn_mock_service
+          require 'pact/mock_service/server/windows_safe_spawn'
+          pidfile = mock_service_pidfile
+          Pact::MockService::Server::WindowsSafeSpawn.(service_spawn_command, pidfile, options[:port], options[:ssl])
+        end
+
+        def service_spawn_command
+          command = []
+          if ENV['PACT_STANDALONE_WRAPPER_PATH']
+            command << ENV['PACT_STANDALONE_WRAPPER_PATH']
+          else
+            command << FileUtils::RUBY
+            command << "-S #{$0}"
+          end
+          command << "service"
+          command += build_service_options
+          command.join(" ")
+        end
+
+        def service_switch_names
+          Pact::MockService::CLI.commands['service'].options.values.each_with_object({}){| option, hash| hash[option.human_name] = option.switch_name }
+        end
+
+        def build_service_options
+          switch_names = service_switch_names
+          options.collect{ |key, value| "#{switch_names[key]} #{value}" if switch_names[key] }.compact
+        end
       end
     end
   end

data/lib/pact/mock_service/cli/pidfile.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pact/mock_service/os'
 
 module Pact
   module MockService
@@ -73,14 +74,13 @@ module Pact
             sleep sleep_time
             tries += 1
           end
-          raise "Process #{pid_from_file} not stopped after {100 * sleep_time} seconds." if process_running?
+          raise "Process #{pid_from_file} not stopped after #{100 * sleep_time} seconds." if process_running?
         end
 
         def kill_process
           if file_exists?
             begin
-              `ps -ef | grep pact`
-              Process.kill 2, pid_from_file
+              windows? ? windows_kill : kill_2
               waitpid
               delete
             rescue Errno::ESRCH
@@ -91,6 +91,19 @@ module Pact
             $stderr.puts "No PID file found at #{pidfile_path}, server probably not running. Use `ps -ef | grep pact` if you suspect the process is still running."
           end
         end
+
+        def windows?
+          Pact::MockService::OS.windows?
+        end
+
+        def kill_2
+          Process.kill 2, pid_from_file
+        end
+
+        def windows_kill
+         cmd = "taskkill /f /pid #{pid_from_file}"
+         `#{cmd}`
+        end
       end
     end
   end

data/lib/pact/mock_service/os.rb

@@ -0,0 +1,13 @@
+module Pact
+  module MockService
+    module OS
+
+      extend self
+
+      # Thanks RSpec
+      def windows?
+        !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'pact/mock_service/server/wait_for_server_up'
+require 'pact/mock_service/os'
+
+module Pact
+  module MockService
+    module Server
+      class WindowsSafeSpawn
+
+        class PortUnavailableError < StandardError; end
+
+        def self.call command, pidfile, port, ssl = false
+          if pidfile.can_start?
+            if port_available? port
+              pid = spawn(command, spawn_options)
+              pidfile.pid = pid
+              Process.detach(pid)
+              Server::WaitForServerUp.(port, {ssl: ssl})
+              pidfile.write
+            else
+              raise PortUnavailableError.new("ERROR: Port #{port} already in use.")
+            end
+          end
+        end
+
+        def self.spawn_options
+          if Pact::MockService::OS.windows?
+            {new_pgroup: true}
+          else
+            {}
+          end
+        end
+
+        def self.port_available? port
+          server = TCPServer.new('127.0.0.1', port)
+          true
+        rescue
+          false
+        ensure
+          server.close if server
+        end
+      end
+    end
+  end
+end

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.1.0"
+    VERSION = "2.1.1-alpha.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1.pre.alpha.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,16 +74,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -102,16 +102,16 @@ dependencies:
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -214,30 +214,44 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
+- !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'
 description: 
 email:
 - james.fraser@alumni.swinburne.edu
@@ -288,6 +302,7 @@ files:
 - lib/pact/mock_service/interactions/verification.rb
 - lib/pact/mock_service/interactions/verified_interactions.rb
 - lib/pact/mock_service/logger.rb
+- lib/pact/mock_service/os.rb
 - lib/pact/mock_service/request_decorator.rb
 - lib/pact/mock_service/request_handlers.rb
 - lib/pact/mock_service/request_handlers/base_administration_request_handler.rb
@@ -308,6 +323,7 @@ files:
 - lib/pact/mock_service/server/respawn.rb
 - lib/pact/mock_service/server/spawn.rb
 - lib/pact/mock_service/server/wait_for_server_up.rb
+- lib/pact/mock_service/server/windows_safe_spawn.rb
 - lib/pact/mock_service/session.rb
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb
@@ -326,12 +342,12 @@ 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.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact