MrMurano 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0642fae83286309c41974774d6ec3fdc7bd974d
-  data.tar.gz: 103ad1f76094b609f67b720fa59c2c61cbea8f38
+  metadata.gz: 809f02a0c7b0aec4e0543cc15ed16de379307e42
+  data.tar.gz: 7f1bab55284fc4515a089c534f6874a09d951187
 SHA512:
-  metadata.gz: 1ae0f3fa923702d749407014c7379e8004789d893a82f2727c9a6e72834fe200036dbbc56bb8efa8f949b08b593d021826cde1085db7d31c536591eefaf4539a
-  data.tar.gz: 753a5a77d087f74d4eaf8680e58d87e2dfdf0b14ecaeed2c1faa01e2053d634f3df94f2742d61f4f192f7b681764f713d4834d4ad19bb8733f484f6802d786a4
+  metadata.gz: 66eb7efda3dd5293e9525592dfdf103f6e9d81c10dc0341302eba4f0b3218214a3252cdf4408bf325737f5a483a41af9bacbcb73ecedf54eac67c5e775837de4
+  data.tar.gz: 49bd0d228335166260c33d06eb87e86b23cc2d8ffbc8ad8e34ce3c2fe3837252e58873c1c812a8aa673016ca810b04cab2ebbabe8ae38bfe457dace8e6d1faa7

data/lib/MrMurano/commands/logs.rb

@@ -1,70 +1,19 @@
-require 'date'
-require 'json'
-require 'rainbow/ext/string'
+require 'MrMurano/Solution'
+require 'MrMurano/makePretty'
 
 command :logs do |c|
   c.syntax = %{mr logs [options]}
   c.description = %{Get the logs for a solution}
   c.option '-f','--follow', %{Follow logs from server}
-  c.option '--pollrate RATE', Integer, %{Seconds to sleep between polls}
   c.option('--[no-]color', %{Toggle colorizing of logs}) {
     Rainbow.enabled = false
   }
   c.option '--[no-]pretty', %{Reformat JSON blobs in logs.}
   c.option '--[no-]localtime', %{Adjust Timestamps to be in local time}
+  c.option '--raw', %{Don't do any formating of the log data}
 
   c.action do |args,options|
-    options.default :pretty=>true, :localtime=>true, :pollrate=>5
-
-    lasttime = ""
-
-    def makePretty(line, options)
-      out=''
-      if line.has_key?(:type) then
-        out << "#{line[:type]} ".upcase.color(:red).background(:aliceblue)
-      end
-      out << "[#{line[:subject]}]".color(:red).background(:aliceblue)
-      out << " "
-      if options.localtime then
-        curtime = Time.at(line[:timestamp]).localtime.to_datetime.iso8601(3)
-      else
-        curtime = Time.at(line[:timestamp]).to_datetime.iso8601(3)
-      end
-      out << curtime.color(:blue)
-      out << ":\n"
-      if line.has_key?(:data) then
-        data = line[:data]
-
-        if data.kind_of?(Hash) and data.has_key?(:request) and data.has_key?(:response) then
-          out << "---------\nrequest:"
-          if options.pretty then
-            ret = JSON.pretty_generate(data[:request]).to_s
-            ret[0] = ret[0].color(:magenta)
-            ret[-1] = ret[-1].color(:magenta)
-            out << ret
-          else
-            out << data[:request].to_json
-          end
-
-          out << "\n---------\nresponse:"
-          if options.pretty then
-            ret = JSON.pretty_generate(data[:response]).to_s
-            ret[0] = ret[0].color(:magenta)
-            ret[-1] = ret[-1].color(:magenta)
-            out << ret
-          else
-            out << data[:response].to_json
-          end
-
-        else
-          out << data.to_s
-        end
-
-      else
-        out << line.to_s
-      end
-      out
-    end
+    options.default :pretty=>true, :localtime=>true, :raw => false
 
     sol = MrMurano::Solution.new
 
@@ -80,11 +29,15 @@ command :logs do |c|
 
               # for all complete JSON blobs, make them pretty.
               chunk.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
-                js = JSON.parse(m, {:allow_nan=>true,
-                                    :symbolize_names => true,
-                                    :create_additions=>false})
-                puts makePretty(js, options)
-                '' #remove
+                if options.raw then
+                  puts m
+                else
+                  js = JSON.parse(m, {:allow_nan=>true,
+                                      :symbolize_names => true,
+                                      :create_additions=>false})
+                  puts MrMurano::Pretties::makePretty(js, options)
+                end
+                '' #remove (we're kinda abusing gsub here.)
               end
 
               # is there an incomplete one?
@@ -95,7 +48,7 @@ command :logs do |c|
             end
           end
         end
-      rescue Interrupt => e
+      rescue Interrupt => _
       end
 
     else
@@ -103,7 +56,11 @@ command :logs do |c|
 
       if ret.kind_of?(Hash) and ret.has_key?(:items) then
         ret[:items].reverse.each do |line|
-          puts makePretty(line, options)
+          if options.raw then
+            puts line
+          else
+            puts MrMurano::Pretties::makePretty(line, options)
+          end
         end
       else
         say_error "Couldn't get logs: #{ret}"

data/lib/MrMurano/makePretty.rb

@@ -0,0 +1,66 @@
+require 'date'
+require 'json'
+require 'rainbow/ext/string'
+
+module MrMurano
+  module Pretties
+    def self.makeJsonPretty(data, options)
+      if options.pretty then
+        ret = JSON.pretty_generate(data).to_s
+        ret[0] = ret[0].color(:magenta)
+        ret[-1] = ret[-1].color(:magenta)
+        ret
+      else
+        data.to_json
+      end
+    end
+
+    def self.makePretty(line, options)
+      out=''
+      out << "#{line[:type] || '--'} ".upcase.color(:red).background(:aliceblue)
+      out << "[#{line[:subject] || ''}]".color(:red).background(:aliceblue)
+      out << " "
+      if line.has_key?(:timestamp) then
+        if line[:timestamp].kind_of? Numeric then
+          if options.localtime then
+            curtime = Time.at(line[:timestamp]).localtime.to_datetime.iso8601(3)
+          else
+            curtime = Time.at(line[:timestamp]).to_datetime.iso8601(3)
+          end
+        else
+          curtime = line[:timestamp]
+        end
+      else
+        curtime = "<no timestamp>"
+      end
+      out << curtime.color(:blue)
+      out << ":\n"
+      if line.has_key?(:data) then
+        data = line[:data]
+
+        if data.kind_of?(Hash) then
+          if data.has_key?(:request) and data.has_key?(:response) then
+            out << "---------\nrequest:"
+            out << makeJsonPretty(data[:request], options)
+
+            out << "\n---------\nresponse:"
+            out << makeJsonPretty(data[:response], options)
+          else
+            out << makeJsonPretty(data, options)
+          end
+        else
+          out << data.to_s
+        end
+
+      else
+        line.delete :type
+        line.delete :timestamp
+        line.delete :subject
+        out << makeJsonPretty(line, options)
+      end
+      out
+    end
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end
 

data/spec/MakePretties_spec.rb

@@ -0,0 +1,83 @@
+require 'MrMurano/version'
+require 'MrMurano/makePretty'
+
+RSpec.describe MrMurano::Pretties do
+  before(:example) do
+    @options = {:pretty=>true}
+    def @options.method_missing(mid)
+      self[mid]
+    end
+  end
+
+  it "makes json pretty with color" do
+    data ={:type=>"debug", :timestamp=>1476386031,
+           :subject=>"websocket_websocket_info",
+           :data=>"Script Error: "}
+    str ="\e[35m{\e[0m\n  \"type\": \"debug\",\n  \"timestamp\": 1476386031,\n  \"subject\": \"websocket_websocket_info\",\n  \"data\": \"Script Error: \"\n\e[35m}\e[0m"
+    ret = MrMurano::Pretties::makeJsonPretty(data, @options)
+    expect(ret).to eq(str)
+  end
+  it "makes json pretty without color" do
+    data ={:type=>"debug", :timestamp=>1476386031,
+           :subject=>"websocket_websocket_info",
+           :data=>"Script Error: "}
+    str ="{\"type\":\"debug\",\"timestamp\":1476386031,\"subject\":\"websocket_websocket_info\",\"data\":\"Script Error: \"}"
+    @options[:pretty] = false
+    ret = MrMurano::Pretties::makeJsonPretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+  it "makes it pretty." do
+    data ={:type=>"debug", :timestamp=>1476386031,
+           :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-13T14:13:51.000-05:00\e[0m:\nScript Error: "
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+  it "makes it pretty; missing type" do
+    data ={:timestamp=>1476386031,
+           :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-13T14:13:51.000-05:00\e[0m:\nScript Error: "
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+  it "makes it pretty; missing timestamp" 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: "
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+  it "makes it pretty; missing subject" do
+    data ={:type=>"debug", :timestamp=>1476386031,
+           :data=>"Script Error: "}
+    str ="\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[]\e[0m \e[34m2016-10-13T14:13:51.000-05:00\e[0m:\nScript Error: "
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+
+  it "makes it pretty; missing data" do
+    data ={:type=>"debug", :timestamp=>1476386031,
+           :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-13T14:13:51.000-05:00\e[0m:\n\e[35m{\e[0m\n\e[35m}\e[0m"
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+
+  it "makes it pretty; NAN timestamp" 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: "
+    ret = MrMurano::Pretties::makePretty(data, @options)
+    expect(ret).to eq(str)
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -231,11 +231,13 @@ files:
 - lib/MrMurano/commands/timeseries.rb
 - lib/MrMurano/hash.rb
 - lib/MrMurano/http.rb
+- lib/MrMurano/makePretty.rb
 - lib/MrMurano/verbosing.rb
 - lib/MrMurano/version.rb
 - spec/Account-Passwords_spec.rb
 - spec/ConfigFile_spec.rb
 - spec/Config_spec.rb
+- spec/MakePretties_spec.rb
 - spec/ProductBase_spec.rb
 - spec/ProductContent_spec.rb
 - spec/Product_spec.rb
@@ -272,6 +274,7 @@ test_files:
 - spec/Account-Passwords_spec.rb
 - spec/ConfigFile_spec.rb
 - spec/Config_spec.rb
+- spec/MakePretties_spec.rb
 - spec/ProductBase_spec.rb
 - spec/ProductContent_spec.rb
 - spec/Product_spec.rb