MuranoCLI 3.1.0.beta.1 → 3.1.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f37048d0f8e9d3ee210166e7f27240e01a465fb
-  data.tar.gz: 635efd3ce5432c2d7737464c4bd1c7cef8a3e3de
+  metadata.gz: 95686f2eae5bd71592aa26801013d10f0bd86ab4
+  data.tar.gz: f5945447a99d04c067bfdce969b51a3ac8f47721
 SHA512:
-  metadata.gz: 06aa8d4b6de186aeb2de85d7a68a42d733971b56db0153356c1d4b681c0bdb78708549d267db31317b20e968c6b5b6b92f9629bc66c88180852c415cb3da538b
-  data.tar.gz: ae8101e79d98a35c398461b7c8e0f9809c6af891e2d1181e0136b43bf54e48cb7ef0c7d62e4feb3e4b863608768b7d2391d97e2557c6f685d5276c5cf320ac9c
+  metadata.gz: 453233bd46640db49c720c9f3da8bc78a328ac366a51e496bae7573a6b53a84c567d886751456f4d4792eed8636b271b6476fc7819e5feff539cb41be14dbf6f
+  data.tar.gz: 46b6e68db8b619c1f23885b7f1448ec531ce18cbde41f6307c56ad940a0eabde16f839d05774cda30997eaa2f2314eb1031b830a75036a25e09fc6c77d23a94e

data/lib/MrMurano/commands/logs.rb

@@ -148,6 +148,10 @@ class LogsCmd
       View the last 100 product log entries
     ).strip, 'murano logs'
 
+    cmd.example %(
+      View the last 10 product log entries
+    ).strip, 'murano logs --limit 10'
+
     cmd.example %(
       Stream the application logs, including the last 100 records
     ).strip, 'murano logs --follow'
@@ -179,6 +183,34 @@ class LogsCmd
     cmd.example %(
       Stream logs with the severity levels ALERT, CRITICAL, WARNING, and DEBUG
     ).strip, 'murano logs --follow -V -l 1-2,WARN,7'
+
+    cmd.example %(
+      Show only log entries whose message contains the case-insensitive substring, "hello"
+    ).strip, 'murano logs --message hello'
+
+    cmd.example %(
+      Show only log entries whose message contains the case-sensitive substring, "Hello"
+    ).strip, 'murano logs --message Hello --no-insensitive'
+
+    cmd.example %(
+      Display logs using a custom timestamp format (see `man strftime` for format options)
+    ).strip, %(murano logs --sprintf '%m/%d/%Y %Hh %Mm %Ss')
+
+    cmd.example %(
+      Stream logs using compact format, using one line per log entry
+    ).strip, 'murano logs --follow --one-line'
+
+    cmd.example %(
+      Stream logs using two lines per log entry (1 header line and 1 message line)
+    ).strip, 'murano logs --follow --message-only'
+
+    cmd.example %(
+      Format log entries as JSON (useful if you want to pipe the results, e.g., to `jq`)
+    ).strip, 'murano logs --json'
+
+    cmd.example %(
+      Format log entries as YAML
+    ).strip, 'murano logs --yaml'
   end
 
   def cmd_add_logs_options(cmd)
@@ -418,7 +450,7 @@ class LogsCmd
         end
       end
     end
-    query_parts['severity'] = { '$in': indices }
+    query_parts['severity'] = { '$in' => indices }
   end
 
   def assemble_query_types_array(query_parts)
@@ -500,7 +532,7 @@ class LogsCmd
     else
       operator = '$nin'
     end
-    query_parts[field] = { "#{operator}": resolved_terms }
+    query_parts[field] = { "#{operator}" => resolved_terms }
   end
 
   def term_indicates_exclude?(term)

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

data/spec/MakePretties_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe MrMurano::Pretties do
     data = { type: 'debug', timestamp: 1_476_386_031,
              subject: 'websocket_websocket_info',
              data: 'Script Error: ', }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -50,7 +50,7 @@ RSpec.describe MrMurano::Pretties do
     data = { timestamp: 1_476_386_031,
              subject: 'websocket_websocket_info',
              data: 'Script Error: ', }
-    str = "\e[31m\e[48;5;231m-- \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
+    str = "\e[36m-- \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -60,7 +60,9 @@ 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')
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m#{ldt}\e[0m:\nScript Error: "
+    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: "
     @options[:localtime] = true
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     @options[:localtime] = false
@@ -71,7 +73,7 @@ RSpec.describe MrMurano::Pretties do
     data = { type: 'debug',
              subject: 'websocket_websocket_info',
              data: 'Script Error: ', }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m<no timestamp>\e[0m:\nScript Error: "
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m<no timestamp>\e[0m:\nScript Error: "
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -79,7 +81,7 @@ RSpec.describe MrMurano::Pretties do
   it 'makes it pretty; missing subject' do
     data = { type: 'debug', timestamp: 1_476_386_031,
              data: 'Script Error: ', }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
+    str = "\e[36mDEBUG \e[0m\e[36m[]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\nScript Error: "
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -87,7 +89,7 @@ RSpec.describe MrMurano::Pretties do
   it 'makes it pretty; missing data' do
     data = { type: 'debug', timestamp: 1_476_386_031,
              subject: 'websocket_websocket_info', }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n\e[35m{\e[0m\n\e[35m}\e[0m"
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n\e[35m{\e[0m\n\e[35m}\e[0m"
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -96,7 +98,7 @@ RSpec.describe MrMurano::Pretties do
     data = { type: 'debug', timestamp: 'bob',
              subject: 'websocket_websocket_info',
              data: 'Script Error: ', }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34mbob\e[0m:\nScript Error: "
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34mbob\e[0m:\nScript Error: "
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -107,7 +109,7 @@ RSpec.describe MrMurano::Pretties do
              data: {
                random: 'junk',
              }, }
-    str = "\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n\e[35m{\e[0m\n  \"random\": \"junk\"\n\e[35m}\e[0m"
+    str = "\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n\e[35m{\e[0m\n  \"random\": \"junk\"\n\e[35m}\e[0m"
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end
@@ -119,7 +121,7 @@ RSpec.describe MrMurano::Pretties do
                request: { method: 'get' },
                response: { status: 200 },
              }, }
-    str = %(\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n---------\nrequest:\e[35m{\e[0m\n  "method\": \"get\"\n\e[35m}\e[0m\n---------\nresponse:\e[35m{\e[0m\n  \"status\": 200\n\e[35m}\e[0m)
+    str = %(\e[36mDEBUG \e[0m\e[36m[websocket_websocket_info]\e[0m \e[34m2016-10-13 19:13:51\e[0m:\n---------\nrequest:\e[35m{\e[0m\n  \"method\": \"get\"\n\e[35m}\e[0m\n---------\nresponse:\e[35m{\e[0m\n  \"status\": 200\n\e[35m}\e[0m)
     ret = MrMurano::Pretties.MakePrettyLogsV1(data, @options)
     expect(ret).to eq(str)
   end

metadata

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