pact 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-### 1.0.4 (unreleased)
+### 1.0.4 (6 September 2013)
+
+* Added pact/tasks as an easy way to load the rake tasks and classes into the client project [Beth Skurrie]
+* Removed unused rake_task.rb file [Beth Skurrie]
 
 ### 1.0.3 (5 September 2013)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.3)
+    pact (1.0.4)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       hashie (~> 2.0)

data/README.md

@@ -117,9 +117,12 @@ end
 
 #### Configure your service provider rack app
 
-Create a `pact_helper.rb` in your service provider project. The file must be called pact_helper.rb so the verification tasks can find it, however there is some flexibility in where it can be stored. The recommended place is `specs/service_providers/pact_helper.rb`.
+Create a `pact_helper.rb` in your service provider project. The file must be called pact_helper.rb so the built in verification tasks can find it, however there is some flexibility in where it can be stored. The recommended place is `specs/service_providers/pact_helper.rb`.
 
 ```ruby
+require 'spec_helper'
+require 'provider_states_for_my_consumer' #See next section on setting up provider states
+
 Pact.service_provider "My Provider" do
   app { MyApp.new }
 end
@@ -185,16 +188,14 @@ Here is an example pact:verify:head task, pointing the the pact file for "some_c
 
 ```ruby
 Pact::VerificationTask.new(:head) do | pact |
-  pact.uri 'http://our_build_server/MY-CONSUMER-BUILD/latestSuccessful/artifact/Pacts/some_consumer-this_service provider.json',
-    support_file: './spec/consumers/pact_helper'
+  pact.uri 'http://our_build_server/MY-CONSUMER-BUILD/latestSuccessful/artifact/Pacts/some_consumer-this_service provider.json'
 end
 ```
 
 ```ruby
 # Ideally we'd like to be able to create a production task like this, but firewalls are making this tricky right now.
 Pact::VerificationTask.new(:production) do | pact |
-  pact.uri 'http://our_prod_server/pacts/some_consumer-this_service_provider.json',
-    support_file: './spec/consumers/pact_helper'
+  pact.uri 'http://our_prod_server/pacts/some_consumer-this_service_provider.json'
 end
 ```
 

data/lib/pact/tasks.rb

@@ -0,0 +1,2 @@
+load File.expand_path('../tasks/pact.rake', File.dirname(__FILE__))
+require 'pact/verification_task'

data/lib/pact/verification_task.rb

@@ -11,15 +11,20 @@ require_relative 'pact_task_helper'
 	end
 
 	The pact.uri may be a local file system path or a remote URL.
-	The support_file should include code that makes your rack app available for the rack testing framework.
+
+	To run a pact:verify:xxx task you need to define a pact_helper.rb, ideally in spec/service_consumers.
+	It should contain your service_provider definition, and load any provider state definition files.
+	It should also load all your app's dependencies (eg by calling out to spec_helper)
+
 	Eg.
 
+	require 'spec_helper'
+	require 'provider_states_for_my_consumer'
+
 	Pact.service_provider "My Provider" do
 		app { TestApp.new }
 	end
 
-	It should also load all your app's dependencies (eg by calling out to spec_helper)
-
 =end
 
 

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/tasks/pact.rake

@@ -1,16 +1,16 @@
 require 'pact'
 require 'pact/pact_task_helper'
 
-include PactTaskHelper
+
 namespace :pact do
 
+  include PactTaskHelper
+
 	desc "Runs the specified pact file against the service provider"
-  task :verify, :pact_uri, :support_file do | t, args |
-    puts 'BLSH'
+  task :verify, :pact_uri do | t, args |
     require 'pact/provider/pact_spec_runner'
     puts "Using pact at uri #{args[:pact_uri]}"
-    puts "Using support file #{args[:support_file]}"
-    pact_spec_config = {uri: args[:pact_uri], support_file: args[:support_file]}
+    pact_spec_config = {uri: args[:pact_uri]}
     exit_status = Pact::Provider::PactSpecRunner.run([pact_spec_config])
     fail failure_message if exit_status != 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -299,9 +299,9 @@ files:
 - lib/pact/provider/provider_state.rb
 - lib/pact/provider/rspec.rb
 - lib/pact/provider/test_methods.rb
-- lib/pact/rake_task.rb
 - lib/pact/reification.rb
 - lib/pact/request.rb
+- lib/pact/tasks.rb
 - lib/pact/term.rb
 - lib/pact/verification_task.rb
 - lib/pact/version.rb

data/lib/pact/rake_task.rb

@@ -1,64 +0,0 @@
-require 'rake/tasklib'
-
-
-module Pact
-
-  ##
-  # To enable `rake pact`, put something like this in your Rakefile:
-  #
-  #     ```
-  #     require 'pact/rake_task'
-  #
-  #     Pact::RakeTask.new do |pact|
-  #       pact.file 'spec/pacts/some-pact.json',
-  #         from_url: 'http://example.com/some-pact.json'
-  #       pact.file 'spec/pacts/other-pact.json',
-  #         from_url: 'http://example.com/other-pact.json'
-  #     end
-  #     ```
-  class RakeTask < ::Rake::TaskLib
-    attr_reader :connections
-
-    def initialize(name = :pact)
-      @connections = []
-
-      yield self
-
-      namespace name do
-        desc "Update integration pacts from external sources"
-        task :pull do
-          connections.each do |conn|
-            body = fetch conn[:url]
-            File.open(conn[:file], 'w') {|f| f.write body }
-            puts "Wrote #{conn[:url]} to #{conn[:file]}"
-          end
-        end
-      end
-      task name => "#{name}:pull" # default task for the namespace
-    end
-
-    def file(filename, options = {})
-      url = options.fetch(:from_url)
-      @connections << {file: filename, url: url}
-    end
-
-    private
-    # written with plain Net::HTTP to avoid bringing in extra dependencies
-    def fetch(url_string, redirection_limit = 5)
-      raise 'Too many HTTP redirects' if redirection_limit == 0
-      url = URI.parse(url_string)
-      response = Net::HTTP.get_response(url)
-      case response
-      when Net::HTTPSuccess then
-        response.body
-      when Net::HTTPRedirection then
-        location = response['Location']
-        fetch(location, redirection_limit - 1)
-      else
-        response.value # raise the appropriate error
-      end
-    end
-  end
-
-
-end