morpheus-cli 3.3.2.6.1 → 3.3.2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1b8cab856aa48299dcdee9d248286e84e82d98d
-  data.tar.gz: dcbedabff74562525087fe4412607288915bab98
+  metadata.gz: 03a7254c914049f6b4127d9ec18d0dbf6a0f1ad4
+  data.tar.gz: 28d72f20987f22f85ed34182cf42196d1d0c3427
 SHA512:
-  metadata.gz: 69bbcebda49f660d9560374d18b12824035e519927a259293e72edb38442a1a9d00e4ea7c90a0af7e47d161d302aa490bfa960d6dd55b09fa4583aa46a543667
-  data.tar.gz: a40841aa668a7721989aefa9f9b9d49bb0b033d4eef4acff9a7363e143a5bd1df5e805eb3456c4effac78930c286880da8b22aea5ef509bec1716232fc577605
+  metadata.gz: 2296878eb4b01319eb354818bc36b98e47a96494c624a9bce32c136f21e69c31a20a9b1a73e37527f0fe675515f0e6ce9e0f265c652d5ecb1b11a24e02f564cf
+  data.tar.gz: 00b9bc18a789978e4e765835d6cd163de81a69b03105cfbfc6a4f90516a4898ffaf552423b949afd2375f04172a50072b60779bc9aa0d0534dae2a0b7cb0f0ae

data/lib/morpheus/api/api_client.rb

@@ -283,8 +283,8 @@ class Morpheus::APIClient
     Morpheus::LibraryContainerTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
-  def library_packages
-    Morpheus::LibraryPackagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  def packages
+    Morpheus::PackagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
   end
 
 end

data/lib/morpheus/api/packages_interface.rb

@@ -0,0 +1,92 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::PackagesInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  # def get(id)
+  #   raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+  #   url = "#{@base_url}/api/packages/#{id}"
+  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
+  #   opts = {method: :get, url: url, headers: headers}
+  #   execute(opts)
+  # end
+
+  def list(params={})
+    url = "#{@base_url}/api/packages"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def search(params={})
+    url = "#{@base_url}/api/packages/search"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def install(payload)
+    url = "#{@base_url}/api/packages/install"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/packages/update/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/packages/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def export(params, outfile)
+    url = "#{@base_url}/api/packages/export"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :post, url: url, headers: headers}
+    # execute(opts, false)
+    if Dir.exists?(outfile)
+      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
+    end
+    # if @verify_ssl == false
+    #   opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    # end
+    if @dry_run
+      return opts
+    end
+    http_response = nil
+    bad_body = nil
+    File.open(outfile, 'w') {|f|
+      block = proc { |response|
+        if response.code.to_i == 200
+          response.read_body do |chunk|
+              #puts "writing to #{outfile} ..."
+              f.write chunk
+          end
+        else
+          # puts_error (#{response.inspect}) #{chunk} ..."
+          bad_body = response.body.to_s
+        end
+      }
+      opts[:block_response] = block
+      http_response = RestClient::Request.new(opts).execute
+      # RestClient::Request.execute(opts)
+    }
+    return http_response, bad_body
+  end
+
+
+end

data/lib/morpheus/cli.rb

@@ -115,7 +115,7 @@ module Morpheus
       load 'morpheus/cli/library_container_templates_command.rb'
       load 'morpheus/cli/library_option_types_command.rb'
       load 'morpheus/cli/library_option_lists_command.rb'
-      load 'morpheus/cli/library_packages_command.rb'
+      load 'morpheus/cli/packages_command.rb'
 
       load 'morpheus/cli/version_command.rb'
       load 'morpheus/cli/alias_command.rb'

data/lib/morpheus/cli/instances.rb

@@ -155,7 +155,7 @@ class Morpheus::Cli::Instances
             }
             row
           }
-          columns = [:id, :name, :group, :cloud, :type, :version, :environment, :nodes, {:connection => {max_width: 30}}, :status]
+          columns = [:id, {:name => {:max_width => 50}}, :group, :cloud, :type, :version, :environment, :nodes, {:connection => {:max_width => 30}}, :status]
           term_width = current_terminal_width()
           if term_width > 190
             columns += [:cpu, :memory, :storage]

data/lib/morpheus/cli/{library_packages_command.rb → packages_command.rb}

@@ -6,9 +6,9 @@ class Morpheus::Cli::LibraryPackagesCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::LibraryHelper
 
-  set_command_name :'library-packages'
-  register_subcommands :download
-  # register_subcommands :upload
+  set_command_name :'packages'
+  # register_subcommands :list, :get, :install, :update, :remove, :export
+  register_subcommands :export
 
   # hide until this is released
   set_command_hidden
@@ -19,17 +19,36 @@ class Morpheus::Cli::LibraryPackagesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_packages_interface = @api_client.library_packages
-    @library_instance_types_interface = @api_client.library_instance_types
+    @packages_interface = @api_client.packages
   end
 
   def handle(args)
     handle_subcommand(args)
   end
 
+  def list(args)
+    raise "not yet implemented"
+  end
+
+  def get(args)
+    raise "not yet implemented"
+  end
+
+  def install(args)
+    raise "not yet implemented"
+  end
+
+  def update(args)
+    raise "not yet implemented"
+  end
+
+  def remove(args)
+    raise "not yet implemented"
+  end
+
   # generate a new .morpkg file
-  def download(args)
-    full_command_string = "#{command_name} download #{args.join(' ')}".strip
+  def export(args)
+    full_command_string = "#{command_name} export #{args.join(' ')}".strip
     options = {}
     params = {}
     instance_type_codes = nil
@@ -69,12 +88,23 @@ class Morpheus::Cli::LibraryPackagesCommand
         do_overwrite = true
         do_mkdir = true
       end
-      opts.on( '--open PROG', String, "Unzip the package and open the expanded directory with the specified program." ) do |val|
+      opts.on( '--open [PROG]', String, "Unzip the package and open the expanded directory with the specified program." ) do |val|
         unzip_and_open = true
-        open_prog = val.to_s
+        if val.to_s.empty?
+          open_prog = val.to_s
+        else
+          open_prog = val.to_s
+        end
+        if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+          open_prog = "start"
+        elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+          open_prog = "open"
+        elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+          open_prog = "xdg-open"
+        end
       end
       build_common_options(opts, options, [:dry_run, :quiet])
-      opts.footer = "Download one or many instance types as a morpheus library package (.morpkg) file.\n" + 
+      opts.footer = "Export one or many instance types as a morpheus library package (.morpkg) file.\n" + 
                     "[instance-type] is required. This is the instance type code." +
                     "--instance-types can bv. This is a list of instance type codes."
     end
@@ -82,7 +112,7 @@ class Morpheus::Cli::LibraryPackagesCommand
 
     if args.count != 1 && !instance_type_codes && !params['all']
       print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} download expects 1 argument and received #{args.count}: #{args.join(' ')}\n#{optparse}"
+      puts_error  "#{command_name} export expects 1 argument and received #{args.count}: #{args.join(' ')}\n#{optparse}"
       return 1
     end
     connect(options)
@@ -137,14 +167,14 @@ class Morpheus::Cli::LibraryPackagesCommand
       end
 
       if options[:dry_run]
-        print_dry_run @library_packages_interface.dry.download(params, outfile), full_command_string
+        print_dry_run @packages_interface.dry.export(params, outfile), full_command_string
         return 1
       end
       if !options[:quiet]
         print cyan + "Downloading morpheus package file #{outfile} ... "
       end
 
-      http_response, bad_body = @library_packages_interface.download(params, outfile)
+      http_response, bad_body = @packages_interface.export(params, outfile)
 
       # FileUtils.chmod(0600, outfile)
       success = http_response.code.to_i == 200
@@ -190,12 +220,6 @@ class Morpheus::Cli::LibraryPackagesCommand
     end
   end
 
-
-  def upload
-    raise "not yet implemented"
-  end
-
-
   private
 
   

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.3.2.6.1"
+    VERSION = "3.3.2.6.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.3.2.6.1
+  version: 3.3.2.6.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,7 +171,6 @@ files:
 - lib/morpheus/api/library_container_upgrades_interface.rb
 - lib/morpheus/api/library_instance_types_interface.rb
 - lib/morpheus/api/library_layouts_interface.rb
-- lib/morpheus/api/library_packages_interface.rb
 - lib/morpheus/api/license_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
 - lib/morpheus/api/logs_interface.rb
@@ -191,6 +190,7 @@ files:
 - lib/morpheus/api/option_type_lists_interface.rb
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
+- lib/morpheus/api/packages_interface.rb
 - lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/power_scheduling_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
@@ -246,7 +246,6 @@ files:
 - lib/morpheus/cli/library_layouts_command.rb
 - lib/morpheus/cli/library_option_lists_command.rb
 - lib/morpheus/cli/library_option_types_command.rb
-- lib/morpheus/cli/library_packages_command.rb
 - lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
 - lib/morpheus/cli/load_balancers.rb
@@ -275,6 +274,7 @@ files:
 - lib/morpheus/cli/networks_command.rb
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
+- lib/morpheus/cli/packages_command.rb
 - lib/morpheus/cli/policies_command.rb
 - lib/morpheus/cli/power_scheduling_command.rb
 - lib/morpheus/cli/preseed_scripts_command.rb

data/lib/morpheus/api/library_packages_interface.rb

@@ -1,50 +0,0 @@
-require 'morpheus/api/api_client'
-
-class Morpheus::LibraryPackagesInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
-
-  def download(params, outfile)
-    url = "#{@base_url}/api/library/packages/download"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    # execute(opts, false)
-    if Dir.exists?(outfile)
-      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
-    end
-    # if @verify_ssl == false
-    #   opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
-    # end
-    if @dry_run
-      return opts
-    end
-    http_response = nil
-    bad_body = nil
-    File.open(outfile, 'w') {|f|
-      block = proc { |response|
-        if response.code.to_i == 200
-          response.read_body do |chunk|
-              #puts "writing to #{outfile} ..."
-              f.write chunk
-          end
-        else
-          # puts_error (#{response.inspect}) #{chunk} ..."
-          bad_body = response.body.to_s
-        end
-      }
-      opts[:block_response] = block
-      http_response = RestClient::Request.new(opts).execute
-      # RestClient::Request.execute(opts)
-    }
-    return http_response, bad_body
-  end
-
-  def upload(file, params={})
-    raise "implement this"
-  end
-
-end