pact-mock_service 2.10.1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f1f71217eb757b58cda16f0410ebbbd2b6de982380e05a1d6a40f556c29df38
-  data.tar.gz: 652799963b66d0bb8b6371080f1a01c8f9bc98f047c3013479125c86dc0928fd
+  metadata.gz: 747c96bb4d050f110fcce31d689e1d618bfca4bbd4ffcd80cb4cbfe9d2a73169
+  data.tar.gz: 32383ee0cdb1aa0a91d631f12c9f666a44d931244aa31d55e53eb54657a0f0bb
 SHA512:
-  metadata.gz: dfc6d897b48f6a5a2e8dfb5ac113e44ab1d8da309f1bd11fb5939a95ee8f80cea0dbe2e055591eaa2d3112b53fbf381f561cae33a6e12e8635235d207bb5111c
-  data.tar.gz: 507de0001545aaba8a96f1e10d7c26772d80aa0c819368e818149b493cdcf5b640c37ad498336ab8def5fa230109a05ee269a9680b3f5bc421a5000613989b56
+  metadata.gz: 0b2df396720759af740955a36889fd8874d6a0bfa54e1f49a88c1d3d923399927847830476cc0e610701f4ec9a89f8bd1b67dc1a4f0ed1cc5b1185f2f6c16426
+  data.tar.gz: a42b7aeedbc4cd54d8546be463eefef1bf63137c3c3bbdd7d84da433144b99a43dd48a1aafe8bd1df42165efd38f525a467765e749fe9d673d0110906da66722

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v2.11.0"></a>
+### v2.11.0 (2018-08-28)
+
+
+#### Features
+
+* **stub-server**
+  * allow pacts to be loaded from a directory	 ([c5babe7](/../../commit/c5babe7))
+
+
 <a name="v2.10.1"></a>
 ### v2.10.1 (2018-08-21)
 

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.10.1"
+    VERSION = "2.11.0"
   end
 end

data/lib/pact/stub_service/cli.rb

@@ -10,16 +10,17 @@ module Pact
   module StubService
     class CLI < Pact::MockService::CLI::CustomThor
 
-      desc 'PACT_URI ...', "Start a stub service with the given pact file(s)."
+      desc 'PACT_URI ...', "Start a stub service with the given pact file(s) or directory."
       long_desc <<-DOC
-        Start a stub service with the given pact file(s). Pact URIs may be local file paths or HTTP.
+        Start a stub service with the given pact file(s) or directories. Pact URIs may be local
+        file or directory paths, or HTTP.
         Include any basic auth details in the URL using the format https://USERNAME:PASSWORD@URI.
         Where multiple matching interactions are found, the interactions will be sorted by
         response status, and the first one will be returned. This may lead to some non-deterministic
         behaviour. If you are having problems with this, please raise it on the pact-dev google group,
         and we can discuss some potential enhancements.
         Note that only versions 1 and 2 of the pact specification are currently fully supported.
-        Pacts using the v3 format may be used, however, any matching features added in v4 will
+        Pacts using the v3 format may be used, however, any matching features added in v3 will
         currently be ignored.
       DOC
 
@@ -33,13 +34,16 @@ module Pact
       method_option :stub_pactfile_paths, hide: true
       method_option :monkeypatch, hide: true
 
-      def service(*pactfiles)
-        raise Thor::Error.new("Please provide an existing pact file to load") if pactfiles.empty?
+      def service(*pact_files)
         require 'pact/mock_service/run'
-        options.stub_pactfile_paths = pactfiles
+        require 'pact/support/expand_file_list'
+
+        expanded_pact_files = file_list(pact_files)
+        raise Thor::Error.new("Please provide at least one pact file to load") if expanded_pact_files.empty?
+
         opts = Thor::CoreExt::HashWithIndifferentAccess.new
         opts.merge!(options)
-        opts[:stub_pactfile_paths] = pactfiles
+        opts[:stub_pactfile_paths] = expanded_pact_files
         opts[:pactfile_write_mode] = 'none'
         MockService::Run.(opts)
       end
@@ -52,6 +56,12 @@ module Pact
       end
 
       default_task :service
+
+      no_commands do
+        def file_list(pact_files)
+          Pact::Support::ExpandFileList.call(pact_files)
+        end
+      end
     end
   end
 end

data/lib/pact/support/expand_file_list.rb

@@ -0,0 +1,26 @@
+module Pact
+  module Support
+    module ExpandFileList
+      def self.call pact_files
+        pact_files
+          .collect{ |path| unixify_path(path) }
+          .collect{ | path | expand_path(path) }
+          .flatten
+      end
+
+      def self.unixify_path(path)
+        path.gsub(/\\+/, '/')
+      end
+
+      def self.expand_path(path)
+        if File.directory?(path)
+          Dir.glob(File.join(path, "*.json"))
+        elsif Dir.glob(path).any?
+          Dir.glob(path)
+        else
+          path
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.11.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -379,6 +379,7 @@ files:
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb
 - lib/pact/stub_service/cli.rb
+- lib/pact/support/expand_file_list.rb
 homepage: https://github.com/bethesque/pact-mock_service
 licenses:
 - MIT