MuranoCLI 3.0.0 → 3.0.1

data/lib/MrMurano/commands/globals.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -50,7 +50,9 @@ global_option('--exclude-scopes SCOPES', Array, exclude_help) do |value|
 end
 
 # --no-page is handled early on, in bin/murano.
-global_option('--no-page', %(Do not page --help output))
+global_option('--[no-]page', %(Do not page --help output)) do |value|
+  $cfg['tool.no-page'] = !value
+end
 
 global_option('--[no-]plugins', %(Do not load plugins. Good for when one goes bad))
 
@@ -58,6 +60,10 @@ global_option('--[no-]progress', %(Disable spinner and progress message)) do |va
   $cfg['tool.no-progress'] = !value
 end
 
+global_option('--[no-]ascii', %(Use only ASCII in output)) do |value|
+  $cfg['tool.ascii'] = value
+end
+
 global_option('-V', '--verbose', %(Be chatty)) do
   $cfg['tool.verbose'] = true
 end

data/lib/MrMurano/commands/keystore.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -18,9 +18,10 @@ in a solution. This allows for easier debugging, being able to quickly get and
 set data. As well as calling any of the other supported REDIS commands.
   ).strip
   c.project_not_required = true
+  c.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end

data/lib/MrMurano/commands/link.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -13,16 +13,17 @@ require 'MrMurano/SolutionId'
 
 MSG_SERVICE_LINKS_NONE_FOUND = 'No service links found' unless defined? MSG_SERVICE_LINKS_NONE_FOUND
 
-command 'link' do |c|
+command :link do |c|
   c.syntax = %(murano link)
   c.summary = %(Use the link commands to manage solution links)
   c.description = %(
 Use the link commands to manage solution links.
   ).strip
   c.project_not_required = true
+  c.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say(MrMurano::SubCmdGroupHelp.new(c).get_help)
   end
 end
@@ -189,9 +190,8 @@ def link_solutions(sol_a, sol_b, options)
       elsif response.is_a?(Net::HTTPConflict)
         svc_cfg_exists = true
       else
-        MrMurano::Verbose.error(
-          "Unable to link solutions: ‘#{Rainbow(response.message).underline}’"
-        )
+        resp_msg = MrMurano::Verbose.fancy_ticks(Rainbow(response.message).underline)
+        MrMurano::Verbose.error("Unable to link solutions: #{resp_msg}")
         sercfg.showHttpError(request, response)
       end
     end
@@ -226,9 +226,8 @@ def link_solutions(sol_a, sol_b, options)
       elsif response.is_a?(Net::HTTPConflict)
         evt_hlr_exists = true
       else
-        MrMurano::Verbose.error(
-          "Failed to create default event handler: ‘#{Rainbow(response.message).underline}’"
-        )
+        resp_msg = MrMurano::Verbose.fancy_ticks(Rainbow(response.message).underline)
+        MrMurano::Verbose.error("Failed to create default event handler: #{resp_msg}")
         evthlr.showHttpError(request, response)
       end
     end
@@ -264,11 +263,11 @@ def unlink_solutions(sol_a, sol_b)
     sercfg.debug "Deleting #{svc[:service]} : #{svc[:script_key]} : #{svc[:id]}"
     ret = sercfg.remove(svc[:id])
     if !ret.nil?
-      msg = "Unlinked ‘#{svc[:script_key]}’"
+      msg = "Unlinked #{MrMurano::Verbose.fancy_ticks(svc[:script_key])}"
       msg += " from #{sol_a.quoted_name}" unless sol_a.quoted_name.to_s.empty?
       say(msg)
     else
-      sercfg.warning "Failed to unlink ‘#{svc[:id]}’"
+      sercfg.warning "Failed to unlink #{MrMurano::Verbose.fancy_ticks(svc[:id])}"
     end
   end
 
@@ -289,11 +288,12 @@ def unlink_solutions(sol_a, sol_b)
     evthlr.debug "Deleting #{evth[:service]} : #{evth[:alias]} : #{evth[:id]}"
     ret = evthlr.remove(evth[:id])
     if !ret.nil?
-      msg = "Removed ‘#{evth[:alias]}’"
+      msg = "Removed #{MrMurano::Verbose.fancy_ticks(evth[:alias])}"
       msg += " from #{sol_a.quoted_name}" unless sol_a.quoted_name.to_s.empty?
       say(msg)
     else
-      MrMurano::Verbose.warning "Failed to remove handler ‘#{svc[:id]}’"
+      svc_id = MrMurano::Verbose.fancy_ticks(svc[:id])
+      MrMurano::Verbose.warning "Failed to remove handler #{svc_id}"
     end
   end
 end

data/lib/MrMurano/commands/login.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -75,7 +75,8 @@ Essentially, this command is the same as:
     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")
+      cfg_key_q = MrMurano::Verbose.fancy_ticks(cfg_key)
+      MrMurano::Verbose.warning("No config key #{cfg_key_q}: no password to delete")
     end
     cfg_val
   end

data/lib/MrMurano/commands/mock.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -8,16 +8,17 @@
 require 'MrMurano/Mock'
 require 'MrMurano/ReCommander'
 
-command 'mock' do |c|
+command :mock do |c|
   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.subcmdgrouphelp = true
 
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end

data/lib/MrMurano/commands/password.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -14,8 +14,10 @@ command :password do |c|
 Commands for working with usernames and passwords.
   ).strip
   c.project_not_required = true
+  c.subcmdgrouphelp = true
+
   c.action do |_args, _options|
-    ::Commander::UI.enable_paging
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
     say MrMurano::SubCmdGroupHelp.new(c).get_help
   end
 end

data/lib/MrMurano/commands/postgresql.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.16 /coding: utf-8
+# Last Modified: 2017.08.23 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -125,7 +125,9 @@ extra table in your database. (__murano_cli__.migrate_version)
 
   c.action do |args, options|
     c.verify_arg_count!(args, 2, ['Missing direction'])
-    options.default(dir: File.join($cfg['location.base'], ($cfg['postgresql.migrations_dir'] || '')))
+    options.default(
+      dir: File.join($cfg['location.base'], ($cfg['postgresql.migrations_dir'] || '')),
+    )
 
     pg = MrMurano::Postgresql.new
 
@@ -135,7 +137,7 @@ extra table in your database. (__murano_cli__.migrate_version)
     elsif direction =~ /up/i
       direction = 'up'
     else
-      pg.error "Unrecogized direction: ‘#{direction}’"
+      pg.error "Unrecognized direction: #{MrMurano::Verbose.fancy_ticks(direction)}"
       exit 1
     end
 

data/lib/MrMurano/commands/settings.rb

@@ -1,18 +1,40 @@
+# Last Modified: 2017.08.22 /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 'vine'
 require 'yaml'
 require 'MrMurano/hash'
 require 'MrMurano/ReCommander'
 require 'MrMurano/Setting'
 
+command :setting do |c|
+  c.syntax = %(murano setting)
+  c.summary = %(Use the setting commands to manage service settings)
+  c.description = %(
+Use the setting commands to manage service settings.
+  ).strip
+  c.project_not_required = true
+  c.subcmdgrouphelp = true
+
+  c.action do |_args, _options|
+    ::Commander::UI.enable_paging unless $cfg['tool.no-page']
+    say(MrMurano::SubCmdGroupHelp.new(c).get_help)
+  end
+end
+
 command 'setting list' do |c|
-  c.syntax = %{murano setting list}
-  c.summary = %{List which services and settings are avalible.}
-  c.description = %{
-List which services and settings are avalible.
-  }.strip
+  c.syntax = %(murano setting list)
+  c.summary = %(List which services and settings are available)
+  c.description = %(
+List which services and settings are available.
+  ).strip
   c.project_not_required = true
 
-  c.action do |args, options|
+  c.action do |args, _options|
     c.verify_arg_count!(args)
 
     setting = MrMurano::Setting.new
@@ -20,7 +42,7 @@ List which services and settings are avalible.
     ret = setting.list
 
     dd = []
-    ret.each_pair { |k,v| v.each { |s| dd << "#{k}.#{s}" } }
+    ret.each_pair { |k, v| v.each { |s| dd << "#{k}.#{s}" } }
 
     setting.outf dd
   end
@@ -28,13 +50,13 @@ end
 alias_command 'settings list', 'setting list'
 
 command 'setting read' do |c|
-  c.syntax = %{murano setting read <service>.<setting> [<sub-key>]}
-  c.summary = %{Read a setting on a Service}
-  c.description = %{
+  c.syntax = %(murano setting read <service>.<setting> [<sub-key>])
+  c.summary = %(Read a setting on a Service)
+  c.description = %(
 Read a setting on a Service.
-  }.strip
+  ).strip
 
-  c.option '-o', '--output FILE', String, %{File to save output to}
+  c.option '-o', '--output FILE', String, %(File to save output to)
 
   c.action do |args, options|
     c.verify_arg_count!(args, 2, ['Missing <service>.<setting>'])
@@ -49,18 +71,16 @@ Read a setting on a Service.
     ret = ret.access(subkey) unless subkey.nil?
 
     io = nil
-    if options.output then
-      io = File.open(options.output, 'w')
-    end
+    io = File.open(options.output, 'w') if options.output
     setting.outf(ret, io)
     io.close unless io.nil?
   end
 end
 
 command 'setting write' do |c|
-  c.syntax = %{murano setting write <service>.<setting> <sub-key> [<value>...]}
-  c.summary = %{Write a setting on a Service}
-  c.description = %{
+  c.syntax = %(murano setting write <service>.<setting> <sub-key> [<value>...])
+  c.summary = %(Write a setting on a Service)
+  c.description = %(
 Write a setting on a Service, or just part of a setting.
 
 if <value> is omitted on command line, then it is read from STDIN.
@@ -68,25 +88,25 @@ if <value> is omitted on command line, then it is read from STDIN.
 This always does a read-modify-write.
 
 If a sub-key doesn't exist, that entire path will be created as dicts.
-  }.strip
+  ).strip
 
-  c.option '--bool', %{Set Value type to boolean}
-  c.option '--num', %{Set Value type to number}
-  c.option '--string', %{Set Value type to string (this is default)}
-  c.option '--json', %{Value is parsed as JSON}
-  c.option '--array', %{Set Value type to array of strings}
-  c.option '--dict', %{Set Value type to a dictionary of strings}
+  c.option '--bool', %(Set Value type to boolean)
+  c.option '--num', %(Set Value type to number)
+  c.option '--string', %(Set Value type to string (this is default))
+  c.option '--json', %(Value is parsed as JSON)
+  c.option '--array', %(Set Value type to array of strings)
+  c.option '--dict', %(Set Value type to a dictionary of strings)
 
-  c.option '--append', %{When sub-key is an array, append values instead of replacing}
-  c.option '--merge', %{When sub-key is a dict, merge values instead of replacing (child dicts are also merged)}
+  c.option '--append', %(When sub-key is an array, append values instead of replacing)
+  c.option '--merge', %(When sub-key is a dict, merge values instead of replacing (child dicts are also merged))
 
-  c.example %{murano setting write Gateway.protocol devmode --bool yes}, %{}
-  c.example %{murano setting write Gateway.identity_format options.length --int 24}, %{}
+  c.example %(murano setting write Gateway.protocol devmode --bool yes), %()
+  c.example %(murano setting write Gateway.identity_format options.length --int 24), %()
 
-  c.example %{murano setting write Webservice.cors methods --array HEAD GET POST}, %{}
-  c.example %{murano setting write Webservice.cors headers --append --array X-My-Token}, %{}
+  c.example %(murano setting write Webservice.cors methods --array HEAD GET POST), %()
+  c.example %(murano setting write Webservice.cors headers --append --array X-My-Token), %()
 
-  c.example %{murano setting write Webservice.cors --type=json - < }, %{}
+  c.example %(murano setting write Webservice.cors --type=json - < ), %()
 
   c.action do |args, options|
     c.verify_arg_count!(args, nil, ['Missing <service>.<setting>', 'Missing <sub-key>'])
@@ -108,63 +128,61 @@ If a sub-key doesn't exist, that entire path will be created as dicts.
     setting = MrMurano::Setting.new
 
     # If value is '-', pull from $stdin
-    if value.nil? and args.count == 0 then
-      value = $stdin.read
-    end
+    value = $stdin.read if value.nil? && args.count == 0
 
     # Set value to correct type.
-    if options.bool then
-      if value =~ /(yes|y|true|t|1|on)/i then
+    if options.bool
+      if value =~ /(yes|y|true|t|1|on)/i
         value = true
-      elsif value =~ /(no|n|false|f|0|off)/i then
+      elsif value =~ /(no|n|false|f|0|off)/i
         value = false
       else
-        setting.error %{Value "#{value}" is not a bool type!}
+        setting.error %(Value "#{value}" is not a bool type!)
         exit 2
       end
-    elsif options.num then
+    elsif options.num
       begin
         value = Integer(value)
-      rescue Exception => e
+      rescue StandardError => e
         setting.debug e.to_s
         begin
           value = Float(value)
-        rescue Exception => e
-          setting.error %{Value "#{value}" is not a number}
+        rescue StandardError => e
+          setting.error %(Value "#{value}" is not a number)
           setting.debug e.to_s
           exit 2
         end
       end
-    elsif options.json then
+    elsif options.json
       # We use the YAML parser since it will handle most common typos in json and
       # product the intended output.
       begin
         value = YAML.load(value)
-      rescue Exception => e
-        setting.error %{Value not valid JSON (or YAML)}
+      rescue StandardError => e
+        setting.error %(Value not valid JSON (or YAML))
         setting.debug e.to_s
         exit 2
       end
 
-    elsif options.array then
+    elsif options.array
       # take remaining args as an array
       value = args
 
-    elsif options.dict then
+    elsif options.dict
       # take remaining args and convert to hash
       begin
         value = Hash.transform_keys_to_symbols(Hash[*args])
       rescue ArgumentError => e
-        setting.error %{Odd number of arguments to dictionary}
+        setting.error %(Odd number of arguments to dictionary)
         setting.debug e.to_s
         exit 2
-      rescue Exception => e
-        setting.error %{Cannot make dictionary from args}
+      rescue StandardError => e
+        setting.error %(Cannot make dictionary from args)
         setting.debug e.to_s
         exit 2
       end
 
-    elsif options.string then
+    elsif options.string
       value = value.to_s
     else
       # is a string.
@@ -172,32 +190,30 @@ If a sub-key doesn't exist, that entire path will be created as dicts.
     end
 
     ret = setting.read(service, pref)
-    setting.verbose %{Read value: #{ret}}
+    setting.verbose %(Read value: #{ret})
 
     # modify and merge.
-    if options.append then
+    if options.append
       g = ret.access(subkey)
-      unless g.kind_of? Array then
-        setting.error %{Cannot append; "#{subkey}" is not an array.}
+      unless g.is_a? Array
+        setting.error %(Cannot append; "#{subkey}" is not an array.)
         exit 3
       end
       g.push(*value)
 
-    elsif options.merge then
+    elsif options.merge
       g = ret.access(subkey)
-      unless g.kind_of? Hash then
-        setting.error %{Cannot append; "#{subkey}" is not a dictionary.}
+      unless g.is_a? Hash
+        setting.error %(Cannot append; "#{subkey}" is not a dictionary.)
         exit 3
       end
       g.deep_merge!(value)
     else
       ret.set(subkey, value)
     end
-    setting.verbose %{Going to write composed value: #{ret}}
+    setting.verbose %(Going to write composed value: #{ret})
 
     setting.write(service, pref, ret)
   end
 end
 
-#  vim: set ai et sw=2 ts=2 :
-