MrMurano 1.7.4 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d72a03a23fc127df24572d0bcce4bf5f8d9a09a
-  data.tar.gz: 12f54ac0517fe13c75e27a00c183c281f96bf2a2
+  metadata.gz: 18a4696a79038b6f17c3a43cf1253edf00945062
+  data.tar.gz: aab88cf46593211db7207e8759e31f52a407a7c2
 SHA512:
-  metadata.gz: 17203808b81805c17690858518445441aa2f16e3059ed35f3a1a1e6f13cf3697d9239c8b3424f6d678f367b0ef3a45345d377707dbb833f69971ae6ab753202b
-  data.tar.gz: 817516675a6df0af3602ef3434f5faf36d00235f1bca4d650a3bf975042babce1eff4322fb7df598d4b0ead2b92996d71d0add9ec9f8004d24d19dc2fb15398c
+  metadata.gz: 1e88eb9c42ddfda7599c5be3f53cfec180f1faadb5fdc83a0d2f784401ba11eab1f54b5db69ac4d517f07a9284f1706502bbc7701989bcf8b52df5d39d4ecdff
+  data.tar.gz: 20751f37d098dbc3f547518c80a9a465eaa62b9850b60ce12089f1b661c7ded530f68391e537994513cd0762d292b45c6277b11e078069d0bcce92b10b5f4c59

data/README.markdown

@@ -5,6 +5,13 @@
 
 Do more from the command line with [Murano](https://exosite.com/platform/)
 
+MrMurano is the command-line tool that interacts with Murano and makes different
+tasks easier. MrMurano makes it easy to deploy code to a solution, import many
+product definitions at once, set up endpoints and APIs, and more.
+
+MrMurano works around the idea of syncing, much like rsync.  Files from your working
+directory are synced up (or down) from Murano.
+
 ## Usage
 
 ### To start from an existing project in Murano
@@ -26,11 +33,13 @@ running in Murano. Here is the list.
 - Set it: `mr config business.id ZZZZZZZZZ`
 - Create a product: `mr product create myawesomeproduct`
 - Save the result: `mr config product.id YYYYYYYYY`
-- Define the product: `mr product spec push --file prd.spec`
+- Set the product definition: `mr config product.spec prd.spec`
+- Add resource aliases to specs/prd.spec
+- Sync the product definition up: `mr syncup -V --specs`
 - Create a solution: `mr solution create myawesomesolution`
 - Save the result: `mr config solution.id XXXXXX`
 - Sync solution code up: `mr syncup -V`
-- Assign the prodcut to the solution: `mr assign set`
+- Assign the product to the solution: `mr assign set`
 
 Do stuff, see what changed: `mr status` or `mr diff`.
 Then deploy with `mr syncup`
@@ -105,15 +114,29 @@ EOF
 This also allows for keeping private things in a seperate config file and having
 the shared things checked into source control.
 
-### Keystore
+### Direct Service Access
+
+To aid with debugging, MrMurano has direct access to some of the services in a
+solution.
 
-To aid with debugging, MrMurano has direct access to a solution's Keystore service.
+Currently these are:
+- Keystore: `mr keystore`
+- Timeseries: `mr timeseries`
+- TSDB: `mr tsdb`
 
-To see all of the keys in the current solution: `mr keystore`
+### Output Format
 
-### Timeseries
+Many sub-commands respect the `outformat` setting.  This lets you switch the output
+between YAML, JSON, Ruby, CSV, and pretty tables.  Not all formats work with all
+commands.
 
-To aid with debugging, MrMurano has direct access to a solution's Timeseries service.
+```
+mr tsdb product list
+mr tsdb product list -c outformat=csv
+mr tsdb product list -c outformat=json
+mr tsdb product list -c outformat=yaml
+mr tsdb product list -c outformat=pp
+```
 
 ### Product Content Area
 
@@ -183,18 +206,9 @@ spec
 spec/cico.murano.spec
 ```
 
+## Developing
 
-### Bundles
-
-MrMuanro allows adding bundles of resources to your project.
-
-A Bundle is a group of modules, endpoints, and static files.
-
-Bundles live in the 'bundle' directory.  Each bundle is a directory that matches
-the layout of a project. (with directories for endpoints, modules, files, etc)
-
-The items in bundles are layered by sorting the bundle names. Then your project's
-items are layered on top.  This builds the list of what is synced.  It also allows
-you to override things that are in a bundle from you project.
+MrMurano uses git flow for managing branches.
 
+MrMurano also uses [bunder](http://bundler.io).
 

data/TODO.taskpaper

@@ -3,6 +3,12 @@ Readme:
 	- Look into using VCR for testing. @pri(low)
 
 Commands:
+	- Init command.
+	- 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’
+	only command.  That is they should return help like the plain `mr` command, but
+	just for their sub-section of things
 	- Errors and Warnings should get sent to STDERR @done(2016-11-03)
 	- Need a more consistent output format. 'pp' is still used in many places. @done(2016-11-03)
 	Maybe have a tool setting for output format? json, yaml, pp, csv, table ?
@@ -17,7 +23,7 @@ Account:
 	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
-	- Add support for multiple endpoints in one file (maybe) @pri(low)
+	- Add support for multiple endpoints in one file @pri(high) @done(2016-11-18)
 	- Add directory support like in modules @done(2016-07-26)
 
 Files:
@@ -39,12 +45,18 @@ CORS:
 	- GET&PUT /cors data @done(2016-09-08)
 
 TSDB:
-	- Add support for new TSDB service. @pri(high)
+	- For query, if no metrics on cmdline, then do listMetrics and use all. @done(2016-11-21)
+	well, the first 1000 or whatever we get from a single call to listMetrics
+	- Query should handle tags prefixed with @ to match write. @done(2016-11-21)
+	- Add support for new TSDB service. @pri(high) @done(2016-11-03)
 
 Timeseries:
 	- Add CSV output option. @done(2016-09-09)
 
 Product:
+	- 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.
 	- Auto convert exoline spec files into murano spec files on upload? @done(2016-10-27)
 	Not doing this. Convert is there if you need it.
 	- write alias command @done(2016-09-26)
@@ -54,12 +66,20 @@ Service Device:
 	- When listing and bussiness.id is missing, gracefully fall back to --idonly @done(2016-09-12)
 
 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.
 	- 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)
 
+SyncUpDown:
+	- Document the hash keys for an item. @pri(high)
+	Also consider turning that hash into a Struct
+	- Allow specifying local files to limit actions to.
+
 SolutionBase:
 	- All network traffic is serialized. Make some parallel.
+	This might break some things.
 	- Errors from the server should be displayed prettier. @done(2016-09-26)
 	- JSON parse should use symbols for keys. @done(2016-09-01)
 	- Add the --curl verbose option. @done(2016-08-12)

data/lib/MrMurano/Config.rb

@@ -39,7 +39,7 @@ module MrMurano
     CFG_PRVT_NAME = '.mrmuranorc.private'.freeze # Going away.
     CFG_DIR_NAME = '.mrmurano'.freeze
     CFG_ALTRC_NAME = '.mrmurano/config'.freeze
-    CFG_SYS_NAME = '/etc/mrmuranorc'.freeze
+    CFG_SYS_NAME = '/etc/mrmuranorc'.freeze # Going away.
 
     def initialize
       @paths = []
@@ -64,7 +64,10 @@ module MrMurano
       end
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
       fixModes(Pathname.new(Dir.home) + CFG_DIR_NAME)
-      @paths << ConfigFile.new(:system, Pathname.new(CFG_SYS_NAME))
+      if Pathname.new(CFG_SYS_NAME).exist? then
+        say_warning "!!! Using #{CFG_SYS_NAME} is deprecated"
+        @paths << ConfigFile.new(:system, Pathname.new(CFG_SYS_NAME))
+      end
       @paths << ConfigFile.new(:defaults, nil, IniFile.new())
 
 
@@ -83,6 +86,7 @@ module MrMurano
       set('location.roles', 'roles.yaml', :defaults)
       set('location.users', 'users.yaml', :defaults)
       set('location.cors', 'cors.yaml', :defaults)
+      set('location.specs', 'specs', :defaults)
 
       set('files.default_page', 'index.html', :defaults)
 

data/lib/MrMurano/Product-Resources.rb

@@ -33,10 +33,12 @@ module MrMurano
       name = $cfg['product.spec']
       prid = $cfg['product.id']
       name = $cfg["p-#{prid}.spec"] unless prid.nil? or $cfg["p-#{prid}.spec"].nil?
+      raise "No spec file named; run `mr config prodcut.spec <specfile>`" if name.nil?
 
       unless $cfg['location.specs'].nil? then
-        name = File.join($cfg['location.specs'], name)
+        name = ::File.join($cfg['location.specs'], name)
       end
+      debug " spec file name => #{name}"
       name
     end
 

data/lib/MrMurano/Solution-Endpoint.rb

@@ -16,11 +16,15 @@ module MrMurano
     ##
     # This gets all data about all endpoints
     def list
-      get()
+      get().map do |item|
+        item[:content_type] = 'application/json' if item[:content_type].empty?
+        item
+      end
     end
 
     def fetch(id)
       ret = get('/' + id.to_s)
+      ret[:content_type] = 'application/json' if ret[:content_type].empty?
       aheader = (ret[:script].lines.first or "").chomp
       dheader = /^--#ENDPOINT (?i:#{ret[:method]}) #{ret[:path]}$/
       rheader = %{--#ENDPOINT #{ret[:method]} #{ret[:path]}\n}
@@ -45,10 +49,12 @@ module MrMurano
       raise "no file" unless local.exist?
 
       # we assume these are small enough to slurp.
-      script = local.read
+      unless remote.has_key? :script then
+        script = local.read
+        remote[:script] = script
+      end
       limitkeys = [:method, :path, :script, @itemkey]
       remote = remote.select{|k,v| limitkeys.include? k }
-      remote[:script] = script
 #      post('', remote)
       if remote.has_key? @itemkey then
         put('/' + remote[@itemkey], remote) do |request, http|
@@ -84,16 +90,31 @@ module MrMurano
     end
 
     def toRemoteItem(from, path)
-      # read first line of file and get method/path from it?
+      # Path could be have multiple endpoints in side, so a loop.
+      items = []
       path = Pathname.new(path) unless path.kind_of? Pathname
-      aheader = path.readlines().first
-      md = /--#ENDPOINT (\S+) (.*)/.match(aheader)
-      if md.nil? then
-        rp = path.relative_path_from(Pathname.new(Dir.pwd))
-        say_warning "Not an Endpoint: #{rp.to_s}"
-        return nil
+      cur = nil
+      lineno=0
+      path.readlines().each do |line|
+        md = /--#ENDPOINT (?<method>\S+) (?<path>\S+)( (?<ctype>.*))?/.match(line)
+        if not md.nil? then
+          # header line.
+          cur[:line_end] = lineno unless cur.nil?
+          items << cur unless cur.nil?
+          cur = {:method=>md[:method],
+                 :path=>md[:path],
+                 :content_type=> (md[:ctype] or 'application/json'),
+                 :local_path=>path,
+                 :line=>lineno,
+                 :script=>line}
+        elsif not cur.nil? and not cur[:script].nil? then
+          cur[:script] << line
+        end
+        lineno += 1
       end
-      {:method=>md[1], :path=>md[2]}
+      cur[:line_end] = lineno unless cur.nil?
+      items << cur unless cur.nil?
+      items
     end
 
     def synckey(item)
@@ -107,7 +128,7 @@ module MrMurano
       if itemB[:script].nil? and itemB[:local_path] then
         itemB[:script] = itemB[:local_path].read
       end
-      return itemA[:script] != itemB[:script]
+      return (itemA[:script] != itemB[:script] or itemA[:content_type] != itemB[:content_type])
     end
 
   end

data/lib/MrMurano/Solution-ServiceConfig.rb

@@ -37,6 +37,7 @@ module MrMurano
 
     def call(opid, meth=:get, data=nil, id=scid, &block)
       call = "/#{id.to_s}/call/#{opid.to_s}"
+      debug "Will call: #{call}"
       case meth
       when :get
         get(call, data, &block)

data/lib/MrMurano/SubCmdGroupContext.rb

@@ -0,0 +1,45 @@
+
+module MrMurano
+  class SubCmdGroupHelp
+    attr :name, :description
+
+    def initialize(command)
+      @name = command.syntax.to_s
+      @description = command.description.to_s
+      @runner = ::Commander::Runner.instance
+      prefix = /^#{command.name.to_s} /
+      cmds = @runner.instance_variable_get(:@commands).select{|n,_| n.to_s =~ prefix}
+      @commands = cmds
+      als = @runner.instance_variable_get(:@aliases).select{|n,_| n.to_s =~ prefix}
+      @aliases = als
+
+      @options = {}
+    end
+
+    def program(key)
+      case key
+      when :name
+        @name
+      when :description
+        @description
+      when :help
+        nil
+      else
+        nil
+      end
+    end
+
+    def alias?(name)
+      @aliases.include? name.to_s
+    end
+
+    def get_help
+      hf = @runner.program(:help_formatter).new(self)
+      pc = Commander::HelpFormatter::ProgramContext.new(self).get_binding
+      hf.template(:help).result(pc)
+    end
+  end
+end
+
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/SyncUpDown.rb

@@ -5,6 +5,7 @@ require 'MrMurano/Config'
 require 'MrMurano/hash'
 
 module MrMurano
+  ## Track what things are syncable.
   class SyncRoot
     Syncable = Struct.new(:name, :class, :type, :desc, :bydefault) do
     end
@@ -258,16 +259,18 @@ module MrMurano
           path
         end
       end.flatten.compact.reject do |path|
+        # TODO: These globs should be in $cfg.
         path.fnmatch('*_test.lua') or path.basename.fnmatch('.*')
       end.select do |path|
+        # TODO: These globs should be in $cfg.
         path.extname == '.lua'
       end.map do |path|
-        # sometimes this is a name, sometimes it is an item.
-        # do I want to keep that? NO.
-        name = toRemoteItem(from, path)
-        unless name.nil? then
-          name[:local_path] = path
-          name
+        item = toRemoteItem(from, path)
+        if item.kind_of?(Array) then
+          item.compact.map{|i| i[:local_path] = path; i}
+        elsif not item.nil? then
+          item[:local_path] = path
+          item
         end
       end.flatten.compact
     end
@@ -368,19 +371,31 @@ module MrMurano
     # @param item Hash: The item to get a diff of
     # @return String: The diff output
     def dodiff(item)
-      tfp = Tempfile.new([tolocalname(item, @itemkey), '.lua'])
+      trmt = Tempfile.new([tolocalname(item, @itemkey)+'_remote_', '.lua'])
+      tlcl = Tempfile.new([tolocalname(item, @itemkey)+'_local_', '.lua'])
+      if item.has_key? :script then
+        Pathname.new(tlcl.path).open('wb') do |io|
+          io << item[:script]
+        end
+      else
+        Pathname.new(tlcl.path).open('wb') do |io|
+          io << item[:local_path].read
+        end
+      end
       df = ""
       begin
-        download(Pathname.new(tfp.path), item)
+        download(Pathname.new(trmt.path), item)
 
         cmd = $cfg['diff.cmd'].shellsplit
-        cmd << tfp.path
-        cmd << item[:local_path].to_s
+        cmd << trmt.path
+        cmd << tlcl.path
 
         IO.popen(cmd) {|io| df = io.read }
       ensure
-        tfp.close
-        tfp.unlink
+        trmt.close
+        trmt.unlink
+        tlcl.close
+        tlcl.unlink
       end
       df
     end

data/lib/MrMurano/commands.rb

@@ -7,12 +7,14 @@ require 'MrMurano/commands/domain'
 require 'MrMurano/commands/exportImport'
 require 'MrMurano/commands/keystore'
 require 'MrMurano/commands/logs'
+require 'MrMurano/commands/product'
 require 'MrMurano/commands/productCreate'
 require 'MrMurano/commands/productDelete'
 require 'MrMurano/commands/productList'
 require 'MrMurano/commands/productSpec'
 require 'MrMurano/commands/productWrite'
 require 'MrMurano/commands/serialNumberCmds'
+require 'MrMurano/commands/solution'
 require 'MrMurano/commands/solutionCreate'
 require 'MrMurano/commands/solutionDelete'
 require 'MrMurano/commands/solutionList'

data/lib/MrMurano/commands/assign.rb

@@ -4,11 +4,14 @@ 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::SC_Device.new
 
     trigs = sol.showTriggers()
-    if options.idonly or $cfg['business.id'].nil? then
+    options.idonly = true if $cfg['business.id'].nil?
+
+    if options.idonly then
       say trigs.join(' ')
     else
       acc = MrMurano::Account.new
@@ -17,8 +20,8 @@ command 'assign list' do |c|
       if products.empty? then
         say trigs.join(' ')
       else
-        busy = products.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
-        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
+        busy = products.map{|r| [r[:label], r[:modelId]]}
+        table = Terminal::Table.new :rows => busy, :headings => ['Label', 'ModelID']
         say table
       end
     end

data/lib/MrMurano/commands/content.rb

@@ -1,5 +1,19 @@
 require 'MrMurano/Product'
 
+command :content do |c|
+  c.syntax = %{mr content}
+  c.summary = %{About Content Area}
+  c.description = %{This set of commands let you interact with the content area for a product.
+
+This is where OTA data can be stored so that devices can easily download it.
+}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 command 'content list' do |c|
   c.syntax = %{mr content list}
   c.summary = %{List downloadable content for a product}
@@ -13,7 +27,6 @@ command 'content list' do |c|
     prd.outf prd.list
   end
 end
-alias_command :content, 'content list'
 
 command 'content info' do |c|
   c.syntax = %{mr content info <content id>}

data/lib/MrMurano/commands/keystore.rb

@@ -36,6 +36,18 @@ module MrMurano
   end
 end
 
+command :keystore do |c|
+  c.syntax = %{mr keystore}
+  c.summary = %{About Keystore}
+  c.description = %{The Keystore sub-commands let you interact directly with the Keystore instance
+in a solution.  This allows for easier debugging, being able to quickly get and
+set data.  As well as calling any of the other supported REDIS commands.}
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 command 'keystore info' do |c|
   c.syntax = %{mr keystore info}
   c.description = %{Show info about the Keystore}
@@ -53,7 +65,6 @@ command 'keystore list' do |c|
     sol.outf sol.listkeys
   end
 end
-alias_command :keystore, 'keystore list'
 
 command 'keystore get' do |c|
   c.syntax = %{mr keystore get <key>}

data/lib/MrMurano/commands/product.rb

@@ -0,0 +1,14 @@
+require 'MrMurano/SubCmdGroupContext'
+
+command :product do |c|
+  c.syntax = %{mr product}
+  c.summary = %{About Product}
+  c.description = %{Sub-commands for working with Products}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productList.rb

@@ -5,19 +5,42 @@ command 'product list' do |c|
   c.syntax = %{mr product list [options]}
   c.description = %{List products}
   c.option '--idonly', 'Only return the ids'
+  c.option '--[no-]all', 'Show all fields'
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
   c.action do |args, options|
     acc = MrMurano::Account.new
     data = acc.products
+
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+
     if options.idonly then
-      say data.map{|row| row[:pid]}.join(' ')
+      headers = [:modelId]
+      data = data.map{|row| [row[:modelId]]}
+    elsif not options.all then
+      headers = [:label, :modelId]
+      data = data.map{|r| [r[:label], r[:modelId]]}
     else
-      busy = data.map{|r| [r[:label], r[:type], r[:pid], r[:modelId]]}
-      table = Terminal::Table.new :rows => busy, :headings => ['Label', 'Type', 'PID', 'ModelID']
-      say table
+      headers = data[0].keys
+      data = data.map{|r| headers.map{|h| r[h]}}
     end
+
+    acc.outf(data, io) do |dd, ios|
+      if options.idonly then
+        ios.puts dd.join(' ')
+      else
+        acc.tabularize({
+          :headers=>headers.map{|h| h.to_s},
+          :rows=>dd
+        }, ios)
+      end
+    end
+    io.close unless io.nil?
+
   end
 end
-alias_command :product, 'product list'
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productSpec.rb

@@ -4,6 +4,17 @@ require 'MrMurano/hash'
 require 'yaml'
 require 'terminal-table'
 
+command 'product spec' do |c|
+  c.syntax = %{mr product spec}
+  c.summary = %{About Product Specs}
+  c.description = %{Some utility for working with prodcut specification files.}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 command 'product spec convert' do |c|
   c.syntax = %{mr product spec convert FILE}
   c.summary = %{Convert exoline spec file into Murano format}
@@ -72,11 +83,11 @@ command 'product spec pull' do |c|
     end
 
     prd.outf(ret, io) do |dd, ios|
-      if ret.kind_of? Array then
-        ios.puts ret.join(' ')
+      if dd.kind_of? Array then
+        ios.puts dd.join(' ')
       else
         prd.tabularize({
-          :rows => ret[:resources].map{|r| [r[:alias], r[:format], r[:rid]]},
+          :rows => dd[:resources].map{|r| [r[:alias], r[:format], r[:rid]]},
           :headers => ['Alias', 'Format', 'RID']
         }, ios)
       end
@@ -84,7 +95,6 @@ command 'product spec pull' do |c|
     io.close unless io.nil?
   end
 end
-alias_command 'product spec', 'product spec pull'
 alias_command 'product spec list', 'product spec pull', '--astable'
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/serialNumberCmds.rb

@@ -1,6 +1,18 @@
 require 'MrMurano/Product'
 require 'terminal-table'
 
+command :sn do |c|
+  c.syntax = %{mr sn}
+  c.summary = %{About Serial Numbers}
+  c.description = %{The sn sub-commands allow for managing the identifiers (or Serial Numbers) on
+a product.}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 command 'sn list' do |c|
   c.syntax = %{mr sn list [options]}
   c.summary = %{List serial numbers for a product}
@@ -18,7 +30,6 @@ command 'sn list' do |c|
     say table
   end
 end
-alias_command :sn, 'sn list'
 
 command 'sn enable' do |c|
   c.syntax = %{mr sn enable [<sn>|--file <sns>]}

data/lib/MrMurano/commands/solution.rb

@@ -0,0 +1,14 @@
+require 'MrMurano/SubCmdGroupContext'
+
+command :solution do |c|
+  c.syntax = %{mr solution}
+  c.summary = %{About Solution}
+  c.description = %{Sub-commands for working with solutions}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/solutionList.rb

@@ -5,19 +5,41 @@ command 'solution list' do |c|
   c.syntax = %{mr solution list [options]}
   c.description = %{List solutions}
   c.option '--idonly', 'Only return the ids'
+  c.option '--[no-]all', 'Show all fields'
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
   c.action do |args, options|
     acc = MrMurano::Account.new
     data = acc.solutions
+
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+
     if options.idonly then
-      say data.map{|row| row[:apiId]}.join(' ')
+      headers = [:apiId]
+      data = data.map{|row| [row[:apiId]]}
+    elsif not options.all then
+      headers = [:apiId, :domain]
+      data = data.map{|r| [r[:apiId], r[:domain]]}
     else
-      busy = data.map{|r| [r[:apiId], r[:domain], r[:type], r[:sid]]}
-      table = Terminal::Table.new :rows => busy, :headings => ['API ID', 'Domain', 'Type', 'SID']
-      say table
+      headers = data[0].keys
+      data = data.map{|r| headers.map{|h| r[h]}}
+    end
+
+    acc.outf(data, io) do |dd, ios|
+      if options.idonly then
+        ios.puts dd.join(' ')
+      else
+        acc.tabularize({
+          :headers=>headers.map{|h| h.to_s},
+          :rows=>dd
+        }, ios)
+      end
     end
+    io.close unless io.nil?
   end
 end
-alias_command :solution, 'solution list'
 
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/status.rb

@@ -20,7 +20,11 @@ command :status do |c|
 
     def fmtr(item)
       if item.has_key? :local_path then
-        item[:local_path].relative_path_from(Pathname.pwd()).to_s
+        lp = item[:local_path].relative_path_from(Pathname.pwd()).to_s
+        if item.has_key?(:line) and item[:line] > 0 then
+          return "#{lp}:#{item[:line]}"
+        end
+        lp
       else
         item[:synckey]
       end

data/lib/MrMurano/commands/timeseries.rb

@@ -22,6 +22,19 @@ module MrMurano
   end
 end
 
+command :timeseries do |c|
+  c.syntax = %{mr timeseries}
+  c.summary = %{About Timeseries}
+  c.description = %{The timeseries sub-commands let you interact directly with the Timeseries
+instance in a solution.  This allows for easier debugging, being able to
+quickly try out different queries or write test data.}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 command 'timeseries query' do |c|
   c.syntax = %{mr timeseries query <query string>}
   c.description = %{Query the timeseries database}

data/lib/MrMurano/commands/tsdb.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'MrMurano/Solution-ServiceConfig'
+require 'MrMurano/SubCmdGroupContext'
 
 module MrMurano
   module ServiceConfigs
@@ -50,6 +51,7 @@ Also, many date-time formats can be parsed and will be converted to microseconds
   }
   c.option '--when TIMESTAMP', %{When this data happened. (defaults to now)}
   # TODO: add option to take data from STDIN.
+  c.example 'mr tsdb write hum=45 lux=12765 @sn=44', %{Write two metrics (hum and lux) with a tag (sn)}
 
   c.action do |args, options|
     sol = MrMurano::ServiceConfigs::Tsdb.new
@@ -80,15 +82,13 @@ Also, many date-time formats can be parsed and will be converted to microseconds
 end
 
 command 'tsdb query' do |c|
-  c.syntax = %{mr tsdb query [options] }
+  c.syntax = %{mr tsdb query [options] <metric>|@<tag=value> …}
   c.summary = %{query data}
-  c.description =%{
-
-  list metrics to return
-  list tag=value to match
-
+  c.description =%{Query data from the TSDB.
 
 FUNCS is a comma seperated list of the aggregate functions.
+Currently: avg, min, max, count, sum.  For string metrics, only count.
+
 FILL is null, none, any integer, previous
 
 DURATION is an integer with time unit to indicate relative time before now.
@@ -114,6 +114,16 @@ Also, many date-time formats can be parsed and will be converted to microseconds
 
   c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
+  c.example 'mr tsdb query hum', 'Get all hum metric entries'
+  c.example 'mr tsdb query hum @sn=45', 'Get all hum metric entries for tag sn=45'
+  c.example 'mr tsdb query hum --limit 1', 'Get just the most recent entry'
+  c.example 'mr tsdb query hum --relative_start 1h', 'Get last hour of hum entries'
+  c.example 'mr tsdb query hum --relative_start -1h', 'Get last hour of hum entries'
+  c.example 'mr tsdb query hum --relative_start 2h --relative_end 1h', 'Get hum entries of two hours ago, but not the last hours'
+  c.example 'mr tsdb query hum --sampling_size 30m', 'Get one hum entry from each 30 minute chunk of time'
+  c.example 'mr tsdb query hum --sampling_size 30m --aggregate avg', 'Get average hum entry from each 30 minute chunk of time'
+
+
   c.action do |args, options|
     sol = MrMurano::ServiceConfigs::Tsdb.new
 
@@ -124,6 +134,7 @@ Also, many date-time formats can be parsed and will be converted to microseconds
       if arg =~ /=/ then
         # a tag.
         k,v = arg.split('=', 2)
+        k = k[1..-1] if k[0] == '@'
         tags[k] = v
       else
         metrics << arg
@@ -132,6 +143,11 @@ Also, many date-time formats can be parsed and will be converted to microseconds
     query[:tags] = tags unless tags.empty?
     query[:metrics] = metrics unless metrics.empty?
 
+    # A query without any metrics is invalid.  So if the user didn't provide any,
+    # look up all of them (well, frist however many) and use that list.
+    ret = sol.listMetrics
+    query[:metrics] = ret[:metrics]
+
     unless options.start_time.nil? then
       query[:start_time] = sol.str_to_timestamp(options.start_time)
     end
@@ -199,4 +215,17 @@ command 'tsdb list metrics' do |c|
   end
 end
 
+command :tsdb do |c|
+  c.syntax = %{mr tsdb}
+  c.summary = %{About TSDB}
+  c.description = %{The tsdb sub-commands let you interact directly with the TSDB instance in a
+solution.  This allows for easier debugging, being able to quickly try out
+different queries or write test data.}
+
+  c.action do |args, options|
+    ::Commander::UI.enable_paging
+    say MrMurano::SubCmdGroupHelp.new(c).get_help
+  end
+end
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '1.7.4'.freeze
+  VERSION = '1.8.0'.freeze
 end
 

data/spec/ProductResources_spec.rb

@@ -8,6 +8,7 @@ RSpec.describe MrMurano::ProductResources do
     $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")
@@ -19,6 +20,37 @@ RSpec.describe MrMurano::ProductResources do
     expect(uri.to_s).to eq("https://bizapi.hosted.exosite.io/api:1/product/XYZ/proxy/onep:v1/rpc/process")
   end
 
+  context "location" do
+    it "Gets a product.spec, with location.specs" do
+      loc = @prd.location
+      expect(loc).to eq("specs/XYZ.yaml")
+    end
+    it "Gets a product.spec, without location.specs" do
+      $cfg.set('location.specs', nil, :defaults)
+      loc = @prd.location
+      expect(loc).to eq("XYZ.yaml")
+    end
+
+    it "Gets a p-FOO.spec, with location.specs" do
+      $cfg['p-XYZ.spec'] = 'magical.file'
+      loc = @prd.location
+      expect(loc).to eq("specs/magical.file")
+    end
+
+    it "Gets a p-FOO.spec, without location.specs" do
+      $cfg['p-XYZ.spec'] = 'magical.file'
+      $cfg.set('location.specs', nil, :defaults)
+      loc = @prd.location
+      expect(loc).to eq("magical.file")
+    end
+
+    it "raises when no spec name" do
+      $cfg['product.spec'] = nil
+      $cfg['product.id'] = nil
+      expect { @prd.location }.to raise_error("No spec file named; run `mr config prodcut.spec <specfile>`")
+    end
+  end
+
   context "do_rpc" do
     # Note, do_rpc is private.
     it "Accepts an object" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -209,6 +209,7 @@ files:
 - lib/MrMurano/Solution-Services.rb
 - lib/MrMurano/Solution-Users.rb
 - lib/MrMurano/Solution.rb
+- lib/MrMurano/SubCmdGroupContext.rb
 - lib/MrMurano/SyncUpDown.rb
 - lib/MrMurano/commands.rb
 - lib/MrMurano/commands/account.rb
@@ -221,12 +222,14 @@ files:
 - lib/MrMurano/commands/exportImport.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/productList.rb
 - lib/MrMurano/commands/productSpec.rb
 - lib/MrMurano/commands/productWrite.rb
 - lib/MrMurano/commands/serialNumberCmds.rb
+- lib/MrMurano/commands/solution.rb
 - lib/MrMurano/commands/solutionCreate.rb
 - lib/MrMurano/commands/solutionDelete.rb
 - lib/MrMurano/commands/solutionList.rb