MrMurano 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba16e5f2344bf987358a56dada5f3e3b8c4cc88
-  data.tar.gz: 6528a533043deae3b1e81493e52fee94772506c1
+  metadata.gz: 02d6e091a69dd09c071539a97a2b9d3755ad9202
+  data.tar.gz: 46f2c3f6836c39648de3c08beef0eaf7c4ceb54b
 SHA512:
-  metadata.gz: c66eccf67ca91de551b15493faa4059c648eb83f60c6b6fc39839a6938ab91a35795e3291c3630df1ac660cb0fcb0ff82b96afcea8353b84ef5a0d1855f1cfbe
-  data.tar.gz: 29c38a617d405be2c6d732e19369c4f46147f98ffa82bc86394ffaabc34693d7696fcd38df139506732829948f9f26c3090650adf381b1fb49f57ccb606fbe34
+  metadata.gz: fa6b24a0ce013cb732a5563efbe86c54bbeb2cb9264cf69cc0dd1a7a43528f3fb22ef005af188ce7400ac2a7be40a9f716d850b395a24076edd550d8faf47d5c
+  data.tar.gz: 2633547b8be35f46ee9239b3092f8d6ebb7242fea6e8c62c53bdf9df93c461b57c22945a8fbabc556d054d64d85208052b8545d8a59bae85c464532e2b9ab389

data/TODO.taskpaper

@@ -2,12 +2,13 @@ Readme:
 	- Add more walk-thrus of common actions. (create new solution, …)
 
 Commands:
-	- Status will show things have changes when they don’t.
+	- Status will show {modules,eventhandlers} have changes when they don’t.
 	- First time run needs to be smoothed out. @done(2016-08-09)
 	- Default for most commands should be -same @done(2016-08-02)
 	- Add Diff Command @done(2016-07-27)
 
 Account:
+	- token is refetched many times. Do this once per run. @done(2016-09-12)
 	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
@@ -31,9 +32,15 @@ CORS:
 	- Get working with sync up/down.
 	- GET&PUT /cors data @done(2016-09-08)
 
+Timeseries:
+	- Add CSV output option. @done(2016-09-09)
+
 Product:
 	- Need to add way to set the product ID on a device eventhandler. @done(2016-08-01)
 
+Service Device:
+	- When listing and bussiness.id is missing, gracefully fall back to --idonly @done(2016-09-12)
+
 Config:
 	- Think about adding dev,staging,prod system; how would that work?
 	Would it work ok to just use the --configfile option?
@@ -43,6 +50,7 @@ Config:
 	- Maybe add dotenv support.
 
 SolutionBase:
+	- Errors from the server should be displayed prettier.
 	- All network traffic is serialized. Make some parallel.
 	- JSON parse should use symbols for keys. @done(2016-09-01)
 	- Add the --curl verbose option. @done(2016-08-12)

data/lib/MrMurano/Account.rb

@@ -35,10 +35,10 @@ module MrMurano
       end
       hd = @data[host]
       if hd.nil? or not hd.kind_of?(Hash) then
-        hd = {user=>pass}
+        @data[host] = {user=>pass}
         return
       end
-      hd[user] = pass
+      @data[host][user] = pass
       return
     end
     def get(host, user)
@@ -51,14 +51,7 @@ module MrMurano
   end
 
   class Account
-    def initialize
-      @json_opts = {
-        :allow_nan => true,
-        :symbolize_names => true,
-        :create_additions => false
-      }
-    end
-
+    include Http
 
     def endPoint(path)
       URI('https://' + $cfg['net.host'] + '/api:1/' + path.to_s)
@@ -86,84 +79,46 @@ module MrMurano
       }
     end
 
+    # Store the token in a class variable so that we only fetch it once per run
+    # session of this tool
+    @@token = nil
     def token
-      if @token.nil? then
-        r = endPoint('token/')
-        Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
-          request = Net::HTTP::Post.new(r)
-          request.content_type = 'application/json'
-          #request.basic_auth(username(), password())
-          request.body = JSON.generate(_loginInfo)
-
-          response = http.request(request)
-          case response
-          when Net::HTTPSuccess
-            token = JSON.parse(response.body, @json_opts)
-            @token = token[:token]
-          else
-            say_error "No token! because: #{response}"
-            @token = nil
-            raise response
-          end
-        end
-      end
-      @token
-    end
+      if @@token.nil? then
+        # Cannot have token call token, so cannot use workit.
+        uri = endPoint('token/')
+        request = Net::HTTP::Post.new(uri)
+        curldebug(request)
 
-    def businesses
-      r = endPoint('user/' + $cfg['user.name'] + '/membership/')
-      Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
-        request = Net::HTTP::Get.new(r)
         request.content_type = 'application/json'
-        request['authorization'] = 'token ' + token
+        #request.basic_auth(username(), password())
+        request.body = JSON.generate(_loginInfo)
 
         response = http.request(request)
         case response
         when Net::HTTPSuccess
-          busy = JSON.parse(response.body, @json_opts)
-          return busy
+          token = JSON.parse(response.body, json_opts)
+          @@token = token[:token]
         else
+          say_error "No token! because: #{response}"
+          @@token = nil
           raise response
         end
       end
+      @@token
+    end
+
+    def businesses
+      get('user/' + $cfg['user.name'] + '/membership/')
     end
 
     def products
       raise "Missing Bussiness ID" if $cfg['business.id'].nil?
-      r = endPoint('business/' + $cfg['business.id'] + '/product/')
-      Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
-        request = Net::HTTP::Get.new(r)
-        request.content_type = 'application/json'
-        request['authorization'] = 'token ' + token
-
-        response = http.request(request)
-        case response
-        when Net::HTTPSuccess
-          busy = JSON.parse(response.body, @json_opts)
-          return busy
-        else
-          raise response
-        end
-      end
+      get('business/' + $cfg['business.id'] + '/product/')
     end
 
     def solutions
       raise "Missing Bussiness ID" if $cfg['business.id'].nil?
-      r = endPoint('business/' + $cfg['business.id'] + '/solution/')
-      Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
-        request = Net::HTTP::Get.new(r)
-        request.content_type = 'application/json'
-        request['authorization'] = 'token ' + token
-
-        response = http.request(request)
-        case response
-        when Net::HTTPSuccess
-          busy = JSON.parse(response.body, @json_opts)
-          return busy
-        else
-          raise response
-        end
-      end
+      get('business/' + $cfg['business.id'] + '/solution/')
     end
 
   end

data/lib/MrMurano/Solution-Endpoint.rb

@@ -20,7 +20,7 @@ module MrMurano
 
     def fetch(id)
       ret = get('/' + id.to_s)
-      aheader = ret[:script].lines.first.chomp
+      aheader = (ret[:script].lines.first or "").chomp
       dheader = /^--#ENDPOINT (?i:#{ret[:method]}) #{ret[:path]}$/
       rheader = %{--#ENDPOINT #{ret[:method]} #{ret[:path]}\n}
       if block_given? then
@@ -86,7 +86,11 @@ module MrMurano
       path = Pathname.new(path) unless path.kind_of? Pathname
       aheader = path.readlines().first
       md = /--#ENDPOINT (\S+) (.*)/.match(aheader)
-      raise "Not an Endpoint: #{path.to_s}" if md.nil?
+      if md.nil? then
+        rp = path.relative_path_from(Pathname.new(Dir.pwd))
+        say_warning "Not an Endpoint: #{rp.to_s}"
+        return nil
+      end
       {:method=>md[1], :path=>md[2]}
     end
 

data/lib/MrMurano/Solution-File.rb

@@ -125,12 +125,13 @@ module MrMurano
       #sha1 = Digest::SHA1.file(path.to_s).hexdigest
       def hexit(str)
         ret=''
+        # TODO: find a faster way to do this.
         str.each_byte{|b| ret << "%02x" % b}
         ret
       end
       sha1 = Digest::SHA1.new
       path.open('rb:ASCII-8BIT') do |io|
-        while chunk = io.read(4096) do
+        while chunk = io.read(1048576) do
           sha1 << hexit(chunk)
         end
       end

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -25,23 +25,23 @@ module MrMurano
       return @scid unless @scid.nil?
       @scid = scid_for_name(@serviceName)
     end
+  end
 
-    #  Below is Device ServiceConfig Specific.  Should it be in its own class?
+  class SC_Device < ServiceConfig
+    def initialize
+      super
+      @serviceName = 'device'
+    end
 
     def assignTriggers(products)
-      scid = scid_for_name('device')
-
       details = fetch(scid)
       products = [products] unless products.kind_of? Array
-      details[:triggers] = {:pid=>products}
+      details[:triggers] = {:pid=>products, :vendor=>products}
 
       put('/'+scid, details)
-
     end
 
     def showTriggers
-      scid = scid_for_name('device')
-
       details = fetch(scid)
 
       return [] if details[:triggers].nil?
@@ -51,46 +51,55 @@ module MrMurano
   end
 end
 
-command :assign do |c|
-  c.syntax = 'mr assign [product]'
-  c.description = 'Assign a product to a eventhandler'
-
-  c.option '--list', %{List assigned products}
+command 'assign list' do |c|
+  c.syntax = 'mr assign list [options]'
+  c.description = 'List the products that are assigned'
   c.option '--idonly', 'Only return the ids'
-
   c.action do |args, options|
-    sol = MrMurano::ServiceConfig.new
+    sol = MrMurano::SC_Device.new
 
-    if options.list then
-      trigs = sol.showTriggers()
-      if options.idonly then
+    trigs = sol.showTriggers()
+    if options.idonly or $cfg['business.id'].nil? then
+      say trigs.join(' ')
+    else
+      acc = MrMurano::Account.new
+      products = acc.products
+      products.select!{|p| trigs.include? p[:modelId] }
+      if products.empty? then
         say trigs.join(' ')
       else
-        acc = MrMurano::Account.new
-        products = acc.products
-        products.select!{|p| trigs.include? p[:pid] }
         busy = products.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
         table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
         say table
       end
-
-    else
-      prname = args.shift
-      if prname.nil? then
-        prid = $cfg['product.id']
-      else
-        acc = MrMurano::Account.new
-        products = acc.products
-        products.select!{|p| p[:label] == prname or p[:pid] == prname }
-        prid = products.map{|p| p[:pid]}
-      end
-      raise "No product ID!" if prid.nil?
-      say "Assigning #{prid} to solution" if $cfg['tool.verbose']
-      sol.assignTriggers(prid) unless $cfg['tool.dry']
     end
+  end
+end
+alias_command :assign, 'assign list'
 
+command 'assign set' do |c|
+  c.syntax = 'mr assign set [product]'
+  c.description = 'Assign a product to a eventhandler'
 
+  c.action do |args, options|
+    sol = MrMurano::SC_Device.new
+
+    prname = args.shift
+    if prname.nil? then
+      prid = $cfg['product.id']
+    else
+      acc = MrMurano::Account.new
+      products = acc.products
+      products.select!{|p|
+        p[:label] == prname or p[:modelId] == prname or p[:pid] == prname
+      }
+      prid = products.map{|p| p[:modelId]}
+    end
+    raise "No product ID!" if prid.nil?
+    say "Assigning #{prid} to solution" if $cfg['tool.verbose']
+    sol.assignTriggers(prid) unless $cfg['tool.dry']
   end
+
 end
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-Services.rb

@@ -153,7 +153,11 @@ module MrMurano
       path = Pathname.new(path) unless path.kind_of? Pathname
       aheader = path.readlines().first
       md = /--#EVENT (\S+) (\S+)/.match(aheader)
-      raise "Not an Event handler: #{path.to_s}" if md.nil?
+      if md.nil? then
+        rp = path.relative_path_from(Pathname.new(Dir.pwd))
+        say_warning "Not an Event handler: #{rp}"
+        return nil
+      end
       {:service=>md[1], :event=>md[2]}
     end
 

data/lib/MrMurano/Solution.rb

@@ -9,110 +9,27 @@ module MrMurano
   class SolutionBase
     # This might also be a valid ProductBase.
     def initialize
-      @token = Account.new.token
-      raise "Not logged in!" if @token.nil?
       @sid = $cfg['solution.id']
       raise "No solution!" if @sid.nil?
       @uriparts = [:solution, @sid]
       @itemkey = :id
       @locationbase = $cfg['location.base']
       @location = nil
-      @json_opts = {
-        :allow_nan => true,
-        :symbolize_names => true,
-        :create_additions => false
-      }
     end
 
+    include Http
+
     def verbose(msg)
       if $cfg['tool.verbose'] then
         say msg
       end
     end
 
-    def curldebug(request)
-      if $cfg['tool.curldebug'] then
-        a = []
-        a << %{curl -s -H 'Authorization: #{request['authorization']}'}
-        a << %{-H 'User-Agent: #{request['User-Agent']}'}
-        a << %{-H 'Content-Type: #{request.content_type}'}
-        a << %{-X #{request.method}}
-        a << %{'#{request.uri.to_s}'}
-        a << %{-d '#{request.body}'} unless request.body.nil?
-        puts a.join(' ')
-      end
-    end
-
     def endPoint(path='')
       parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
       s = parts.map{|v| v.to_s}.join('/')
       URI(s + path.to_s)
     end
-    def http
-      uri = URI('https://' + $cfg['net.host'])
-      if @http.nil? then
-        @http = Net::HTTP.new(uri.host, uri.port)
-        @http.use_ssl = true
-        @http.start
-      end
-      @http
-    end
-
-    def set_req_defaults(request)
-      request.content_type = 'application/json'
-      request['authorization'] = 'token ' + @token
-      request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
-      request
-    end
-
-    def workit(request, &block)
-      set_req_defaults(request)
-      curldebug(request)
-      if block_given? then
-        yield request, http()
-      else
-        response = http().request(request)
-        case response
-        when Net::HTTPSuccess
-          return {} if response.body.nil?
-          begin
-            return JSON.parse(response.body, @json_opts)
-          rescue
-            return response.body
-          end
-        else
-          say_error "got #{response} from #{request} #{request.uri.to_s}"
-          say_error ":: #{response.body}"
-          say_error '==='
-          raise response
-        end
-      end
-    end
-
-    def get(path='', &block)
-      uri = endPoint(path)
-      workit(Net::HTTP::Get.new(uri), &block)
-    end
-
-    def post(path='', body={}, &block)
-      uri = endPoint(path)
-      req = Net::HTTP::Post.new(uri)
-      req.body = JSON.generate(body)
-      workit(req, &block)
-    end
-
-    def put(path='', body={}, &block)
-      uri = endPoint(path)
-      req = Net::HTTP::Put.new(uri)
-      req.body = JSON.generate(body)
-      workit(req, &block)
-    end
-
-    def delete(path='', &block)
-      uri = endPoint(path)
-      workit(Net::HTTP::Delete.new(uri), &block)
-    end
-
     # …
 
     ##
@@ -215,9 +132,11 @@ module MrMurano
         # sometimes this is a name, sometimes it is an item.
         # do I want to keep that? NO.
         name = toRemoteItem(from, path)
-        name[:local_path] = path
-        name
-      end
+        unless name.nil? then
+          name[:local_path] = path
+          name
+        end
+      end.flatten.compact
     end
 
     def synckey(item)

data/lib/MrMurano/http.rb

@@ -0,0 +1,103 @@
+require 'uri'
+require 'net/http'
+require 'json'
+
+module MrMurano
+  module Http
+    def token
+      return @token unless @token.nil?
+      @token = Account.new.token
+      raise "Not logged in!" if @token.nil?
+      @token
+    end
+
+    def json_opts
+      return @json_opts unless @json_opts.nil?
+      @json_opts = {
+        :allow_nan => true,
+        :symbolize_names => true,
+        :create_additions => false
+      }
+    end
+
+    def curldebug(request)
+      if $cfg['tool.curldebug'] then
+        a = []
+        a << %{curl -s -H 'Authorization: #{request['authorization']}'}
+        a << %{-H 'User-Agent: #{request['User-Agent']}'}
+        a << %{-H 'Content-Type: #{request.content_type}'}
+        a << %{-X #{request.method}}
+        a << %{'#{request.uri.to_s}'}
+        a << %{-d '#{request.body}'} unless request.body.nil?
+        puts a.join(' ')
+      end
+    end
+
+    def http
+      uri = URI('https://' + $cfg['net.host'])
+      if @http.nil? then
+        @http = Net::HTTP.new(uri.host, uri.port)
+        @http.use_ssl = true
+        @http.start
+      end
+      @http
+    end
+
+    def set_req_defaults(request)
+      request.content_type = 'application/json'
+      request['authorization'] = 'token ' + token
+      request['User-Agent'] = "MrMurano/#{MrMurano::VERSION}"
+      request
+    end
+
+    def workit(request, &block)
+      set_req_defaults(request)
+      curldebug(request)
+      if block_given? then
+        yield request, http()
+      else
+        response = http().request(request)
+        case response
+        when Net::HTTPSuccess
+          return {} if response.body.nil?
+          begin
+            return JSON.parse(response.body, json_opts)
+          rescue
+            return response.body
+          end
+        else
+          say_error "got #{response} from #{request} #{request.uri.to_s}"
+          say_error ":: #{response.body}"
+          say_error '==='
+          raise response
+        end
+      end
+    end
+
+    def get(path='', &block)
+      uri = endPoint(path)
+      workit(Net::HTTP::Get.new(uri), &block)
+    end
+
+    def post(path='', body={}, &block)
+      uri = endPoint(path)
+      req = Net::HTTP::Post.new(uri)
+      req.body = JSON.generate(body)
+      workit(req, &block)
+    end
+
+    def put(path='', body={}, &block)
+      uri = endPoint(path)
+      req = Net::HTTP::Put.new(uri)
+      req.body = JSON.generate(body)
+      workit(req, &block)
+    end
+
+    def delete(path='', &block)
+      uri = endPoint(path)
+      workit(Net::HTTP::Delete.new(uri), &block)
+    end
+
+  end
+end
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/keystore.rb

@@ -87,6 +87,7 @@ alias_command 'keystore rm', 'keystore delete'
 
 command 'keystore command' do |c|
   c.syntax = %{mr keystore command <key> <command> <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.

data/lib/MrMurano/logs.rb

@@ -55,6 +55,9 @@ command :logs do |c|
           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
@@ -63,24 +66,37 @@ command :logs do |c|
               curtime = Time.at(line[:timestamp]).to_datetime.iso8601(3)
             end
             out << curtime.color(:blue)
-            out << ":"
-            out << "\n---------\nrequest:"
-            if options.pretty then
-              ret = JSON.pretty_generate(line[:data][:request]).to_s
-              ret[0] = ret[0].color(:magenta)
-              ret[-1] = ret[-1].color(:magenta)
-              out << ret
-            else
-              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
+            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[:data][:response].to_json
+              out << line.to_s
             end
 
           end

data/lib/MrMurano/timeseries.rb

@@ -1,3 +1,4 @@
+require 'csv'
 
 module MrMurano
   class Timeseries < ServiceConfig
@@ -25,14 +26,25 @@ command 'timeseries query' do |c|
   c.syntax = %{mr timeseries query <query string>}
   c.description = %{Query the timeseries database}
   c.option '--[no-]json', %{Display results as raw json}
-  #c.option '--csv', %{Display results as csv}
-  # Should get a CSV formatter to make sure cells are properly escapped.
+  c.option '--[no-]csv', %{Display results as CSV}
+
   c.action do |args,options|
-    options.defalts :json=>false
+    options.defalts :json=>false, :csv=>false
     sol = MrMurano::Timeseries.new
     ret = sol.query args.join(' ')
     if options.json then
       puts ret.to_json
+
+    elsif options.csv then
+      (ret[:results] or []).each do |res|
+        (res[:series] or []).each do |ser|
+          cols = ser[:columns] #.map{|h| "#{ser[:name]}.#{h}"}
+          CSV($stdout, :headers=>cols, :write_headers=>true) do |csv|
+            ser[:values].each{|v| csv << v}
+          end
+        end
+      end
+
     else
       (ret[:results] or []).each do |res|
         (res[:series] or []).each do |ser|

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.3.1'.freeze
+	VERSION = '1.3.2'.freeze
 end
 

data/lib/MrMurano.rb

@@ -1,5 +1,6 @@
 require 'MrMurano/version'
 require 'MrMurano/hash.rb'
+require 'MrMurano/http'
 require 'MrMurano/configFile'
 require 'MrMurano/Account'
 require 'MrMurano/Solution'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -179,6 +179,7 @@ files:
 - lib/MrMurano/configFile.rb
 - lib/MrMurano/cors.rb
 - lib/MrMurano/hash.rb
+- lib/MrMurano/http.rb
 - lib/MrMurano/keystore.rb
 - lib/MrMurano/logs.rb
 - lib/MrMurano/shelledCommand.rb