MuranoCLI 3.2.2.beta.1 → 3.2.2.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f04979f9c6537564334a7b27e3bcbcb8170f2d03bbd8671ff2a4cd1ded574e2b
-  data.tar.gz: 1f64fcef2dc2f78af895963e13fd6aa33ddd142ec7f582625325985ad26fc3e7
+  metadata.gz: 12d344b05fe0a8a403f5d166b1ac75b5b111a476111612b4ba45134e307d5df3
+  data.tar.gz: d53c7a3d60aac2088cf707616e0bcfdcef62d96a722bd1f438221b962866f5b8
 SHA512:
-  metadata.gz: 9d0cf2a926767fcba117514e27845ec796be9bae47cd1472d1a9e3774b6664f1121e1415f719de97947d7e5885270c6fd57e53d0667005bed4d7360e723b670a
-  data.tar.gz: 875ef855f9f777409d055518eadae32d25fd1442cd47fe9fd3679e2e3f65d0a095a6047a8d0869f74bf2d91df3b40f0a1b48fc58dd111383b568cefe2a05bc8c
+  metadata.gz: 7e79ea5d8fd3e7cdb3f947f801523d6c8c663ea2d2cd59ac97ef2c328052215660986f0698ba7f1351f039c9af9106a0cf54fa144ad930b8e6da6eb469870e88
+  data.tar.gz: 58c1a02f8df8d9f4d9cf868d70e8280b7f2b763a3627471dcf8d91b6fc28dab7ed7be2f1ed1b190aed20a7a4b0b54a7bacb9f2756988a7b3e27529b23e31b72f

data/HISTORY.md

@@ -2,6 +2,52 @@
 
 ---------------------------------------------------------------------------
 
+## Murano CLI v3.2.2.beta.2 (2018-08-30)
+
+### Improved
+
+- Allow `murano logs` to be run from anywhere (no longer require being run from within a project directory). (Issue: [MUR-6519](https://i.exosite.com/jira/browse/MUR-6519))
+
+- Generally, when no solutions found, exit immediately with nonzero error code. (Issue: [MUR-7081](https://i.exosite.com/jira/browse/MUR-7081))
+
+- For any command, check if optional arguments are specified before the complete command name, and show usage help if so. (Issue: [MUR-7171](https://i.exosite.com/jira/browse/MUR-7171))
+
+### Fixed
+
+- Relax Solution name validation to only worry about length (e.g., allow special characters, such as “™”). (Issue: [MUR-7736](https://i.exosite.com/jira/browse/MUR-7736))
+
+- Fix specifying value to `keystore set` using `STDIN` (e.g., `echo "my value" | murano keystore set my_key`). (Issue: [MUR-4410](https://i.exosite.com/jira/browse/MUR-4410))
+
+- Do not support `hash` or `signature` as valid `device enable` `--auth` types. (Issue: [MUR-7350](https://i.exosite.com/jira/browse/MUR-7350))
+
+- Prefer BizAPI's `sid` over deprecated `api_id` (and do not throw error if ID is missing but warn user instead). (Issue: [MUR-6646](https://i.exosite.com/jira/browse/MUR-6646))
+
+- Print nothing on `progresql "UPDATE..."` rather than crashing (and do same for any PostgreSQL command that generates an empty response). (Issue: [MUR-5133](https://i.exosite.com/jira/browse/MUR-5133))
+
+(Thank you, CLI Hackday Participants!)
+
+---------------------------------------------------------------------------
+
+## Murano CLI v3.2.2.beta.1 (2018-08-24)
+
+### Fixed
+
+- On `murano init`, display Product names in Solution picker rather than Product IDs. (Issue: [MUR-5026](https://i.exosite.com/jira/browse/MUR-5026))
+
+### Developer improvements
+
+- New `rake version` command.
+
+---------------------------------------------------------------------------
+
+## Murano CLI v3.2.1 (2018-08-17)
+
+### New, Improved, Fixed
+
+- See notes below for the intermediate `3.2.1.pre.beta.*` builds.
+
+---------------------------------------------------------------------------
+
 ## Murano CLI v3.2.1.pre.beta.7 (2018-08-09)
 
 ### Improved

data/lib/MrMurano/Gateway.rb

@@ -424,9 +424,7 @@ module MrMurano
 
       DEVICE_AUTH_TYPES = %i[
         certificate
-        hash
         password
-        signature
         token
         csr
       ].freeze

data/lib/MrMurano/ReCommander.rb

@@ -154,6 +154,8 @@ module Commander
       defopts = ($cfg["#{active_command.name}.options"] || '').split
       @args.push(*defopts)
       end_of_options_hack
+      # Check if they are passing an option first
+      must_not_option_passed_first!
       do_help = help_hack
       $cfg.validate_cmd_business_and_project(active_command) unless do_help
       parse_global_options_real
@@ -198,6 +200,13 @@ module Commander
       %w[-v --version].freeze
     end
 
+    def must_not_option_passed_first!
+      return unless @args[0].to_s.start_with? '-'
+      return if %w[-h --help -v --version].include? @args[0]
+      MrMurano::Verbose.warning('Usage: murano <sub-cmd> [<options>]')
+      exit 1
+    end
+
     def fix_args_for_help
       # If `murano --help` is specified, let rb-commander handle it.
       # But if `murano command --help` is specified, don't let cmdr

data/lib/MrMurano/Solution.rb

@@ -86,7 +86,9 @@ module MrMurano
   class Solution < SolutionBase
     def initialize(api_id=nil)
       meta = api_id if api_id.is_a?(Hash)
-      api_id = api_id[:api_id] || api_id[:apiId] if api_id.is_a?(Hash)
+      # TODO: Deprecate usage of solution.apiId from BizAPI; migrate to solution.sid.
+      # Bizapi is currently returning both values set to the same thing.
+      api_id = api_id[:sid] || api_id[:api_id] || api_id[:apiId] if api_id.is_a?(Hash)
       super(api_id)
       set_name
       @meta = {}
@@ -329,9 +331,9 @@ module MrMurano
 
     # FIXME/2017-06-28: Test uppercase characters again.
 
-    # SYNC_ME: See regex in bizapi: lib/api/route/business/solution.js
+    # Validate the solution name field, not the label. This can be anything and is not unique.
     def name_validate_regex
-      /^[a-zA-Z0-9\-\s]{1,63}$/
+      /^.{1,63}$/
     end
 
     def name_validate_help
@@ -349,9 +351,9 @@ The name must contain at least 1 character and no more than 63.
       super
     end
 
-    # SYNC_ME: See regex in bizapi: lib/api/route/business/solution.js
+    # Validate the solution name field, not the label. This can be anything and is not unique.
     def name_validate_regex
-      /^(?![0-9])[a-zA-Z0-9]{2,63}$/
+      /^.{2,63}$/
     end
 
     def name_validate_help

data/lib/MrMurano/SolutionId.rb

@@ -25,7 +25,7 @@ module MrMurano
         # see instead 'application.id' and 'product.id'. We just
         # use 'solution.id' to indicate that the caller specified
         # a solution ID explicitly (i.e., it's not from the $cfg).
-        raise 'Missing api_id or class @solntype!?' if api_id.to_s.empty?
+        warn 'Missing api_id or class @solntype!?' if api_id.to_s.empty?
         @solntype = 'solution.id'
       end
       if api_id

data/lib/MrMurano/commands/keystore.rb

@@ -98,12 +98,28 @@ Set the value of a key in the Keystore.
   c.must_not_be_managed = true
 
   c.action do |args, _options|
-    c.verify_arg_count!(args, nil, ['Missing key', 'Missing value(s)'])
+    c.verify_arg_count!(args, nil, ['Missing key'])
+    value = args[1..-1]
+
+    if !value.nil?
+      value = value.join(' ')
+    else
+      resp = IO.select([$stdin], nil, nil, 0)
+      value = $stdin.read unless resp.nil?
+    end
+    must_have_value!(value)
+
     sol = MrMurano::Keystore.new
-    sol.setkey(args[0], args[1..-1].join(' '))
+    sol.setkey(args[0], value)
   end
 end
 
+def must_have_value!(value)
+  return unless value.nil?
+  MrMurano::Verbose.warning('Missing value')
+  exit 1
+end
+
 command 'keystore delete' do |c|
   c.syntax = %(murano keystore delete <key>)
   c.summary = %(Delete a key from the Keystore)

data/lib/MrMurano/commands/logs.rb

@@ -66,6 +66,7 @@ class LogsCmd
     cmd_add_logs_options(cmd)
     cmd_add_format_options(cmd)
     cmd_add_filter_options(cmd)
+    cmd.project_not_required = true
     cmd.action do |args, options|
       @options = options
       cmd.verify_arg_count!(args)

data/lib/MrMurano/commands/postgresql.rb

@@ -77,6 +77,7 @@ Queries can include $# escapes that are filled from the --param option.
     io = File.open(options.output, 'w') if options.output
 
     def pretty_res(pg, res, ios)
+      return if (res[:rows] || []).empty?
       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]

data/lib/MrMurano/commands/solution.rb

@@ -386,7 +386,7 @@ def cmd_solution_find_and_output(args, options)
 end
 
 def cmd_solution_find_solutions(biz, args, options)
-  must_fetch_solutions!(options, args, biz)
+  must_fetch_solutions!(options, args, biz, exitnonzero: true)
 end
 
 def cmd_solution_output_solutions(biz, solz, options)

data/lib/MrMurano/commands/solution_picker.rb

@@ -91,7 +91,7 @@ end
 #   cmd_add_solntype_pickers, and then in the action block, call
 #   cmd_defaults_solntype_pickers, and then call this method.
 # - Optional restrict to just solutions in the current project.
-def must_fetch_solutions!(options, args=[], biz=nil)
+def must_fetch_solutions!(options, args=[], biz=nil, exitnonzero: false)
   solz = []
 
   if biz.nil?
@@ -185,7 +185,7 @@ def must_fetch_solutions!(options, args=[], biz=nil)
 
   if solz.empty?
     MrMurano::Verbose.error(MSG_SOLUTIONS_NONE_FOUND)
-    exit 0
+    exit exitnonzero && 1 || 0
   end
 
   biz.sort_solutions!(solz)

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.2.2.beta.1'
+  VERSION = '3.2.2.beta.2'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.2.beta.1
+  version: 3.2.2.beta.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified