MuranoCLI 3.2.0.beta.1 → 3.2.0.beta.5

data/lib/MrMurano/commands/init.rb

@@ -20,8 +20,10 @@ require 'MrMurano/commands/business'
 require 'MrMurano/commands/solution'
 require 'MrMurano/commands/sync'
 
-def init_cmd_description
-  %(
+class InitCmd
+  include MrMurano::Verbose
+
+  INIT_CMD_DESCRIPTION = %(
 
 The init command helps you create a new Murano project
 ======================================================
@@ -101,115 +103,117 @@ that you can edit.
     http://docs.exosite.com/
 
   ).strip
-end
-
-command :init do |c|
-  c.syntax = %(murano init)
-  c.summary = %(The easy way to start a project)
-  c.description = init_cmd_description
 
-  c.example %(
-    Initialize Murano project using specific Business and Solutions
-  ).strip, 'murano init --business-id 12345 --product-name myprod --application-name myapp'
+  def command_init(cmd)
+    cmd.syntax = %(murano init)
+    cmd.summary = %(The easy way to start a project)
+    cmd.description = INIT_CMD_DESCRIPTION
 
-  # Let user specify existing business and/or solution IDs and/or names.
-  cmd_option_business_pickers(c)
-  cmd_option_application_pickers(c)
-  cmd_option_product_pickers(c)
+    cmd.example %(
+      Initialize Murano project using specific Business and Solutions
+    ).strip, 'murano init --business-id 12345 --product-name myprod --application-name myapp'
 
-  c.option('--refresh', %(Ignore Business and Solution IDs found in the config))
-  c.option('--purge', %(Remove Project directories and files, and recreate anew))
-  c.option('--[no-]sync', %(Pull down existing remote files (generally a good thing) (default: true)))
-  c.option('--[no-]mkdirs', %(Create default directories))
+    # Let user specify existing business and/or solution IDs and/or names.
+    cmd_option_business_pickers(cmd)
+    cmd_option_application_pickers(cmd)
+    cmd_option_product_pickers(cmd)
 
-  # This command can be run without a project config.
-  c.project_not_required = true
-  # This command should not walk up the directory tree
-  # looking for a .murano/config project config file.
-  c.restrict_to_cur_dir = true
-  # Ask for user password if not found.
-  c.prompt_if_logged_off = true
+    cmd.option('--refresh', %(Ignore Business and Solution IDs found in the config))
+    cmd.option('--purge', %(Remove Project directories and files, and recreate anew))
+    cmd.option('--[no-]sync', %(Pull down existing remote files (generally a good thing) (default: true)))
+    cmd.option('--[no-]mkdirs', %(Create default directories))
 
-  c.action do |args, options|
-    c.verify_arg_count!(args, 1)
-    options.default(refresh: false, purge: false, sync: true, mkdirs: true)
+    # This command can be run without a project config.
+    cmd.project_not_required = true
+    # This command should not walk up the directory tree
+    # looking for a .murano/config project config file.
+    cmd.restrict_to_cur_dir = true
+    # Ask for user password if not found.
+    cmd.prompt_if_logged_off = true
 
-    acc = MrMurano::Account.new
-    validate_dir!(acc, args, options)
+    cmd.action do |args, options|
+      cmd.verify_arg_count!(args, 1)
+      options.default(refresh: false, purge: false, sync: true, mkdirs: true)
 
-    puts('')
-    if $cfg.project_exists
-      verbage = 'Rebasing'
-    else
-      verbage = 'Creating'
-    end
-    say("#{verbage} project at #{Rainbow($cfg['location.base'].to_s).underline}")
+      acc = MrMurano::Account.new
+      validate_dir!(acc, args, options)
 
-    puts('')
+      puts('')
+      if $cfg.project_exists
+        verbage = 'Rebasing'
+      else
+        verbage = 'Creating'
+      end
+      say("#{verbage} project at #{Rainbow($cfg['location.base'].to_s).underline}")
 
-    # Try to import a .Solutionfile.secret.
-    # NOTE/2017-06-29: .Solutionfile.secret and SolutionFile (see ProjectFile.rb)
-    # are old MurCLI constructs; here we just try to migrate from the old format
-    # to the new format (where config goes in .murano/config and there's an
-    # explicit directory structure; the user cannot specify a different file
-    # hierarchy).
-    MrMurano::ConfigMigrate.new.import_secret
-
-    # See if the config already specifies a Business ID. If not, see if the
-    # config contains a username and password; otherwise, ask for them. With
-    # a username and password, get the list of businesses from Murano; if
-    # just one found, use that; if more than one found, ask user which one
-    # to use; else, if no businesses found, spit out the new-account URL
-    # and tell the user to use their browser to create a new Business.
-    unless $cfg['user.name'].to_s.empty?
-      say("Found User #{Rainbow($cfg['user.name']).underline}")
       puts('')
-    end
 
-    # Find and verify Business by ID (from $cfg) or by name (from --business),
-    # or ask user which business to use. If user has not logged on, they will
-    # be asked for their username and/or password first.
-    biz = business_find_or_ask!(acc, options)
-    # Save the 'business.id' and 'business.name' to the project config.
-    # ([lb] guessing biz guaranteed to be not nil, but checking anyway.)
-    biz.write unless biz.nil?
-
-    # Verify or ask user to create Solutions.
-    sol_opts = {
-      create_ok: true,
-      update_cfg: true,
-      ignore_cfg: options.refresh,
-      verbose: true,
-    }
-    # Get/Create Application ID
-    sol_opts[:match_api_id] = options.application_id
-    sol_opts[:match_name] = options.application_name
-    sol_opts[:match_fuzzy] = options.application
-    appl = solution_find_or_create(biz: biz, type: :application, **sol_opts)
-    # Get/Create Product ID
-    sol_opts[:match_api_id] = options.product_id
-    sol_opts[:match_name] = options.product_name
-    sol_opts[:match_fuzzy] = options.product
-    prod = solution_find_or_create(biz: biz, type: :product, **sol_opts)
-
-    # Automatically link solutions.
-    link_opts = { verbose: true }
-    link_solutions(appl, prod, link_opts)
-
-    # If no ProjectFile, then write a ProjectFile.
-    write_project_file
-
-    if options.mkdirs
-      # Make the directory structure.
-      make_directories(purge: options.purge)
-
-      # For new solutions, Murano creates a few empty and example event handlers.
-      # For existing solutions, the user might already have created some files.
-      # Grab them now.
-      syncdown_new_and_existing if options.sync
-    end
+      # Try to import a .Solutionfile.secret.
+      # NOTE/2017-06-29: .Solutionfile.secret and SolutionFile (see ProjectFile.rb)
+      # are old MurCLI constructs; here we just try to migrate from the old format
+      # to the new format (where config goes in .murano/config and there's an
+      # explicit directory structure; the user cannot specify a different file
+      # hierarchy).
+      MrMurano::ConfigMigrate.new.import_secret
+
+      # See if the config already specifies a Business ID. If not, see if the
+      # config contains a username and password; otherwise, ask for them. With
+      # a username and password, get the list of businesses from Murano; if
+      # just one found, use that; if more than one found, ask user which one
+      # to use; else, if no businesses found, spit out the new-account URL
+      # and tell the user to use their browser to create a new Business.
+      unless $cfg['user.name'].to_s.empty?
+        say("Found User #{Rainbow($cfg['user.name']).underline}")
+        puts('')
+      end
+
+      # Find and verify Business by ID (from $cfg) or by name (from --business),
+      # or ask user which business to use. If user has not logged on, they will
+      # be asked for their username and/or password first.
+      biz = business_find_or_ask!(acc, options)
+      # Save the 'business.id' and 'business.name' to the project config.
+      # ([lb] guessing biz guaranteed to be not nil, but checking anyway.)
+      biz.write unless biz.nil?
+
+      # Verify or ask user to create Solutions.
+      sol_opts = {
+        create_ok: true,
+        update_cfg: true,
+        ignore_cfg: options.refresh,
+        verbose: true,
+      }
+      # Get/Create Application ID
+      sol_opts[:match_api_id] = options.application_id
+      sol_opts[:match_name] = options.application_name
+      sol_opts[:match_fuzzy] = options.application
+      appl = solution_find_or_create(biz: biz, type: :application, **sol_opts)
+      # Get/Create Product ID
+      sol_opts[:match_api_id] = options.product_id
+      sol_opts[:match_name] = options.product_name
+      sol_opts[:match_fuzzy] = options.product
+      prod = solution_find_or_create(biz: biz, type: :product, **sol_opts)
+
+      # Automatically link solutions.
+      unless appl.nil? || prod.nil?
+        link_opts = { verbose: true }
+        link_solutions(appl, prod, link_opts)
+      end
+
+      # If no ProjectFile, then write a ProjectFile.
+      write_project_file
+
+      if options.mkdirs
+        # Make the directory structure.
+        make_directories(purge: options.purge)
+
+        # For new solutions, Murano creates a few empty and example event handlers.
+        # For existing solutions, the user might already have created some files.
+        # Grab them now.
+        syncdown_new_and_existing if options.sync
+      end
 
-    blather_success
+      blather_success
+    end
   end
 
   def highlight_id(id)
@@ -397,19 +401,29 @@ command :init do |c|
     important_ids = %w[business application product].freeze
     importantest_width = important_ids.map do |id_name|
       cfg_key = id_name + '.id'
+      # If the user did not set up an application or product, it's ID is nil.
+      next 0 if $cfg[cfg_key].nil?
       $cfg[cfg_key].length + id_postfix.length
     end.max # Max the map; get the length of the longest ID.
     important_ids.each do |id_name|
       # cfg_key is, e.g., 'business.id', 'product.id', 'application.id'
       cfg_key = id_name + '.id'
-      next if $cfg[cfg_key].nil?
+      identifier = $cfg[cfg_key] || '<n/a>'
       #say "#{id_name.capitalize} ID: #{highlight_id($cfg[cfg_key])}"
       # Right-aligned:
       tmpl = format('%%%ds: %%s', importantest_width)
       # Left-aligned:
       #tmpl = format('%%-%ds: %%s', importantest_width)
-      say(format(tmpl, id_name.capitalize + id_postfix, highlight_id($cfg[cfg_key])))
+      say(format(tmpl, id_name.capitalize + id_postfix, highlight_id(identifier)))
     end
     puts('')
   end
 end
+
+def wire_cmd_init
+  init_cmd = InitCmd.new
+  command(:init) { |cmd| init_cmd.command_init(cmd) }
+end
+
+wire_cmd_init
+

data/lib/MrMurano/commands/keystore.rb

@@ -7,7 +7,7 @@
 
 require 'MrMurano/Keystore'
 require 'MrMurano/ReCommander'
-require 'MrMurano/Solution-ServiceConfig'
+require 'MrMurano/SubCmdGroupContext'
 
 command :keystore do |c|
   c.syntax = %(murano keystore)

data/lib/MrMurano/commands/logs.rb

@@ -14,6 +14,7 @@ require 'MrMurano/verbosing'
 require 'MrMurano/Logs'
 require 'MrMurano/ReCommander'
 require 'MrMurano/Solution'
+require 'MrMurano/commands/solution_picker'
 
 # Because Ruby 2.0 does not support quoted keys, e.g., { '$eq': 'value' }.
 # rubocop:disable Style/HashSyntax
@@ -397,7 +398,7 @@ Use a "#{INCLUDE_INDICATOR}" or "#{EXCLUDE_INDICATOR}" prefix to include or excl
     n_formatting += 1 if @options.pp
     return unless n_formatting > 1
     format_options = '--raw, --message-only, --one-line, --json, --yaml, or --pp'
-    warn "Try using just one of #{format_options}, but not two or more."
+    warning "Try using just one of #{format_options}, but not two or more."
     exit 1
   end
 

data/lib/MrMurano/commands/postgresql.rb

@@ -75,11 +75,8 @@ Queries can include $# escapes that are filled from the --param option.
     io = nil
     io = File.open(options.output, 'w') if options.output
 
-    pg.outf(ret, io) do |dd, ios|
-      dd = dd[:result]
-      # Look for date cells and pretty them. (a Hash with specific fields)
-      # All others, call to_s
-      rows = dd[:rows].map do |row|
+    def pretty_res(pg, res, ios)
+      rows = res[:rows].map do |row|
         row.map do |cell|
           if cell.is_a?(Hash) && cell.keys.sort == %i[day hour min month sec usec year]
             t = Time.gm(
@@ -93,12 +90,22 @@ Queries can include $# escapes that are filled from the --param option.
       end
       pg.tabularize(
         {
-          headers: dd[:columns],
+          headers: res[:columns],
           rows: rows,
         },
         ios
       )
     end
+    pg.outf(ret, io) do |dd, ios|
+      dd = dd[:result]
+      # Look for date cells and pretty them. (a Hash with specific fields)
+      # All others, call to_s
+      if dd.is_a? Array
+        dd.each { |d| pretty_res(pg, d, ios) }
+      else
+        pretty_res(pg, dd, ios)
+      end
+    end
     io.close unless io.nil?
   end
 end
@@ -149,7 +156,10 @@ extra table in your database. (__murano_cli__.migrate_version)
       CREATE TABLE IF NOT EXISTS __murano_cli__.migrate_version (version integer);
       SELECT version FROM __murano_cli__.migrate_version ORDER BY version DESC;
     ).gsub(/^\s+/, '')
-    unless ret[:error].nil?
+    if ret.nil?
+      pg.error 'Unknown Postgresql failure determining version'
+      exit 1
+    elsif !ret[:error].nil?
       pp ret
       exit 1
     end