service_mock 0.7.1 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9c6b2185d2d52eeda2b5b5a5487d766cdd9d7bc
-  data.tar.gz: f4c1fd46633aafffd94ad7345be13785cc6f731a
+  metadata.gz: d0c8f7835468a570de6203c0123ec41598a86cad
+  data.tar.gz: 6e5684703af629bf3b141aaefd31af528e51647f
 SHA512:
-  metadata.gz: f92c202ccdae0f705052dc2b0dfa198d7616bb9e26da55439eea0bb87661a057da039db7f5a800ba532313fdefb32269829565fcc3584da65e457667f8a77c11
-  data.tar.gz: 5f8082f11c4bf0c7f1d798ff3d8a0e46ab0e63f6ce0e78bc9215a1f3b490664e8bcce32b593a22e1c5f108e7dc1cb03dbbd26a5500a949d403b615544a8706ef
+  metadata.gz: 45a99d300a1eb75fdff45a056464818c0a171b701e247d6d88b9dccf808fb1fed12bb87ff1fbf76bfd92511ee1740ae0f1b0c82d702e20f542f94ca90ac5b02c
+  data.tar.gz: b9018538106fc49a3e4af10da4075fe6e0ebf379036537b03e028d354b78023c8257448b0dd2db7e621857f9b8991018406b2f1ecb33dcfacdfdf9e53917e7ca

data/ChangeLog

@@ -1,3 +1,6 @@
+=== Release 0.8 / 23-Sep-2017
+* Added ability to provide proxy settings that are using when communicating with the server
+
 === Release 0.7.1 / 21-Aug-2017
 * Added ability to specify the stub creator file via Cucumber tags
 * Added count methods to retrieve the count for a specific request - thanks Jarl Friis

data/lib/service_mock/server.rb

@@ -45,6 +45,7 @@ module ServiceMock
 
     attr_accessor :inherit_io, :wait_for_process, :remote_host, :classpath
     attr_reader :wiremock_version, :working_directory, :process
+    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
 
     def initialize(wiremock_version, working_directory = ::ServiceMock.working_directory)
       @wiremock_version = wiremock_version
@@ -139,7 +140,7 @@ module ServiceMock
     def count(request_criteria)
       return if ::ServiceMock.disable_stubs
       yield self if block_given?
-      return JSON.parse(http.post('/__admin/requests/count', request_criteria).body)['count']
+      JSON.parse(http.post('/__admin/requests/count', request_criteria).body)['count']
     end
 
     #
@@ -149,7 +150,7 @@ module ServiceMock
       return if ::ServiceMock.disable_stubs
       yield self if block_given?
       content = File.open(filename, 'rb') { |file| file.read }
-      return count(content)
+      count(content)
     end
 
     #
@@ -213,9 +214,17 @@ module ServiceMock
     end
 
     def http
+      if using_proxy
+        return Net::HTTP.Proxy(proxy_addr, proxy_port,
+                        proxy_user, proxy_pass)
+      end
       Net::HTTP.new(admin_host, admin_port)
     end
 
+    def using_proxy
+      proxy_addr && proxy_port
+    end
+
     def admin_host
       return ENV['WIREMOCK_URL'].match(/http\:\/\/(.+)\:\d+/)[1] if ENV['WIREMOCK_URL']
       "#{remote_host ? remote_host : 'localhost'}"

data/lib/service_mock/version.rb

@@ -1,3 +1,3 @@
 module ServiceMock
-  VERSION = "0.7.1"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_mock
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: '0.8'
 platform: ruby
 authors:
 - Jeffrey S. Morgan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess