MrMurano 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2a53f721bb1eb5785155d07e9a0f63afb07b43
-  data.tar.gz: d0deb6961935b84b30766580fb1f3e66dc1439ac
+  metadata.gz: eb66958edb807052d6d7e8ea8673cf1137dea0f7
+  data.tar.gz: 84d50836cafec96fb0bd3c6cc92ecd2c78b92a61
 SHA512:
-  metadata.gz: 3694669cfcc0b7a9588cff924ac3aa9516e5a30194a9884cdb3911617542d813a3015f3b7cc4a72cf08eaf71f6dcd886d63cd8fa029297316627fb2f49aa5d1c
-  data.tar.gz: 0a510f4d9d497057a7b3371be4f792720f4d84eb9ee815be2dfcbcd580329835f4f0461c7bf746785482285514ce31045a414e523575ac66d173b84646a14c75
+  metadata.gz: bafcf0de9d2466d5e6262217317ee7f3824baf012645ed5136388a99e34cd91bf87b73751435c78ef62acbcd656723a7c28988ce23b98dd7e566c0355429f42f
+  data.tar.gz: d09ef03f75a47cb230949635d1562e9ce2e076a2acc617cfd4281ff486146884ea79ad89b63582bca687314623848dc41316be2446e4deb8b69ab338084674a1

data/TODO.taskpaper

@@ -39,6 +39,7 @@ Timeseries:
 
 Product:
 	- Auto convert exoline spec files into murano spec files on upload?
+	- write alias command @done(2016-09-26)
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
 Service Device:

data/lib/MrMurano/commands.rb

@@ -9,6 +9,7 @@ require 'MrMurano/commands/exportImport'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
 require 'MrMurano/commands/productSpec'
+require 'MrMurano/commands/productWrite'
 require 'MrMurano/commands/status'
 require 'MrMurano/commands/sync'
 require 'MrMurano/commands/timeseries'

data/lib/MrMurano/commands/config.rb

@@ -11,7 +11,6 @@ command :config do |c|
   c.example %{See what the current combined config is}, 'mr config --dump'
   c.example %{Query a value}, 'mr config solution.id'
   c.example %{Set a new value; writing to the project config file}, 'mr config solution.id XXXXXXXX'
-  c.example %{Set a new value; writing to the private config file}, 'mr config --private solution.id XXXXXXXX'
   c.example %{Set a new value; writing to the user config file}, 'mr config --user user.name my@email.address'
   c.example %{Unset a value in a configfile. (lower scopes will become visible if set)},
     'mr config diff.cmd --unset'
@@ -20,7 +19,7 @@ command :config do |c|
   c.option '--system', 'Use only the system config file. (/etc/mrmuranorc)'
   c.option '--user', 'Use only the config file in $HOME (.mrmuranorc)'
   c.option '--project', 'Use only the config file in the project (.mrmuranorc)'
-  c.option '--private', 'Use only the private config file in the project (.mrmuranorc.private)'
+  c.option '--env', 'Use only the config file from $MR_CONFIGFILE'
   c.option '--specified', 'Use only the config file from the --config option.'
 
   c.option '--unset', 'Remove key from config file.'
@@ -34,14 +33,14 @@ command :config do |c|
       say_error "Need a config key"
     elsif args.count == 1 and not options.unset then
       options.defaults :system=>false, :user=>false, :project=>false,
-        :specified=>false, :private=>false
+        :specified=>false, :env=>false
 
       # For read, if no scopes, than all. Otherwise just those specified
       scopes = []
       scopes << :system if options.system
       scopes << :user if options.user
       scopes << :project if options.project
-      scopes << :private if options.private
+      scopes << :env if options.env
       scopes << :specified if options.specified
       scopes = MrMurano::Config::CFG_SCOPES if scopes.empty?
 
@@ -49,13 +48,13 @@ command :config do |c|
     else
 
       options.defaults :system=>false, :user=>false, :project=>true,
-        :specified=>false, :private=>false
+        :specified=>false, :env=>false
       # For write, if scope is specified, only write to that scope.
       scope = :project
       scope = :system if options.system
       scope = :user if options.user
       scope = :project if options.project
-      scope = :private if options.private
+      scope = :env if options.env
       scope = :specified if options.specified
 
       args[1] = nil if options.unset

data/lib/MrMurano/commands/keystore.rb

@@ -84,23 +84,51 @@ command 'keystore delete' do |c|
   end
 end
 alias_command 'keystore rm', 'keystore delete'
+alias_command 'keystore del', 'keystore delete'
 
 command 'keystore command' do |c|
-  c.syntax = %{mr keystore command <key> <command> <args...>}
+  c.syntax = %{mr keystore command <command> <key> <args...>}
   c.summary = %{Call some Redis commands in the Keystore}
   c.description = %{Call some Redis commands in the Keystore.
 
 Only a subset of all Redis commands is supported.
 See http://docs.exosite.com/murano/services/keystore/#command for current list.
   }
-  c.example %{mr keystore command mykey lpush myvalue}, %{Push a value onto list}
-  c.example %{mr keystore command mykey lpush A B C}, %{Push three values onto list}
-  c.example %{mr keystore command mykey lrem 0 B}, %{Remove all B values from list}
+  c.example %{mr keystore command lpush mykey myvalue}, %{Push a value onto list}
+  c.example %{mr keystore command lpush mykey A B C}, %{Push three values onto list}
+  c.example %{mr keystore command lrem mykey 0 B}, %{Remove all B values from list}
   c.action do |args,options|
-    sol = MrMurano::Keystore.new
-    pp sol.command(args[0], args[1], args[2..-1])
+    if args.count < 2 then
+      say_error "Not enough params"
+    else
+      sol = MrMurano::Keystore.new
+      ret = sol.command(args[1], args[0], args[2..-1])
+      if ret.has_key?(:value) then
+        puts ret[:value]
+      else
+        say_error "#{ret[:code]}: #{ret.message}"
+        pp ret[:error] if ($cfg['tool.debug'] and ret.has_key?(:error))
+      end
+    end
   end
 end
 alias_command 'keystore cmd', 'keystore command'
 
+# A bunch of common REDIS commands that are suported in Murano
+alias_command 'keystore lpush', 'keystore command', 'lpush'
+alias_command 'keystore lindex', 'keystore command', 'lindex'
+alias_command 'keystore llen', 'keystore command', 'llen'
+alias_command 'keystore linsert', 'keystore command', 'linsert'
+alias_command 'keystore lrange', 'keystore command', 'lrange'
+alias_command 'keystore lrem', 'keystore command', 'lrem'
+alias_command 'keystore lset', 'keystore command', 'lset'
+alias_command 'keystore ltrim', 'keystore command', 'ltrim'
+alias_command 'keystore rpop', 'keystore command', 'rpop'
+alias_command 'keystore rpush', 'keystore command', 'rpush'
+alias_command 'keystore sadd', 'keystore command', 'sadd'
+alias_command 'keystore srem', 'keystore command', 'srem'
+alias_command 'keystore scard', 'keystore command', 'scard'
+alias_command 'keystore smembers', 'keystore command', 'smembers'
+alias_command 'keystore spop', 'keystore command', 'spop'
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/logs.rb

@@ -20,100 +20,103 @@ command :logs do |c|
 
     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 = ""
-          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
-
-            out = line
-
-          elsif line.kind_of?(Hash) then
-            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]
+      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)
+              }
 
-              if data.kind_of?(Hash) and data.has_key?(:request) and data.has_key?(:response) then
-                out << "---------\nrequest:"
+              line.gsub!(/\{(?>[^}{]+|\g<0>)*\}/m) do |m|
                 if options.pretty then
-                  ret = JSON.pretty_generate(data[:request]).to_s
+                  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)
-                  out << ret
+                  ret
                 else
-                  out << data[:request].to_json
+                  m.sub!(/^{/){|ml| ml.color(:magenta)}
+                  m.sub!(/}$/){|ml| ml.color(:magenta)}
+                  m
                 end
+              end
+
+              out = line
+
+            elsif line.kind_of?(Hash) then
+              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 << "\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
+                  out << data.to_s
                 end
 
               else
-                out << data.to_s
+                out << line.to_s
               end
 
-            else
-              out << line.to_s
             end
 
-          end
+            if curtime > lasttime then
+              lasttime = curtime
+              puts out
+            end
 
-          if curtime > lasttime then
-            lasttime = curtime
-            puts out
           end
-
+        else
+          say_error "Couldn't get logs: #{ret}"
+          break
         end
-      else
-        say_error "Couldn't get logs: #{ret}"
-        break
-      end
 
-      sleep(options.pollrate) if options.follow
-    end while options.follow
+        sleep(options.pollrate) if options.follow
+      end while options.follow
+    rescue Interrupt => e
+    end
 
   end
 end

data/lib/MrMurano/commands/productWrite.rb

@@ -0,0 +1,25 @@
+require 'MrMurano/Product'
+
+command 'product write' do |c|
+  c.syntax = %{mr product write <sn> <alias> <value> ([<alias> <value>]…)}
+  c.summary = %{Write values into the product}
+
+  c.action do |args,options|
+    sn = args.shift
+    if (args.count % 2) != 0 then
+      say_error "Last alias is missing a value to write."
+    else
+      data = Hash[*args]
+      prd = MrMurano::Product.new
+      ret = prd.write(sn, data)
+      ret.each_pair do |k,v|
+        if v == 'ok' then
+          say "#{k.to_s}: #{v}"
+        else
+          say_error "#{k.to_s}: #{v}"
+        end
+      end
+    end
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/http.rb

@@ -61,7 +61,7 @@ module MrMurano
         ret = JSON.parse(data, json_opts)
         return JSON.pretty_generate(ret)
       rescue
-        return response.body
+        return data
       end
     end
 

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -218,6 +218,7 @@ files:
 - lib/MrMurano/commands/keystore.rb
 - lib/MrMurano/commands/logs.rb
 - lib/MrMurano/commands/productSpec.rb
+- lib/MrMurano/commands/productWrite.rb
 - lib/MrMurano/commands/status.rb
 - lib/MrMurano/commands/sync.rb
 - lib/MrMurano/commands/timeseries.rb