morpheus-cli 4.2.20 → 5.0.2

data/lib/morpheus/cli/commands/standard/source_command.rb

@@ -14,7 +14,7 @@ class Morpheus::Cli::SourceCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [file] [file2]"
       build_common_options(opts, options, [])
-      opts.footer = "This will execute a file, treatin it as a script of morpheus commands"
+      opts.footer = "This will execute a file as a script where each line is a morpheus command or expression."
     end
     optparse.parse!(args)
     if args.count < 1

data/lib/morpheus/cli/commands/standard/update_command.rb

@@ -0,0 +1,76 @@
+require 'morpheus/cli/cli_command'
+require 'json'
+
+# This is for use in dotfile scripts and the shell..
+class Morpheus::Cli::UpdateCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :update
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      opts.on( '-f', '--force', "Force Update, executes update even if latest version is already installed." ) do
+        options[:force] = true
+      end
+      build_common_options(opts, options, [:dry_run, :quiet])
+      opts.footer = "This will update the morpheus command line interface to the latest version.\nThis is done by executing the system command: `gem update #{morpheus_gem_name}`"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
+
+    current_version = Morpheus::Cli::VERSION
+    latest_version = get_latest_version()
+    latest_version = latest_version
+    
+    if current_version == latest_version && !options[:force]
+      unless options[:quiet]
+        print cyan, "The latest version is already installed. (#{latest_version})", "\n", reset
+      end
+      return 0, nil
+    end
+
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to update the #{morpheus_gem_name} gem from version #{current_version} to version #{latest_version}?")
+      return 9, "aborted command"
+    end
+
+    gem_update_command = "gem update #{morpheus_gem_name}"
+
+    if options[:dry_run]
+      unless options[:quiet]
+        print "\n"
+        print "#{cyan}#{bold}#{dark}COMMAND#{reset}\n"
+        puts gem_update_command
+        print "\n", reset
+      end
+      return 0, nil
+    end
+    
+    # ok, update it
+    if options[:quiet]
+      system(gem_update_command)
+    else
+      `#{gem_update_command}`
+    end
+
+    if $?.success?
+      return 0, nil
+    else
+      return $?.exitstatus, "update failed"
+    end
+
+  end
+
+  protected
+
+  def morpheus_gem_name
+    'morpheus-cli'
+  end
+
+  def get_latest_version
+    result = HTTP.get("https://rubygems.org/api/v1/gems/#{morpheus_gem_name}.json")
+    json_response = JSON.parse(result.body)
+    json_response["version"]
+  end
+
+end

data/lib/morpheus/cli/containers_command.rb

@@ -35,6 +35,9 @@ class Morpheus::Cli::ContainersCommand
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
+      opts.on( nil, '--costs', "Display Cost and Price" ) do
+        options[:include_costs] = true
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
@@ -99,6 +102,8 @@ class Morpheus::Cli::ContainersCommand
         "Name" => lambda {|it| it['server'] ? it['server']['name'] : '(no server)' }, # there is a server.displayName too?
         "Type" => lambda {|it| it['containerType'] ? it['containerType']['name'] : '' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        # "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        # "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
         "Instance" => lambda {|it| it['instance'] ? it['instance']['name'] : '' },
         "Host" => lambda {|it| it['server'] ? it['server']['name'] : '' },
         "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
@@ -133,6 +138,15 @@ class Morpheus::Cli::ContainersCommand
         end
       end
 
+      if options[:include_costs]
+        print_h2 "Container Cost"
+        cost_columns = {
+          "Cost" => lambda {|it| it['hourlyCost'] ? format_money(it['hourlyCost'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+          "Price" => lambda {|it| it['hourlyPrice'] ? format_money(it['hourlyPrice'], (it['currency'] || 'USD'), {sigdig:15}).to_s + ' per hour' : '' },
+        }
+        print_description_list(cost_columns, container)
+      end
+
       print reset, "\n"
 
       # refresh until a status is reached

data/lib/morpheus/cli/deploy.rb

@@ -6,6 +6,7 @@ class Morpheus::Cli::Deploy
   include Morpheus::Cli::DeploymentsHelper
 
   set_command_name :deploy
+  set_command_description "Deploy to an instance from a morpheus.yml file."
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -18,30 +19,35 @@ class Morpheus::Cli::Deploy
     options={}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus deploy [environment]"
-      build_common_options(opts, options, [:auto_confirm, :remote, :dry_run])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :remote, :dry_run])
       opts.footer = <<-EOT
 Deploy to an instance using the morpheus.yml file, located in the working directory.
 [environment] is optional. Merge settings under environments.{environment}. Default is no environment.
 
-First this parses the morpheus.yml file and merges the specified environment settings.
-The specified instance must exist and the specified version must not exist.
-If the settings are valid, the new deployment version will be created and 
-all the specified files are uploaded to the new deployment version.
-Finally, it deploys the new version to the instance.
+First the morpheus.yml YAML file is parsed, merging the specified environment's nested settings.
+The specified instance must exist and the specified deployment version must not exist.
+If the settings are valid, the new deployment version will be created.
+If is a file type deployment, all the discovered files are uploaded to the new deployment version.
+Finally, it deploys the new version to the instance using any specified config options.
 
 The morpheus.yml should be located in the working directory.
-This file contains the information necessary to perform a deployment via the cli.
+This YAML file contains the settings that specify how to execute the deployment.
 
 File Settings
 ==================
 
-* name - (required) The instance name we are deploying to and, by default, name of the deployment being created.
+* name - (required) The instance name being deployed to, also the default name of the deployment.
 * version - (required) The version identifier of the deployment being created (userVersion)
 * deployment - The name of the deployment being created, name is used by default
-* script - The initial script to run before looking for files to upload.
-* files - List of file patterns to use for uploading files and their target destination. 
+* type - The type of deployment, file, 'git' or 'fetch', default is 'file'.
+* script - The initial script to run, happens before finding the files to be uploaded.
+* files - (required) List of file patterns to use for uploading files and their target destination. 
           Each item should contain path and pattern, path may be relative to the working directory, default pattern is: '**/*'
-* options - Map of deployment options depending on deployment type
+          only applies to type 'file'
+* url - (required) The url to fetch files from, only applies to types 'git' and 'fetch'.
+* ref - The git reference, default is master (main), only applies to type git.
+* config - Map of deployment config options depending on deployment type
+* options - alias for config
 * post_script - A post operation script to be run on the local machine
 * stage_only - If set to true the deploy will only be staged and not actually run
 * environments - Map of objects that contain nested properties for each environment name
@@ -51,7 +57,7 @@ It is possible to nest these properties in an "environments" map to override bas
 Example
 ==================
 
-name: neatsite
+name: mysite
 version: 5.0
 script: "rake build"
 files: 
@@ -60,6 +66,16 @@ environments:
   production:
     files:
     - path: production-build
+
+
+Git Example
+==================
+
+name: morpheus-apidoc
+version: 5.0.0
+type: git
+url: "https://github.com/gomorpheus/morpheus-apidoc"
+
 EOT
     end
     optparse.parse!(args)
@@ -106,45 +122,90 @@ EOT
     instance = instance_results['instances'][0]
     instance_id = instance['id']
 
+    # auto detect type, default to file
+    deploy_type = deploy_args['type'] || deploy_args['deployType']
+    if deploy_type.nil?
+      if deploy_args['gitUrl']
+        deploy_type = 'git'
+      elsif deploy_args['fetchUrl'] || deploy_args['url']
+        deploy_type = 'fetch'
+      end
+    end
+    if deploy_type.nil?
+      deploy_type = "file"
+    end
+    deploy_url = deploy_args['url'] || deploy_args['fetchUrl'] || deploy_args['gitUrl']
+    if deploy_url.nil? && (deploy_type == "git" || deploy_type == "fetch")
+      raise_command_error "Deploy type '#{deploy_type}' requires a url to be specified"
+    end
+    #deploy_type = "file" if deploy_type.to_s.downcase == "files"
+
+    deploy_config = deploy_args['options'] || deploy_args['config']
+
     # ok do it
     # fetch/create deployment, create deployment version, upload files, and deploy it to instance.
 
-    print_h1 "Morpheus Deployment"
-
-    columns = {
-      "Instance" => :name,
-      "Deployment" => :deployment,
-      "Version" => :version,
-      "Script" => :script,
-      "Post Script" => :post_script,
-      "Files" => :files,
-      "Environment" => :environment,
-    }
-    pretty_file_config = deploy_args['files'].collect {|it|
-      [(it['path'] ? "path: #{it['path']}" : nil), (it['pattern'] ? "pattern: #{it['pattern']}" : nil)].compact.join(", ")
-    }.join(", ")
-    deploy_settings = {
-      :name => instance_name,
-      :deployment => deployment_name,
-      :version => version_number,
-      :script => deploy_args['script'],
-      :post_script => deploy_args['post_script'],
-      :files => pretty_file_config,
-      # :files => deploy_args['files'],
-      # :files => deploy_files.size,
-      # :file_config => (deploy_files.size == 1 ? deploy_files[0][:destination] : deploy_args['files'])
-      :environment => environment
-    }
-    columns.delete("Script") if deploy_settings[:script].nil?
-    columns.delete("Post Script") if deploy_settings[:post_script].nil?
-    columns.delete("Environment") if deploy_settings[:environment].nil?
-    print_description_list(columns, deploy_settings)
-    print reset, "\n"
+    unless options[:quiet]
+
+      print_h1 "Morpheus Deployment", options
+
+      columns = {
+        "Instance" => :name,
+        "Deployment" => :deployment,
+        "Version" => :version,
+        "Deploy Type" => :type,
+        "Script" => :script,
+        "Post Script" => :post_script,
+        "Files" => :files,
+        "Git Url" => :git_url,
+        "Git Ref" => :git_ref,
+        "Fetch Url" => :fetch_url,
+        "Environment" => :environment,
+      }
+      pretty_file_config = deploy_args['files'] ? deploy_args['files'].collect {|it|
+        [(it['path'] ? "path: #{it['path']}" : nil), (it['pattern'] ? "pattern: #{it['pattern']}" : nil)].compact.join(", ")
+      }.join(", ") : "(none)"
+      deploy_settings = {
+        :name => instance_name,
+        :deployment => deployment_name,
+        :version => version_number,
+        :script => deploy_args['script'],
+        :post_script => deploy_args['post_script'],
+        :files => pretty_file_config,
+        :type => format_deploy_type(deploy_type),
+        :git_url => deploy_args['gitUrl'] || (deploy_type == "git" ? deploy_args['url'] : nil),
+        :git_ref => deploy_args['gitRef'] || (deploy_type == "git" ? deploy_args['ref'] : nil),
+        :fetch_url => deploy_args['fetchUrl'] || (deploy_type == "fetch" ? deploy_args['url'] : nil),
+        # :files => deploy_args['files'],
+        # :files => deploy_files.size,
+        # :file_config => (deploy_files.size == 1 ? deploy_files[0][:destination] : deploy_args['files'])
+        :environment => environment
+      }
+      columns.delete("Script") if deploy_settings[:script].nil?
+      columns.delete("Post Script") if deploy_settings[:post_script].nil?
+      columns.delete("Environment") if deploy_settings[:environment].nil?
+      columns.delete("Files") if deploy_type != "file" && deploy_type != "files"
+      columns.delete("Git Url") if deploy_settings[:git_url].nil?
+      columns.delete("Git Ref") if deploy_settings[:git_ref].nil?
+      columns.delete("Fetch Url") if deploy_settings[:fetch_url].nil?
+      print_description_list(columns, deploy_settings)
+      print reset, "\n"
+
+      if deploy_config
+        print_h2 "Config Options", options
+        print cyan
+        puts as_json(deploy_config)
+        print "\n\n", reset
+      end
+
+    end # unless options[:quiet]
 
     if !deploy_args['script'].nil?
       # do this for dry run too since this is usually what creates the files to be uploaded
-      print cyan, "Executing Pre Deploy Script...", reset, "\n"
-      puts "running command: #{deploy_args['script']}"
+      unless options[:quiet]
+        print cyan, "Executing Pre Deploy Script...", reset, "\n"
+        puts "running command: #{deploy_args['script']}"
+      end
       if !system(deploy_args['script'])
         raise_command_error "Error executing pre script..."
       end
@@ -152,33 +213,71 @@ EOT
 
     # Find Files to Upload
     deploy_files = []
-    if deploy_args['files'].nil? || deploy_args['files'].empty? || !deploy_args['files'].is_a?(Array)
-      raise_command_error "Files not specified. Please specify files array, each item may specify a path or pattern of file(s) to upload"
-    else
-      #print "\n",cyan, "Finding Files...", reset, "\n"
-      current_working_dir = Dir.pwd
-      deploy_args['files'].each do |fmap|
-        Dir.chdir(fmap['path'] || current_working_dir)
-        files = Dir.glob(fmap['pattern'] || '**/*')
-        files.each do |file|
-          if File.file?(file)
-            destination = file.split("/")[0..-2].join("/")
-            # deploy_files << {filepath: File.expand_path(file), destination: destination}
-            deploy_files << {filepath: File.expand_path(file), destination: file}
+    if deploy_type == "file" || deploy_type == "files"
+      if deploy_args['files'].nil? || deploy_args['files'].empty? || !deploy_args['files'].is_a?(Array)
+        raise_command_error "Files not specified. Please specify the files to include, each item may specify a path or pattern of file(s) to upload"
+      else
+        #print "\n",cyan, "Finding Files...", reset, "\n"
+        current_working_dir = Dir.pwd
+        deploy_args['files'].each do |fmap|
+          Dir.chdir(fmap['path'] || current_working_dir)
+          files = Dir.glob(fmap['pattern'] || '**/*')
+          files.each do |file|
+            if File.file?(file)
+              destination = file.split("/")[0..-2].join("/")
+              # deploy_files << {filepath: File.expand_path(file), destination: destination}
+              deploy_files << {filepath: File.expand_path(file), destination: file}
+            end
           end
         end
+        #print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+        Dir.chdir(current_working_dir)
       end
-      #print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
-      Dir.chdir(current_working_dir)
-    end
 
-    if deploy_files.empty?
-      raise_command_error "0 files found for: #{deploy_args['files'].inspect}"
-    else
-      print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+      if deploy_files.empty?
+        raise_command_error "0 files found for: #{deploy_args['files'].inspect}"
+      else
+        unless options[:quiet]
+          print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+        end
+      end
+    elsif deploy_type == "git"
+      # make it work with simpler config, url instead of gitUrl
+      if deploy_args['gitUrl'].nil? && deploy_args['url']
+        deploy_args['gitUrl'] = deploy_args['url'] # .delete('url') maybe?
+      end
+      if deploy_args['gitRef'].nil? && deploy_args['ref']
+        deploy_args['gitRef'] = deploy_args['ref'] # .delete('ref') maybe?
+      end
+      if deploy_args['gitRef'].nil?
+        raise_command_error "fetchUrl not specified. Please specify the git url to fetch the deploy files from."
+      end
+      if deploy_args['gitRef'].nil?
+        #raise_command_error "gitRef not specified. Please specify the git reference to use. eg. main"
+        # deploy_args['gitRef'] = "main"
+      end
+    elsif deploy_type == "git"
+      # make it work with simpler config, url instead of fetchUrl
+      if deploy_args['fetchUrl'].nil? && deploy_args['url']
+        deploy_args['fetchUrl'] = deploy_args['url'] # .delete('url') maybe?
+      end
+      if deploy_args['fetchUrl'].nil?
+        raise_command_error "fetchUrl not specified. Please specify the url to fetch the deploy files from."
+      end
+      
     end
 
-    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to create deployment version #{version_number} (#{deploy_files.size} #{deploy_files.size == 1 ? 'file' : 'files'}) and deploy it to instance #{instance['name']}?")
+    confirm_warning = ""
+    confirm_message = "Are you sure you want to perform this action?"
+    if deploy_type == "file" || deploy_type == "files"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    elsif deploy_type == "git"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    elsif deploy_type == "fetch"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    end
+    puts confirm_warning if !options[:quiet]
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm(confirm_message)
       return 9, "aborted command"
     end
     
@@ -242,7 +341,7 @@ EOT
       payload = {
         'version' => {
           'userVersion' => version_number,
-          'deployType' => (deploy_args['type'] || deploy_args['deployType'] || 'file')
+          'deployType' => deploy_type
         } 
       }
       payload['version']['fetchUrl'] = deploy_args['fetchUrl'] if deploy_args['fetchUrl']
@@ -261,31 +360,31 @@ EOT
 
     
     # Upload Files
-    if deploy_files && !deploy_files.empty?
-      print "\n",cyan, "Uploading #{deploy_files.size} Files...", reset, "\n"
-      current_working_dir = Dir.pwd
-      deploy_files.each do |f|
-        destination = f[:destination]
-        if options[:dry_run]
-          print_dry_run @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
-        else
-          print cyan,"  - Uploading #{f[:destination]} ...", reset if !options[:quiet]
-          upload_result = @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
-          #print green + "SUCCESS" + reset + "\n" if !options[:quiet]
-          print reset, "\n" if !options[:quiet]
+    if deploy_type == "file" || deploy_type == "files"
+      if deploy_files && !deploy_files.empty?
+        print "\n",cyan, "Uploading #{deploy_files.size} Files...", reset, "\n" if !options[:quiet]
+        current_working_dir = Dir.pwd
+        deploy_files.each do |f|
+          destination = f[:destination]
+          if options[:dry_run]
+            print_dry_run @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+          else
+            print cyan,"  - Uploading #{f[:destination]} ...", reset if !options[:quiet]
+            upload_result = @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+            #print green + "SUCCESS" + reset + "\n" if !options[:quiet]
+            print reset, "\n" if !options[:quiet]
+          end
         end
+        print cyan, "Upload Complete!", reset, "\n" if !options[:quiet]
+        Dir.chdir(current_working_dir)
+      else
+        print "\n",cyan, "0 files to upload", reset, "\n" if !options[:quiet]
       end
-      print cyan, "Upload Complete!", reset, "\n"
-      Dir.chdir(current_working_dir)
-    else
-      print "\n",cyan, "0 files to upload", reset, "\n"
     end
 
-    # TODO: support deploying other deployTypes too, git and fetch
-
     if !deploy_args['post_script'].nil?
-      print cyan, "Executing Post Script...", reset, "\n"
-      puts "running command: #{deploy_args['post_script']}"
+      print cyan, "Executing Post Script...", reset, "\n" if !options[:quiet]
+      puts "running command: #{deploy_args['post_script']}" if !options[:quiet]
       if !system(deploy_args['post_script'])
         raise_command_error "Error executing post script..."
       end
@@ -314,10 +413,14 @@ EOT
     end
     # stageOnly means do not actually deploy yet, can invoke @deploy_interface.deploy(deployment['id']) later
     # there is no cli command for that yet though..
-    stage_only = deploy_args['stage_deploy'] || deploy_args['stage_only'] || deploy_args['stageOnly']
+    stage_only = deploy_args['stage'] || deploy_args['stage_deploy'] || deploy_args['stage_only'] || deploy_args['stageOnly']
     if stage_only
       payload['appDeploy']['stageOnly'] = true
     end
+    # config/options to apply to deployment
+    if deploy_config
+      payload['appDeploy']['config'] = deploy_config
+    end
     app_deploy_id = nil
     if options[:dry_run]
       print_dry_run @deploy_interface.dry.create(instance_id, payload)
@@ -325,11 +428,17 @@ EOT
       app_deploy_id = ':appDeployId'
     else
       # Create a new appDeploy record, without stageOnly, this actually does the deployment
-      print cyan, "Deploying #{deployment_name} version #{version_number} to instance #{instance_name} ...", reset, "\n"
+      #print cyan, "Deploying #{deployment_name} version #{version_number} to instance #{instance_name} ...", reset, "\n"
       deploy_result = @deploy_interface.create(instance_id, payload)
       app_deploy = deploy_result['appDeploy']
       app_deploy_id = app_deploy['id']
-      print_green_success "Deploy Successful!"
+      if !options[:quiet]
+        if app_deploy['status'] == 'staged'
+          print_green_success "Staged Deploy #{deployment_name} version #{version_number} to instance #{instance_name}"
+        else
+          print_green_success "Deploying #{deployment_name} version #{version_number} to instance #{instance_name}"
+        end
+      end
     end
     return 0, nil
   end