pact_broker-client 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8305e2cc46298df3b6b08f4209aacef58f9fd1b
-  data.tar.gz: 61f58e6adb4dcf2911aa031d4ecd58a48042c7a4
+  metadata.gz: 06c73ab8a4906ce7f19c0239159954dc0dabafe8
+  data.tar.gz: bfb34a47d2bdad5ce202fd87a8ceb9528744a2af
 SHA512:
-  metadata.gz: ff29557b0f7134e880bd7748ed4ac2e5b6c1fdfdc3f58ea1a8423213a914ddb4a1509b0c49943c8570c28db4bc9520c1e91fe88354341f52619f1cf4ab40ff96
-  data.tar.gz: 98656507dcf1571631e1c377fa28b0d2bc8780412a707615ade09c56f30918bbf682a2b8a8ab5ba943d7ae7ead971c25b790450c25a7fead68e010c12b4ca9ec
+  metadata.gz: 1c26067119ce4860e20625220ac490e02456d8f60816b12ba59857dd1f89778fa1b8e009e82adf57b5f213ad535357ce781b32c41b892120ba15067e24c6d1e7
+  data.tar.gz: fbcb42c1b2ad4794e9f82e5dbea3703b816e62d4a2019c2e4d41f7d7b974e9afc3419fb17184ce49fec1bb3ba63c89aa33bdc3a7497947fc3c9694f4c1684c9e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v1.8.0"></a>
+### v1.8.0 (2017-10-19)
+
+#### Features
+
+* renamed `pact-publish` command to `pact-broker publish`	 ([ed7d23a](/../../commit/ed7d23a))
+
+#### Bug Fixes
+
+* **pact-publish**
+  * ensure process exits with a status 1 when error is raised	 ([800f5cd](/../../commit/800f5cd))
+
 <a name="v1.7.0"></a>
 ### v1.7.0 (2017-10-19)
 

data/gemfiles/default.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pact_broker-client (1.7.0)
+    pact_broker-client (1.8.0)
       httparty
       json
       table_print (~> 1.5)
@@ -17,8 +17,6 @@ GEM
       rake
       thor (>= 0.14.0)
     awesome_print (1.8.0)
-    byebug (9.1.0)
-    coderay (1.1.2)
     conventional-changelog (1.3.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -30,7 +28,6 @@ GEM
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     json (2.1.0)
-    method_source (0.9.0)
     multi_xml (0.6.0)
     pact (1.16.1)
       json (> 1.8.5)
@@ -62,12 +59,6 @@ GEM
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
-    pry (0.11.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
     public_suffix (3.0.0)
     rack (2.0.3)
     rack-test (0.6.3)
@@ -108,7 +99,6 @@ DEPENDENCIES
   fakefs (~> 0.4)
   pact (~> 1.16)
   pact_broker-client!
-  pry-byebug
   rake (~> 10.0.3)
   webmock (~> 3.0)
 

data/gemfiles/ruby_under_22.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    pact_broker-client (1.7.0)
+    pact_broker-client (1.8.0)
       httparty
       json
       table_print (~> 1.5)
@@ -17,8 +17,6 @@ GEM
       rake
       thor (>= 0.14.0)
     awesome_print (1.8.0)
-    byebug (9.1.0)
-    coderay (1.1.2)
     conventional-changelog (1.3.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -29,7 +27,6 @@ GEM
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     json (2.1.0)
-    method_source (0.9.0)
     multi_xml (0.6.0)
     pact (1.16.1)
       json (> 1.8.5)
@@ -60,12 +57,6 @@ GEM
       rspec (>= 2.14)
       term-ansicolor (~> 1.0)
       thor
-    pry (0.11.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
     public_suffix (3.0.0)
     rack (1.6.8)
     rack-test (0.6.3)
@@ -106,7 +97,6 @@ DEPENDENCIES
   fakefs (~> 0.4)
   pact (~> 1.16)
   pact_broker-client!
-  pry-byebug
   rack (< 2.0)
   rake (~> 10.0.3)
   webmock (~> 3.0)

data/lib/pact_broker/client/cli/broker.rb

@@ -1,12 +1,17 @@
 require 'pact_broker/client/can_i_deploy'
 require 'pact_broker/client/version'
 require 'pact_broker/client/cli/version_selector_options_parser'
-require 'thor'
+require 'pact_broker/client/cli/custom_thor'
+require 'pact_broker/client/publish_pacts'
+require 'rake/file_list'
 
 module PactBroker
   module Client
     module CLI
-      class Broker < Thor
+      # Thor::Error will have its backtrace hidden
+      class PactPublicationError < ::Thor::Error; end
+
+      class Broker < CustomThor
         desc 'can-i-deploy', "Returns exit code 0 or 1, indicating whether or not the specified application versions are compatible."
 
         method_option :name, required: true, aliases: "-n", desc: "The application name. Use once for each pacticipant being checked."
@@ -24,12 +29,63 @@ module PactBroker
           exit(1) unless result.success
         end
 
+        desc 'publish PACT_DIRS_OR_FILES ...', "Publish pacts to a Pact Broker."
+        method_option :consumer_app_version, required: true, aliases: "-a", desc: "The consumer application version"
+        method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
+        method_option :broker_username, aliases: "-u", desc: "Pact Broker basic auth username"
+        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
+        method_option :tag, aliases: "-t", type: :array, banner: "TAG", desc: "Tag name for consumer version. Can be specified multiple times."
+        method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
+
+        def publish(*pact_files)
+          validate_pact_files(pact_files)
+          success = publish_pacts(pact_files)
+          raise PactPublicationError, "One or more pacts failed to be published" unless success
+        rescue PactBroker::Client::Error => e
+          raise PactPublicationError, "#{e.class} - #{e.message}"
+        end
+
         desc 'version', "Show the pact_broker-client gem version"
         def version
           $stdout.puts PactBroker::Client::VERSION
         end
 
         no_commands do
+
+          def self.exit_on_failure?
+            true
+          end
+
+          def validate_pact_files pact_files
+            unless pact_files && pact_files.any?
+              raise RequiredArgumentMissingError, "No value provided for required pact_files"
+            end
+          end
+
+          def publish_pacts pact_files
+            PactBroker::Client::PublishPacts.call(
+              options.broker_base_url,
+              file_list(pact_files),
+              options.consumer_app_version,
+              tags,
+              pact_broker_client_options
+            )
+          end
+
+          def file_list pact_files
+            Rake::FileList[pact_files].collect do | path |
+              if File.directory?(path)
+                Rake::FileList[File.join(path, "*.json")]
+              else
+                path
+              end
+            end.flatten
+          end
+
+          def tags
+            [*options.tag].compact
+          end
+
           def pact_broker_client_options
             if options.broker_username
               {

data/lib/pact_broker/client/cli/custom_thor.rb

@@ -6,9 +6,7 @@ module PactBroker
       ##
       # 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
 
@@ -17,24 +15,8 @@ module PactBroker
             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
+            turn_muliple_tag_options_into_array(argv)
           end
 
           # other task names, help, and the help shortcuts

data/lib/pact_broker/client/retry.rb

@@ -23,8 +23,8 @@ module PactBroker
           rescue RescuableError => e
             tries += 1
             $stderr.puts "Error making request - #{e.message}, attempt #{tries} of #{max_tries}"
-            sleep options
             raise e if max_tries == tries
+            sleep options
           end
         end
       end

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.7.0'
+    VERSION = '1.8.0'
   end
 end

data/pact-broker-client.gemspec

@@ -31,5 +31,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'webmock', '~> 3.0'
   gem.add_development_dependency 'conventional-changelog'
   gem.add_development_dependency 'pact', '~> 1.16'
-  gem.add_development_dependency 'pry-byebug'
 end

data/spec/lib/pact_broker/client/cli/{publish_spec.rb → broker_publish_spec.rb}

@@ -1,7 +1,7 @@
-require 'pact_broker/client/cli/publish'
+require 'pact_broker/client/cli/broker'
 
 module PactBroker::Client::CLI
-  describe Publish do
+  describe Broker do
     describe ".broker" do
       before do
         allow(PactBroker::Client::PublishPacts).to receive(:call).and_return(true)
@@ -17,7 +17,7 @@ module PactBroker::Client::CLI
         }
       end
 
-      let(:invoke_broker) { subject.broker(*file_list) }
+      let(:invoke_broker) { subject.publish(*file_list) }
 
       context "with minimum valid options" do
         it "invokes the PublishPacts command" do
@@ -26,7 +26,7 @@ module PactBroker::Client::CLI
             ["spec/support/cli_test_pacts/foo.json"],
             "1.2.3",
             [],
-            {}
+            {verbose: nil}
           )
           invoke_broker
         end

data/spec/lib/pact_broker/client/cli/custom_thor_spec.rb

@@ -24,42 +24,11 @@ module PactBroker::Client::CLI
   describe CustomThor do
     subject { TestThor.new }
 
-    it "invokes the default task when aguments are given without specifying a task" do
-      expect(Delegate).to receive(:call).with(argument: 'foo')
-      TestThor.start(%w{foo})
-    end
-
     it "converts options that are specified multiple times into a single array" do
       expect(Delegate).to receive(:call).with({'multi' => ['one', 'two']})
       TestThor.start(%w{test_multiple_options --multi one --multi two})
     end
 
-    describe ".prepend_default_task_name" do
-      let(:argv_with) { [TestThor.default_command, 'foo'] }
-
-      context "when the default task name is given" do
-        it "does not prepend the default task name" do
-          expect(TestThor.prepend_default_task_name(argv_with)).to eq(argv_with)
-        end
-      end
-
-      context "when the first argument is --help" do
-        let(:argv) { ['--help', 'foo'] }
-
-        it "does not prepend the default task name" do
-          expect(TestThor.prepend_default_task_name(argv)).to eq(argv)
-        end
-      end
-
-      context "when the default task name is not given" do
-        let(:argv) { ['foo'] }
-
-        it "prepends the default task name" do
-          expect(TestThor.prepend_default_task_name(argv)).to eq(argv_with)
-        end
-      end
-    end
-
     describe ".turn_muliple_tag_options_into_array" do
       it "turns '--tag foo --tag bar' into '--tag foo bar'" do
         input = %w{--ignore this --tag foo --tag bar --wiffle --that}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Bethany Skurrie
@@ -136,26 +136,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Publishes pacts to, and retrieves pacts from, the pact broker server.
 email:
 - bskurrie@dius.com.au
 executables:
 - pact-broker
-- pact-publish
 extensions: []
 extra_rdoc_files: []
 files:
@@ -169,7 +154,6 @@ files:
 - RELEASING.md
 - Rakefile
 - bin/pact-broker
-- bin/pact-publish
 - ci.sh
 - doc/markdown/Pact Broker Client - Pact Broker.md
 - doc/markdown/README.md
@@ -182,7 +166,6 @@ files:
 - lib/pact_broker/client/can_i_deploy.rb
 - lib/pact_broker/client/cli/broker.rb
 - lib/pact_broker/client/cli/custom_thor.rb
-- lib/pact_broker/client/cli/publish.rb
 - lib/pact_broker/client/cli/version_selector_options_parser.rb
 - lib/pact_broker/client/error.rb
 - lib/pact_broker/client/matrix.rb
@@ -205,9 +188,9 @@ files:
 - pact-broker-client.gemspec
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
-- spec/lib/pact_broker/client/cli/broker_spec.rb
+- spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb
+- spec/lib/pact_broker/client/cli/broker_publish_spec.rb
 - spec/lib/pact_broker/client/cli/custom_thor_spec.rb
-- spec/lib/pact_broker/client/cli/publish_spec.rb
 - spec/lib/pact_broker/client/cli/version_selector_options_parser_spec.rb
 - spec/lib/pact_broker/client/matrix/text_formatter_spec.rb
 - spec/lib/pact_broker/client/matrix_spec.rb
@@ -266,9 +249,9 @@ summary: See description
 test_files:
 - spec/lib/pact_broker/client/base_client_spec.rb
 - spec/lib/pact_broker/client/can_i_deploy_spec.rb
-- spec/lib/pact_broker/client/cli/broker_spec.rb
+- spec/lib/pact_broker/client/cli/broker_can_i_deploy_spec.rb
+- spec/lib/pact_broker/client/cli/broker_publish_spec.rb
 - spec/lib/pact_broker/client/cli/custom_thor_spec.rb
-- spec/lib/pact_broker/client/cli/publish_spec.rb
 - spec/lib/pact_broker/client/cli/version_selector_options_parser_spec.rb
 - spec/lib/pact_broker/client/matrix/text_formatter_spec.rb
 - spec/lib/pact_broker/client/matrix_spec.rb

data/bin/pact-publish

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'pact_broker/client/cli/publish'
-
-PactBroker::Client::CLI::Publish.start

data/lib/pact_broker/client/cli/publish.rb

@@ -1,85 +0,0 @@
-require 'pact_broker/client/cli/custom_thor'
-require 'pact_broker/client/publish_pacts'
-require 'pact_broker/client/version'
-require 'rake/file_list'
-
-module PactBroker
-  module Client
-    module CLI
-
-      # Thor::Error will have its backtrace hidden
-      class PactPublicationError < ::Thor::Error; end
-
-      class Publish < CustomThor
-        desc 'PACT_DIRS_OR_FILES ...', "Publish pacts to a Pact Broker."
-        method_option :consumer_app_version, required: true, aliases: "-a", desc: "The consumer application version"
-        method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
-        method_option :broker_username, aliases: "-u", desc: "Pact Broker basic auth username"
-        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
-        method_option :tag, aliases: "-t", type: :array, banner: "TAG", desc: "Tag name for consumer version. Can be specified multiple times."
-        method_option :verbose, aliases: "-v", desc: "Verbose output", :required => false
-
-        def broker(*pact_files)
-          validate(pact_files)
-          success = publish_pacts(pact_files)
-          raise PactPublicationError, "One or more pacts failed to be published" unless success
-        rescue PactBroker::Client::Error => e
-          raise PactPublicationError, "#{e.class} - #{e.message}"
-        end
-
-        desc 'version', "Show the pact_broker-client gem version"
-        def version
-          $stdout.puts PactBroker::Client::VERSION
-        end
-
-        default_task :broker
-
-        no_commands do
-
-          def validate pact_files
-            unless pact_files && pact_files.any?
-              raise RequiredArgumentMissingError, "No value provided for required pact_files"
-            end
-          end
-
-          def publish_pacts pact_files
-            PactBroker::Client::PublishPacts.call(
-              options.broker_base_url,
-              file_list(pact_files),
-              options.consumer_app_version,
-              tags,
-              pact_broker_client_options
-            )
-          end
-
-          def file_list pact_files
-            Rake::FileList[pact_files].collect do | path |
-              if File.directory?(path)
-                Rake::FileList[File.join(path, "*.json")]
-              else
-                path
-              end
-            end.flatten
-          end
-
-          def tags
-            [*options.tag].compact
-          end
-
-          def pact_broker_client_options
-            if options.broker_password
-              {
-                basic_auth: {
-                  username: options.broker_username,
-                  password: options.broker_password
-                }
-              }
-            else
-              {}
-            end
-          end
-        end
-      end
-    end
-  end
-end