pact 1.0.1 → 1.0.2

data/Gemfile.lock

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

data/lib/pact/configuration.rb

@@ -36,10 +36,15 @@ module Pact
     c.tmp_dir = File.expand_path('./tmp/pacts')
     c.log_dir = default_log_dir
     c.logger = default_logger c.log_path
-    c.pactfile_write_mode = :overwrite
+    c.pactfile_write_mode = is_rake_running? ? :overwrite : :update
     c
   end
 
+  #Would love a better way of determining this! It sure won't work on windows.
+  def self.is_rake_running?
+    `ps -ef | grep rake | grep #{Process.ppid} | grep -v 'grep'`.size > 0
+  end
+
   def self.default_log_dir
     File.expand_path("./log")
   end

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -78,19 +78,29 @@ module Pact
         end
       end
 
-      def log_and_puts msg
+      def warn_and_stderr msg
         $stderr.puts msg
         logger.warn msg
       end
 
+      def info_and_puts msg
+        $stdout.puts msg
+        logger.info msg
+      end
+
       def existing_interactions
         interactions = []
         if pactfile_exists?
           begin
             interactions = existing_consumer_contract.interactions
+            info_and_puts "*****************************************************************************"
+            info_and_puts "Updating existing file .#{consumer_contract.pactfile_path.gsub(Dir.pwd, '')} as config.pactfile_write_mode is :update"
+            info_and_puts "Only interactions defined in this test run will be updated."
+            info_and_puts "As interactions are identified by description and provider state, pleased note that if either of these have changed, the old interactions won't be removed from the pact file until rake is next run."
+            info_and_puts "*****************************************************************************"
           rescue StandardError => e
-            log_and_puts "Could not load existing consumer contract from #{consumer_contract.pactfile_path} due to #{e}"
-            log_and_puts "Creating a new file."
+            warn_and_stderr "Could not load existing consumer contract from #{consumer_contract.pactfile_path} due to #{e}"
+            warn_and_stderr "Creating a new file."
           end
         end
         interactions

data/lib/pact/pact_task_helper.rb

@@ -0,0 +1,7 @@
+module PactTaskHelper
+  def failure_message
+    "\n* * * * * * * * * * * * * * * * * * *\n" +
+    "Provider did not honour pact file.\nSee\n * #{Pact.configuration.log_path}\n * #{Pact.configuration.tmp_dir}\nfor logs and pact files." +
+    "\n* * * * * * * * * * * * * * * * * * *\n\n"
+  end
+end

data/lib/pact/verification_task.rb

@@ -1,5 +1,6 @@
 require 'rake/tasklib'
 require 'pact/provider/pact_spec_runner'
+require_relative 'pact_task_helper'
 
 =begin
 	To create a rake pact:verify:<something> task
@@ -23,32 +24,29 @@ require 'pact/provider/pact_spec_runner'
 
 =end
 
+
 module Pact
 	class VerificationTask < ::Rake::TaskLib
 	  attr_reader :pact_spec_config
 
+	  include PactTaskHelper
 	  def initialize(name)
 	    @pact_spec_config = []
 
 	    yield self
 
 	    namespace :pact do
+
 	      desc "Verify provider against the consumer pacts for #{name}"
 	      task "verify:#{name}" do
 	        exit_status = Provider::PactSpecRunner.run(pact_spec_config)
 	        fail failure_message if exit_status != 0
 	      end
-
-	      def failure_message
-	      	"\n* * * * * * * * * * * * * * * * * * *\n" +
-	      	"Provider did not honour pact file.\nSee\n * #{Pact.configuration.log_path}\n * #{Pact.configuration.tmp_dir}\nfor logs and pact files." +
-	      	"\n* * * * * * * * * * * * * * * * * * *\n\n"
-	      end
 	    end
 	  end
 
 	  def uri(uri, options)
-	    @pact_spec_config << {uri: uri, support_file: options[:support_file], consumer: options[:consumer]}
+	    @pact_spec_config << {uri: uri, support_file: options[:support_file]}
 	  end
 	end
 end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/tasks/pact.rake

@@ -1,6 +1,17 @@
+require 'pact'
+require 'pact/pact_task_helper'
+
+include PactTaskHelper
 namespace :pact do
-	desc "Runs all the tasks prefixed with pact:verify in this project"
-  task :verify do
-    Rake::Task.tasks.find_all{ | task| task.name.start_with? "pact:verify:"}.map(&:invoke)
+
+	desc "Runs the specified pact file against the service provider"
+  task :verify, :pact_uri, :support_file do | t, args |
+    puts 'BLSH'
+    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]}
+    exit_status = Pact::Provider::PactSpecRunner.run([pact_spec_config])
+    fail failure_message if exit_status != 0
   end
 end

data/spec/lib/pact/consumer/consumer_contract_builder_spec.rb

@@ -22,7 +22,7 @@ module Pact
 
 			   let(:consumer_name) { 'a consumer' }
 			   let(:provider_name) { 'a provider' }
-			   let(:consumer_contract_builder) { 
+			   let(:consumer_contract_builder) {
 			      Pact::Consumer::ConsumerContractBuilder.new(
 			         :pactfile_write_mode => pactfile_write_mode,
 			         :consumer_name => consumer_name,
@@ -42,15 +42,36 @@ module Pact
 			   end
 
 			   context "when updating pact" do
+				   	before do
+
+				   	end
 			      let(:pactfile_write_mode) {:update}
 			      it "loads the interactions from the existing pact file" do
-			         expect(consumer_contract_builder.consumer_contract.interactions).to eq expected_interactions
+			      	ConsumerContractBuilder.any_instance.stub(:info_and_puts)
+			        expect(consumer_contract_builder.consumer_contract.interactions).to eq expected_interactions
 			      end
 
 			      it "uses an UpdatableInteractionsFilter to handle new interactions" do
+			      	ConsumerContractBuilder.any_instance.stub(:info_and_puts)
 			      	Pact::Consumer::UpdatableInteractionsFilter.should_receive(:new).with(expected_interactions)
 			      	consumer_contract_builder
 			      end
+
+			      let(:line0) { /\*/ }
+			      let(:line1) { /Updating existing file/ }
+			      let(:line2) { /Only interactions defined in this test run will be updated/ }
+			      let(:line3) { /As interactions are identified by description and provider state/ }
+			      it "logs a description message" do
+			      	$stdout.should_receive(:puts).with(line0).twice
+			      	$stdout.should_receive(:puts).with(line1)
+			      	$stdout.should_receive(:puts).with(line2)
+			      	$stdout.should_receive(:puts).with(line3)
+			      	Pact.configuration.logger.should_receive(:info).with(line0).twice
+			      	Pact.configuration.logger.should_receive(:info).with(line1)
+			      	Pact.configuration.logger.should_receive(:info).with(line2)
+			      	Pact.configuration.logger.should_receive(:info).with(line3)
+			      	consumer_contract_builder
+			      end
 			   end
 
 			   context "when an error occurs deserializing the existing pactfile" do

data/spec/lib/pact/verification_task_spec.rb

@@ -24,7 +24,7 @@ module Pact
 
 		describe 'execute' do
 
-			let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file, consumer: @consumer] }
+			let(:consumer_contract) { [ uri: @pact_uri, support_file: @support_file] }
 
 			it 'verifies the pacts using PactSpecRunner' do
 				Provider::PactSpecRunner.should_receive(:run).with(consumer_contract).and_return(0)

data/tasks/pact-test.rake

@@ -4,13 +4,14 @@ namespace :pact do
 
 	desc 'Runs pact tests against a sample application, testing failure and success.'
 	task :tests do
+		silent = true
 		puts "Running task pact:tests"
 		# Run these specs silently, otherwise expected failures will be written to stdout and look like unexpected failures.
 
-		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_pass.json', support_file: './spec/support/pact_rake_support.rb', consumer: 'some-test-consumer' }], silent: true)
+		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_pass.json', support_file: './spec/support/pact_rake_support.rb', consumer: 'some-test-consumer' }], silent: silent)
 		fail 'Expected pact to pass' unless (result == 0)
 
-		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_fail.json', support_file: './spec/support/pact_rake_support.rb' }], silent: true)
+		result = Pact::Provider::PactSpecRunner.run([{ uri: './spec/support/test_app_fail.json', support_file: './spec/support/pact_rake_support.rb' }], silent: silent)
 		fail 'Expected pact to fail' if (result == 0)
 
 		puts "Task pact:tests completed succesfully."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -274,6 +274,7 @@ files:
 - lib/pact/logging.rb
 - lib/pact/matchers.rb
 - lib/pact/matchers/matchers.rb
+- lib/pact/pact_task_helper.rb
 - lib/pact/provider.rb
 - lib/pact/provider/dsl.rb
 - lib/pact/provider/matchers.rb