MrMurano 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ed883f1122316d6a5fef1d112d1493f2db527c
-  data.tar.gz: 296deaeb1328e5da115bcfc43b65d53a068e8eb1
+  metadata.gz: 3ac31eaa1f880c2269de0ebf0b44af394c8c7d80
+  data.tar.gz: b060f57b1dc7ec60242408458a4541963a7b061b
 SHA512:
-  metadata.gz: 91a9311aa80db4f70058059aad657d78371ede8e77ae7b5cbb89c777a31e96001232e28012efbd4f107bc2daa8d64fbb3c55a18ed571677dc7d28d2e472f97f4
-  data.tar.gz: d16cb066bc361d0b8f176ff8da3e64406b0e36508c96185ce158610840353b6991c92e978797563f01eefee987266d53e2a22fba7872d14677c6cb2f491dba69
+  metadata.gz: d711b5f10c54a489ffef3cf03584014516be2035db33b92434935ac485d53731faf95a53b20ddd648e7faf37d188b7da1f89563ef452b678ed2d48088f74bbcc
+  data.tar.gz: 79c236e485bf9fccf3c865a0bcfdcec932a1b786830af0e5443e068dada40928415d63d7872f4f20805ccdc7fe7fbdb60b9e2f09103beefa7de7d086e7eba8c7

data/Rakefile

@@ -2,7 +2,6 @@ require "bundler/gem_tasks"
 
 task :default => [:test]
 
-# TODO: figure out better way to test.
 desc "Install gem in user dir"
 task :bob do
     sh %{gem install --user-install pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
@@ -17,6 +16,19 @@ task :echo do
     puts "= #{Bundler::GemHelper.gemspec.version} ="
 end
 
+desc "Push only develop, master, and tags to origin"
+task :gitpush do
+    sh %{git checkout develop}
+    sh %{git push}
+    sh %{git checkout master}
+    sh %{git push}
+    sh %{git push --tags}
+end
+
+#task :gempush do
+#    sh %{gem push pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
+#end
+
 desc "Prints a cmd to test this in another directory"
 task :testwith do
     pwd=Dir.pwd.sub(Dir.home, '~')

data/lib/MrMurano/commands/logs.rb

@@ -18,106 +18,99 @@ command :logs do |c|
 
     lasttime = ""
 
-    sol = MrMurano::Solution.new
-    begin
-      begin
-        ret = sol.get('/logs') # TODO: ('/logs?polling=true') Currently ignored.
-
-        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)
-                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
+    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
 
-              out = line
+        else
+          out << data.to_s
+        end
 
-            elsif line.kind_of?(Hash) then
-              out=""
+      else
+        out << line.to_s
+      end
+      out
+    end
 
-              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)
+    sol = MrMurano::Solution.new
+
+    if options.follow then
+      # open a lasting connection and continueally feed makePretty()
+      begin
+        sol.get('/logs?polling=true') do |request, http|
+          request["Accept-Encoding"] = "None"
+          http.request(request) do |response|
+            remainder=''
+            response.read_body do |chunk|
+              chunk = remainder + chunk unless remainder.empty?
+
+              # 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
               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
+
+              # is there an incomplete one?
+              if chunk.match(/(\{.*$)/m) then
+                remainder = $1
               end
 
             end
+          end
+        end
+      rescue Interrupt => e
+      end
 
-            if curtime > lasttime then
-              lasttime = curtime
-              puts out
-            end
+    else
+      ret = sol.get('/logs')
 
-          end
-        else
-          say_error "Couldn't get logs: #{ret}"
-          break
+      if ret.kind_of?(Hash) and ret.has_key?(:items) then
+        ret[:items].reverse.each do |line|
+          puts makePretty(line, options)
         end
+      else
+        say_error "Couldn't get logs: #{ret}"
+        break
+      end
 
-        sleep(options.pollrate) if options.follow
-      end while options.follow
-    rescue Interrupt => e
     end
-
   end
 end
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/http.rb

@@ -56,12 +56,11 @@ module MrMurano
       request
     end
 
-    def tryToPrettyJSON(data)
+    def isJSON(data)
       begin
-        ret = JSON.parse(data, json_opts)
-        return JSON.pretty_generate(ret)
+        return true, JSON.parse(data, json_opts)
       rescue
-        return data
+        return false, data
       end
     end
 
@@ -76,7 +75,19 @@ module MrMurano
         puts "Got #{response.code} #{response.message}"
         response.each_capitalized{|k,v| puts "< #{k}: #{v}"}
       end
-      say_error "Request Failed: #{response.code}: #{tryToPrettyJSON(response.body)}"
+      isj, jsn = isJSON(response.body)
+      resp = "Request Failed: #{response.code}: "
+      if isj then
+        if $cfg['tool.fullerror'] then
+          resp << JSON.pretty_generate(jsn)
+        else
+          resp << "[#{jsn[:statusCode]}] " if jsn.has_key? :statusCode
+          resp << jsn[:message] if jsn.has_key? :message
+        end
+      else
+        resp << jsn
+      end
+      say_error resp
     end
 
     def workit(request, &block)

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.5.4'.freeze
+  VERSION = '1.5.5'.freeze
 end
 

metadata

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