morpheus-cli 3.4.1 → 3.4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cae9fa383e2f3e2f683d95e78b90e851ac67808
-  data.tar.gz: 28a8fc238051fec391131d076d45e065af42e7f5
+  metadata.gz: 85a8eae139abcd5b680608c7316af97006dd0445
+  data.tar.gz: 6f49e6037ac110032a8e35ac0923e01f4b1666c9
 SHA512:
-  metadata.gz: 336714794aad079df0bd46bcd8da9d5981575dff8c960217e20f3f7647337b964b0ceb510cd8a03cec61d67414acfb416b16a6426c1a83944d5a062a195e1a1a
-  data.tar.gz: 610d960440d705699df69bb7c700cd0edc979e487fe34707393b924d0c751c23dffc590bd83ae08373a133dbcc72a00ef7c2c325eb5a704e525005f4df68917b
+  metadata.gz: c9ce121ef8455783c9d74bd2405b63fdb321db8ec9938a9767f13400d49c37cf75ee47939127a5755e690d7e90808b394435d84fbf7869386c1c3d4b02eddbbf
+  data.tar.gz: 1a0ee4756032f37ce30dcbd5dbfb67ec3b201ec9b84a9b985999305cedeb5acd825810b6a6a60a7fe70fad717ff44e827574d64e1cc6f2f2425fca0463f2874e

data/lib/morpheus/api/packages_interface.rb

@@ -39,6 +39,13 @@ class Morpheus::PackagesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def install_file(package_file, params={})
+    url = "#{@base_url}/api/packages/install-file"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
+    payload = package_file
+    execute(method: :post, url: url, headers: headers, payload: payload, timeout: 36000)
+  end
+
   def update(id, payload)
     url = "#{@base_url}/api/packages/update/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/cli/packages_command.rb

@@ -173,7 +173,8 @@ class Morpheus::Cli::LibraryPackagesCommand
     outfile = nil
     do_overwrite = false
     do_mkdir = false
-    unzip_and_open = false
+    do_unzip = false
+    do_open = false
     open_prog = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance-type]")
@@ -221,8 +222,12 @@ class Morpheus::Cli::LibraryPackagesCommand
         do_overwrite = true
         do_mkdir = true
       end
+      opts.on( '--unzip', "Unzip the package to a directory with the same name." ) do
+        do_unzip = true
+      end
       opts.on( '--open [PROG]', String, "Unzip the package and open the expanded directory with the specified program." ) do |val|
-        unzip_and_open = true
+        do_unzip = true
+        do_open = true
         if !val.to_s.empty?
           open_prog = val.to_s
         else
@@ -318,7 +323,7 @@ class Morpheus::Cli::LibraryPackagesCommand
           print green + "SUCCESS" + reset + "\n"
         end
 
-        if unzip_and_open
+        if do_unzip
           package_dir = File.join(File.dirname(outfile), File.basename(outfile).sub(/\.morpkg\Z/, ''))
           if File.exists?(package_dir)
             print cyan,"Deleting existing directory #{package_dir}",reset,"\n"
@@ -326,7 +331,9 @@ class Morpheus::Cli::LibraryPackagesCommand
           end
           print cyan,"Unzipping to #{package_dir}",reset,"\n"
           system("unzip '#{outfile}' -d '#{package_dir}' > /dev/null 2>&1")
-          system("#{open_prog} '#{package_dir}'")
+          if do_open
+            system("#{open_prog} '#{package_dir}'")
+          end
         end
 
         return 0

data/lib/morpheus/cli/policies_command.rb

@@ -826,7 +826,7 @@ class Morpheus::Cli::PoliciesCommand
 
   def format_tenants(accounts)
     if accounts && accounts.size > 0
-      accounts = accounts.sort {|it| it['name'] }.uniq {|it| it['id'] }
+      accounts = accounts.sort {|a,b| a['name'] <=> b['name'] }.uniq {|it| it['id'] }
       account_ids = accounts.collect {|it| it['id'] }
       account_names = accounts.collect {|it| it['name'] }
       "(#{account_ids.join(',')}) #{account_names.join(',')}"

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.4.1"
+    VERSION = "3.4.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.1.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler