morpheus-cli 3.1.2 → 3.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41e5e60229896649507f3df02222124865c803ff
-  data.tar.gz: c4eef70518c898cf317d99c3148bbbb0b57af624
+  metadata.gz: bd692a97b1bbed2d5e8ea4bbd23cdcd9a978fdcd
+  data.tar.gz: 31761018c7d726c6f72dcf0a104eab21d441be08
 SHA512:
-  metadata.gz: 673e4e27f7a0dc245ead08bb40bf4f7ab67c5a73c4ac81d283c29659b66fe1a7b932c6bc62ea1e417ee3b4317e34d6117c98dc6d3958e67fab0ef292e45d3d38
-  data.tar.gz: 74b88bc851e272d82a46f2f8341b335c74cecdc5c6ada550bd8b973bd4a2fb6a0aa3dfb83a7092e1c4a138457f1ef874b32a4d1c58e94ae06fe0bc854d8385bd
+  metadata.gz: cd4f34da720c642384ddc9514d8c8175ba3a68188a8dc3b4b0b99968d3df524f7469f0be0a855a25977e51ddada333011dfb0385a4f810ff5d670e87361cdd76
+  data.tar.gz: 9a754c3209288fac407ab5a86824415ddc31487232631a496436d946fa5061961579653837c93cd29240dc35cad33b0cd006c3f0267d8eb0965ea7cbf1a13e81

data/lib/morpheus/cli/cli_command.rb

@@ -233,21 +233,7 @@ module Morpheus
             end
 
           when :payload
-            opts.on('--payload JSON', String, "Payload JSON, skip all prompting") do |val|
-              begin
-                options[:payload] = JSON.parse(val.to_s)
-              rescue => ex
-                raise ::OptionParser::InvalidOption.new("Failed to parse payload as JSON. Error: #{ex.message}")
-              end
-            end
-            opts.on('--payload-yaml YAML', String, "Payload YAML, skip all prompting") do |val|
-              begin
-                options[:payload] = YAML.load(val.to_s)
-              rescue => ex
-                raise ::OptionParser::InvalidOption.new("Failed to parse payload as YAML. Error: #{ex.message}")
-              end
-            end
-            opts.on('--payload-file FILE', String, "Payload from a local JSON or YAML file, skip all prompting") do |val|
+            opts.on('--payload FILE', String, "Payload from a local JSON or YAML file, skip all prompting") do |val|
               options[:payload_file] = val.to_s
               begin
                 payload_file = File.expand_path(options[:payload_file])
@@ -264,6 +250,20 @@ module Morpheus
                 raise ::OptionParser::InvalidOption.new("Failed to parse payload file: #{payload_file} Error: #{ex.message}")
               end
             end
+            opts.on('--payload-json JSON', String, "Payload JSON, skip all prompting") do |val|
+              begin
+                options[:payload] = JSON.parse(val.to_s)
+              rescue => ex
+                raise ::OptionParser::InvalidOption.new("Failed to parse payload as JSON. Error: #{ex.message}")
+              end
+            end
+            opts.on('--payload-yaml YAML', String, "Payload YAML, skip all prompting") do |val|
+              begin
+                options[:payload] = YAML.load(val.to_s)
+              rescue => ex
+                raise ::OptionParser::InvalidOption.new("Failed to parse payload as YAML. Error: #{ex.message}")
+              end
+            end
 
           when :list
             opts.on( '-m', '--max MAX', "Max Results" ) do |max|

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.1.2"
+    VERSION = "3.1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.2.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler