MrMurano 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809f02a0c7b0aec4e0543cc15ed16de379307e42
-  data.tar.gz: 7f1bab55284fc4515a089c534f6874a09d951187
+  metadata.gz: 6a025c5dcac4ea0902844834d8a91fe8ddbef68d
+  data.tar.gz: d409283477356d621bb94b14e1a98a8a7c2ed7f8
 SHA512:
-  metadata.gz: 66eb7efda3dd5293e9525592dfdf103f6e9d81c10dc0341302eba4f0b3218214a3252cdf4408bf325737f5a483a41af9bacbcb73ecedf54eac67c5e775837de4
-  data.tar.gz: 49bd0d228335166260c33d06eb87e86b23cc2d8ffbc8ad8e34ce3c2fe3837252e58873c1c812a8aa673016ca810b04cab2ebbabe8ae38bfe457dace8e6d1faa7
+  metadata.gz: 6f00e7636e61805ebe1f92d36009ce0a4f0f8ccb227f896b4ba2ff11dbecdb5a15ac4106b016ab889fb85b078f4c830247faea69c7cab397a19c1288f189f751
+  data.tar.gz: a8bbe3938bce7d0ae4e876d916916823f793cbeac9dddcf3ba72359bb0d16994d2c3be5051046cb73c717ec23f1c341070266b320b31da8a9d5349f7d8a9f47d

data/lib/MrMurano/commands/logs.rb

@@ -32,10 +32,15 @@ command :logs do |c|
                 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)
+                  begin
+                    js = JSON.parse(m, {:allow_nan=>true,
+                                        :symbolize_names => true,
+                                        :create_additions=>false})
+                    puts MrMurano::Pretties::makePretty(js, options)
+                  rescue
+                    say_error '=== JSON parse error, showing raw instead ==='
+                    puts m
+                  end
                 end
                 '' #remove (we're kinda abusing gsub here.)
               end

data/lib/MrMurano/makePretty.rb

@@ -25,7 +25,7 @@ module MrMurano
           if options.localtime then
             curtime = Time.at(line[:timestamp]).localtime.to_datetime.iso8601(3)
           else
-            curtime = Time.at(line[:timestamp]).to_datetime.iso8601(3)
+            curtime = Time.at(line[:timestamp]).gmtime.to_datetime.iso8601(3)
           end
         else
           curtime = line[:timestamp]

data/lib/MrMurano/version.rb

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

data/spec/MakePretties_spec.rb

@@ -3,7 +3,7 @@ require 'MrMurano/makePretty'
 
 RSpec.describe MrMurano::Pretties do
   before(:example) do
-    @options = {:pretty=>true}
+    @options = {:pretty=>true, :localtime=>false}
     def @options.method_missing(mid)
       self[mid]
     end
@@ -31,7 +31,7 @@ RSpec.describe MrMurano::Pretties 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: "
+    str ="\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13T19:13:51.000+00:00\e[0m:\nScript Error: "
     ret = MrMurano::Pretties::makePretty(data, @options)
     expect(ret).to eq(str)
   end
@@ -40,7 +40,7 @@ RSpec.describe MrMurano::Pretties 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: "
+    str ="\e[31m\e[48;5;231m-- \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13T19:13:51.000+00:00\e[0m:\nScript Error: "
     ret = MrMurano::Pretties::makePretty(data, @options)
     expect(ret).to eq(str)
   end
@@ -57,7 +57,7 @@ RSpec.describe MrMurano::Pretties do
   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: "
+    str ="\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[]\e[0m \e[34m2016-10-13T19:13:51.000+00:00\e[0m:\nScript Error: "
     ret = MrMurano::Pretties::makePretty(data, @options)
     expect(ret).to eq(str)
   end
@@ -66,7 +66,7 @@ RSpec.describe MrMurano::Pretties do
   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"
+    str ="\e[31m\e[48;5;231mDEBUG \e[0m\e[31m\e[48;5;231m[websocket_websocket_info]\e[0m \e[34m2016-10-13T19:13:51.000+00: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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander