MrMurano 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: becf766cb2d799e7cd09460a9d1a9b0907074c49
-  data.tar.gz: 007d4c8c73d94cb48a67a048bb8af95bdf3b3914
+  metadata.gz: dbf6540edd42b5a6cac68bb92b3f18f69cf0e90e
+  data.tar.gz: 311ff88459a51b3af06604d89d5c9b58f32b849f
 SHA512:
-  metadata.gz: de75b5e29711198f832c96668eca04c83cee6b284c0287ad05e6b3480158f3cb816d41204d518f29989ffa9ff44cb25f1276377e65114a9cd71acc01a0cdff0b
-  data.tar.gz: 7e73558588ce36f65fd90f524f5e870aeae5c69dc27408a1abd5ab8a266f7a1612c887bcb8902d9ac5b54040f9898bd686cf05c0fff8fd536daa2469b2792356
+  metadata.gz: d01eaf47965c58e51cd502e5a6268d799a5cc96d4eca6bc4930a4dbe555519114ecae0c8483c1876bfbf3bc29cde1ead1cb5a91ccf307d5580c86f0fec7df5ba
+  data.tar.gz: 8b2b715ba8955ad9ea54c02ad9a5acbc8781f7f70129929f7a295d6b17a5bd53893934f190ef79d1803f633e679a2ccfafbd3d201bde83174ff183ec7af60dcf

data/lib/MrMurano/logs.rb

@@ -25,34 +25,72 @@ command :logs do |c|
       if ret.kind_of?(Hash) and ret.has_key?('items') then
         ret['items'].reverse.each do |line|
           curtime = ""
+          if line.kind_of?(String) then
 
-          line.sub!(/^\[[^\]]*\]/) {|m| m.color(:red).background(:aliceblue)}
-          line.sub!(/\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)(?:\+\d\d:\d\d)/) {|m|
-            if options.localtime then
-              m = DateTime.parse(m).to_time.localtime.to_datetime.iso8601(3)
+            line.sub!(/^\[[^\]]*\]/) {|m| m.color(:red).background(:aliceblue)}
+            line.sub!(/\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(?:\.\d+)(?:\+\d\d:\d\d)/) {|m|
+              if options.localtime then
+                m = DateTime.parse(m).to_time.localtime.to_datetime.iso8601(3)
+              end
+              curtime = m
+              m.color(:blue)
+            }
+
+            line.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
+              if options.pretty then
+                js = JSON.parse(m, {:allow_nan=>true, :create_additions=>false})
+                ret = JSON.pretty_generate(js).to_s
+                ret[0] = ret[0].color(:magenta)
+                ret[-1] = ret[-1].color(:magenta)
+                ret
+              else
+                m.sub!(/^{/){|ml| ml.color(:magenta)}
+                m.sub!(/}$/){|ml| ml.color(:magenta)}
+                m
+              end
             end
-            curtime = m
-            m.color(:blue)
-          }
 
-          line.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
+            out = line
+
+          elsif line.kind_of?(Hash) then
+            line = Hash.transform_keys_to_symbols(line)
+            out=""
+
+            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 << ":"
+            out << "\n---------\nrequest:"
             if options.pretty then
-              js = JSON.parse(m, {:allow_nan=>true, :create_additions=>false})
-              ret = JSON.pretty_generate(js).to_s
+              ret = JSON.pretty_generate(line[:data][:request]).to_s
               ret[0] = ret[0].color(:magenta)
               ret[-1] = ret[-1].color(:magenta)
-              ret
+              out << ret
             else
-              m.sub!(/^{/){|ml| ml.color(:magenta)}
-              m.sub!(/}$/){|ml| ml.color(:magenta)}
-              m
+              out << line[:data][:request].to_json
             end
+            out << "\n---------\nresponse:"
+            if options.pretty then
+              ret = JSON.pretty_generate(line[:data][:response]).to_s
+              ret[0] = ret[0].color(:magenta)
+              ret[-1] = ret[-1].color(:magenta)
+              out << ret
+            else
+              out << line[:data][:response].to_json
+            end
+
           end
 
           if curtime > lasttime then
             lasttime = curtime
-            puts line
+            puts out
           end
+
         end
       else
         say_error "Couldn't get logs: #{ret}"

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.2.0'.freeze
+	VERSION = '1.2.1'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander