pact_broker-client 0.0.3 → 0.0.5

data/CHANGELOG.md

@@ -2,6 +2,13 @@ Do this to generate your change history
 
     $ git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)' 'package/pact_broker-client-0.0.PRODVERSION'..'package/pact_broker-client-0.0.NEWVERSION'
 
+#### 0.0.4 (2013-11-15)
+
+* cf33479 - Merge branch 'master' of github.com:bethesque/pact_broker-client (Beth, 20 hours ago)
+* 01087ae - Fixed problem where PublicationTask block was evaluated at load time, instead of run time. (Beth, 20 hours ago)
+* 2073234 - Updating to use example.org as the base URL (Beth, 2 days ago)
+* 07073de - Updating latest pact URL (Beth, 2 days ago)
+
 #### 0.0.3 (2013-11-13)
 
 * a3488bd - Fixing application/json+hal to application/hal+json (Beth, 2 days ago)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact_broker-client (0.0.3)
+    pact_broker-client (0.0.5)
       httparty
       json
       pact
@@ -11,16 +11,7 @@ GEM
   specs:
     awesome_print (1.1.0)
     coderay (1.0.9)
-    columnize (0.3.6)
-    daemons (1.1.9)
-    debugger (1.6.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     diff-lcs (1.2.5)
-    eventmachine (1.0.3)
     fakefs (0.4.2)
     find_a_port (1.0.1)
     httparty (0.12.0)
@@ -29,15 +20,15 @@ GEM
     json (1.8.1)
     method_source (0.8.2)
     multi_xml (0.5.5)
-    pact (1.0.20)
+    pact (1.0.23)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       json
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
       rspec (~> 2.12)
-      thin
       thor
+      webrick
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -58,17 +49,13 @@ GEM
       rspec (~> 2.11)
     rspec-mocks (2.14.4)
     slop (3.4.6)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.18.1)
+    webrick (1.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  debugger
   fakefs (~> 0.4)
   pact_broker-client!
   pry

data/lib/pact_broker/client/pacts.rb

@@ -25,14 +25,14 @@ module PactBroker
         end
       end
 
-      def latest
+      def list_latest
         response = self.class.get("/pacts/latest", headers: default_get_headers)
         handle_response(response) do
           map_pact_list_do_hash JSON.parse(response.body)["pacts"]
         end
       end
 
-      def last options
+      def latest options
         url = get_latest_consumer_contract_url(options)
         response = self.class.get(url, headers: default_get_headers)
         handle_response(response) do
@@ -59,7 +59,7 @@ module PactBroker
         end
       end
 
-      def find_last_consumer_contract_query options
+      def find_latest_consumer_contract_query options
         query = {:consumer => options[:consumer], :provider => options[:provider]}
         query[:tag] = options[:tag] if options[:tag]
         query

data/lib/pact_broker/client/tasks/publication_task.rb

@@ -17,22 +17,22 @@ module PactBroker
 
       attr_accessor :pattern, :pact_broker_base_url, :consumer_version
 
-      def initialize name = nil
+      def initialize name = nil, &block
         @name = name
         @pattern = 'spec/pacts/*.json'
         @pact_broker_base_url = 'http://pact-broker'
-        yield self
-        rake_task
+        rake_task &block
       end
 
       private
 
-      def rake_task
+      def rake_task &block
         namespace :pact do
           desc "Publish pacts to pact broker"
           task task_name do
+            block.call(self)
             require 'pact_broker/client/publish_pacts'
-            success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[@pattern], consumer_version).call
+            success = PactBroker::Client::PublishPacts.new(pact_broker_base_url, FileList[pattern], consumer_version).call
             raise "One or more pacts failed to be published" unless success
           end
         end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '0.0.3'
+    VERSION = '0.0.5'
   end
 end

data/lib/pact_broker/client/versions.rb

@@ -5,9 +5,9 @@ module PactBroker
     class Versions < BaseClient
 
 
-      def last options
+      def latest options
         query = options[:tag] ? {tag: options[:tag]} : {}
-        response = self.class.get("#{version_base_url(options)}/last", query: query, headers: default_get_headers)
+        response = self.class.get("#{version_base_url(options)}/latest", query: query, headers: default_get_headers)
 
         handle_response(response) do
           string_keys_to_symbols(response.to_hash)

data/pact-broker-client.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.4'
   gem.add_development_dependency 'rspec-fire'
-  gem.add_development_dependency 'debugger'
+  #gem.add_development_dependency 'debugger'
 end

data/spec/lib/pact_broker/client/tasks/publication_task_spec.rb

@@ -15,7 +15,7 @@ module PactBroker::Client
 
     before do
       PactBroker::Client::PublishPacts.stub(:new).and_return(publish_pacts)
-      FileList.should_receive(:[]).with(pattern).and_return(pact_file_list)
+      FileList.stub(:[]).with(pattern).and_return(pact_file_list)
     end
 
     let(:pattern) { "spec/pacts/*.json" }
@@ -66,6 +66,19 @@ module PactBroker::Client
       end
     end
 
+    describe "timing of block execution" do
+
+      before :all do
+        PactBroker::Client::PublicationTask.new(:exception) do | task |
+          raise 'A contrived exception'
+        end
+      end
+
+      it "does not execute the block passed to the publication task until the task is called" do
+        expect{ Rake::Task['pact:publish:exception'].execute }.to raise_error 'A contrived exception'
+      end
+    end
+
 
   end
 

data/spec/pacts/pact_broker_client-pact_broker.json

@@ -23,14 +23,14 @@
         "body": {
           "_links": {
             "self": {
-              "href": "http://localhost:1234/pacts/latest"
+              "href": "http://example.org/pacts/latest"
             }
           },
           "pacts": [
             {
               "_links": {
                 "self": {
-                  "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/pacts/Pricing%20Service"
+                  "href": "http://example.org/pact/provider/Pricing%20Service/consumer/Condor/version/1.3.0"
                 }
               },
               "_embedded": {
@@ -38,7 +38,7 @@
                   "name": "Condor",
                   "_links": {
                     "self": {
-                      "href": "http://localhost:1234/pacticipants/Condor"
+                      "href": "http://example.org/pacticipants/Condor"
                     }
                   },
                   "_embedded": {
@@ -50,7 +50,7 @@
                 "provider": {
                   "_links": {
                     "self": {
-                      "href": "http://localhost:1234/pacticipants/Pricing%20Service"
+                      "href": "http://example.org/pacticipants/Pricing%20Service"
                     }
                   },
                   "name": "Pricing Service"
@@ -78,12 +78,12 @@
         "body": {
           "_links": {
             "self": {
-              "href": "http://localhost:1234/pacticipants"
+              "href": "http://example.org/pacticipants"
             },
             "pacticipants": [
               {
-                "href": "http://localhost:1234/pacticipants/Condor",
-                "name": "Condor"
+                "href": "http://example.org/pacticipants/Condor",
+                "title": "Condor"
               }
             ]
           },
@@ -91,15 +91,15 @@
             {
               "_links": {
                 "self": {
-                  "href": "http://localhost:1234/pacticipants/Condor"
+                  "href": "http://example.org/pacticipants/Condor"
                 }
               },
               "name": "Condor",
               "_embedded": {
-                "last_version": {
+                "latest_version": {
                   "_links": {
                     "self": {
-                      "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0"
+                      "href": "http://example.org/pacticipants/Condor/versions/1.3.0"
                     }
                   },
                   "number": "1.3.0"
@@ -127,22 +127,22 @@
         "body": {
           "_links": {
             "self": {
-              "href": "http://localhost:1234/pacticipants/Pricing%20Service"
+              "href": "http://example.org/pacticipants/Pricing%20Service"
             },
             "versions": {
-              "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions"
+              "href": "http://example.org/pacticipants/Pricing%20Service/versions"
             },
-            "last_version": {
-              "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions/last"
+            "latest_version": {
+              "href": "http://example.org/pacticipants/Pricing%20Service/versions/latest"
             }
           },
           "name": "Pricing Service",
           "repository_url": "git@git.realestate.com.au:business-systems/pricing-service",
           "_embedded": {
-            "last_version": {
+            "latest_version": {
               "_links": {
                 "self": {
-                  "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions/1.3.0"
+                  "href": "http://example.org/pacticipants/Pricing%20Service/versions/1.3.0"
                 }
               },
               "number": "1.3.0"
@@ -465,7 +465,7 @@
       "provider_state": "a version with production details exists for the Pricing Service",
       "request": {
         "method": "get",
-        "path": "/pacticipants/Pricing%20Service/versions/last",
+        "path": "/pacticipants/Pricing%20Service/versions/latest",
         "headers": {
           "Accept": "application/json"
         },
@@ -490,7 +490,7 @@
       "provider_state": "no version exists for the Pricing Service",
       "request": {
         "method": "get",
-        "path": "/pacticipants/Pricing%20Service/versions/last",
+        "path": "/pacticipants/Pricing%20Service/versions/latest",
         "headers": {
           "Accept": "application/json"
         }

data/spec/service_providers/extra_goodies_spec.rb

@@ -39,7 +39,7 @@ module PactBroker::Client
             )
         end
         it "returns the response body" do
-            expect(pact_broker_client.pacts.latest).to eq(expected_pacts)
+            expect(pact_broker_client.pacts.list_latest).to eq(expected_pacts)
         end
       end
     end

data/spec/service_providers/pact_broker_client_spec.rb

@@ -48,7 +48,7 @@ module PactBroker::Client
             )
         end
         it "returns true" do
-            pact_broker_client.pacticipants.versions.pacts.publish options
+            expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_true
         end
       end
 
@@ -67,7 +67,7 @@ module PactBroker::Client
             )
         end
         it "returns true" do
-            pact_broker_client.pacticipants.versions.pacts.publish options
+            expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_true
         end
       end
 
@@ -86,7 +86,7 @@ module PactBroker::Client
             )
         end
         it "returns true" do
-            pact_broker_client.pacticipants.versions.pacts.publish options
+            expect(pact_broker_client.pacticipants.versions.pacts.publish(options)).to be_true
         end
       end
 
@@ -244,7 +244,7 @@ module PactBroker::Client
           end
 
           it "returns the pact json" do
-            response = pact_broker_client.pacticipants.versions.pacts.last consumer: 'Condor', provider: 'Pricing Service'
+            response = pact_broker_client.pacticipants.versions.pacts.latest consumer: 'Condor', provider: 'Pricing Service'
             expect(response).to eq(pact_json)
           end
 
@@ -265,7 +265,7 @@ module PactBroker::Client
             })
           end
           it "returns nil" do
-            response = pact_broker_client.pacticipants.versions.pacts.last consumer: 'Condor', provider: 'Pricing Service'
+            response = pact_broker_client.pacticipants.versions.pacts.latest consumer: 'Condor', provider: 'Pricing Service'
             expect(response).to eq(nil)
           end
         end
@@ -290,7 +290,7 @@ module PactBroker::Client
           end
 
           it "returns the pact json" do
-            response = pact_broker_client.pacticipants.versions.pacts.last consumer: 'Condor', provider: 'Pricing Service', tag: 'prod'
+            response = pact_broker_client.pacticipants.versions.pacts.latest consumer: 'Condor', provider: 'Pricing Service', tag: 'prod'
             expect(response).to eq(pact_json)
           end
         end
@@ -309,7 +309,7 @@ module PactBroker::Client
               upon_receiving("a request for the latest version tagged with 'prod'").
               with(
                 method: :get,
-                path: '/pacticipants/Pricing%20Service/versions/last',
+                path: '/pacticipants/Pricing%20Service/versions/latest',
                 query: 'tag=prod',
                 headers: get_request_headers).
               will_respond_with( status: 200,
@@ -317,7 +317,7 @@ module PactBroker::Client
                 body: body )
           end
           it 'returns the version details' do
-            expect( pact_broker_client.pacticipants.versions.last pacticipant: 'Pricing Service', tag: 'prod' ).to eq body
+            expect( pact_broker_client.pacticipants.versions.latest pacticipant: 'Pricing Service', tag: 'prod' ).to eq body
           end
         end
       end
@@ -326,11 +326,11 @@ module PactBroker::Client
           pact_broker.
             given("no version exists for the Pricing Service").
             upon_receiving("a request for the latest version").
-            with(method: :get, path: '/pacticipants/Pricing%20Service/versions/last', headers: get_request_headers).
+            with(method: :get, path: '/pacticipants/Pricing%20Service/versions/latest', headers: get_request_headers).
             will_respond_with( status: 404, headers: pact_broker_response_headers )
         end
         it 'returns nil' do
-          expect( pact_broker_client.pacticipants.versions.last pacticipant: 'Pricing Service' ).to eq nil
+          expect( pact_broker_client.pacticipants.versions.latest pacticipant: 'Pricing Service' ).to eq nil
         end
       end
     end

data/spec/support/pacticipant_get.json

@@ -1,16 +1,16 @@
 {
     "_links": {
-        "self": { "href": "http://localhost:1234/pacticipants/Pricing%20Service" },
-        "versions": { "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions" },
-        "last_version": { "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions/last" }
+        "self": { "href": "http://example.org/pacticipants/Pricing%20Service" },
+        "versions": { "href": "http://example.org/pacticipants/Pricing%20Service/versions" },
+        "latest_version": { "href": "http://example.org/pacticipants/Pricing%20Service/versions/latest" }
     },
     "name" : "Pricing Service",
     "repository_url": "git@git.realestate.com.au:business-systems/pricing-service",
     "_embedded" : {
-        "last_version" : {
+        "latest_version" : {
             "_links" : {
                 "self": {
-                    "href": "http://localhost:1234/pacticipants/Pricing%20Service/versions/1.3.0"
+                    "href": "http://example.org/pacticipants/Pricing%20Service/versions/1.3.0"
                 }
             },
             "number" : "1.3.0"

data/spec/support/pacticipants_list.json

@@ -1,22 +1,22 @@
 {
     "_links": {
-        "self": { "href": "http://localhost:1234/pacticipants" },
+        "self": { "href": "http://example.org/pacticipants" },
         "pacticipants": [
-            { "href": "http://localhost:1234/pacticipants/Condor", "name": "Condor" }
+            { "href": "http://example.org/pacticipants/Condor", "title": "Condor" }
         ]
     },
     "pacticipants" : [{
       "_links": {
           "self" : {
-            "href" : "http://localhost:1234/pacticipants/Condor"
+            "href" : "http://example.org/pacticipants/Condor"
           }
         },
       "name" : "Condor",
       "_embedded" : {
-          "last_version" : {
+          "latest_version" : {
               "_links" : {
                   "self": {
-                      "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0"
+                      "href": "http://example.org/pacticipants/Condor/versions/1.3.0"
                   }
               },
               "number" : "1.3.0"

data/spec/support/pacts_latest_list.json

@@ -1,14 +1,14 @@
 {
     "_links": {
         "self": {
-            "href": "http://localhost:1234/pacts/latest"
+            "href": "http://example.org/pacts/latest"
         }
     },
     "pacts": [
         {
             "_links": {
                 "self": {
-                    "href": "http://localhost:1234/pacticipants/Condor/versions/1.3.0/pacts/Pricing%20Service"
+                    "href": "http://example.org/pact/provider/Pricing%20Service/consumer/Condor/version/1.3.0"
                 }
             },
             "_embedded": {
@@ -16,7 +16,7 @@
                     "name": "Condor",
                     "_links": {
                         "self": {
-                            "href": "http://localhost:1234/pacticipants/Condor"
+                            "href": "http://example.org/pacticipants/Condor"
                         }
                     },
                     "_embedded": {
@@ -28,7 +28,7 @@
                 "provider": {
                     "_links": {
                         "self": {
-                            "href": "http://localhost:1234/pacticipants/Pricing%20Service"
+                            "href": "http://example.org/pacticipants/Pricing%20Service"
                         }
                     },
                     "name": "Pricing Service"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact
@@ -123,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Publishes pacts to, and retrieves pacts from, the pact broker server.
 email:
 - bskurrie@dius.com.au
@@ -193,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 931028457925136727
+      hash: -1305860573935195556
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 931028457925136727
+      hash: -1305860573935195556
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23