morpheus-cli 3.5.2 → 3.5.3

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.5.2"
+    VERSION = "3.5.3"
   end
 end

data/lib/morpheus/cli/whoami.rb

@@ -183,7 +183,7 @@ class Morpheus::Cli::Whoami
         }
         print_description_list({
           "Name" => 'name',
-          "Url" => 'url',
+          "URL" => 'url',
           "Version" => 'buildVersion'
         }, appliance_data)
 

data/lib/morpheus/formatters.rb

@@ -97,6 +97,17 @@ def format_duration_seconds(seconds, format="human")
   out
 end
 
+def format_duration_milliseconds(milliseconds, format="human", ms_threshold=1000)
+  out = ""
+  milliseconds = milliseconds.abs.to_i
+  if ms_threshold && ms_threshold > milliseconds
+    out = "#{milliseconds}ms"
+  else
+    out = format_duration_seconds((milliseconds.to_f / 1000).floor, format)
+  end
+  out
+end
+
 # returns a human readable time duration
 # @param seconds - duration in seconds
 def format_human_duration(seconds)
@@ -127,6 +138,9 @@ def format_human_duration(seconds)
     else
       out << "#{minutes.floor} minutes"
     end
+  elsif seconds > 0 && seconds < 1
+    ms = (seconds.to_f * 1000).to_i
+    out << "#{ms}ms"
   else
     seconds = seconds.floor
     if seconds == 1

data/lib/morpheus/morpkg.rb

@@ -0,0 +1,119 @@
+require 'zip'
+
+module Morpheus
+
+  # A module for building .morpkg files
+  module Morpkg
+
+    # parse the manifest json data for a package source directory
+    def self.parse_package_manifest(source_directory)
+      source_directory = File.expand_path(source_directory)
+      manifest_filename = File.join(source_directory, "package-manifest.json")
+      if !File.exists?(manifest_filename)
+        raise "Package manifest file not found: #{manifest_filename}"
+      end
+      manifest = JSON.parse(File.read(manifest_filename))
+      return manifest
+    end
+
+    # write a .morpkg file for a package source directory
+    # validates manifest data
+    # default outfile is code-version.morpkg
+    # returns outfile (filename) or raises exception
+    def self.build_package(source_directory, outfile=nil, do_overwrite=false)
+      source_directory = File.expand_path(source_directory)
+      manifest = self.parse_package_manifest(source_directory)
+      code = manifest["code"]
+      version = manifest["version"]
+      org = manifest["org"] || manifest["organization"]
+      type = manifest["type"]
+      if code.nil? || code.empty?
+        raise "Package manifest data missing: code"
+      end
+      if version.nil? || version.empty?
+        raise "Package manifest data missing: version"
+      end
+      # if org.nil? || org.empty?
+      #   raise "Package manifest data missing: org"
+      # end
+      # if type.nil? || type.empty?
+      #   raise "Package manifest data missing: type"
+      # end
+      if outfile.nil? || outfile.empty?
+        # outfile = "#{orig_dir}/#{type}-#{code}-#{version}.morpkg"
+        # outfile = File.join(File.dirname(source_directory), "#{type}-#{code}-#{version}.morpkg")
+        outfile = File.join(File.dirname(source_directory), "#{code}-#{version}.morpkg")
+      elsif File.directory?(outfile)
+        outfile = File.join(outfile, "#{code}-#{version}.morpkg")
+      end
+      if Dir.exists?(outfile)
+        raise "Invalid package target. #{outfile} is the name of an existing directory."
+      end
+      if File.exists?(outfile)
+        if do_overwrite
+          # don't delete, just overwrite.
+          # File.delete(outfile)
+        else
+          raise "Invalid package target. File already exists: #{outfile}"
+        end
+      end
+      # build directories if needed
+      if !Dir.exists?(File.dirname(outfile))
+        Dir.mkdir(File.dirname(outfile))
+      end
+
+      # write the .morpkg file and return filename
+      zf = ZipFileGenerator.new(source_directory, outfile)
+      zf.write()
+      
+      return outfile
+    end
+
+    # This is a simple example which uses rubyzip to
+    # recursively generate a zip file from the contents of
+    # a specified directory. The directory itself is not
+    # included in the archive, rather just its contents.
+    #
+    # Usage:
+    #   directoryToZip = "/tmp/input"
+    #   outputFile = "/tmp/out.zip"
+    #   zf = ZipFileGenerator.new(directoryToZip, outputFile)
+    #   zf.write()
+    class ZipFileGenerator
+
+      # Initialize with the directory to zip and the location of the output archive.
+      def initialize(inputDir, outputFile)
+        @inputDir = inputDir
+        @outputFile = outputFile
+      end
+
+      # Zip the input directory.
+      def write()
+        entries = Dir.entries(@inputDir); entries.delete("."); entries.delete("..")
+        io = Zip::File.open(@outputFile, Zip::File::CREATE);
+        writeEntries(entries, "", io)
+        io.close();
+      end
+
+      # A helper method to make the recursion work.
+      private
+      def writeEntries(entries, path, io)
+
+        entries.each { |e|
+          zipFilePath = path == "" ? e : File.join(path, e)
+          diskFilePath = File.join(@inputDir, zipFilePath)
+          puts "Deflating " + diskFilePath # remove me
+          if  File.directory?(diskFilePath)
+            io.mkdir(zipFilePath)
+            subdir =Dir.entries(diskFilePath); subdir.delete("."); subdir.delete("..")
+            writeEntries(subdir, zipFilePath, io)
+          else
+            io.get_output_stream(zipFilePath) { |f| f.puts(File.open(diskFilePath, "rb").read())}
+          end
+        }
+      end
+
+    end
+
+  end
+end

data/morpheus-cli.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types'
   spec.add_dependency "table_print"
   spec.add_dependency "http"
+  spec.add_dependency "rubyzip"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Infrastructure agnostic cloud application management & orchestration
   CLI for Morpheus. Easily manage and orchestrate VMS on private or public infrastructure
   and containerized architectures.
@@ -164,6 +178,7 @@ files:
 - lib/morpheus/api/archive_buckets_interface.rb
 - lib/morpheus/api/archive_files_interface.rb
 - lib/morpheus/api/auth_interface.rb
+- lib/morpheus/api/blueprints_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_policies_interface.rb
 - lib/morpheus/api/clouds_interface.rb
@@ -174,6 +189,7 @@ files:
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
 - lib/morpheus/api/execute_schedules_interface.rb
+- lib/morpheus/api/execution_request_interface.rb
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
@@ -211,6 +227,7 @@ files:
 - lib/morpheus/api/packages_interface.rb
 - lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/power_schedules_interface.rb
+- lib/morpheus/api/processes_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
@@ -221,6 +238,7 @@ files:
 - lib/morpheus/api/task_sets_interface.rb
 - lib/morpheus/api/tasks_interface.rb
 - lib/morpheus/api/user_groups_interface.rb
+- lib/morpheus/api/user_settings_interface.rb
 - lib/morpheus/api/user_sources_interface.rb
 - lib/morpheus/api/users_interface.rb
 - lib/morpheus/api/virtual_images_interface.rb
@@ -232,6 +250,7 @@ files:
 - lib/morpheus/cli/app_templates.rb
 - lib/morpheus/cli/apps.rb
 - lib/morpheus/cli/archives_command.rb
+- lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -253,6 +272,7 @@ files:
 - lib/morpheus/cli/edit_rc_command.rb
 - lib/morpheus/cli/error_handler.rb
 - lib/morpheus/cli/execute_schedules_command.rb
+- lib/morpheus/cli/execution_request_command.rb
 - lib/morpheus/cli/expression_parser.rb
 - lib/morpheus/cli/groups.rb
 - lib/morpheus/cli/hosts.rb
@@ -280,6 +300,7 @@ files:
 - lib/morpheus/cli/mixins/library_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
 - lib/morpheus/cli/mixins/print_helper.rb
+- lib/morpheus/cli/mixins/processes_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
 - lib/morpheus/cli/monitoring_apps_command.rb
@@ -300,6 +321,7 @@ files:
 - lib/morpheus/cli/policies_command.rb
 - lib/morpheus/cli/power_schedules_command.rb
 - lib/morpheus/cli/preseed_scripts_command.rb
+- lib/morpheus/cli/processes_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb
 - lib/morpheus/cli/roles.rb
@@ -313,6 +335,7 @@ files:
 - lib/morpheus/cli/storage_providers_command.rb
 - lib/morpheus/cli/tasks.rb
 - lib/morpheus/cli/user_groups_command.rb
+- lib/morpheus/cli/user_settings_command.rb
 - lib/morpheus/cli/user_sources_command.rb
 - lib/morpheus/cli/users.rb
 - lib/morpheus/cli/version.rb
@@ -324,6 +347,7 @@ files:
 - lib/morpheus/ext/nil_class.rb
 - lib/morpheus/formatters.rb
 - lib/morpheus/logging.rb
+- lib/morpheus/morpkg.rb
 - lib/morpheus/rest_client.rb
 - lib/morpheus/terminal.rb
 - morpheus-cli.gemspec