MrMurano 1.6.3 → 1.7.0

data/lib/MrMurano/commands/sync.rb

@@ -3,12 +3,11 @@ command :syncdown do |c|
   c.syntax = %{mr syncdown [options]}
   c.description = %{Sync project down from Murano}
   c.option '--all', 'Sync everything'
-  c.option '-s','--[no-]files', %{Sync Static Files}
-  c.option '-a','--[no-]endpoints', %{Sync Endpoints}
-  c.option '-m','--[no-]modules', %{Sync Modules}
-  c.option '-e','--[no-]eventhandlers', %{Sync Event Handlers}
-  c.option '--roles', %{Sync Roles}
-  c.option '--users', %{Sync Users}
+
+  # Load options to control which things to sync
+  MrMurano::SyncRoot.each_option do |s,l,d|
+    c.option s, l, d
+  end
 
   c.option '--[no-]delete', %{Don't delete things from server}
   c.option '--[no-]create', %{Don't create things on server}
@@ -17,41 +16,14 @@ command :syncdown do |c|
   c.example %{Make local be like what is on the server}, %{mr syncdown --all}
   c.example %{Pull down new things, but don't delete or modify anything}, %{mr syncdown --all --no-delete --no-update}
   c.example %{Only Pull new static files}, %{mr syncdown --files --no-delete --no-update}
-  
+
   c.action do |args,options|
     options.default :delete=>true, :create=>true, :update=>true
-    MrMurano.checkSAME(options)
-    
-    if options.endpoints then
-      sol = MrMurano::Endpoint.new
-      sol.syncdown(options)
-    end
-
-    if options.modules then
-      sol = MrMurano::Library.new
-      sol.syncdown(options)
-    end
-
-    if options.eventhandlers then
-      sol = MrMurano::EventHandler.new
-      sol.syncdown(options)
-    end
-
-    if options.roles then
-      sol = MrMurano::Role.new
-      sol.syncdown(options)
-    end
 
-    if options.users then
-      sol = MrMurano::User.new
+    MrMurano::SyncRoot.each_filtered(options.__hash__) do |name, type, klass|
+      sol = klass.new
       sol.syncdown(options)
     end
-
-    if options.files then
-      sol = MrMurano::File.new
-      sol.syncdown(options)
-    end
-
   end
 end
 alias_command :pull, :syncdown, '--no-delete'
@@ -60,12 +32,11 @@ command :syncup do |c|
   c.syntax = %{mr syncup [options]}
   c.description = %{Sync project up into Murano}
   c.option '--all', 'Sync everything'
-  c.option '-s','--[no-]files', %{Sync Static Files}
-  c.option '-a','--[no-]endpoints', %{Sync Endpoints}
-  c.option '-m','--[no-]modules', %{Sync Modules}
-  c.option '-e','--[no-]eventhandlers', %{Sync Event Handlers}
-  c.option '--roles', %{Sync Roles}
-  c.option '--users', %{Sync Users}
+
+  # Load options to control which things to sync
+  MrMurano::SyncRoot.each_option do |s,l,d|
+    c.option s, l, d
+  end
 
   c.option '--[no-]delete', %{Don't delete things from server}
   c.option '--[no-]create', %{Don't create things on server}
@@ -77,38 +48,11 @@ command :syncup do |c|
 
   c.action do |args,options|
     options.default :delete=>true, :create=>true, :update=>true
-    MrMurano.checkSAME(options)
-
-    if options.endpoints then
-      sol = MrMurano::Endpoint.new
-      sol.syncup(options)
-    end
-
-    if options.modules then
-      sol = MrMurano::Library.new
-      sol.syncup(options)
-    end
-
-    if options.eventhandlers then
-      sol = MrMurano::EventHandler.new
-      sol.syncup(options)
-    end
-
-    if options.roles then
-      sol = MrMurano::Role.new
-      sol.syncup(options)
-    end
 
-    if options.users then
-      sol = MrMurano::User.new
+    MrMurano::SyncRoot.each_filtered(options.__hash__) do |name, type, klass|
+      sol = klass.new
       sol.syncup(options)
     end
-
-    if options.files then
-      sol = MrMurano::File.new
-      sol.syncup(options)
-    end
-
   end
 end
 alias_command :push, :syncup, '--no-delete'

data/lib/MrMurano/commands/timeseries.rb

@@ -8,15 +8,15 @@ module MrMurano
     end
 
     def query(query)
-      post("/#{scid}/call/query", {:q=>query})
+      call(:query, :post, {:q=>query})
     end
 
     def write(writestr)
-      post("/#{scid}/call/write", { :query=>writestr })
+      call(:write, :post, { :query=>writestr })
     end
 
     def command(cmd)
-      post("/#{scid}/call/command", { :q=>cmd})
+      call(:command, :post, { :q=>cmd})
     end
 
   end
@@ -25,6 +25,7 @@ end
 command 'timeseries query' do |c|
   c.syntax = %{mr timeseries query <query string>}
   c.description = %{Query the timeseries database}
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
   c.option '--[no-]json', %{Display results as raw json}
   c.option '--[no-]csv', %{Display results as CSV}
 
@@ -32,29 +33,28 @@ command 'timeseries query' do |c|
     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
+    $cfg['tool.outformat'] = 'json' if options.json
+    $cfg['tool.outformat'] = 'best csv' if options.csv
 
-    else
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+
+    sol.outf(ret, io) do |dd, ios|
       (ret[:results] or []).each do |res|
         (res[:series] or []).each do |ser|
-          cols = ser[:columns]
-          table = Terminal::Table.new :title=>ser[:name], :headings=>cols, :rows=>ser[:values]
-          puts table
+          sol.tabularize({
+            :title=>ser[:name],
+            :headers=>ser[:columns],
+            :rows=>ser[:values]
+          }, ios)
         end
       end
-      # If nothing displayed, Format wasn't what we expected, so do what?
     end
+    io.close unless io.nil?
+
   end
 end
 alias_command :tsq, 'timeseries query'
@@ -65,13 +65,10 @@ command 'timeseries write' do |c|
   c.option '--[no-]json', %{Display results as raw json}
   c.action do |args,options|
     options.defalts :json=>false
+    $cfg['tool.outformat'] = 'json' if options.json
     sol = MrMurano::Timeseries.new
     ret = sol.write args.join(' ')
-    if options.json then
-      puts ret.to_json
-    else
-      pp ret
-    end
+    sol.outf ret
   end
 end
 alias_command :tsw, 'timeseries write'
@@ -82,13 +79,10 @@ command 'timeseries command' do |c|
   c.option '--[no-]json', %{Display results as raw json}
   c.action do |args,options|
     options.defalts :json=>false
+    $cfg['tool.outformat'] = 'json' if options.json
     sol = MrMurano::Timeseries.new
     ret = sol.command args.join(' ')
-    if options.json then
-      puts ret.to_json
-    else
-      pp ret
-    end
+    sol.outf ret
   end
 end
 

data/lib/MrMurano/commands/tsdb.rb

@@ -0,0 +1,202 @@
+require 'date'
+require 'MrMurano/Solution-ServiceConfig'
+
+module MrMurano
+  module ServiceConfigs
+    class Tsdb < ServiceConfig
+      def initialize
+        super
+        @serviceName = 'tsdb'
+      end
+
+      def write(data)
+        call(:write, :post, data)
+      end
+
+      def query(query)
+        call(:query, :post, query)
+      end
+
+      def listTags
+        call(:listTags)
+      end
+
+      def listMetrics
+        call(:listMetrics)
+      end
+
+
+      def str_to_timestamp(str)
+        if str =~ /^\d+(u|ms|s)?$/ then
+          str
+        else
+          dt = DateTime.parse(str)
+          (dt.to_time.to_f * 1000000).to_i
+        end
+      end
+    end
+  end
+end
+
+command 'tsdb write' do |c|
+  c.syntax = %{mr tsdb write [options] <metric=value>|@<tag=value> … }
+  c.summary = %{write data}
+  c.description = %{Write data
+
+TIMESTAMP is microseconds since unix epoch, or can be suffixed with units.
+Units are u (microseconds), ms (milliseconds), s (seconds)
+
+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.action do |args, options|
+    sol = MrMurano::ServiceConfigs::Tsdb.new
+
+    # we have hash of tags, hash of metrics, optional timestamp.
+    metrics = {}
+    tags = {}
+    args.each do |item|
+      key, value = item.split('=', 2)
+      if key[0] == '@' then
+        tags[key[1..-1]] = value.to_s  #tags are always strings.
+      else
+        value = value.to_i if value == value.to_i.to_s
+        metrics[key] = value
+      end
+    end
+
+    data = {:tags=>tags, :metrics=>metrics}
+    if not options.when.nil? and options.when != 'now' then
+      data[:ts] = sol.str_to_timestamp(options.when)
+    end
+
+    ret = sol.write(data)
+    if ret != {} then
+      sol.error ret
+    end
+  end
+end
+
+command 'tsdb query' do |c|
+  c.syntax = %{mr tsdb query [options] }
+  c.summary = %{query data}
+  c.description =%{
+
+  list metrics to return
+  list tag=value to match
+
+
+FUNCS is a comma seperated list of the aggregate functions.
+FILL is null, none, any integer, previous
+
+DURATION is an integer with time unit to indicate relative time before now.
+Units are u (microseconds), ms (milliseconds), s (seconds), m (minutes),
+h (hours), d (days), w (weeks)
+
+TIMESTAMP is microseconds since unix epoch, or can be suffixed with units.
+Units are u (microseconds), ms (milliseconds), s (seconds)
+
+Also, many date-time formats can be parsed and will be converted to microseconds
+  }
+  c.option '--start_time TIMESTAMP', %{Start time range}
+  c.option '--end_time TIMESTAMP', %{End time range; defaults to now}
+  c.option '--relative_start DURATION', %{Start time relative from now}
+  c.option '--relative_end DURATION', %{End time relative from now}
+  c.option '--sampling_size DURATION', %{The size of time slots used for downsampling}
+  c.option '--limit NUM', Integer, %{Limit number of data points returned}
+  c.option '--epoch UNIT', ['u','ms','s'], %{Set size of returned timestamps}
+  c.option '--mode MODE', ['merge','split'], %{Merge or split each returned metric}
+  c.option '--fill FILL', %{Value to fill for time slots with no data points exist in merge mode}
+  c.option '--order_by ORDER', ['desc','asc'], %{Return results in ascending or descending time order}
+  c.option '--aggregate FUNCS', %{Aggregation functions to apply}
+
+  c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
+
+  c.action do |args, options|
+    sol = MrMurano::ServiceConfigs::Tsdb.new
+
+    query = {}
+    tags = {}
+    metrics = []
+    args.each do |arg|
+      if arg =~ /=/ then
+        # a tag.
+        k,v = arg.split('=', 2)
+        tags[k] = v
+      else
+        metrics << arg
+      end
+    end
+    query[:tags] = tags unless tags.empty?
+    query[:metrics] = metrics unless metrics.empty?
+
+    unless options.start_time.nil? then
+      query[:start_time] = sol.str_to_timestamp(options.start_time)
+    end
+    unless options.end_time.nil? then
+      query[:end_time] = sol.str_to_timestamp(options.end_time)
+    end
+
+    unless options.relative_start.nil? then
+      o = options.relative_start
+      o = "-#{o}" unless o[0] == '-'
+      query[:relative_start] = o
+    end
+    unless options.relative_end.nil? then
+      o = options.relative_end
+      o = "-#{o}" unless o[0] == '-'
+      query[:relative_end] = o
+    end
+    query[:sampling_size] = options.sampling_size unless options.sampling_size.nil?
+
+    query[:limit] = options.limit unless options.limit.nil?
+    query[:epoch] = options.epoch unless options.epoch.nil?
+    query[:mode] = options.mode unless options.mode.nil?
+    query[:order_by] = options.order_by unless options.order_by.nil?
+
+    query[:fill] = options.fill unless options.fill.nil?
+    unless options.aggregate.nil? then
+      query[:aggregate] = options.aggregate.split(',')
+    end
+
+    io=nil
+    if options.output then
+      io = File.open(options.output, 'w')
+    end
+    sol.outf sol.query(query) do |dd, ios|
+      sol.tabularize({
+        :headers=>dd[:columns],
+        :rows=>dd[:values]
+      }, ios)
+    end
+    io.close unless io.nil?
+  end
+end
+
+command 'tsdb list tags' do |c|
+  c.syntax = %{mr tsdb list tags [options]}
+  c.summary = %{List tags}
+
+  c.action do |args, options|
+    sol = MrMurano::ServiceConfigs::Tsdb.new
+    ret = sol.listTags
+    # TODO: handle looping if :next != nil
+    sol.outf ret[:tags].keys
+  end
+end
+
+command 'tsdb list metrics' do |c|
+  c.syntax = %{mr tsdb list metrics [options]}
+  c.summary = %{List metrics}
+
+  c.action do |args, options|
+    sol = MrMurano::ServiceConfigs::Tsdb.new
+    ret = sol.listMetrics
+    # TODO: handle looping if :next != nil
+    sol.outf ret[:metrics]
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/zshcomplete.erb

@@ -0,0 +1,112 @@
+#compdef <%= program :name %>
+
+__<%= program :name %>_common_options=(
+<% for option in @options -%>
+  <%- if flatswitches(option).count > 1 -%>
+    {<%= flatswitches(option).join(',') %>}<%= takesArg(option) %>:"<%= optionDesc option %>"
+  <%- else -%>
+    "<%= flatswitches(option).first %><%= takesArg(option) %>:<%= optionDesc option %>"
+  <%- end -%>
+<% end %>
+)
+
+_<%= program :name %> () {
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    # except this fails when a command only has one arg and then options.
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+    #echo "\n=$curcontext=$state=$words=\n"
+    case $state in
+        (command)
+          local -a list
+          list=(
+          <%- for name, subs in cmdTree -%>
+            <%- cmd = subs["\0cmd"] -%>
+            <%- if cmd.nil? -%>
+              <%= name %>:'  '
+            <%-else-%>
+              <%= name %>:'<%= cmd.summary || cmd.description.lines[0] -%>'
+            <%-end-%>
+          <%-end-%>
+          )
+          _describe -t firstArg 'firstArg' list
+          _describe -t options 'global options' __<%= program :name %>_common_options
+          ;;
+        (options)
+          case $line[1] in
+          <%- for name, subs in cmdTree -%>
+            (<%= name %>)
+              __<%=program :name%>-<%= name %>
+            ;;
+          <%-end-%>
+          esac
+          ;;
+    esac
+}
+
+<%- for  name, subs in cmdTree -%>
+  <%- command = subs["\0cmd"]; subs = subs.reject{|k,_| k == "\0cmd"} -%>
+__<%=program :name%>-<%= name %> () {
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+      <%- unless subs.empty? -%>
+      local -a subcommands
+      subcommands=(
+      <%- for sname, ssubs in subs -%>
+        <%- command = ssubs["\0cmd"] -%>
+        <%- if command.nil? then -%>
+          <%=sname%>:''
+        <%-else-%>
+          <%=sname%>:'<%= command.summary || command.description.lines[0] -%>'
+        <%-end-%>
+      <%-end-%>
+      )
+			_describe -t commands 'subcommand' subcommands
+      <%-end-%>
+      _describe -t options 'global options' __<%= program :name %>_common_options
+      <%- unless command.nil? or command.options.empty? then -%>
+      _arguments \
+        <%- for option in command.options -%>
+          <%- if flatswitches(option).count > 1 -%>
+            {<%= flatswitches(option).join(',') %>}<%= takesArg(option) %>"[<%= optionDesc option %>]: :" \
+          <%- else -%>
+            "<%= flatswitches(option).first %><%= takesArg(option) %>[<%= optionDesc option %>]: :" \
+          <%- end -%>
+        <%- end -%>
+      <%- end %>
+    ;;
+    (options)
+      case $line[1] in
+      <%- for sname, ssubs in subs -%>
+        <%- command = ssubs["\0cmd"]; subs = ssubs.reject{|k,_| k == "\0cmd"} -%>
+        (<%=sname%>)
+        _describe -t options 'global options' __<%= program :name %>_common_options
+        <%- unless command.nil? or command.options.empty? then -%>
+          _arguments \
+          <%- for option in command.options -%>
+            <%- if flatswitches(option).count > 1 -%>
+              {<%= flatswitches(option).join(',') %>}<%= takesArg(option) %>"[<%= optionDesc option %>]: :" \
+            <%- else -%>
+              "<%= flatswitches(option).first %><%= takesArg(option) %>[<%= optionDesc option %>]: :" \
+            <%- end -%>
+          <%- end -%>
+        <%- end %>
+        ;;
+      <%-end-%>
+      esac
+    ;;
+  esac
+}
+<%- end -%>
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands.rb

@@ -1,4 +1,3 @@
-
 require 'MrMurano/commands/account'
 require 'MrMurano/commands/assign'
 require 'MrMurano/commands/config'
@@ -20,3 +19,7 @@ require 'MrMurano/commands/solutionList'
 require 'MrMurano/commands/status'
 require 'MrMurano/commands/sync'
 require 'MrMurano/commands/timeseries'
+require 'MrMurano/commands/tsdb'
+
+require 'MrMurano/commands/completion'
+

data/lib/MrMurano/http.rb

@@ -12,7 +12,7 @@ module MrMurano
     end
 
     def json_opts
-      return @json_opts unless @json_opts.nil?
+      return @json_opts unless not defined?(@json_opts) or @json_opts.nil?
       @json_opts = {
         :allow_nan => true,
         :symbolize_names => true,
@@ -38,7 +38,7 @@ module MrMurano
 
     def http
       uri = URI('https://' + $cfg['net.host'])
-      if @http.nil? then
+      if not defined?(@http) or @http.nil? then
         @http = Net::HTTP.new(uri.host, uri.port)
         @http.use_ssl = true
         @http.start
@@ -111,8 +111,9 @@ module MrMurano
       end
     end
 
-    def get(path='', &block)
+    def get(path='', query=nil, &block)
       uri = endPoint(path)
+      uri.query = URI.encode_www_form(query) unless query.nil?
       workit(set_def_headers(Net::HTTP::Get.new(uri)), &block)
     end
 

data/lib/MrMurano/makePretty.rb

@@ -1,14 +1,23 @@
 require 'date'
 require 'json'
-require 'rainbow/ext/string'
+require 'highline'
 
 module MrMurano
   module Pretties
+
+    HighLine::Style.new(:name=>:on_aliceblue, :code=>"\e[48;5;231m", :rgb=>[240, 248, 255])
+    PRETTIES_COLORSCHEME = HighLine::ColorScheme.new do |cs|
+      cs[:subject] = [:red, :on_aliceblue]
+      cs[:timestamp] = [:blue]
+      cs[:json] = [:magenta]
+    end
+    HighLine.color_scheme = PRETTIES_COLORSCHEME
+
     def self.makeJsonPretty(data, options)
       if options.pretty then
         ret = JSON.pretty_generate(data).to_s
-        ret[0] = ret[0].color(:magenta)
-        ret[-1] = ret[-1].color(:magenta)
+        ret[0] = HighLine.color(ret[0], :json)
+        ret[-1] = HighLine.color(ret[-1], :json)
         ret
       else
         data.to_json
@@ -17,8 +26,8 @@ module MrMurano
 
     def self.makePretty(line, options)
       out=''
-      out << "#{line[:type] || '--'} ".upcase.color(:red).background(:aliceblue)
-      out << "[#{line[:subject] || ''}]".color(:red).background(:aliceblue)
+      out << HighLine.color("#{line[:type] || '--'} ".upcase, :subject)
+      out << HighLine.color("[#{line[:subject] || ''}]", :subject)
       out << " "
       if line.has_key?(:timestamp) then
         if line[:timestamp].kind_of? Numeric then
@@ -33,7 +42,7 @@ module MrMurano
       else
         curtime = "<no timestamp>"
       end
-      out << curtime.color(:blue)
+      out << HighLine.color(curtime, :timestamp)
       out << ":\n"
       if line.has_key?(:data) then
         data = line[:data]