pact-provider-verifier 1.26.0 → 1.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2353417f47f75fbb238b3401c5ddbfa5dc98766f83ac1e78105a246420549636
-  data.tar.gz: abc6c780757ba1153318867cd8869883c6bbae1bee245a0504d3ed4b39708704
+  metadata.gz: 6aa619044ae521e7f472fcb86c62389dd908d4799a509bb3a1b7b688947960b2
+  data.tar.gz: beedd9e10ca307512db6306c6888c15075caa3878c6db7cb998d377421aef5e1
 SHA512:
-  metadata.gz: b700edfe49387ab05780793f5fb9c515041633e6e345ee4bd30a8d4fbe0e9a64f1a0a55dd1c9daef12ad03fcd9d497c0eef4cabb16a7090d999bea6f996700fe
-  data.tar.gz: 4ac919f6e3f8fa1e6fa15719b67c5cb6406c7de62e2b26cb67f828afdc872dbe1c75f695b1b43885ebb2b08a66f72672041b4740ef21e4fb5f1acc8d863d91a0
+  metadata.gz: 549f619ce02b6367a97a4e18534861ee13f3a3f9e3e3dea527d3f4e035d253061fe46e637ec6355ce19fae14e18389e70f51c90bb21d13253ffc926199a13429
+  data.tar.gz: fdd5bb10143752116f9a5446d2c96e258aacf30fc19684e90bbf431d68104c3c2d428ce9e9a21ac4ba5cb92a5720d721e4f7a39f47e282a1a6dbfd2a98837706

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+<a name="v1.27.1-1"></a>
+### v1.27.1-1 (2020-01-16)
+
+
+#### Features
+
+* update git command use to determine branch name	 ([3dae935](/../../commit/3dae935))
+
+
+<a name="v1.27.0-1"></a>
+### v1.27.0-1 (2020-01-16)
+
+
+#### Features
+
+* **cli**
+  * add --tag-with-git-branch	 ([f652dd5](/../../commit/f652dd5))
+
+
 <a name="v1.26.0-1"></a>
 ### v1.26.0-1 (2020-01-11)
 

data/lib/pact/provider_verifier/app.rb

@@ -7,6 +7,7 @@ require 'pact/provider/rspec'
 require 'pact/message'
 require 'pact/cli/run_pact_verification'
 require 'pact/provider_verifier/aggregate_pact_configs'
+require 'pact/provider_verifier/git'
 require 'rack/reverse_proxy'
 require 'faraday_middleware'
 require 'json'
@@ -17,14 +18,15 @@ module Pact
       include Pact::WaitUntilServerAvailable
 
       PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
+      EMPTY_ARRAY = [].freeze
       attr_reader :pact_urls, :options, :consumer_version_tags, :provider_version_tags, :consumer_version_selectors, :publish_verification_results
 
       def initialize pact_urls, options = {}
         @pact_urls = pact_urls
         @options = options
-        @consumer_version_tags = options[:consumer_version_tag] || []
-        @provider_version_tags = options[:provider_version_tag] || []
-        @consumer_version_selectors = parse_consumer_version_selectors(options[:consumer_version_selector] || [])
+        @consumer_version_tags = options.consumer_version_tag || EMPTY_ARRAY
+        @provider_version_tags = merge_provider_version_tags(options)
+        @consumer_version_selectors = parse_consumer_version_selectors(options.consumer_version_selector || EMPTY_ARRAY)
         @publish_verification_results = options.publish_verification_results || ENV['PACT_BROKER_PUBLISH_VERIFICATION_RESULTS'] == 'true'
       end
 
@@ -215,6 +217,10 @@ module Pact
         consumer_version_selectors.collect{ | string | JSON.parse(string) }
       end
 
+      def merge_provider_version_tags(options)
+        (options.provider_version_tag || EMPTY_ARRAY) + (options.tag_with_git_branch ? [Git.branch] : EMPTY_ARRAY)
+      end
+
       def print_deprecation_note
         if options.provider_states_url
           $stderr.puts "WARN: The --provider-states-url option is deprecated and the URL endpoint can be removed from the application"

data/lib/pact/provider_verifier/cli/verify.rb

@@ -33,6 +33,7 @@ module Pact
         method_option :consumer_version_tag, type: :array, banner: "TAG", desc: "Retrieve the latest pacts with this consumer version tag. Used in conjunction with --provider. May be specified multiple times.", :required => false
         method_option :consumer_version_selector, type: :array, banner: "SELECTOR", desc: "JSON string specifying a selector that identifies which pacts to verify. May be specified multiple times. See below for further documentation.", :required => false
         method_option :provider_version_tag, type: :array, banner: "TAG", desc: "Tag to apply to the provider application version. May be specified multiple times.", :required => false
+        method_option :tag_with_git_branch, aliases: "-g", type: :boolean, default: false, required: false, desc: "Tag provider version with the name of the current git branch. Default: false"
         method_option :provider_app_version, aliases: "-a", desc: "Provider application version, required when publishing verification results", :required => false
         method_option :publish_verification_results, aliases: "-r", desc: "Publish verification results to the broker. This can also be enabled by setting the environment variable PACT_BROKER_PUBLISH_VERIFICATION_RESULTS=true", required: false, type: :boolean, default: false
         method_option :enable_pending, desc: "Allow pacts which are in pending state to be verified without causing the overall task to fail. For more information, see https://pact.io/pending", required: false, type: :boolean, default: false

data/lib/pact/provider_verifier/error.rb

@@ -0,0 +1,5 @@
+module Pact
+  module ProviderVerifier
+    class Error < StandardError; end
+  end
+end

data/lib/pact/provider_verifier/git.rb

@@ -0,0 +1,65 @@
+require 'pact/provider_verifier/error'
+
+# Keep in sync with pact_broker-client/lib/pact_broker/client/git.rb
+
+module Pact
+  module ProviderVerifier
+    module Git
+      COMMAND = 'git name-rev --name-only HEAD'.freeze
+      BRANCH_ENV_VAR_NAMES = %w{BUILDKITE_BRANCH CIRCLE_BRANCH TRAVIS_BRANCH GIT_BRANCH GIT_LOCAL_BRANCH APPVEYOR_REPO_BRANCH CI_COMMIT_REF_NAME}.freeze
+
+      def self.branch
+        find_branch_from_env_vars || branch_from_git_command
+      end
+
+      # private
+
+      def self.find_branch_from_env_vars
+        BRANCH_ENV_VAR_NAMES.collect { |env_var_name| branch_from_env_var(env_var_name) }.compact.first
+      end
+
+      def self.branch_from_env_var(env_var_name)
+        val = ENV[env_var_name]
+        if val && val.strip.size > 0
+          val
+        else
+          nil
+        end
+      end
+
+      def self.branch_from_git_command
+        branch_names = nil
+        begin
+          branch_names = execute_git_command
+            .split("\n")
+            .collect(&:strip)
+            .reject(&:empty?)
+            .collect(&:split)
+            .collect(&:first)
+            .collect{ |line| line.gsub(/^origin\//, '') }
+            .reject{ |line| line == "HEAD" }
+
+        rescue StandardError => e
+          raise Pact::ProviderVerifier::Error, "Could not determine current git branch using command `#{COMMAND}`. #{e.class} #{e.message}"
+        end
+
+        validate_branch_names(branch_names)
+        branch_names[0]
+      end
+
+      def self.validate_branch_names(branch_names)
+        if branch_names.size == 0
+          raise Pact::ProviderVerifier::Error, "Command `#{COMMAND}` didn't return anything that could be identified as the current branch."
+        end
+
+        if branch_names.size > 1
+          raise Pact::ProviderVerifier::Error, "Command `#{COMMAND}` returned multiple branches: #{branch_names.join(", ")}. You will need to get the branch name another way."
+        end
+      end
+
+      def self.execute_git_command
+        `#{COMMAND}`
+      end
+    end
+  end
+end

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.26.0"
+    VERSION = "1.27.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.27.1
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -298,6 +298,8 @@ files:
 - lib/pact/provider_verifier/cli/custom_thor.rb
 - lib/pact/provider_verifier/cli/verify.rb
 - lib/pact/provider_verifier/custom_middleware.rb
+- lib/pact/provider_verifier/error.rb
+- lib/pact/provider_verifier/git.rb
 - lib/pact/provider_verifier/pact_helper.rb
 - lib/pact/provider_verifier/provider_states/add_provider_states_header.rb
 - lib/pact/provider_verifier/provider_states/remove_provider_states_header_middleware.rb