MrMurano 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5093bd76cafdb8ab726abb77602c2b19b1fb2e
-  data.tar.gz: 763e072b76d582ad97046a89e194e12551f1ce23
+  metadata.gz: becf766cb2d799e7cd09460a9d1a9b0907074c49
+  data.tar.gz: 007d4c8c73d94cb48a67a048bb8af95bdf3b3914
 SHA512:
-  metadata.gz: 09131c8d2d1a5acee4b297f55a90fa3ea2bc284940dd95de6d7c361572a567366625768f4b3b39c9cb15772a42e8a27eeb876a4342e21227bc800bddf557bec5
-  data.tar.gz: 7294edb4f8bd9fe50685d11a1cf51f3670c9dbe49d1109ba60c31c919368375e96827fd886c2b905a916db1756e016c1dcfeaa83654c728f7a3dc00bf59dad41
+  metadata.gz: de75b5e29711198f832c96668eca04c83cee6b284c0287ad05e6b3480158f3cb816d41204d518f29989ffa9ff44cb25f1276377e65114a9cd71acc01a0cdff0b
+  data.tar.gz: 7e73558588ce36f65fd90f524f5e870aeae5c69dc27408a1abd5ab8a266f7a1612c887bcb8902d9ac5b54040f9898bd686cf05c0fff8fd536daa2469b2792356

data/Gemfile

@@ -6,6 +6,7 @@ gem 'commander', '~> 4.4.0'
 gem 'terminal-table', '~> 1.4.5'
 gem 'mime-types', '~> 1.25.1'
 gem 'mime-types-data', '~> 3.2016'
-gem 'http-form_data', '~> 1.0.1'
 gem 'inifile', '~> 3.0'
+gem 'http-form_data', '~> 1.0.1'
+gem 'rainbow', '~> 2.1.0'
 

data/MrMurano.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/tadpol/MrMurano'
   s.summary     = 'Do more from the command line with Murano'
   s.description = %{Do more from the command line with Murano
-  
+
   Push and pull data from Murano.
   Get status on what things have changed.
   See a diff of the changes before you push.
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('mime-types-data', '~> 3.2016')
   s.add_runtime_dependency('inifile', '~> 3.0')
   s.add_runtime_dependency('http-form_data', '~> 1.0.1')
+  s.add_runtime_dependency('rainbow', '~> 2.1.0')
 
   s.add_development_dependency('bundler', '~> 1.7.6')
   s.add_development_dependency('rspec', '~> 3.2')

data/lib/MrMurano.rb

@@ -8,6 +8,7 @@ require 'MrMurano/Solution-File.rb'
 require 'MrMurano/Solution-Services.rb'
 require 'MrMurano/Solution-Users.rb'
 require 'MrMurano/Solution-ServiceConfig.rb'
+require 'MrMurano/logs.rb'
 require 'MrMurano/sync.rb'
 require 'MrMurano/status.rb'
 #require 'MrMurano/shelledCommand'

data/lib/MrMurano/configFile.rb

@@ -98,6 +98,7 @@ module MrMurano
 
     def load_specific(file)
       spc = ConfigFile.new(:specified, Pathname.new(file))
+      spc.load
       @paths.insert(1, spc)
     end
 

data/lib/MrMurano/logs.rb

@@ -0,0 +1,67 @@
+require 'date'
+require 'json'
+require 'rainbow/ext/string'
+
+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.action do |args,options|
+    options.default :pretty=>true, :localtime=>true, :pollrate=>5
+
+    lasttime = ""
+
+    sol = MrMurano::Solution.new
+    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 = ""
+
+          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
+
+          if curtime > lasttime then
+            lasttime = curtime
+            puts line
+          end
+        end
+      else
+        say_error "Couldn't get logs: #{ret}"
+        break
+      end
+
+      sleep(options.pollrate) if options.follow
+    end while options.follow
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -94,6 +94,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +150,8 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: "Do more from the command line with Murano\n  \n  Push and pull data
-  from Murano.\n  Get status on what things have changed.\n  See a diff of the changes
+description: "Do more from the command line with Murano\n\n  Push and pull data from
+  Murano.\n  Get status on what things have changed.\n  See a diff of the changes
   before you push.\n  "
 email:
 - tadpol@tadpol.org
@@ -163,6 +177,7 @@ files:
 - lib/MrMurano/Solution.rb
 - lib/MrMurano/configFile.rb
 - lib/MrMurano/hash.rb
+- lib/MrMurano/logs.rb
 - lib/MrMurano/shelledCommand.rb
 - lib/MrMurano/status.rb
 - lib/MrMurano/sync.rb