MuranoCLI 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b5bb74dbabc6127f0fe9e054b41b218b64964d
-  data.tar.gz: c2e188788986effcfd60c676d3950df224ee6935
+  metadata.gz: 9e6cce4e91f5060a854bb7994fe2f5692aa6e9a0
+  data.tar.gz: 24c9ea0a2c2f8f2889740e60aa79fedfe4f4e7eb
 SHA512:
-  metadata.gz: e309c8cb7301754d9e58b8ad007a1d3bef23167dbf9370002a9d76874539da9028199ac004f80b84afa2ccb61026836bdc3368579d4e0a2f1d411fe20a7ab087
-  data.tar.gz: 059dcf12cc97380afa732316ba860dc96f2c814cb85fd30533ecf3d31c781d05cfce8a80b7b6324ffa65272721b0fe0fa01c683aa4771c9d690526054923cb06
+  metadata.gz: 5ef371516ac2ae1a8b308a08b81b0d64f3458d4bb7f2b74ef36b3c4628eba2ba04aa9a3273cbf7ed43e30a77e384c24bb3c1451724576f30c1f6408095c1fb61
+  data.tar.gz: 97c8dfafc76608f74ea8e87ff35f4a5208e74d27766316119c78bb0e4ad5cda0bead9fb23a0155d6b1a725760188aa74d0b258a39da817de5c7a51c694f12baf

data/.rubocop.yml

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # Copyright © 2016-2017 Exosite LLC.
 # License: MIT. See LICENSE.txt.
 #  vim:tw=0:ts=2:sw=2:et:ai
@@ -71,6 +71,14 @@ Metrics/PerceivedComplexity:
 Metrics/LineLength:
   Enabled: false
 
+# "Security/YAMLLoad: Prefer using YAML.safe_load over YAML.load."
+# Rubocop suggests using safe_load.
+#   https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-load
+#   https://ruby-doc.org/stdlib-2.1.0/libdoc/psych/rdoc/Psych.html#method-c-safe_load
+# I think Psych.safe_load was added in Ruby 2.1, so we shouldn't use it. [lb]
+Security/YAMLLoad:
+  Enabled: false
+
 # "Use only ascii symbols in comments."
 Style/AsciiComments:
   Enabled: false
@@ -84,6 +92,12 @@ Style/Documentation:
 Style/ConditionalAssignment:
   EnforcedStyle: assign_inside_condition
 
+# "Use each_with_object instead of inject."
+Style/EachWithObject:
+  Exclude:
+    # Methods copy-pasted from a blog.
+    - 'lib/MrMurano/hash.rb'
+
 # "Put empty method definitions on a single line."
 # You can do, e.g.,
 #     def my_method(some_var) end
@@ -102,6 +116,7 @@ Style/FileName:
     - 'MuranoCLI.gemspec'
     - 'Rakefile'
     - 'lib/MrMurano.rb'
+    - 'lib/MrMurano/makePretty.rb'
     - 'lib/MrMurano/Account.rb'
     - 'lib/MrMurano/Business.rb'
     - 'lib/MrMurano/Config-Migrate.rb'
@@ -120,6 +135,7 @@ Style/FileName:
     - 'lib/MrMurano/Solution.rb'
     - 'lib/MrMurano/SolutionId.rb'
     - 'lib/MrMurano/SubCmdGroupContext.rb'
+    - 'lib/MrMurano/SyncAllowed.rb'
     - 'lib/MrMurano/SyncRoot.rb'
     - 'lib/MrMurano/SyncUpDown.rb'
     - 'lib/MrMurano/Webservice-Cors.rb'
@@ -137,6 +153,23 @@ Style/GlobalVars:
 Style/NumericPredicate:
   Enabled: false
 
+# "Don't use parentheses around the condition of an elsif."
+# This is a matter of taste. Rubocop would have you do, e.g.,
+#   if something
+#      ...
+#   elsif another_thing ||
+#         something_else
+#     ...
+# But if you don't like lining up the condition like that, you
+# might want to try, e.g.,
+#   elsif (
+#     another_thing ||
+#     something_else
+#   )
+#     ...
+Style/ParenthesesAroundCondition:
+  Enabled: false
+
 # "Provide an exception class and message as arguments to raise."
 Style/RaiseArgs:
   EnforcedStyle: compact
@@ -159,6 +192,22 @@ Style/RedundantParentheses:
 #  #EnforcedStyle: percent_r
 #  EnforcedStyle: slashes
 
+# "Use safe navigation (&.) instead of checking if an object exists before
+#  calling the method."
+#
+# - "The Safe Navigation Operator (&.) in Ruby"
+#    http://mitrev.net/ruby/2015/11/13/the-operator-in-ruby/
+#
+# The safe nav op was only added in Ruby 2.3.0, and we support 2.0.
+Style/SafeNavigation:
+  Enabled: false
+
+# "Do not use semicolons to terminate expressions."
+Style/Semicolon:
+  Exclude:
+    # Methods copy-pasted from a blog.
+    - 'lib/MrMurano/hash.rb'
+
 # "Avoid comma after the last parameter of a method call."
 # FIXME/2017-06-30: Is this okay?
 Style/TrailingCommaInArguments:
@@ -170,16 +219,6 @@ Style/TrailingCommaInLiteral:
   # still tell you not to use trailing comma in single-line list.
   EnforcedStyleForMultiline: "consistent_comma"
 
-# "Use safe navigation (&.) instead of checking if an object exists before
-#  calling the method."
-#
-# - "The Safe Navigation Operator (&.) in Ruby"
-#    http://mitrev.net/ruby/2015/11/13/the-operator-in-ruby/
-#
-# The safe nav op was only added in Ruby 2.3.0, and we support 2.0.
-Style/SafeNavigation:
-  Enabled: false
-
 AllCops:
   Include:
     - 'bin/murano'
@@ -203,20 +242,4 @@ AllCops:
     #
     # 2017-08-16: Ug.
     - 'lib/MrMurano/optparse.rb'
-    #
-    # FIXME/2017-07-25: Finish linting these files, and delete from this list.
-    # ✗ 2017-07-31: 943 offenses herein these 26 files.
-    # ✓ 2017-08-16: 420 offenses herein these 15 files.
-    - 'lib/MrMurano/Content.rb'
-    - 'lib/MrMurano/Mock.rb'
-    - 'lib/MrMurano/Setting.rb'
-    - 'lib/MrMurano/SubCmdGroupContext.rb'
-    - 'lib/MrMurano/Webservice-Endpoint.rb'
-    - 'lib/MrMurano/Webservice-File.rb'
-    - 'lib/MrMurano/hash.rb'
-    - 'lib/MrMurano/http.rb'
-    - 'lib/MrMurano/makePretty.rb'
-    - 'lib/MrMurano/commands/business.rb'
-    - 'lib/MrMurano/commands/cors.rb'
-    - 'lib/MrMurano/commands/settings.rb'
 

data/.trustme.vim

@@ -13,12 +13,16 @@
 " since every time we call autocmd, the command is appended,
 " and this file gets sourced every switch to a corresponding
 " project buffer.
-augroup trustme
-  " Remove! all trustme autocommands.
-  autocmd! trustme
-  "autocmd BufWrite *.rb silent !touch TOUCH
-  "autocmd BufWrite <buffer> echom "trustme is hooked!"
-  " MEH/2017-08-02: This won't hook bin/murano.
-  autocmd BufWrite <buffer> silent !./.trustme.sh &
-augroup END
+"augroup trustme
+"  " Remove! all trustme autocommands.
+"  autocmd! trustme
+"  "autocmd BufWrite *.rb silent !touch TOUCH
+"  "autocmd BufWrite <buffer> echom "trustme is hooked!"
+"  " MEH/2017-08-02: This won't hook bin/murano.
+""  autocmd BufWrite <buffer> silent !./.trustme.sh &
+"  autocmd BufWritePost <buffer> silent !./.trustme.sh &
+"augroup END
+
+"echomsg 'Calling trustme.sh'
+silent !./.trustme.sh &
 

data/bin/murano

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# 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.
@@ -8,6 +8,7 @@
 
 require 'commander/import'
 require 'dotenv'
+require 'English'
 require 'highline'
 require 'pathname'
 #require 'pp'
@@ -36,13 +37,13 @@ program :description, %(
   Manage Applications and Products in Exosite's Murano
 ).strip
 
-# The Commander defaults to paged help.
-# The user can disable with --no-page, e.g.,
-#   alias murano='murano --no-page'
-if ARGV.include?('--no-page')
-  program :help_paging, false
-  ARGV.delete('--no-page')
-end
+# If being piped, e.g.,
+#   murano command ... | ...
+# or
+#   VAR=$(murano command ...)
+# etc., then do not do progress.
+# TEST/2017-08-23: Does this work on Windows?
+ARGV.push('--no-progress') unless $stdout.tty?
 
 default_command :help
 
@@ -81,3 +82,17 @@ $cfg.validate_cmd
 $project = MrMurano::ProjectFile.new
 $project.load
 
+# The Commander defaults to paged help.
+# The user can disable with --no-page, e.g.,
+#   alias murano='murano --no-page'
+# We define this here and not in globals.rb because
+#   `murano --help` does not cause globals.rb to be sourced.
+paging = nil
+paging = true if ARGV.include?('--page')
+paging = false if ARGV.include?('--no-page')
+unless paging.nil?
+  program :help_paging, paging
+  $cfg['tool.no-page'] = !paging
+end
+# else, commander defaults to paging.
+

data/docs/basic_example.rst

@@ -247,7 +247,7 @@ just grab a random UUID.
 
     $ SOME_ID=$(uuidgen)
 
-    $ murano device enable ${SOME_ID}
+    $ murano device enable ${SOME_ID} --expire 1
 
     $ murano device list
 

data/docs/completions/murano_completion-bash

@@ -14,6 +14,7 @@ __app_switches=(
     --no-page
     --no-plugins
     --no-progress
+    --no-ascii
     --verbose
     --help
     --version
@@ -78,6 +79,7 @@ function _murano () {
         diff
         domain
         find
+        gwe
         help
         init
         keystore
@@ -164,6 +166,9 @@ function _murano () {
         (find)
           __murano-find "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
+        (gwe)
+          __murano-gwe "$cmd1" "$cmd2" "${used_switches[@]}"
+        ;;
         (help)
           __murano-help "$cmd1" "$cmd2" "${used_switches[@]}"
         ;;
@@ -795,6 +800,7 @@ function __murano-content () {
     case $subcmd1 in
       (delete)
       more_switches=(
+        {--trace}
       )
       ;;
       (download)
@@ -1091,7 +1097,10 @@ function __murano-device () {
       enable
       httpurl
       list
+      lock
       read
+      revoke
+      unlock
       write
     )
   else
@@ -1118,11 +1127,23 @@ function __murano-device () {
         {--trace}
       )
       ;;
+      (lock)
+      more_switches=(
+      )
+      ;;
       (read)
       more_switches=(
         {--trace}
       )
       ;;
+      (revoke)
+      more_switches=(
+      )
+      ;;
+      (unlock)
+      more_switches=(
+      )
+      ;;
       (write)
       more_switches=(
       )
@@ -1450,6 +1471,72 @@ function __murano-find () {
   COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
 }
 
+# Completion for subcommand: "gwe".
+function __murano-gwe () {
+  local subcmd1="$1"
+  local subcmd2="$2"
+  #local subcmdn="$3"
+  local used_switches="${@:3}"
+  local last="${COMP_WORDS[COMP_CWORD]}"
+  local len=$(($COMP_CWORD - 1))
+
+  local -a more_switches
+
+  local -a comp_list
+
+  #>&2 echo -e "\nsubcmd1=$subcmd1 / subcmd2=$subcmd2 / last=$last / len=$len"
+  #>&2 echo "used_switches=$used_switches"
+  #>&2 echo "more_switches=$more_switches"
+
+  # NOTE: Not doing anything special for ${subcmd2}.
+  #       Are there sub-sub-commands we shoud list?
+  if [[ -z ${subcmd1} || ${len} -eq 1 ]]; then
+    comp_list=(
+      app
+    )
+  else
+    case $subcmd1 in
+      (app)
+      more_switches=(
+      )
+      ;;
+    esac
+  fi
+
+  # Add unused application-wide flags.
+  local idx
+  for ((idx = 0; idx < ${#__app_switches[@]}; idx++)); do
+    local switch=${__app_switches[$idx]}
+    if ! contains_element "$switch" "${used_switches[@]}"; then
+      comp_list+=("$switch")
+    fi
+  done
+  # Add unused subcommand flags.
+  for ((idx = 0; idx < ${#more_switches[@]}; idx++)); do
+    local switch=${more_switches[$idx]}
+    comp_list+=("$switch")
+  done
+
+  # If there are only --flags, <TAB> will put the common prefix,
+  # "--", but maybe the user doesn't want to add a flag after all.
+  if [[ -z ${last} ]]; then
+    local flags_only=true
+    for ((idx = 0; idx < ${#comp_list[@]}; idx++)); do
+      local switch=${comp_list[$idx]}
+      if [[ ${switch} != --* ]]; then
+        flags_only=false
+        break
+      fi
+    done
+    if ${flags_only}; then
+      # Use two Unicode en spaces to prevent compgen from prefixing "--".
+      comp_list+=("	 ")
+    fi
+  fi
+
+  COMPREPLY=($(compgen -W '${comp_list[@]}' -- "${last}"))
+}
+
 # Completion for subcommand: "help".
 function __murano-help () {
   local subcmd1="$1"
@@ -2274,6 +2361,7 @@ function __murano-password () {
       ;;
       (delete)
       more_switches=(
+        {--trace}
       )
       ;;
       (list)

data/lib/MrMurano/Account.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.17 /coding: utf-8
+# Last Modified: 2017.08.22 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -129,7 +129,7 @@ Or set your password with `murano password set <username>`.
         error 'Check to see if username and password are correct.'
         unless ENV['MURANO_PASSWORD'].to_s.empty?
           pwd_path = $cfg.file_at('passwords', :user)
-          warning "BEWARE: The password used was from MURANO_PASSWORD, not from #{pwd_path}"
+          warning "NOTE: MURANO_PASSWORD specifies the password; it was not read from #{pwd_path}"
         end
         @token = nil
       end
@@ -158,7 +158,7 @@ Or set your password with `murano password set <username>`.
           (
             match_bid.include?(biz[:bizid]) ||
             match_name.include?(biz[:name]) ||
-            match_termy.any? do |term|
+            match_fuzzy.any? do |term|
               biz[:name] =~ /#{Regexp.escape(term)}/i || biz[:bizid] =~ /#{Regexp.escape(term)}/i
             end
           )

data/lib/MrMurano/Business.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.
@@ -119,7 +119,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
     end
 
     def pretty_name_and_id
-      "‘#{Rainbow(name).underline}’ <#{bid}>"
+      "#{fancy_ticks(Rainbow(name).underline)} <#{bid}>"
     end
 
     # ---------------------------------------------------------------------
@@ -247,7 +247,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
       elsif type == :product
         sol = MrMurano::Product.new(sid)
       else
-        #raise "Unexpected path: Unrecognized type ‘#{type}’"
+        #raise "Unexpected path: Unrecognized type #{fancy_ticks(type)}"
         sol = MrMurano::Solution.new(sid)
       end
       sol.biz = self
@@ -275,7 +275,7 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
           workit_response(response)
         else
           MrMurano::Verbose.error(
-            "Unable to create #{sol.type_name}: ‘#{sol.name}’"
+            "Unable to create #{sol.type_name}: #{fancy_ticks(sol.name)}"
           )
           ok = false
           if response.is_a?(Net::HTTPConflict)
@@ -329,12 +329,12 @@ or set it interactively using \`#{MrMurano::EXE_NAME} init\`
       #  if ret.count > 1
       #    warning("Found more than 1 matching solution: #{ret}")
       #  elsif ret.count.zero?
-      #    error("Unable to verify solution created for ‘#{sol.name}’: #{ret}")
+      #    error("Unable to verify solution created for #{fancy_ticks(sol.name)}: #{ret}")
       #    exit 3
       #  end
       #  sol.meta = ret.first
       #  if sol.sid.to_s.empty? then
-      #    error("New solution created for ‘#{sol.name}’ missing ID?: #{ret}")
+      #    error("New solution created for #{fancy_ticks(sol.name)} missing ID?: #{ret}")
       #    exit 3
       #  end
       #  sol.sid = sid