MrMurano 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4a5cac4ca6bec3161d9d83abda05976c8fd7a6
-  data.tar.gz: b1c881c673de6875dfe0e0aea2e22a41b9f06803
+  metadata.gz: c1ab13a9e2ec31727024cb8776e466d1764e592f
+  data.tar.gz: 7a1d7d1f1b6d135b89af5053d0277fa2917c62ea
 SHA512:
-  metadata.gz: d988176730a12c3350fe1338e6adfa120d158f44bcf2b8156a6f087bcb90250b376ad70fad26519082076d15cc57d7a357b933a4f846fb54c37f8ade7c513dfc
-  data.tar.gz: f063e60b3f7b2e94ff48fdee1e679d3457dae261989b39ac6b880e595ee43d5cedcde723dcc4b91d7f5e8d6834c423d21ab6fa5ac925d4abb244c24d0d259a93
+  metadata.gz: 8b51b475707e85b63490e8f547674651cd47666ddb1cade28ade86f3b08724dba7a6df65e850975f9a630161cb1bc0b7b3277ea8c2262a8f5f8315b47fb03e1b
+  data.tar.gz: 0c61906ec034c36d5551ac790042e4b3df6127c4f8075e5f9f70167f85eb11f6c6925e89d19497ca2d2186fd1f38d41ab19728b6dd16587efa083cc01bfb3cbe

data/Gemfile

@@ -17,3 +17,7 @@ group :test do
   gem 'webmock', '~> 2.1.0'
 end
 
+group :windows do
+  gem 'ocra', '~> 1.3.6'
+end
+

data/README.markdown

@@ -212,3 +212,12 @@ MrMurano uses git flow for managing branches.
 
 MrMurano also uses [bunder](http://bundler.io).
 
+## Windows
+
+The MrMurano gem will install on Windows.
+
+You can install Ruby on Windows with [RubyInstaller](http://rubyinstaller.org).
+You might run into a [known SSL cert issue](http://guides.rubygems.org/ssl-certificate-update/).
+If so follow the steps there to update the certs.
+
+

data/Rakefile

@@ -25,9 +25,18 @@ task :gitpush do
     sh %{git push --tags}
 end
 
-#task :gempush do
-#    sh %{gem push pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
-#end
+task :gempush do
+    sh %{gem push pkg/MrMurano-#{Bundler::GemHelper.gemspec.version}.gem}
+end
+
+task :gemit do 
+    mrt=Bundler::GemHelper.gemspec.version
+    sh %{git checkout v#{mrt}}
+    Rake::Task[:build].invoke
+    Rake::Task[:bob].invoke
+    Rake::Task[:gempush].invoke
+    sh %{git checkout develop}
+end
 
 desc "Prints a cmd to test this in another directory"
 task :testwith do

data/TODO.taskpaper

@@ -3,7 +3,7 @@ Readme:
 	- Look into using VCR for testing. @pri(low)
 
 Commands:
-	- Init command.
+	- Init command. @done(2016-11-28)
 	- Empty sub-commands should return help. @done(2016-11-21)
 	There are a bunch of empty sub-commands that prefix another layer. Such as
 	assign, content, product, and others.  Those should be impemented as a ‘help’
@@ -23,6 +23,7 @@ Account:
 	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
+	- In fetch(); add content_type to script header if not application/json
 	- Add support for multiple endpoints in one file @pri(high) @done(2016-11-18)
 	- Add directory support like in modules @done(2016-07-26)
 
@@ -54,6 +55,7 @@ Timeseries:
 	- Add CSV output option. @done(2016-09-09)
 
 Product:
+	- Add option for progress bar when uploading content files.
 	- Support multiple products.
 	Think about how this would work.  There is the syncing of the resoruces, and then
 	some of the commands that use product.id.
@@ -68,6 +70,9 @@ Service Device:
 Config:
 	- Add config tool.default_sync to set which things sync{up,down} by default
 	It is internally hardcoded to be -s, -a, -m, -e right now.
+	- Store passwords in system Keychain on system that have a Keychain.
+	mac OS does, various Linux desktops have a couple differnet ones.  Not sure about
+	Windows.
 	- Add ENV['MR_CONFIGFILE'] path to file to load like --configfile @done(2016-09-22)
 	- Maybe add dotenv support. @done(2016-09-22)
 	- Think about adding dev,staging,prod system; how would that work? @done(2016-09-16)

data/bin/mr

@@ -8,6 +8,8 @@ require 'pp'
 require 'dotenv'
 Dotenv.load
 
+Signal.trap('INT', 'EXIT') # Don't drop traces on ^C
+
 program :version, MrMurano::VERSION
 program :description, %{Manage a Solution and Product in Exosite's Murano}
 

data/lib/MrMurano/Config.rb

@@ -74,6 +74,7 @@ module MrMurano
       set('tool.verbose', false, :defaults)
       set('tool.debug', false, :defaults)
       set('tool.dry', false, :defaults)
+      set('tool.fullerror', false, :defaults)
       set('tool.outformat', 'best', :defaults)
 
       set('net.host', 'bizapi.hosted.exosite.io', :defaults)

data/lib/MrMurano/Product-1P-Device.rb

@@ -0,0 +1,129 @@
+require 'MrMurano/Product'
+
+module MrMurano
+  class Product1PDevice < ProductBase
+    include ProductOnePlatformRpcShim
+
+    def initialize
+      super
+      @uriparts << :proxy
+      @uriparts << 'onep:v1'
+      @uriparts << :rpc
+      @uriparts << :process
+      @model_rid = nil
+      @sn_rid = nil
+    end
+
+    ## Get the internal protocol identifier for a device
+    # +sn+:: Identifier for a device
+    def sn_rid(sn)
+      return @sn_rid unless @sn_rid.nil?
+      prd = Product.new()
+      found = []
+
+      offset = 0
+      loop do
+        listing = prd.list(offset)
+        break if listing.empty?
+        found = listing.select{|item| item[:sn] == sn}
+        break unless found.empty?
+
+        offset += 50
+      end
+
+      @sn_rid = found.first[:rid]
+      @sn_rid
+    end
+
+    ## Get information about a device
+    # +sn+:: Identifier for a device
+    def info(sn)
+      do_rpc({:id=>1,
+              :procedure=>:info,
+              :arguments=>[sn_rid(sn), {}]
+      }, sn_rid(sn))
+    end
+
+    ## List resources on a device
+    # +sn+:: Identifier for a device
+    def list(sn)
+      data = info(sn)
+      dt = {}
+      data[:aliases].each{|k,v| v.each{|a| dt[a] = k.to_s}}
+      dt
+    end
+
+    def listing(sn)
+      do_rpc({:id=>1,
+              :procedure=>:listing,
+              :arguments=>[sn_rid(sn), [:dataport], {}]
+      }, sn_rid(sn))
+    end
+
+    ## Read the last value for resources on a device
+    # +sn+:: Identifier for a device
+    # +aliases+:: Array of resource names
+    def read(sn, aliases)
+      aliases = [aliases] unless aliases.kind_of? Array
+      calls = aliases.map do |a|
+        {
+         :procedure=>:read,
+         :arguments=>[ {:alias=>a}, {} ]
+        }
+      end
+      do_mrpc(calls, sn_rid(sn)).map do |i|
+        if i.has_key?(:result) and i[:result].count > 0 and i[:result][0].count > 1 then
+          i[:result][0][1]
+        else
+          nil
+        end
+      end
+    end
+
+    ## Get a tree of info for a device and its resources.
+    # +sn+:: Identifier for a device
+    def twee(sn)
+      inf = info(sn)
+
+      aliases = inf[:aliases].keys
+      # information for all
+      info_calls = aliases.map do |rid|
+        {:procedure=>:info, :arguments=>[rid, {}]}
+      end
+
+      limitkeys = [:basic, :description, :usage, :children, :storage]
+
+      isubs = do_mrpc(info_calls, sn_rid(sn))
+      children = isubs.map{|i| i[:result].select{|k,v| limitkeys.include? k} }
+
+      # most current value
+      read_calls = aliases.map do |rid|
+        {:procedure=>:read, :arguments=>[rid, {}]}
+      end
+      ivalues = do_mrpc(read_calls, sn_rid(sn))
+
+      rez = aliases.zip(children, ivalues).map do |d|
+        dinf = d[1]
+        dinf[:rid] = d[0]
+        dinf[:alias] = inf[:aliases][d[0]].first
+
+        iv = d[2]
+        if iv.has_key?(:result) and iv[:result].count > 0 and iv[:result][0].count > 1 then
+          dinf[:value] = iv[:result][0][1]
+        else
+          dinf[:value] = nil
+        end
+
+        dinf
+      end
+
+      inf[:children] = rez
+      inf.select!{|k,v| limitkeys.include? k }
+      inf
+    end
+
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Product-Resources.rb

@@ -9,6 +9,7 @@ module MrMurano
   # Or better stated, that's all okami-shim is.
   class ProductResources < ProductBase
     include SyncUpDown
+    include ProductOnePlatformRpcShim
 
     def initialize
       super
@@ -42,35 +43,6 @@ module MrMurano
       name
     end
 
-    ## The model RID for this product.
-    def model_rid
-      return @model_rid unless @model_rid.nil?
-      prd = Product.new
-      data = prd.info
-      if data.kind_of?(Hash) and data.has_key?(:modelrid) then
-        @model_rid = data[:modelrid]
-      else
-        raise "Bad info; #{data}"
-      end
-      @model_rid
-    end
-
-    ## Do a 1P RPC call
-    #
-    # While this will take an array of calls, don't. Only pass one.
-    def do_rpc(calls)
-      calls = [calls] unless calls.kind_of?(Array)
-      r = post('', {
-        :auth=>{:client_id=>model_rid},
-        :calls=>calls
-      })
-      return r if not r.kind_of?(Array) or r.count < 1
-      r = r[0]
-      return r if not r.kind_of?(Hash) or r[:status] != 'ok'
-      r[:result]
-    end
-    private :do_rpc
-
     ## Get 1P info about the prodcut
     def info
       do_rpc({:id=>1,

data/lib/MrMurano/Product.rb

@@ -29,6 +29,52 @@ module MrMurano
     end
   end
 
+  module ProductOnePlatformRpcShim
+    ## The model RID for this product.
+    def model_rid
+      return @model_rid unless @model_rid.nil?
+      prd = Product.new
+      data = prd.info
+      if data.kind_of?(Hash) and data.has_key?(:modelrid) then
+        @model_rid = data[:modelrid]
+      else
+        raise "Bad info; #{data}"
+      end
+      @model_rid
+    end
+
+    ## Do a 1P RPC call
+    #
+    # While this will take an array of calls, don't. Only pass one.
+    # This only returns the result of the first call. Results from other calls are
+    # dropped.
+    def do_rpc(calls, cid=model_rid)
+      calls = [calls] unless calls.kind_of?(Array)
+      r = post('', {
+        :auth=>{:client_id=>cid},
+        :calls=>calls
+      })
+      return r if not r.kind_of?(Array) or r.count < 1
+      r = r[0]
+      return r if not r.kind_of?(Hash) or r[:status] != 'ok'
+      r[:result]
+    end
+    private :do_rpc
+
+    ## Do many 1P RPC calls
+    def do_mrpc(calls, cid=model_rid)
+      calls = [calls] unless calls.kind_of?(Array)
+      maxid = ((calls.max_by{|c| c[:id] or 0 }[:id]) or 0)
+      calls.map!{|c| c[:id] = (maxid += 1) unless c.has_key?(:id); c}
+      post('', {
+        :auth=>{:client_id=>cid},
+        :calls=>calls
+      })
+    end
+    private :do_mrpc
+
+  end
+
   class Product < ProductBase
     ## Get info about the product
     def info

data/lib/MrMurano/Solution-Endpoint.rb

@@ -25,9 +25,10 @@ module MrMurano
     def fetch(id)
       ret = get('/' + id.to_s)
       ret[:content_type] = 'application/json' if ret[:content_type].empty?
+      # TODO: add content_type to header if not application/json
       aheader = (ret[:script].lines.first or "").chomp
       dheader = /^--#ENDPOINT (?i:#{ret[:method]}) #{ret[:path]}$/
-      rheader = %{--#ENDPOINT #{ret[:method]} #{ret[:path]}\n}
+      rheader = %{--#ENDPOINT #{ret[:method].upcase} #{ret[:path]}\n}
       if block_given? then
         yield rheader unless dheader =~ aheader
         yield ret[:script]

data/lib/MrMurano/commands/config.rb

@@ -32,7 +32,7 @@ command :config do |c|
     elsif args.count == 0 then
       say_error "Need a config key"
     elsif args.count == 1 and not options.unset then
-      options.defaults :system=>false, :user=>false, :project=>false,
+      options.default :system=>false, :user=>false, :project=>false,
         :specified=>false, :env=>false
 
       # For read, if no scopes, than all. Otherwise just those specified
@@ -47,7 +47,7 @@ command :config do |c|
       say $cfg.get(args[0], scopes)
     else
 
-      options.defaults :system=>false, :user=>false, :project=>true,
+      options.default :system=>false, :user=>false, :project=>true,
         :specified=>false, :env=>false
       # For write, if scope is specified, only write to that scope.
       scope = :project

data/lib/MrMurano/commands/content.rb

@@ -75,7 +75,7 @@ command 'content upload' do |c|
   c.option '--meta STRING', %{Add extra meta info to the content item}
 
   c.action do |args, options|
-    options.defaults :meta=>' '
+    options.default :meta=>' '
     prd = MrMurano::ProductContent.new
 
     if args[0].nil? then

data/lib/MrMurano/commands/domain.rb

@@ -4,7 +4,7 @@ command :domain do |c|
   c.summary = %{Print the domain for this solution}
   c.option '--[no-]raw', %{Don't add scheme}
   c.action do |args,options|
-    options.defaults :raw=>true
+    options.default :raw=>true
     sol = MrMurano::Solution.new
     ret = sol.info()
     if options.raw then

data/lib/MrMurano/commands/exportImport.rb

@@ -1,6 +1,9 @@
 require 'pathname'
 require 'json'
+require 'yaml'
 require 'fileutils'
+require 'MrMurano/dir'
+require 'MrMurano/Account'
 
 command 'config export' do |c|
   c.syntax = %{mr config export}
@@ -17,7 +20,7 @@ command 'config export' do |c|
   c.option '--[no-]merge', "Merge endpoints into a single routes.lua file"
 
   c.action do |args, options|
-    options.defaults :merge => true
+    options.default :merge => true
 
     solfile = Pathname.new($cfg['location.base'] + 'Solutionfile.json')
     solsecret = Pathname.new($cfg['location.base'] + '.Solutionfile.secret')
@@ -91,10 +94,17 @@ command 'config import' do |c|
   by the exosite-cli tool.
   }
 
+  c.option '--[no-]move', %{Move files into expected places if needed}
+
   c.action do |args, options|
+    options.default :move=>true
+
     solfile = ($cfg['location.base'] + 'Solutionfile.json')
     solsecret = ($cfg['location.base'] + '.Solutionfile.secret')
 
+    acc = MrMurano::Account.new
+    fuopts = {:noop=>$cfg['tool.dry'], :verbose=>$cfg['tool.verbose']}
+
     if solfile.exist? then
       # Is in JSON, which as a subset of YAML, so use YAML parser
       solfile.open do |io|
@@ -102,6 +112,83 @@ command 'config import' do |c|
         $cfg.set('location.files', sf['assets']) if sf.has_key? 'assets'
         $cfg.set('location.files', sf['file_dir']) if sf.has_key? 'file_dir'
         $cfg.set('files.default_page', sf['default_page']) if sf.has_key? 'default_page'
+
+        # look at :routes/:custom_api if in a subdir, set location.endpoints
+        # Otherwise to move it
+        routes = (sf['custom_api'] or sf['routes'] or '')
+        if routes == '' then
+          acc.verbose "No endpoints to import"
+        elsif File.dirname(routes) == '.' then
+          acc.warning "Routes file #{File.basename(routes)} not in endpoints directory"
+          if options.move then
+            acc.warning "Moving it to #{$cfg['location.endpoints']}"
+            FileUtils.mkpath($cfg['location.endpoints'], fuopts)
+            FileUtils.mv(routes, File.join($cfg['location.endpoints'], File.basename(routes)), fuopts)
+          end
+        else
+          # Otherwise just use the location they already have
+          routeDir = File.dirname(routes)
+          acc.verbose "For endpoints using #{routeDir}"
+          if $cfg['location.endpoints'] != routeDir then
+            $cfg.set('location.endpoints', routeDir)
+          end
+        end
+
+        # if has :cors, export it
+        if sf.has_key?('cors') then
+          acc.verbose "Exporting CORS to #{$cfg['location.cors']}"
+          File.open($cfg['location.cors'], 'w') do |cio|
+            cio << sf['cors'].to_yaml
+          end
+        end
+
+        def update_or_stop(paths, cfgkey, what, acc=MrMurano::Account.new)
+          crd = Dir.common_root(paths)
+          acc.debug "crd => #{crd}"
+          if crd.empty? then
+            acc.error "#{what.capitalize} in multiple directories! #{crd.join(', ')}"
+            acc.error "Please move them manually into #{$cfg[cfgkey]}"
+            exit(1)
+          else
+            maxd = Dir.max_depth(paths) - crd.count
+            if maxd > 2 then
+              acc.error "Some #{what} are in directories too deep."
+              acc.error "Please move them manually to #{$cfg[cfgkey]}"
+              exit(1)
+            else
+              crd = File.join(crd)
+              acc.verbose "For #{what} using #{crd}"
+              if $cfg[cfgkey] != crd then
+                $cfg.set(cfgkey, crd)
+              end
+            end
+          end
+        end
+
+        # scan modules for common sub-dir. Set if found. Otherwise warn.
+        modules = (sf['modules'] or {})
+        update_or_stop(modules.values, 'location.modules', 'modules')
+
+        # scan eventhandlers for common sub-dir. Set if found. Otherwise warn.
+        eventhandlers = (sf['event_handler'] or sf['services'] or {})
+        evd = eventhandlers.values.map{|e| e.values}.flatten
+        update_or_stop(evd, 'location.eventhandlers', 'eventhandlers')
+
+        # add header to each eventhandler
+        eventhandlers.each do |service, events|
+          events.each do |event, path|
+            # open path, if no header, add it
+            data = IO.readlines(path)
+            dheader = "--#EVENT #{service} #{event}"
+            aheader = (data.first or "").chomp
+            if aheader != dheader then
+              acc.verbose "Adding event header to #{path}"
+              data.insert(0, dheader)
+              File.open(path, 'w'){|eio| eio.puts(data)} unless $cfg['tool.dry']
+            end
+          end
+        end
+
       end
     end
 
@@ -133,7 +220,7 @@ command 'config import' do |c|
     end
 
     say "Configuration items have been imported."
-    say "Use `mr syncdown` get get all endpoints, modules, and event handlers"
+    #say "Use `mr syncdown` get get all endpoints, modules, and event handlers"
   end
 
 end

data/lib/MrMurano/commands/init.rb

@@ -0,0 +1,117 @@
+require 'MrMurano/Account'
+
+
+command :init do |c|
+  c.syntax = %{mr init}
+  c.summary = %{The easy way to start a project}
+  c.description = %{}
+
+  c.option '--force', %{Override existing business, solution, or product ids}
+  c.option '--[no-]mkdirs', %{Create default directories}
+
+  c.action do |args, options|
+    options.default :force=>false, :mkdirs=>true
+
+    if not options.force and ($cfg['location.base'] + 'Solutionfile.json').exist? then
+      y=ask("A Solutionfile.json exists, Do you want exit and run `mr config import` instead? [yN]")
+      exit 0 unless y =~ /^n/i
+    end
+
+
+    # If they have never logged in, then asking for the business.id will also ask
+    # for their username and password.
+    acc = MrMurano::Account.new
+
+
+    # 1. Get business id
+    if not options.force and not $cfg['business.id'].nil? then
+      say "Using Business ID already set to #{$cfg['business.id']}"
+    else
+      bizz = acc.businesses
+      if bizz.count == 1 then
+        bizid = bizz.first
+        say "You are only part of one business; using #{bizid[:name]}"
+        $cfg.set('businesses.id', bizid[:bizid], :project)
+
+      else
+        choose do |menu|
+          menu.prompt = "Select which Business to use:"
+          menu.flow = :columns_across
+          bizz.sort{|a,b| a[:name]<=>b[:name]}.each do |b|
+            menu.choice(b[:name]) do
+              $cfg.set('business.id', b[:bizid], :project)
+            end
+          end
+        end
+      end
+    end
+    puts '' # blank line
+
+    # 2. Get Solution id
+    if not options.force and not $cfg['solution.id'].nil? then
+      say "Using Solution ID already set to #{$cfg['solution.id']}"
+    else
+      solz = acc.solutions
+      if solz.count == 1 then
+        sol = solz.first
+        say "You only have one solution; using #{sol[:domain]}"
+        $cfg.set('solution.id', sol[:apiId], :project)
+      else
+        choose do |menu|
+          menu.prompt = "Select which Solution to use:"
+          menu.flow = :columns_across
+          solz.sort{|a,b| a[:domain]<=>b[:domain]}.each do |s|
+            menu.choice(s[:domain].sub(/\..*$/,'')) do
+              $cfg.set('solution.id', s[:apiId], :project)
+            end
+          end
+        end
+      end
+    end
+    puts '' # blank line
+
+    # 3. Get Product id
+    if not options.force and not $cfg['product.id'].nil? then
+      say "Using Product ID already set to #{$cfg['product.id']}"
+    else
+      podz = acc.products
+      if podz.count == 1 then
+        prd = podz.first
+        say "You only have one product; using #{prd[:label]}"
+        $cfg.set('product.id', prd[:modelId], :project)
+      else
+        choose do |menu|
+          menu.prompt = "Select which Product to use:"
+          menu.flow = :columns_across
+          podz.sort{|a,b| a[:label]<=>b[:label]}.each do |p|
+            menu.choice(p[:label]) do
+              $cfg.set('product.id', p[:modelId], :project)
+            end
+          end
+        end
+      end
+    end
+
+
+    puts ''
+    say "Ok, In business ID: #{$cfg['business.id']} using Solution ID: #{$cfg['solution.id']} with Product ID: #{$cfg['product.id']}"
+
+    if options.mkdirs then
+      %w{
+        location.files
+        location.endpoints
+        location.modules
+        location.eventhandlers
+        location.specs
+      }.each do |cfgi|
+        path = $cfg[cfgi]
+        path = Pathname.new(path) unless path.kind_of? Pathname
+        path.mkpath unless path.exist?
+      end
+      say "Default directories created"
+    end
+
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productDevice.rb

@@ -0,0 +1,67 @@
+require 'MrMurano/Product-1P-Device'
+
+command 'product device' do |c|
+  c.syntax = %{mr product device}
+  c.summary = %{Interact with a device in a product}
+  c.description = %{}
+
+  c.action do |a,o|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+command 'product device read' do |c|
+  c.syntax = %{mr product device read <identifier> (<resources>)}
+  c.summary = %{Read recources on a device}
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
+
+  c.action do |args,options|
+    snid = args.shift
+    prd = MrMurano::Product1PDevice.new
+
+    if args.count == 0 then
+      # fetch list and read all
+      args = prd.list(snid).keys
+    end
+
+    io=nil
+    io = File.open(options.output, 'w') if options.output
+    data = prd.read(snid, args)
+    prd.outf(data, io)
+    io.close unless io.nil?
+
+  end
+end
+
+command 'product device twee' do |c|
+  c.syntax = %{mr product device twee <identifier>}
+  c.summary = %{Show info about a device}
+
+
+  c.action do |args,options|
+    options.default :width=>HighLine::SystemExtensions.terminal_size[0]
+    snid = args.shift
+    prd = MrMurano::Product1PDevice.new
+    data = prd.twee(snid)
+
+    io=nil
+    io = File.open(options.output, 'w') if options.output
+    prd.outf(data, io) do |dd,ios|
+      data={}
+      data[:title] = "#{snid} #{dd[:description][:name]} #{dd[:basic][:status]}"
+      data[:headers] = [:Resource, :Format, :Modified, :Value]
+      data[:rows] = dd[:children].map do |child|
+        [ (child[:description][:name] or child[:alias]),
+          child[:description][:format],
+          child[:basic][:modified],
+          (child[:value] or "").to_s[0..22] # TODO adjust based on terminal width
+        ]
+      end
+      prd.tabularize(data, ios)
+    end
+    io.close unless io.nil?
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productWrite.rb

@@ -1,8 +1,8 @@
 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}
+command 'product device write' do |c|
+  c.syntax = %{mr product device write <identifier> <alias> <value> ([<alias> <value>]…)}
+  c.summary = %{Write values into a device}
 
   c.action do |args,options|
     sn = args.shift

data/lib/MrMurano/commands/tsdb.rb

@@ -194,12 +194,30 @@ end
 command 'tsdb list tags' do |c|
   c.syntax = %{mr tsdb list tags [options]}
   c.summary = %{List tags}
+  c.option '--values', %{Also return the known tag values}
 
   c.action do |args, options|
+    options.default :values=>false
+
     sol = MrMurano::ServiceConfigs::Tsdb.new
     ret = sol.listTags
     # TODO: handle looping if :next != nil
-    sol.outf ret[:tags].keys
+
+    if options.values then
+      sol.outf(ret[:tags]) do |dd, ios|
+        data={}
+        data[:headers] = dd.keys
+        data[:rows] = dd.keys.map{|k| dd[k]}
+        len = data[:rows].map{|i| i.length}.max
+        data[:rows].each{|r| r.fill(nil, r.length, len - r.length)}
+        data[:rows] = data[:rows].transpose
+        sol.tabularize(data, ios)
+      end
+    else
+      sol.outf ret[:tags].keys
+    end
+
+
   end
 end
 

data/lib/MrMurano/commands.rb

@@ -5,11 +5,13 @@ require 'MrMurano/commands/content'
 require 'MrMurano/commands/cors'
 require 'MrMurano/commands/domain'
 require 'MrMurano/commands/exportImport'
+require 'MrMurano/commands/init'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
 require 'MrMurano/commands/product'
 require 'MrMurano/commands/productCreate'
 require 'MrMurano/commands/productDelete'
+require 'MrMurano/commands/productDevice'
 require 'MrMurano/commands/productList'
 require 'MrMurano/commands/productSpec'
 require 'MrMurano/commands/productWrite'

data/lib/MrMurano/dir.rb

@@ -0,0 +1,47 @@
+
+## Get the root-most common directories from paths
+def Dir.common_dirs(paths)
+  paths = paths.map do |p|
+    if p.kind_of? Array then
+      p
+    else
+      p.to_s.split(File::SEPARATOR)
+    end
+  end
+
+  paths.map{|p| p.first}.uniq
+end
+
+## How deep is deepest directory path? (not including the file)
+def Dir.max_depth(paths)
+  paths = paths.map do |p|
+    if p.kind_of? Array then
+      p
+    else
+      p.to_s.split(File::SEPARATOR)
+    end
+  end
+
+  paths.map{|p| p.count - 1}.max
+
+end
+
+## Get the deepest common root directory for all paths
+def Dir.common_root(paths, root=[])
+  paths = paths.map do |p|
+    if p.kind_of? Array then
+      p
+    else
+      p.to_s.split(File::SEPARATOR)
+    end
+  end
+
+  base = Dir.common_dirs(paths)
+  if base.count == 1 then
+    return common_root(paths.map{|p| p[1..-1]}, root + base)
+  else
+    return root
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.9.0'.freeze
 end
 

data/lib/MrMurano.rb

@@ -11,6 +11,7 @@ require 'MrMurano/Solution-Services'
 require 'MrMurano/Solution-Users'
 require 'MrMurano/Solution-ServiceConfig'
 require 'MrMurano/Product'
+require 'MrMurano/Product-1P-Device'
 require 'MrMurano/Product-Resources'
 
 require 'MrMurano/commands'

data/spec/ProductResources_spec.rb

@@ -51,66 +51,6 @@ RSpec.describe MrMurano::ProductResources do
     end
   end
 
-  context "do_rpc" do
-    # Note, do_rpc is private.
-    it "Accepts an object" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: [{
-        :id=>1, :status=>"ok", :result=>{}
-      }])
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
-      expect(ret).to eq({})
-    end
-
-    it "Accepts an Array" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: [{:id=>1, :status=>"ok", :result=>{:one=>1}},
-      {:id=>2, :status=>"ok", :result=>{:two=>2}}])
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc([{:id=>1}, {:id=>2}]) }
-      expect(ret).to eq({:one=>1})
-      # yes it only returns first.
-    end
-
-    it "returns res if not Array" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: {:not=>'an array'}.to_json)
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
-      expect(ret).to eq({:not=>'an array'})
-    end
-
-    it "returns res if count less than 1" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: [])
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
-      expect(ret).to eq([])
-    end
-
-    it "returns res[0] if not Hash" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: ["foo"])
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
-      expect(ret).to eq("foo")
-    end
-
-    it "returns res[0] if not status ok" do
-      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
-        to_return(body: [{:id=>1, :status=>'error'}])
-
-      ret = nil
-      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
-      expect(ret).to eq({:id=>1, :status=>'error'})
-    end
-  end
 
   context "queries" do
     it "gets info" do

data/spec/Product_1P_Device_spec.rb

@@ -0,0 +1,136 @@
+require 'MrMurano/version'
+require 'MrMurano/Config'
+require 'MrMurano/Product-1P-Device'
+
+RSpec.describe MrMurano::Product1PDevice do
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['product.id'] = 'XYZ'
+    $cfg['product.spec'] = 'XYZ.yaml'
+
+    @prd = MrMurano::Product1PDevice.new
+    allow(@prd).to receive(:token).and_return("TTTTTTTTTT")
+    allow(@prd).to receive(:sn_rid).and_return("LLLLLLLLLL")
+  end
+
+  it "initializes" do
+    uri = @prd.endPoint('')
+    expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process")
+  end
+
+  it "gets info" do
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+      with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                  :calls=>[{:id=>1,
+                            :procedure=>"info",
+                            :arguments=>["LLLLLLLLLL", {}]} ]}).
+    to_return(body: [{:id=>1, :status=>"ok", :result=>{:comments=>[]}}])
+
+    ret = @prd.info("12")
+    expect(ret).to eq({:comments=>[]})
+  end
+
+  it "lists resources" do
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+      with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                  :calls=>[{:id=>1,
+                            :procedure=>"info",
+                            :arguments=>["LLLLLLLLLL", {}]} ]}).
+    to_return(body: [{:id=>1, :status=>"ok", :result=>{:aliases=>{
+      :s2143rt4regf=>["one"],:njilh32o78rnq=>["two"]}}}])
+
+    ret = @prd.list("12")
+    expect(ret).to eq({"one"=>"s2143rt4regf", "two"=>"njilh32o78rnq"})
+  end
+
+  context "reads resources" do
+    it "single" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                    :calls=>[{:id=>1,
+                              :procedure=>"read",
+                              :arguments=>[{"alias"=>"one"}, {}]} ]}).
+      to_return(body: [{:id=>1, :status=>"ok", :result=>[ [12345678,10] ]}])
+      ret = @prd.read("12", "one")
+      expect(ret).to eq([10])
+    end
+
+    it "multiple" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                    :calls=>[{:id=>1,
+                              :procedure=>"read",
+                              :arguments=>[{"alias"=>"two"}, {}]},
+                             {:id=>2,
+                              :procedure=>"read",
+                              :arguments=>[{"alias"=>"three"}, {}]},
+                             {:id=>3,
+                              :procedure=>"read",
+                              :arguments=>[{"alias"=>"one"}, {}]},
+      ]}).
+      to_return(body: [
+        {:id=>1, :status=>"ok", :result=>[ [12345678,10] ]},
+        {:id=>2, :status=>"ok", :result=>[ [12345678,15] ]},
+        {:id=>3, :status=>"ok", :result=>[ [12345678,20] ]},
+      ])
+      ret = @prd.read("12", ["two","three","one"])
+      expect(ret).to eq([10,15,20])
+    end
+
+  end
+
+  it "gets tree info for device" do
+    # this makes three https calls, info on root, info and read on children
+
+    # root info.
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+      with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                  :calls=>[{:id=>1,
+                            :procedure=>"info",
+                            :arguments=>["LLLLLLLLLL", {}]} ]}).
+    to_return(body: [{:id=>1, :status=>"ok", :result=>{:aliases=>{
+      :s2143rt4regf=>["one"],:njilh32o78rnq=>["two"]}}}])
+
+    # children info
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+      with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                  :calls=>[{:id=>1,
+                            :procedure=>"info",
+                            :arguments=>["s2143rt4regf", {}]},
+                           {:id=>2,
+                            :procedure=>"info",
+                            :arguments=>["njilh32o78rnq", {}]}
+    ]}).
+    to_return(body: [
+      {:id=>1, :status=>"ok", :result=>{:basic=>{:type=>"dataport"}}},
+      {:id=>2, :status=>"ok", :result=>{:basic=>{:type=>"dataport"}}}
+    ])
+
+    # children read
+    stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+      with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                  :calls=>[{:id=>1,
+                            :procedure=>"read",
+                            :arguments=>["s2143rt4regf", {}]},
+                           {:id=>2,
+                            :procedure=>"read",
+                            :arguments=>["njilh32o78rnq", {}]},
+    ]}).
+    to_return(body: [
+      {:id=>1, :status=>"ok", :result=>[ [12345678,10] ]},
+      {:id=>2, :status=>"ok", :result=>[ [12345678,15] ]},
+    ])
+
+    ret = @prd.twee('12')
+    expect(ret).to eq({:children=>[{:basic=>{:type=>"dataport"},
+                                    :rid=>:s2143rt4regf, :alias=>"one", :value=>10},
+                                    {:basic=>{:type=>"dataport"},
+                                     :rid=>:njilh32o78rnq, :alias=>"two",
+                                     :value=>15}]})
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/spec/Product_1P_RPC_spec.rb

@@ -0,0 +1,173 @@
+require 'MrMurano/version'
+require 'MrMurano/Config'
+require 'MrMurano/Product-Resources'
+
+RSpec.describe MrMurano::ProductResources, "#1PshimTests" do
+  before(:example) do
+    $cfg = MrMurano::Config.new
+    $cfg.load
+    $cfg['net.host'] = 'bizapi.hosted.exosite.io'
+    $cfg['product.id'] = 'XYZ'
+    $cfg['product.spec'] = 'XYZ.yaml'
+
+    @prd = MrMurano::ProductResources.new
+    allow(@prd).to receive(:token).and_return("TTTTTTTTTT")
+    allow(@prd).to receive(:model_rid).and_return("LLLLLLLLLL")
+  end
+
+  context "do_rpc" do
+    # Note, do_rpc is private.
+    it "Accepts an object" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{
+        :id=>1, :status=>"ok", :result=>{}
+      }])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
+      expect(ret).to eq({})
+    end
+
+    it "Accepts an Array" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{:id=>1, :status=>"ok", :result=>{:one=>1}},
+      {:id=>2, :status=>"ok", :result=>{:two=>2}}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc([{:id=>1}, {:id=>2}]) }
+      expect(ret).to eq({:one=>1})
+      # yes it only returns first.
+    end
+
+    it "returns res if not Array" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: {:not=>'an array'}.to_json)
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
+      expect(ret).to eq({:not=>'an array'})
+    end
+
+    it "returns res if count less than 1" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
+      expect(ret).to eq([])
+    end
+
+    it "returns res[0] if not Hash" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: ["foo"])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
+      expect(ret).to eq("foo")
+    end
+
+    it "returns res[0] if not status ok" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{:id=>1, :status=>'error'}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_rpc({:id=>1}) }
+      expect(ret).to eq({:id=>1, :status=>'error'})
+    end
+  end
+
+  context "do_mrpc" do
+    # Note, do_rpc is private.
+    it "Accepts an object" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{
+        :id=>1, :status=>"ok", :result=>{}
+      }])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc({:id=>1}) }
+      expect(ret).to eq([{:id=>1, :status=>"ok", :result=>{}}])
+    end
+
+    it "Accepts an Array" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{:id=>1, :status=>"ok", :result=>{:one=>1}},
+      {:id=>2, :status=>"ok", :result=>{:two=>2}}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc([{:id=>1}, {:id=>2}]) }
+      expect(ret).to eq([{:id=>1, :status=>"ok", :result=>{:one=>1}},
+                         {:id=>2, :status=>"ok", :result=>{:two=>2}}])
+    end
+
+    it "fills in all ids if missing" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{:id=>1, :status=>"ok", :result=>{:one=>1}},
+      {:id=>2, :status=>"ok", :result=>{:two=>2}},
+      {:id=>3, :status=>"ok", :result=>{:three=>3}}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc([{}, {}, {}]) }
+      expect(ret).to eq([{:id=>1, :status=>"ok", :result=>{:one=>1}},
+                         {:id=>2, :status=>"ok", :result=>{:two=>2}},
+                         {:id=>3, :status=>"ok", :result=>{:three=>3}}])
+    end
+
+    it "fills in missing ids" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        with(body: {:auth=>{:client_id=>"LLLLLLLLLL"},
+                    :calls=>[{:id=>5, :procedure=>"info"},
+                             {:id=>4, :procedure=>"info"},
+                             {:id=>6, :procedure=>"info"} ]}).
+        to_return(body: [{:id=>5, :status=>"ok", :result=>{:one=>1}},
+      {:id=>4, :status=>"ok", :result=>{:two=>2}},
+      {:id=>6, :status=>"ok", :result=>{:three=>3}}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc([{:procedure=>"info"},
+                                         {:procedure=>"info", :id=>4},
+                                         {:procedure=>"info"}]) }
+      expect(ret).to eq([{:id=>5, :status=>"ok", :result=>{:one=>1}},
+                         {:id=>4, :status=>"ok", :result=>{:two=>2}},
+                         {:id=>6, :status=>"ok", :result=>{:three=>3}}])
+    end
+
+    it "returns res if not Array" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: {:not=>'an array'}.to_json)
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc({:id=>1}) }
+      expect(ret).to eq({:not=>'an array'})
+    end
+
+    it "returns res if count less than 1" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc({:id=>1}) }
+      expect(ret).to eq([])
+    end
+
+    it "returns res[0] if not Hash" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: ["foo"])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc({:id=>1}) }
+      expect(ret).to eq(["foo"])
+    end
+
+    it "returns res[0] if not status ok" do
+      stub_request(:post, "https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process").
+        to_return(body: [{:id=>1, :status=>'error'}])
+
+      ret = nil
+      @prd.instance_eval{ ret = do_mrpc({:id=>1}) }
+      expect(ret).to eq([{:id=>1, :status=>'error'}])
+    end
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -200,6 +200,7 @@ files:
 - lib/MrMurano.rb
 - lib/MrMurano/Account.rb
 - lib/MrMurano/Config.rb
+- lib/MrMurano/Product-1P-Device.rb
 - lib/MrMurano/Product-Resources.rb
 - lib/MrMurano/Product.rb
 - lib/MrMurano/Solution-Cors.rb
@@ -220,11 +221,13 @@ files:
 - lib/MrMurano/commands/cors.rb
 - lib/MrMurano/commands/domain.rb
 - lib/MrMurano/commands/exportImport.rb
+- lib/MrMurano/commands/init.rb
 - lib/MrMurano/commands/keystore.rb
 - lib/MrMurano/commands/logs.rb
 - lib/MrMurano/commands/product.rb
 - lib/MrMurano/commands/productCreate.rb
 - lib/MrMurano/commands/productDelete.rb
+- lib/MrMurano/commands/productDevice.rb
 - lib/MrMurano/commands/productList.rb
 - lib/MrMurano/commands/productSpec.rb
 - lib/MrMurano/commands/productWrite.rb
@@ -238,6 +241,7 @@ files:
 - lib/MrMurano/commands/timeseries.rb
 - lib/MrMurano/commands/tsdb.rb
 - lib/MrMurano/commands/zshcomplete.erb
+- lib/MrMurano/dir.rb
 - lib/MrMurano/hash.rb
 - lib/MrMurano/http.rb
 - lib/MrMurano/makePretty.rb
@@ -251,6 +255,8 @@ files:
 - spec/ProductBase_spec.rb
 - spec/ProductContent_spec.rb
 - spec/ProductResources_spec.rb
+- spec/Product_1P_Device_spec.rb
+- spec/Product_1P_RPC_spec.rb
 - spec/Product_spec.rb
 - spec/Solution-Cors_spec.rb
 - spec/Solution-ServiceConfig_spec.rb
@@ -300,6 +306,8 @@ test_files:
 - spec/ProductBase_spec.rb
 - spec/ProductContent_spec.rb
 - spec/ProductResources_spec.rb
+- spec/Product_1P_Device_spec.rb
+- spec/Product_1P_RPC_spec.rb
 - spec/Product_spec.rb
 - spec/Solution-Cors_spec.rb
 - spec/Solution-ServiceConfig_spec.rb