MuranoCLI 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e2f9256da32058214bb3f721407d9fd480b951
-  data.tar.gz: 947a9c30a1632fae14e8c5e1560a52050bc0748b
+  metadata.gz: d7674b5979fb03799795303b94e871e2021a2f44
+  data.tar.gz: 3f15da4d29cb1482e396e89d84971be9783d15b0
 SHA512:
-  metadata.gz: 770f834abc53c64993f18fff880379b6ebb2ed24905fb662a856e66b103ac8d36cca955fa893fd9cca8a355cbbe39f08c38a71153450680fa1e8e8c5b493935f
-  data.tar.gz: 5f6ccacfaa8a60c09c8e551bbb17844266e5ddb7156f52b701b470c07faaff24fe5203c81b790580f8c3876f110667e4cef2530b815996a0ebda5027838ae247
+  metadata.gz: 1847646d933b575158caec9c9c3a0c2e4d092323253f077929a5dc14a5868b6fb911460ccbda8431d58384aa6ef22f0f51889c6410f02baa835046ba66a8c927
+  data.tar.gz: c17643abde19389b0513a27247197ea06cb64dc77f15bba0df5b37b77b84066caa8a947db90c7276f38990694ab66f9e2b3b26b24566c9fff074043a47b15799

data/lib/MrMurano/commands/devices.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.08.23 /coding: utf-8
+# Last Modified: 2017.10.04 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -239,7 +239,7 @@ Enables Identifiers, creating devices, or digital shadows, in Murano.
 
     unless options.auth.nil?
       options.auth = options.auth.to_sym
-      unless MrMurano::Gateway::Device.DEVICE_AUTH_TYPES.include?(options.auth)
+      unless MrMurano::Gateway::Device::DEVICE_AUTH_TYPES.include?(options.auth)
         MrMurano::Verbose.error("unrecognized --auth: #{options.auth}")
         exit 1
       end

data/lib/MrMurano/commands/tsdb.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.11 /coding: utf-8
+# Last Modified: 2017.10.05 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -156,11 +156,7 @@ Also, many date-time formats can be parsed and will be converted to microseconds
   c.example 'murano tsdb query hum --sampling_size 30m', 'Get one hum entry from each 30 minute chunk of time'
   c.example 'murano tsdb query hum --sampling_size 30m --aggregate avg', 'Get average hum entry from each 30 minute chunk of time'
 
-  c.action do |args, options|
-    # SKIP: c.verify_arg_count!(args)
-
-    sol = MrMurano::ServiceConfigs::Tsdb.new
-
+  def query_from_args(args)
     query = {}
     tags = {}
     metrics = []
@@ -176,7 +172,10 @@ Also, many date-time formats can be parsed and will be converted to microseconds
     end
     query[:tags] = tags unless tags.empty?
     query[:metrics] = metrics unless metrics.empty?
+    query
+  end
 
+  def query_add_options(query, options, sol)
     # 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.
     if query[:metrics].to_s.empty?
@@ -209,42 +208,112 @@ Also, many date-time formats can be parsed and will be converted to microseconds
     query[:order_by] = options.order_by unless options.order_by.nil?
 
     query[:fill] = options.fill unless options.fill.nil?
-    unless options.aggregate.nil?
-      query[:aggregate] = options.aggregate.split(',')
+    return if options.aggregate.nil?
+    query[:aggregate] = options.aggregate.split(',')
+  end
+
+  def unpack_aggregate(query, options, dd)
+    # If aggregated, then we need to break up the columns. since each is now a
+    # hash of the aggregated functions
+
+    # 2017-10-05: Some examples.
+    #
+    # When using, e.g., --sampling_size 30m
+    #
+    #   { :values=>[["2017-10-05T13:30:00.000000+00:00", {:avg=>360.5}]],
+    #     :tags=>{},
+    #     :metrics=>["temperature"],
+    #     :columns=>["time", "temperature"] }
+    #
+    # When not using --sampling_size, e.g.,
+    #
+    #   { :values=>{:temperature=>{:avg=>360.5}},
+    #     :tags=>{},
+    #     :metrics=>["temperature"] }
+    #
+    # Or, if there are not metrics in the specified time frame,
+    #
+    #   { :values=>{:temperature=>{:avg=>nil}},
+    #     :tags=>{},
+    #     :metrics=>["temperature"] }
+
+    if options.aggregate.nil?
+      # Return just :columns and :values to not pollute other
+      # output, i.e., --json, etc.
+      [dd[:columns], dd[:values]]
+    elsif options.sampling_size.nil?
+      # dd[:values] is a Hash.
+      unpack_grouped_values(query, dd)
+    else
+      # dd[:values] is a list.
+      unpack_raw_values(query, dd)
     end
+  end
 
-    io = File.open(options.output, 'w') if options.output
-    sol.outf sol.query(query) do |dd, ios|
-      # If aggregated, then we need to break up the columns. since each is now a
-      # hash of the aggregated functions
-      unless options.aggregate.nil?
-        dd[:values].map! do |row|
-          row.map do |value|
-            if value.is_a? Hash
-              query[:aggregate].map { |qa| value[qa.to_sym] }
-            else
-              value
-            end
-          end.flatten
+  def unpack_raw_values(query, dd)
+    vals = dd[:values].map do |row|
+      row.map do |value|
+        if value.is_a? Hash
+          query[:aggregate].map { |qa| value[qa.to_sym] }
+        elsif value == 'none'
+          # Fill in empty cells, one for each aggregate.
+          query[:aggregate].map { 'none' }
+        else
+          value
+        end
+      end.flatten
+    end
+    cols = dd[:columns].map do |col|
+      if col == 'time'
+        col
+      else
+        query[:aggregate].map { |qa| "#{col}.#{qa}" }
+      end
+    end.flatten!
+    [cols, vals]
+  end
+
+  def unpack_grouped_values(query, dd)
+    vals = []
+    cols = ['metric'] + query[:aggregate]
+    dd[:values].map do |metric, results|
+      row = [metric]
+      query[:aggregate].each do |agg|
+        agg = agg.to_sym
+        if !results.key? agg
+          row += ['none']
+        else
+          row += [results[agg] || '']
         end
-        dd[:columns].map! do |col|
-          if col == 'time'
-            col
-          else
-            query[:aggregate].map { |qa| "#{col}.#{qa}" }
-          end
-        end.flatten!
       end
+      vals += [row]
+    end
+    [cols, vals]
+  end
+
+  def query_solution_query(query, options, sol)
+    io = File.open(options.output, 'w') if options.output
+    results = sol.query(query)
+    sol.outf(results) do |dd, ios|
+      cols, vals = unpack_aggregate(query, options, dd)
       sol.tabularize(
         {
-          headers: dd[:columns],
-          rows: dd[:values],
+          headers: cols,
+          rows: vals,
         },
         ios
       )
     end
     io.close unless io.nil?
   end
+
+  c.action do |args, options|
+    # SKIP: c.verify_arg_count!(args)
+    query = query_from_args(args)
+    sol = MrMurano::ServiceConfigs::Tsdb.new
+    query_add_options(query, options, sol)
+    query_solution_query(query, options, sol)
+  end
 end
 
 command 'tsdb list tags' do |c|

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
-# Last Modified: 2017.09.28 /coding: utf-8
+# Last Modified: 2017.10.06 /coding: utf-8
 # frozen_string_literal: true
 
 # Copyright © 2016-2017 Exosite LLC.
@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.0.5'
+  VERSION = '3.0.6'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified