pact-provider-verifier 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d757a583c93e687e3258791c8fffa9728aa852aa
-  data.tar.gz: 76e22bb5aa7fd87a52c98fba257c1c2786e757dc
+  metadata.gz: 8ce3798b8ee40da180087db72750ff3e72d66055
+  data.tar.gz: ec328a826124163d927bb41c25e9fa3246e667a2
 SHA512:
-  metadata.gz: a0eb14c7d5b7f57b4132f771e191d20569e1b425c5bd720cff8ff7e41171d32126034ba1c79602fec96ee42eb7190806056558a48e66a7a5068b379bfbb55000
-  data.tar.gz: b3c2a7b3d0fd8f280d63ed4f764fbaf65e7153281b7b15134c20be7c7971ddc2df7cd3e5f0065c0c85638fb4b5db57e25e42578efcc87a22a672878776ec4f04
+  metadata.gz: 26ec3b274333503bed29de0549abd432416e9829a939e4fe09237ee3d2f4177ea1c89d6f2499827a3b288a81ca73937d032fd449346608668dd1d271efd4ff11
+  data.tar.gz: 4d044730f12f63c9771b49a04d5b251ac1d47471e62dc27ad387d67e490ea174de426dabaef0c596af12899c5ca0d58f34fd5735d71aa43c8090a6c7c3d4a5e6

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="v1.5.0-1"></a>
+### v1.5.0-1 (2017-10-01)
+
+#### Features
+
+* **cli**
+  * specify pact urls as the arguments to pact-provider-verifier instead of using --pact-urls option	 ([df78617](/../../commit/df78617))
+
 <a name="v1.4.1-1"></a>
 ### v1.4.1-1 (2017-08-27)
 

data/bin/pact-provider-verifier

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'pact/provider_verifier/cli'
-Pact::ProviderVerifier::CLI.start
+require 'pact/provider_verifier/cli/verify'
+Pact::ProviderVerifier::CLI::Verify.start

data/lib/pact/provider_verifier/app.rb

@@ -12,12 +12,13 @@ module Pact
 
       PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
 
-      def initialize options = {}
+      def initialize pact_urls, options = {}
+        @pact_urls = pact_urls
         @options = options
       end
 
-      def self.call options
-        new(options).call
+      def self.call pact_urls, options
+        new(pact_urls, options).call
       end
 
       def call
@@ -31,6 +32,10 @@ module Pact
         exit exit_statuses.count{ | status | status != 0 }
       end
 
+      private
+
+      attr_reader :pact_urls, :options
+
       def setup
         print_deprecation_note
         set_environment_variables
@@ -39,9 +44,9 @@ module Pact
       end
 
       def set_environment_variables
-        ENV['PROVIDER_STATES_SETUP_URL'] = @options.provider_states_setup_url
-        ENV['VERBOSE_LOGGING'] = @options.verbose if @options.verbose
-        ENV['CUSTOM_PROVIDER_HEADER'] = @options.custom_provider_header if @options.custom_provider_header
+        ENV['PROVIDER_STATES_SETUP_URL'] = options.provider_states_setup_url
+        ENV['VERBOSE_LOGGING'] = options.verbose if options.verbose
+        ENV['CUSTOM_PROVIDER_HEADER'] = options.custom_provider_header if options.custom_provider_header
       end
 
       def configure_service_provider
@@ -49,8 +54,8 @@ module Pact
         rack_reverse_proxy = configure_reverse_proxy
         rack_reverse_proxy = configure_custom_header_middlware(rack_reverse_proxy)
 
-        provider_application_version = @options.provider_app_version
-        publish_results  = @options.publish_verification_results
+        provider_application_version = options.provider_app_version
+        publish_results  = options.publish_verification_results
 
         Pact.service_provider "Running Provider Application" do
           app do
@@ -66,7 +71,7 @@ module Pact
       end
 
       def configure_reverse_proxy
-        provider_base_url = @options.provider_base_url
+        provider_base_url = options.provider_base_url
         Rack::ReverseProxy.new do
           reverse_proxy_options(
             verify_mode: OpenSSL::SSL::VERIFY_NONE,
@@ -78,32 +83,27 @@ module Pact
       end
 
       def configure_custom_header_middlware rack_reverse_proxy
-        if @options.custom_provider_header
+        if options.custom_provider_header
           Pact::ProviderVerifier::AddHeaderMiddlware.new(rack_reverse_proxy, parse_header)
         else
           rack_reverse_proxy
         end
       end
 
-      def pact_urls
-        @options.pact_urls.split(',')
-      end
-
       def verify_pact pact_url
         begin
-          options = {
+          verify_options = {
             :pact_helper => PROXY_PACT_HELPER,
             :pact_uri => pact_url,
             :backtrace => false,
-            :pact_broker_username => @options.broker_username,
-            :pact_broker_password => @options.broker_password
+            :pact_broker_username => options.broker_username,
+            :pact_broker_password => options.broker_password
           }
-          options[:description] = ENV['PACT_DESCRIPTION'] if ENV['PACT_DESCRIPTION']
-          options[:provider_state] = ENV['PACT_PROVIDER_STATE'] if ENV['PACT_PROVIDER_STATE']
+          verify_options[:description] = ENV['PACT_DESCRIPTION'] if ENV['PACT_DESCRIPTION']
+          verify_options[:provider_state] = ENV['PACT_PROVIDER_STATE'] if ENV['PACT_PROVIDER_STATE']
 
-          Cli::RunPactVerification.call(options)
+          Cli::RunPactVerification.call(verify_options)
         rescue SystemExit => e
-          puts ""
           e.status
         end
       end
@@ -113,12 +113,12 @@ module Pact
       end
 
       def parse_header
-        header_name, header_value = @options.custom_provider_header.split(":", 2).collect(&:strip)
+        header_name, header_value = options.custom_provider_header.split(":", 2).collect(&:strip)
         {header_name => header_value}
       end
 
       def print_deprecation_note
-        if @options.provider_states_url
+        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"
         end
       end

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

@@ -0,0 +1,71 @@
+require 'thor'
+
+module Pact
+  module ProviderVerifier
+    module CLI
+      ##
+      # Custom Thor task allows the following:
+      #
+      # `script arg1 arg2` to be interpreted as `script <default_task> arg1 arg2`
+      # `--option 1 --option 2` to be interpreted as `--option 1 2` (the standard Thor format for multiple value options)
+      # `script --help` to display the help for the default task instead of the command list
+      #
+      class CustomThor < ::Thor
+
+        no_commands do
+          def self.start given_args = ARGV, config = {}
+            super(massage_args(given_args))
+          end
+
+          def help *args
+            if args.empty?
+              super(self.class.default_task)
+            else
+              super
+            end
+          end
+
+          def self.massage_args argv
+            prepend_default_task_name(turn_muliple_tag_options_into_array(argv))
+          end
+
+          def self.prepend_default_task_name argv
+            if known_first_arguments.include?(argv[0])
+              argv
+            else
+              [default_command] + argv
+            end
+          end
+
+          # other task names, help, and the help shortcuts
+          def self.known_first_arguments
+            @known_first_arguments ||= tasks.keys + ::Thor::HELP_MAPPINGS + ['help']
+          end
+
+          def self.turn_muliple_tag_options_into_array argv
+            new_argv = []
+            opt_name = nil
+            argv.each_with_index do | arg, i |
+              if arg.start_with?('-')
+                opt_name = arg
+                existing = new_argv.find { | a | a.first == opt_name }
+                if !existing
+                  new_argv << [arg]
+                end
+              else
+                if opt_name
+                  existing = new_argv.find { | a | a.first == opt_name }
+                  existing << arg
+                  opt_name = nil
+                else
+                  new_argv << [arg]
+                end
+              end
+            end
+            new_argv.flatten
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+require 'thor'
+require 'socket'
+require 'pact/provider_verifier/app'
+require 'pact/provider_verifier/cli/custom_thor'
+
+module Pact
+  module ProviderVerifier
+    module CLI
+      class Verify < CustomThor
+        desc 'PACT_URL ...', "Verify pact(s) against a provider. Supports local and networked (http-based) files."
+        method_option :provider_base_url, aliases: "-h", desc: "Provider host URL", :required => true
+        method_option :provider_states_setup_url, aliases: "-c", desc: "Base URL to setup the provider states at", :required => 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", required: false
+        method_option :broker_username, aliases: "-n", desc: "Pact Broker basic auth username", :required => false
+        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password", :required => false
+        method_option :custom_provider_header, desc: "Header to add to provider state set up and pact requests. eg 'Authorization: Basic cGFjdDpwYWN0'", :required => false
+        method_option :provider_states_url, aliases: "-s", desc: "DEPRECATED", :required => false
+        method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
+        method_option :pact_urls, aliases: "-u", desc: "DEPRECATED. Please provide as space separated arguments.", :required => false
+
+        def verify(*pact_urls)
+          print_deprecation_warnings
+          Pact::ProviderVerifier::App.call(merged_urls(pact_urls), options)
+        end
+
+        default_task :verify
+
+        desc 'version', 'Show the pact-provider-verifier gem version'
+        def version
+          require 'pact/provider_verifier/version'
+          puts Pact::ProviderVerifier::VERSION
+        end
+
+        no_commands do
+          def merged_urls pact_urls_from_args
+            from_opts = options.pact_urls ? options.pact_urls.split(',') : []
+            from_opts + pact_urls_from_args
+          end
+
+          def print_deprecation_warnings
+            if options.pact_urls
+              $stderr.puts "WARN: The --pact-urls option is deprecated. Please pass in a space separated list of URLs as the first arguments to the pact-provider-verifier command."
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.4.1"
+    VERSION = "1.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -250,7 +250,8 @@ files:
 - lib/pact/provider_verifier.rb
 - lib/pact/provider_verifier/add_header_middlware.rb
 - lib/pact/provider_verifier/app.rb
-- lib/pact/provider_verifier/cli.rb
+- lib/pact/provider_verifier/cli/custom_thor.rb
+- lib/pact/provider_verifier/cli/verify.rb
 - lib/pact/provider_verifier/pact_helper.rb
 - lib/pact/provider_verifier/set_up_provider_state.rb
 - lib/pact/provider_verifier/version.rb
@@ -274,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Provides a Pact verification service for use with Pact

data/lib/pact/provider_verifier/cli.rb

@@ -1,27 +0,0 @@
-require 'thor'
-require 'socket'
-require 'pact/provider_verifier/app'
-
-module Pact
-  module ProviderVerifier
-    class CLI < Thor
-      desc 'verify', "Runs the Pact verification process"
-      method_option :pact_urls, aliases: "-u", desc: "Comma-separated list of Pact file URIs. Supports local and networked (http-based) files", :required => true
-      method_option :provider_base_url, aliases: "-h", desc: "Provide host URL", :required => true
-      method_option :provider_states_setup_url, aliases: "-c", desc: "Base URL to setup the provider states at", :required => false
-      method_option :provider_app_version, aliases: "-a", desc: "The provider application version, required for publishing verification results", :required => false
-      method_option :publish_verification_results, aliases: "-r", desc: "Publish verification results to the broker", required: false
-      method_option :broker_username, aliases: "-n", desc: "Pact Broker username", :required => false
-      method_option :broker_password, aliases: "-p", desc: "Pact Broker password", :required => false
-      method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
-      method_option :custom_provider_header, desc: "Header to add to provider state set up and pact requests. eg 'Authorization: Basic cGFjdDpwYWN0'", :required => false
-      method_option :provider_states_url, aliases: "-s", desc: "DEPRECATED", :required => false
-
-      def verify
-        Pact::ProviderVerifier::App.call(options)
-      end
-
-      default_task :verify
-    end
-  end
-end