MuranoCLI 3.1.0.beta.2 → 3.1.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95686f2eae5bd71592aa26801013d10f0bd86ab4
-  data.tar.gz: f5945447a99d04c067bfdce969b51a3ac8f47721
+  metadata.gz: 25973070b3866a68896c64e0e6441c7074843861
+  data.tar.gz: ae58ca8833ece3921eb83bf8599af83fe4f1efbe
 SHA512:
-  metadata.gz: 453233bd46640db49c720c9f3da8bc78a328ac366a51e496bae7573a6b53a84c567d886751456f4d4792eed8636b271b6476fc7819e5feff539cb41be14dbf6f
-  data.tar.gz: 46b6e68db8b619c1f23885b7f1448ec531ce18cbde41f6307c56ad940a0eabde16f839d05774cda30997eaa2f2314eb1031b830a75036a25e09fc6c77d23a94e
+  metadata.gz: 43414685ea25b78957e864971c26c238883c59bf857bc06615d0bde21be57c8b40688ba44e1bf837bd4648042f18ccc6c0aa25d160e8f4b0e180a09966b02325
+  data.tar.gz: f7135347312c72ed57d579a53b6580fde26c4954fc570025b8e905b2c0c239a3fea4addbb06f6442ba03d3093d1dcfc52d39abc68027c97d19b686bbcb0bfe27

data/.rubocop.yml

@@ -111,7 +111,7 @@ Style/EmptyMethod:
   Enabled: false
 
 # "The name of this source file (Xxxxxxx.rb) should use snake_case."
-Naming/FileName:
+Style/FileName:
   Exclude:
     - 'Gemfile'
     - 'MuranoCLI.gemspec'

data/MuranoCLI.gemspec

@@ -29,17 +29,8 @@ And so much more.
   ).strip
   s.required_ruby_version = '~> 2.0'
 
-  # FIXME: 2017-05-25: Remove this message eventually.
-  s.post_install_message = %(
-MuranoCLI v3.0 introduces backwards-incompatible changes.
-
-If your business was created with MuranoCLI v2.x, you will
-want to continue using the old gem, which you can run by
-explicitly specifying the version. For instance,
-
-  murano _2.2.4_ --version
-
-)
+  # If you want to print a message on Gem install, use the P.I.M., e.g.,:
+  #   s.post_install_message = %(...)
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/MrMurano/commands/logs.rb

@@ -81,60 +81,60 @@ class LogsCmd
 
   def cmd_add_help(cmd)
     cmd.description = %(
-      Get the logs for a solution.
-
-      Each log record contains a number of fields, including the following.
-
-      Severity
-      ================================================================
-      The severity of the log message, as defined by rsyslog standard.
-
-        ID | Name          | Description
-        -- | ------------- | -----------------------------------------
-        0  | Emergency     | System is unusable
-        1  | Alert         | Action must be taken immediately
-        2  | Critical      | Critical conditions
-        3  | Error         | Error conditions
-        4  | Warning       | Warning conditions
-        5  | Notice        | Normal but significant condition
-        6  | Informational | Informational messages
-        7  | Debug         | Debug-level messages
-
-      Type
-      ================================================================
-      The type (emitter system) of the message.
-
-        Name    | Description
-        ------- | ----------------------------------------------------
-        Script  | Script Engine: When User Lua script calls `print()`
-        Call    | Dispatcher: On service calls from Lua
-        Event   | Dispatcher: On event trigger from services
-        Config  | API: On solution configuration change, or
-                |      used service deprecation warning
-        Service | Services generated & transmitted to Dispatcher
-
-
-      Message
-      ================================================================
-      Message can be up to 64kb containing plain text describing a log
-      of the event.
-
-      Service
-      ================================================================
-      The service via which the event name is coming or the service of
-      which the function is called.
-
-      Event
-      ================================================================
-      Depending on the type:
-
-        Event, Script => Event name
-        Call          => operationId
-
-      Tracking ID
-      ================================================================
-      End to end Murano processing id.
-      Used to group logs together for one endpoint request.
+Get the logs for a solution.
+
+Each log record contains a number of fields, including the following.
+
+Severity
+================================================================
+The severity of the log message, as defined by rsyslog standard.
+
+  ID | Name          | Description
+  -- | ------------- | -----------------------------------------
+  0  | Emergency     | System is unusable
+  1  | Alert         | Action must be taken immediately
+  2  | Critical      | Critical conditions
+  3  | Error         | Error conditions
+  4  | Warning       | Warning conditions
+  5  | Notice        | Normal but significant condition
+  6  | Informational | Informational messages
+  7  | Debug         | Debug-level messages
+
+Type
+================================================================
+The type (emitter system) of the message.
+
+  Name    | Description
+  ------- | ----------------------------------------------------
+  Script  | Script Engine: When User Lua script calls `print()`
+  Call    | Dispatcher: On service calls from Lua
+  Event   | Dispatcher: On event trigger from services
+  Config  | API: On solution configuration change, or
+          |      used service deprecation warning
+  Service | Services generated & transmitted to Dispatcher
+
+
+Message
+================================================================
+Message can be up to 64kb containing plain text describing a log
+of the event.
+
+Service
+================================================================
+The service via which the event name is coming or the service of
+which the function is called.
+
+Event
+================================================================
+Depending on the type:
+
+  Event, Script => Event name
+  Call          => operationId
+
+Tracking ID
+================================================================
+End to end Murano processing id.
+Used to group logs together for one endpoint request.
     ).strip
   end
 
@@ -277,16 +277,15 @@ class LogsCmd
   end
 
   def cmd_add_filter_options(cmd)
-    # Common log fields.
     cmd_add_filter_option_severity(cmd)
     cmd_add_filter_option_type(cmd)
     cmd_add_filter_option_message(cmd)
     cmd_add_filter_option_service(cmd)
     cmd_add_filter_option_event(cmd)
+    # FIXME/2018-01-12: MUR-5446: Backend issue supporting endpoint query.
+    #   cmd_add_filter_option_endpoint(cmd)
     # Skipping: timestamp filter
     # Skipping: tracking_id filter
-    # Type-specific fields in data.
-    cmd_add_filter_option_endpoint(cmd)
     # Skipping: module filter
     # Skipping: elapsed time filter (i.e., could do { elapsed: { $gt: 10 } })
   end
@@ -295,9 +294,9 @@ class LogsCmd
     cmd.option(
       '-l', '--severity [NAME|LEVEL|RANGE[,NAME|LEVEL|RANGE...]]', Array,
       %(
-        Only show log entries of this severity.
-        May be specified by name, value, or range, e.g., WARN, 3, 1-4.
-          #{LOG_SEVERITIES.map.with_index { |s, i| "#{s}(#{i})" }.join(' ')}
+Only show log entries of this severity.
+May be specified by name, value, or range, e.g., WARN, 3, 1-4.
+  #{LOG_SEVERITIES.map.with_index { |s, i| "#{s}(#{i})" }.join(' ')}
       ).strip
     ) do |value|
       @filter_severity.push value
@@ -306,10 +305,10 @@ class LogsCmd
 
   def cmd_add_filter_option_type(cmd)
     emitter_type_help = %(
-      Filter log entries by type (emitter system) of message.
-      EMITTERS is 1 or more comma-separated types:
-        #{LOG_EMITTER_TYPES.map(&:to_s)}
-      Use a "#{INCLUDE_INDICATOR}" or "#{EXCLUDE_INDICATOR}" prefix to include or exclude types, respectively.
+Filter log entries by type (emitter system) of message.
+EMITTERS is 1 or more comma-separated types:
+  #{LOG_EMITTER_TYPES.map(&:to_s)}
+Use a "#{INCLUDE_INDICATOR}" or "#{EXCLUDE_INDICATOR}" prefix to include or exclude types, respectively.
     ).strip
     cmd.option('-T EMITTERS', '--types EMITTERS', Array, emitter_type_help) do |values|
       # This seems a little roundabout, but rb-commander only keeps last value.
@@ -532,7 +531,7 @@ class LogsCmd
     else
       operator = '$nin'
     end
-    query_parts[field] = { "#{operator}" => resolved_terms }
+    query_parts[field] = { operator.to_s => resolved_terms }
   end
 
   def term_indicates_exclude?(term)

data/lib/MrMurano/makePretty.rb

@@ -216,7 +216,6 @@ module MrMurano
     def self.log_pretty_assemble_body(line, options)
       out = ''
       return out if options.one_line
-      @body_prefix = options.indent && '  ' || ''
       out += log_pretty_assemble_message(line, options)
       return out if options.message_only
       out += log_pretty_assemble_data(line, options)
@@ -224,9 +223,9 @@ module MrMurano
       out + log_pretty_assemble_tracking_id(line, options)
     end
 
-    def self.log_pretty_assemble_message(line, _options)
+    def self.log_pretty_assemble_message(line, options)
       return '' unless line.key?(:message) && !line[:message].to_s.empty?
-      @body_prefix + line[:message] + "\n"
+      body_prefix(options) + line[:message] + "\n"
     end
 
     def self.log_pretty_assemble_data(line, options)
@@ -244,8 +243,12 @@ module MrMurano
 
     def self.log_pretty_emphasize_entry(entry, hash, options)
       return '' unless hash.key?(entry) && !hash[entry].empty?
-      out = @body_prefix + "---------\n" if options.separators
-      out += @body_prefix + "#{entry}: "
+      out = body_prefix(options) + "---------\n" && options.separators || ''
+      out + log_pretty_entry_value(entry, hash, options)
+    end
+
+    def self.log_pretty_entry_value(entry, hash, options)
+      out = body_prefix(options) + "#{entry}: "
       out += log_pretty_json(hash[entry], options)
       out + "\n"
     end
@@ -257,8 +260,8 @@ module MrMurano
       ]
       data = data.reject { |key, _val| known_keys.include?(key) }
       return '' if data.empty?
-      out = options.separators && (@body_prefix + "---------\n") || ''
-      out + @body_prefix + 'data: ' + log_pretty_json(data, options) + "\n"
+      out = options.separators && (body_prefix(options) + "---------\n") || ''
+      out + body_prefix(options) + 'data: ' + log_pretty_json(data, options) + "\n"
     end
 
     def self.log_pretty_assemble_remainder(line, options)
@@ -274,21 +277,26 @@ module MrMurano
       ]
       line = line.reject { |key, _val| known_keys.include?(key) }
       return '' if line.empty?
-      @body_prefix + log_pretty_json(line, options) + "\n"
+      body_prefix(options) + log_pretty_json(line, options) + "\n"
     end
 
     def self.log_pretty_assemble_tracking_id(line, options)
       return '' unless options.tracking
-      log_pretty_emphasize_entry(:tracking_id, line, options)
+      log_pretty_entry_value(:tracking_id, line, options)
     end
 
     def self.log_pretty_json(hash, options)
       return '' if hash.empty?
-      prefix = @body_prefix.to_s.empty? && '  ' || @body_prefix
+      prefix = body_prefix(options)
+      prefix = prefix.to_s.empty? && '  ' || prefix
       makeJsonPretty(
-        hash, options, indent: prefix, object_nl: "\n" + @body_prefix
+        hash, options, indent: prefix, object_nl: "\n" + prefix
       )
     end
+
+    def self.body_prefix(options)
+      options.indent && '  ' || ''
+    end
   end
 end
 

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.1.0.beta.2'
+  VERSION = '3.1.0.beta.3'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

data/spec/MakePretties_spec.rb

@@ -60,9 +60,7 @@ RSpec.describe MrMurano::Pretties do
              subject: 'websocket_websocket_info',
              data: 'Script Error: ', }
     ldt = Time.at(1_476_386_031).localtime.strftime('%Y-%m-%d %H:%M:%S')
-    local_user = ENV['USER'] || ENV['USERNAME']
-    hour_of_day = (local_user == 'travis') && '19' || '14'
-    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 #{hour_of_day}:13:51\e[0m:\nScript Error: "
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m#{ldt}\e[0m:\nScript Error: "
     @options[:localtime] = true
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     @options[:localtime] = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta.2
+  version: 3.1.0.beta.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified
@@ -640,16 +640,7 @@ homepage: https://github.com/exosite/MuranoCLI
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2+
-
-  MuranoCLI v3.0 introduces backwards-incompatible changes.
-
-  If your business was created with MuranoCLI v2.x, you will
-  want to continue using the old gem, which you can run by
-  explicitly specifying the version. For instance,
-
-    murano _2.2.4_ --version
-
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib