pact-mock_service 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7ba885324798c8512e3957562c9c07f903ef605
-  data.tar.gz: 7c8718131be50169a6a1d8341905b20e25b4e73d
+  metadata.gz: 199d51223a496a48e6ab4ca142d1a1c9fdac4a0b
+  data.tar.gz: 19d3aa4d3228559d5ceb27e7678d3f27842b0eeb
 SHA512:
-  metadata.gz: abbd1c16191e86672a8aac3217836bf98190ff218c84362f99faaa4618e6802327e697b1d9dec1433f05a263f5994ec4c68c4b20ea983e1e4066de8f37b4ff8a
-  data.tar.gz: d811402182f55a9b91ef04f122f02da0ba5ea7ff0168c57332e2ceac000976b861206812c67fd647ff87f2e20dac5f2f9aade0166322ac0fa4a9e6161cb5b858
+  metadata.gz: 3ade3ab0ddb3feb73edcca000b9fa99ba0e82d373859f8accf0b1e4b532ad1b7ecfc48b0ee27a208624da6d1a528099a14ebc277c0afe53a0362a1f2f812f528
+  data.tar.gz: a2916297569c675ab1ad635ce883b162fc54f5c030de1e326879b521bd89882576b47a253d836fd5d24e89ba5b3ac230ed730d65e6dda14ee99334c281b7bd3a

data/CHANGELOG.md

@@ -2,7 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
 
-### 2.3.0 (2017-20-04)
+### 2.4.0 (2017-10-13)
+* 56bd683 - feat(stub): add pact-stub-service CLI (Beth Skurrie, Fri Oct 13 08:20:49 2017 +1100)
+
+### 2.3.0 (2017-10-04)
 * 79cbdc9 - feat: add example script showing usage (Beth Skurrie, Wed Oct 4 13:42:06 2017 +1100)
 * 873d9ee - feat: only write pact on shutdown of mock service if pact has not already been written (Beth Skurrie, Wed Oct 4 13:41:01 2017 +1100)
 * d3c6067 - feat(cli): add --pact-file-write-mode to cli and remove --unique-pact-file-names (Beth Skurrie, Wed Oct 4 08:01:25 2017 +1100)

data/bin/pact-stub-service

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'pact/stub_service/cli'
+Pact::StubService::CLI.start

data/lib/pact/mock_service/app.rb

@@ -20,6 +20,7 @@ module Pact
         logger = Logger.from_options(options)
         @name = options.fetch(:name, "MockService")
         @session = Session.new(options.merge(logger: logger))
+        setup_stub(options[:stub_pactfile_paths]) if options[:stub_pactfile_paths] && options[:stub_pactfile_paths].any?
         request_handlers = RequestHandlers.new(@name, logger, @session, options)
         @app = Rack::Builder.app do
           use Pact::Consumer::MockService::ErrorHandler, logger
@@ -36,6 +37,15 @@ module Pact
         write_pact_if_configured
       end
 
+      def setup_stub stub_pactfile_paths
+        stub_pactfile_paths.each do | pactfile_path |
+          $stdout.puts "Loading interactions from #{pactfile_path}"
+          hash_interactions = JSON.parse(File.read(pactfile_path))['interactions']
+          interactions = hash_interactions.collect { | hash | Interaction.from_hash(hash) }
+          @session.set_expected_interactions interactions
+        end
+      end
+
       def write_pact_if_configured
         consumer_contract_writer = ConsumerContractWriter.new(@session.consumer_contract_details, StdoutLogger.new)
         if consumer_contract_writer.can_write? && !@session.pact_written?

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

@@ -0,0 +1,71 @@
+require 'thor'
+
+module Pact
+  module MockService
+    class CLI < Thor
+      ##
+      # Custom Thor task allows the following:
+      #
+      # `script arg1 arg2` to be interpreted as `script <default_task> arg1 arg2`
+      # `--option 1 --option 2` to be interpreted as `--option 1 2` (the standard Thor format for multiple value options)
+      # `script --help` to display the help for the default task instead of the command list
+      #
+      class CustomThor < ::Thor
+
+        no_commands do
+          def self.start given_args = ARGV, config = {}
+            super(massage_args(given_args))
+          end
+
+          def help *args
+            if args.empty?
+              super(self.class.default_task)
+            else
+              super
+            end
+          end
+
+          def self.massage_args argv
+            prepend_default_task_name(turn_muliple_tag_options_into_array(argv))
+          end
+
+          def self.prepend_default_task_name argv
+            if known_first_arguments.include?(argv[0])
+              argv
+            else
+              [default_command] + argv
+            end
+          end
+
+          # other task names, help, and the help shortcuts
+          def self.known_first_arguments
+            @known_first_arguments ||= tasks.keys + ::Thor::HELP_MAPPINGS + ['help']
+          end
+
+          def self.turn_muliple_tag_options_into_array argv
+            new_argv = []
+            opt_name = nil
+            argv.each_with_index do | arg, i |
+              if arg.start_with?('-')
+                opt_name = arg
+                existing = new_argv.find { | a | a.first == opt_name }
+                if !existing
+                  new_argv << [arg]
+                end
+              else
+                if opt_name
+                  existing = new_argv.find { | a | a.first == opt_name }
+                  existing << arg
+                  opt_name = nil
+                else
+                  new_argv << [arg]
+                end
+              end
+            end
+            new_argv.flatten
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact/mock_service/run.rb

@@ -1,6 +1,7 @@
 require 'find_a_port'
 require 'pact/mock_service/app'
 require 'pact/consumer/mock_service/set_location'
+require 'pact/mock_service/run'
 
 module Pact
   module MockService
@@ -53,7 +54,8 @@ module Pact
           provider: options[:provider],
           cors_enabled: options[:cors],
           pact_specification_version: options[:pact_specification_version],
-          pactfile_write_mode: options[:pact_file_write_mode]
+          pactfile_write_mode: options[:pact_file_write_mode],
+          stub_pactfile_paths: options[:stub_pactfile_paths]
         }
         service_options[:log_file] = open_log_file if options[:log]
         service_options

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.3.0"
+    VERSION = "2.4.0"
   end
 end

data/lib/pact/stub_service/cli.rb

@@ -0,0 +1,45 @@
+require 'pact/mock_service/cli/custom_thor'
+require 'webrick/https'
+require 'rack/handler/webrick'
+require 'fileutils'
+require 'pact/mock_service/server/wait_for_server_up'
+require 'pact/mock_service/cli/pidfile'
+require 'socket'
+
+module Pact
+  module StubService
+    class CLI < Pact::MockService::CLI::CustomThor
+
+      desc 'PACT ...', "Start a stub service with the given pact file(s). Note that this is in beta release, and no logic has been added to handle the situation where more than one matching interaction is found for a request. At the moment, an error response will be returned."
+
+      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 :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
+      method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
+      method_option :sslcert, desc: "Specify the path to the SSL cert to use when running the service over HTTPS"
+      method_option :sslkey, desc: "Specify the path to the SSL key to use when running the service over HTTPS"
+      method_option :stub_pactfile_paths, hide: true
+
+      def service(*pactfiles)
+        raise Thor::Error.new("Please provide an existing pact file to load") if pactfiles.empty?
+        require 'pact/mock_service/run'
+        options.stub_pactfile_paths = pactfiles
+        opts = Thor::CoreExt::HashWithIndifferentAccess.new
+        opts.merge!(options)
+        opts[:stub_pactfile_paths] = pactfiles
+        opts[:pactfile_write_mode] = 'none'
+        MockService::Run.(opts)
+      end
+
+      desc 'version', "Show the pact-stub-service gem version"
+
+      def version
+        require 'pact/mock_service/version.rb'
+        puts Pact::MockService::VERSION
+      end
+
+      default_task :service
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -281,6 +281,7 @@ email:
 - beth@bethesque.com
 executables:
 - pact-mock-service
+- pact-stub-service
 extensions: []
 extra_rdoc_files: []
 files:
@@ -289,6 +290,7 @@ files:
 - LICENSE.txt
 - README.md
 - bin/pact-mock-service
+- bin/pact-stub-service
 - lib/pact/consumer/mock_service/cors_origin_header_middleware.rb
 - lib/pact/consumer/mock_service/error_handler.rb
 - lib/pact/consumer/mock_service/rack_request_helper.rb
@@ -303,6 +305,7 @@ files:
 - lib/pact/mock_service/app.rb
 - lib/pact/mock_service/app_manager.rb
 - lib/pact/mock_service/cli.rb
+- lib/pact/mock_service/cli/custom_thor.rb
 - lib/pact/mock_service/cli/pidfile.rb
 - lib/pact/mock_service/client.rb
 - lib/pact/mock_service/control_server/app.rb
@@ -346,6 +349,7 @@ files:
 - lib/pact/mock_service/session.rb
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb
+- lib/pact/stub_service/cli.rb
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT
@@ -366,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Provides a mock service for use with Pact