Refactor duplicate method_options for create_or_update_webhook and cr…

…eate_webhook commands into their own method in CustomThor class
pact-foundation · Feb 12, 2020 · f72e63f · f72e63f
1 parent 527a5e4
commit f72e63f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 26 deletions.
diff --git a/lib/pact_broker/client/cli/broker.rb b/lib/pact_broker/client/cli/broker.rb
@@ -109,39 +109,15 @@ def describe_version
           exit(1) unless result.success
         end
 
-        method_option :request, banner: "METHOD", aliases: "-X", desc: "HTTP method", required: true
-        method_option :header, aliases: "-H", type: :array, desc: "Header"
-        method_option :data, aliases: "-d", desc: "Data"
-        method_option :user, aliases: "-u", desc: "Basic auth username and password eg. username:password"
-        method_option :consumer, desc: "Consumer name"
-        method_option :provider, desc: "Provider name"
-        method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
-        method_option :broker_username, desc: "Pact Broker basic auth username"
-        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
-        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
-        method_option :contract_content_changed, type: :boolean, desc: "Trigger this webhook when the pact content changes"
-        method_option :provider_verification_published, type: :boolean, desc: "Trigger this webhook when a provider verification result is published"
-        method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
+        shared_options_for_webhook_commands
 
         desc 'create-webhook URL', 'Creates a webhook using the same switches as a curl request.'
         long_desc File.read(File.join(File.dirname(__FILE__), 'create_webhook_long_desc.txt'))
         def create_webhook webhook_url
           run_webhook_commands webhook_url
         end
 
-        method_option :request, banner: "METHOD", aliases: "-X", desc: "HTTP method", required: true
-        method_option :header, aliases: "-H", type: :array, desc: "Header"
-        method_option :data, aliases: "-d", desc: "Data"
-        method_option :user, aliases: "-u", desc: "Basic auth username and password eg. username:password"
-        method_option :consumer, desc: "Consumer name"
-        method_option :provider, desc: "Provider name"
-        method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
-        method_option :broker_username, desc: "Pact Broker basic auth username"
-        method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
-        method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
-        method_option :contract_content_changed, type: :boolean, desc: "Trigger this webhook when the pact content changes"
-        method_option :provider_verification_published, type: :boolean, desc: "Trigger this webhook when a provider verification result is published"
-        method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
+        shared_options_for_webhook_commands
         method_option :uuid, type: :string, required: true, desc: "Specify the uuid for the webhook"
 
         desc 'create-or-update-webhook URL', 'Creates or updates a webhook with a provided uuid and using the same switches as a curl request.'

diff --git a/lib/pact_broker/client/cli/custom_thor.rb b/lib/pact_broker/client/cli/custom_thor.rb
@@ -64,6 +64,22 @@ def self.turn_muliple_tag_options_into_array argv
             end
             new_argv.flatten
           end
+
+          def self.shared_options_for_webhook_commands
+            method_option :request, banner: "METHOD", aliases: "-X", desc: "HTTP method", required: true
+            method_option :header, aliases: "-H", type: :array, desc: "Header"
+            method_option :data, aliases: "-d", desc: "Data"
+            method_option :user, aliases: "-u", desc: "Basic auth username and password eg. username:password"
+            method_option :consumer, desc: "Consumer name"
+            method_option :provider, desc: "Provider name"
+            method_option :broker_base_url, required: true, aliases: "-b", desc: "The base URL of the Pact Broker"
+            method_option :broker_username, desc: "Pact Broker basic auth username"
+            method_option :broker_password, aliases: "-p", desc: "Pact Broker basic auth password"
+            method_option :broker_token, aliases: "-k", desc: "Pact Broker bearer token"
+            method_option :contract_content_changed, type: :boolean, desc: "Trigger this webhook when the pact content changes"
+            method_option :provider_verification_published, type: :boolean, desc: "Trigger this webhook when a provider verification result is published"
+            method_option :verbose, aliases: "-v", type: :boolean, default: false, required: false, desc: "Verbose output. Default: false"
+          end
         end
       end
     end