MuranoCLI 2.2.4 → 3.0.0

data/lib/MrMurano/commands/login.rb

@@ -1,20 +1,83 @@
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'MrMurano/Account'
+require 'MrMurano/Config'
+require 'MrMurano/ReCommander'
 
 command 'login' do |c|
-  c.syntax = %{murano login}
-  c.summary = %{Log into Murano}
-  c.description = %{Log into Murano
+  c.syntax = %(murano login)
+  c.summary = %(Log into Murano)
+  c.description = %(
+Log into Murano.
 
-If you are having trouble logging in, try deleting the saved password first.
-`murano password delete <username>`
-  }
-  c.option '--show-token', %{Shows the API token}
+If you are having trouble logging in, try deleting the saved password first:
+
+  murano password delete <username>
+  ).strip
+  c.option '--show-token', %(Shows the API token)
+  c.project_not_required = true
+  c.prompt_if_logged_off = true
 
   c.action do |args, options|
-    acc = MrMurano::Account.new
-    ret = acc.token
-    say ret if options.show_token
+    c.verify_arg_count!(args)
+    tok = MrMurano::Account.instance.token
+    say tok if options.show_token
+  end
+end
+
+command 'logout' do |c|
+  c.syntax = %(murano logout)
+  c.summary = %(Log out of Murano)
+  c.description = %(
+Log out of Murano.
+
+This command will unset the user.name in the user config, and
+it will remove that user's password from the password file.
+
+Essentially, this command is the same as:
+
+  murano password delete <username>
+  murano config --unset --user user.name
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args)
+
+    net_host = verify_set('net.host')
+    user_name = verify_set('user.name')
+    if net_host && user_name
+      psd = MrMurano::Passwords.new
+      psd.load
+      psd.remove(net_host, user_name)
+      psd.save
+    end
+
+    user_net_host = $cfg.get('net.host', :user)
+    user_net_host = $cfg.get('net.host', :defaults) if user_net_host.nil?
+    user_user_name = $cfg.get('user.name', :user)
+    if (user_net_host == net_host) && (user_user_name == user_name)
+      # Only clear user name from the user config if the net.host
+      # or user.name did not come from a different config, like the
+      # --project config.
+      $cfg.set('user.name', nil, :user)
+      $cfg.set('business.id', nil, :user)
+      $cfg.set('business.name', nil, :user)
+    end
+  end
+
+  def verify_set(cfg_key)
+    cfg_val = $cfg.get(cfg_key)
+    if cfg_val.to_s.empty?
+      cfg_val = nil
+      MrMurano::Verbose.warning("No config key ‘#{cfg_key}’: no password to delete")
+    end
+    cfg_val
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/logs.rb

@@ -1,42 +1,69 @@
-require 'MrMurano/Solution'
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'MrMurano/makePretty'
+require 'MrMurano/ReCommander'
+require 'MrMurano/Solution'
 
 command :logs do |c|
-  c.syntax = %{murano logs [options]}
-  c.description = %{Get the logs for a solution}
-  c.option '-f','--follow', %{Follow logs from server}
-  c.option('--[no-]color', %{Toggle colorizing of logs}) {
-    Rainbow.enabled = false
-  }
-  c.option '--[no-]pretty', %{Reformat JSON blobs in logs.}
-  c.option '--[no-]localtime', %{Adjust Timestamps to be in local time}
-  c.option '--raw', %{Don't do any formating of the log data}
+  c.syntax = %(murano logs [--options])
+  c.summary = %(Get the logs for a solution)
+  c.description = %(
+Get the logs for a solution.
+  ).strip
+
+  # Add flag: --type [application|product].
+  cmd_add_solntype_pickers(c, exclude_all: true)
 
-  c.action do |args,options|
-    options.default :pretty=>true, :localtime=>true, :raw => false
+  c.option '-f', '--follow', %(Follow logs from server)
+  c.option '--[no-]pretty', %(Reformat JSON blobs in logs.)
+  c.option '--[no-]localtime', %(Adjust Timestamps to be in local time)
+  c.option '--raw', %(Don't do any formating of the log data)
+  # FIXME/2017-06-23: It'd be nice to allow :all
+  #   But then we'd have to interleave output somehow with --follow,
+  #   maybe using separate threads?
 
-    sol = MrMurano::Solution.new
+  c.action do |args, options|
+    c.verify_arg_count!(args)
+    options.default(pretty: true, localtime: true, raw: false, type: :application)
+    cmd_defaults_solntype_pickers(options, :application)
 
-    if options.follow then
-      # open a lasting connection and continueally feed makePretty()
+    if options.type == :application
+      sol = MrMurano::Application.new
+    elsif options.type == :product
+      sol = MrMurano::Product.new
+    else
+      MrMurano::Verbose.error "Unknown --type specified: #{options.type}"
+      exit 1
+    end
+
+    if options.follow
+      # Open a lasting connection and continually feed makePretty().
       begin
         sol.get('/logs?polling=true') do |request, http|
-          request["Accept-Encoding"] = "None"
+          request['Accept-Encoding'] = 'None'
           http.request(request) do |response|
-            remainder=''
+            remainder = ''
             response.read_body do |chunk|
               chunk = remainder + chunk unless remainder.empty?
 
-              # for all complete JSON blobs, make them pretty.
+              # For all complete JSON blobs, make them pretty.
               chunk.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
-                if options.raw then
+                if options.raw
                   puts m
                 else
                   begin
-                    js = JSON.parse(m, {:allow_nan=>true,
-                                        :symbolize_names => true,
-                                        :create_additions=>false})
-                    puts MrMurano::Pretties::makePretty(js, options)
+                    js = JSON.parse(
+                      m,
+                      allow_nan: true,
+                      symbolize_names: true,
+                      create_additions: false,
+                    )
+                    puts MrMurano::Pretties.makePretty(js, options)
                   rescue
                     sol.error '=== JSON parse error, showing raw instead ==='
                     puts m
@@ -45,34 +72,38 @@ command :logs do |c|
                 '' #remove (we're kinda abusing gsub here.)
               end
 
-              # is there an incomplete one?
-              if chunk.match(/(\{.*$)/m) then
-                remainder = $1
+              # Is there an incomplete one?
+              chunk.match(/(\{.*$)/m) do |mat|
+                remainder = mat[1]
               end
-
             end
           end
         end
+      # rubocop:disable Lint/HandleExceptions: Do not suppress exceptions.
       rescue Interrupt => _
       end
 
     else
       ret = sol.get('/logs')
 
-      if ret.kind_of?(Hash) and ret.has_key?(:items) then
+      if ret.is_a?(Hash) && ret.key?(:items)
         ret[:items].reverse.each do |line|
-          if options.raw then
+          if options.raw
             puts line
           else
-            puts MrMurano::Pretties::makePretty(line, options)
+            puts MrMurano::Pretties.makePretty(line, options)
           end
         end
       else
         sol.error "Couldn't get logs: #{ret}"
+        # 2017-06-23: Shouldn't this be exit? What're we breaking out of?
         break
       end
-
     end
   end
 end
-#  vim: set ai et sw=2 ts=2 :
+alias_command 'logs application', 'logs', '--type', 'application'
+alias_command 'logs product', 'logs', '--type', 'product'
+alias_command 'application logs', 'logs', '--type', 'application'
+alias_command 'product logs', 'logs', '--type', 'product'
+

data/lib/MrMurano/commands/mock.rb

@@ -1,63 +1,91 @@
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
 require 'MrMurano/Mock'
+require 'MrMurano/ReCommander'
 
 command 'mock' do |c|
-  c.syntax = %{murano mock}
-  c.summary = %{Enable or disable testpoint. Show current UUID.}
-  c.description = %{mock lets you enable testpoints to do local lua development}
+  c.syntax = %(murano mock)
+  c.summary = %(Enable or disable testpoint, or show current UUID)
+  c.description = %(
+The mock command lets you enable testpoints to do local Lua development.
+  ).strip
+  c.project_not_required = true
 
-  c.action do |args, options|
+  c.action do |_args, _options|
     ::Commander::UI.enable_paging
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end
 
 command 'mock enable' do |c|
-  c.syntax = %{murano mock enable}
-  c.summary = %{Create a testpoint file.}
-  c.description = %{Run syncup after running this to carry the change through to Murano.
-   Returns the UUID to be used for authenticating.
-  }
-  c.option '--raw', %{print raw uuid}
+  c.syntax = %(murano mock enable)
+  c.summary = %(Create a testpoint file)
+  c.description = %(
+Create a testpoint file.
+
+Run syncup after running this to carry the change through to Murano.
+
+Returns the UUID to be used for authenticating.
+  ).strip
+  c.option '--raw', %(print raw uuid)
+
   c.action do |args, options|
+    c.verify_arg_count!(args)
     mock = MrMurano::Mock.new
-    uuid = mock.create_testpoint()
-    if options.raw then
+    uuid = mock.create_testpoint
+    if options.raw
       say uuid
     else
-      say %{Created testpoint file. Run `murano syncup` to activate. The following is the authorization token:}
-      say %{$ export AUTHORIZATION="#{uuid}"}
+      say %(Created testpoint file. Run `murano syncup` to activate. The following is the authorization token:)
+      say %($ export AUTHORIZATION="#{uuid}")
     end
   end
 end
 
 command 'mock disable' do |c|
-  c.syntax = %{murano mock disable}
-  c.summary = %{Remove the testpoint file.}
-  c.description = %{Run syncup after running this to carry the change through to Murano.}
+  c.syntax = %(murano mock disable)
+  c.summary = %(Remove the testpoint file)
+  c.description = %(
+Remove the testpoint file.
 
-  c.action do |args, options|
+Run syncup after running this to carry the change through to Murano.
+  ).strip
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args)
     mock = MrMurano::Mock.new
-    removed = mock.remove_testpoint()
-    if removed then
-      say %{Deleted testpoint file. Run `murano syncup` to remove the testpoint.}
+    removed = mock.remove_testpoint
+    if removed
+      say %(Deleted testpoint file. Run `murano syncup` to remove the testpoint.)
     else
-      say %{No testpoint file to remove.}
+      say %(No testpoint file to remove.)
     end
   end
 end
 
 command 'mock show' do |c|
-  c.syntax = %{murano mock disable}
-  c.summary = %{Remove the testpoint file.}
-  c.description = %{Run syncup after running this to carry the change through to Murano.}
+  c.syntax = %(murano mock disable)
+  c.summary = %(Remove the testpoint file)
+  c.description = %(
+Remove the testpoint file.
 
-  c.action do |args, options|
+Run syncup after running this to carry the change through to Murano.
+  ).strip
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args)
     mock = MrMurano::Mock.new
-    uuid = mock.show()
-    if uuid then
+    uuid = mock.show
+    if uuid
       say uuid
     else
-      say %{Could not find testpoint file or UUID in testpoint file.}
+      say %(Could not find testpoint file or UUID in testpoint file.)
     end
   end
 end
+

data/lib/MrMurano/commands/password.rb

@@ -1,91 +1,109 @@
+# Last Modified: 2017.08.16 /coding: utf-8
+# frozen_string_literal: true
+
+# Copyright © 2016-2017 Exosite LLC.
+# License: MIT. See LICENSE.txt.
+#  vim:tw=0:ts=2:sw=2:et:ai
+
+require 'MrMurano/ReCommander'
 
 command :password do |c|
-  c.syntax = %{murano password}
-  c.summary = %{About password commands}
-  c.description = %{Sub-commands for working with usernames and passwords}
-  c.action do |args, options|
+  c.syntax = %(murano password)
+  c.summary = %(About password commands)
+  c.description = %(
+Commands for working with usernames and passwords.
+  ).strip
+  c.project_not_required = true
+  c.action do |_args, _options|
     ::Commander::UI.enable_paging
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end
-
 alias_command 'password current', :config, 'user.name'
 
 command 'password list' do |c|
-  c.syntax = %{murano password list}
-  c.summary = %{List the usernames with saved passwords}
-  c.description = %{List the usernames and hosts that have been saved}
-  c.action do |args, options|
+  c.syntax = %(murano password list)
+  c.summary = %(List the usernames with saved passwords)
+  c.description = %(
+List the usernames and hosts that have been saved.
+  ).strip
+  c.project_not_required = true
+
+  c.action do |args, _options|
+    c.verify_arg_count!(args)
+
     psd = MrMurano::Passwords.new
     psd.load
 
     ret = psd.list
     psd.outf(ret) do |dd, ios|
-      rows=[]
+      rows = []
       dd.each_pair do |key, value|
-        value.each{|v| rows << [key, v] }
+        value.each { |v| rows << [key, v] }
       end
-      psd.tabularize({
-        :rows=>rows, :headers => [:Host, :Username]
-      }, ios)
+      psd.tabularize(
+        { rows: rows, headers: %i[Host Username] },
+        ios
+      )
     end
   end
 end
+alias_command 'passwords list', 'password list'
 
 command 'password set' do |c|
-  c.syntax = %{murano password set <username> [<host>]}
-  c.summary = %{Set password for username}
-
-  c.option '--password PASSWORD', String, %{The password to use}
-  c.option '--from_env', %{Use password in MURANO_PASSWORD}
+  c.syntax = %(murano password set <username> [<host>])
+  c.summary = %(Set password for username)
+  c.description = %(
+Set password for username.
+  ).strip
+  c.option '--password PASSWORD', String, %(The password to use)
+  c.option '--from_env', %(Use password in MURANO_PASSWORD)
+  c.project_not_required = true
 
   c.action do |args, options|
-    psd = MrMurano::Passwords.new
-    psd.load
-
-    if args.count < 1 then
-      psd.error "Missing username"
-      exit 1
-    end
+    c.verify_arg_count!(args, 2, ['Missing username'])
 
     username = args.shift
     host = args.shift
     host = $cfg['net.host'] if host.nil?
 
-    if options.password then
+    psd = MrMurano::Passwords.new
+    psd.load
+    if options.password
       pws = options.password
-    elsif options.from_env then
+    elsif options.from_env
       pws = ENV['MURANO_PASSWORD']
     else
-      pws = ask("Password:  ") { |q| q.echo = "*" }
+      pws = ask('Password:  ') { |q| q.echo = '*' }
     end
-
     psd.set(host, username, pws)
     psd.save
-
   end
 end
 
 command 'password delete' do |c|
-  c.syntax = %{murano password delete <username> [<host>]}
-  c.summary = %{Delete password for username}
+  c.syntax = %(murano password delete <username> [<host>])
+  c.summary = %(Delete password for username)
+  c.description = %(
+Delete password for username.
+  ).strip
+  c.project_not_required = true
+
+  c.option('-y', '--[no-]yes', %(Answer "yes" to all prompts and run non-interactively))
 
   c.action do |args, options|
+    c.verify_arg_count!(args, 2, ['Missing username'])
+
     psd = MrMurano::Passwords.new
     psd.load
 
-    if args.count < 1 then
-      psd.error "Missing username"
-      exit 1
-    end
-
     username = args.shift
     host = args.shift
     host = $cfg['net.host'] if host.nil?
 
+    psd.cmd_confirm_delete!(username, options.yes, 'abort!')
     psd.remove(host, username)
     psd.save
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :