influxdb-cli 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99c5faca92da1f2362bcd999e8007d92d3b91e82
-  data.tar.gz: 7eee7f66b1b30f644d1a9b29c51142bdb909e989
+  metadata.gz: f7a4f8e0419999de09aa047254204462f8150b6d
+  data.tar.gz: f468e14d522630cc1e4b6de1970e3484ba2b8051
 SHA512:
-  metadata.gz: 7839991a77721868443e099662cf3aec93a14a883158594c09584fbb7dbff239b2a7c86649558a1eeb359654950d522a61898b55cbec6a15d3b26086be0fd4b3
-  data.tar.gz: 0b9b02d642bbe109775e395499ac63e01030ca426d3b28aa813f6770e344236babcbc1377008bbb98c0687239041378d09e22c7c3b9571eb893efe5de9e3b93b
+  metadata.gz: 83f22cfbe7d9c64fb8189cf2b37f0dbbf66db33aef45d658e251c77179fca54c18a0b6ffa79d57d439c7a65eea83e1be17d9034e6432c19e5992e1615162a723
+  data.tar.gz: 714a92645856fecd8e2cc3f8b85ef0ab3e6bdce44c7183c4ce274e214834ed235235a7c18a1969f8b0e8951fbdeae4e5d77a528652f90ec5df9ef35e683ee7d8

data/.travis.yml

@@ -6,4 +6,9 @@ rvm:
   - ruby-head
   - jruby-head
 
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+
 script: bundle exec rspec spec

data/bin/influxdb-cli

@@ -42,27 +42,19 @@ end
 # @return [InfluxDB::Client]
 def db; InfluxDBClientTasks.db; end
 
-# Queries data using {http://influxdb.org/docs/query_language/ InfluxDB Query Language}
-# and prints a tabularized output.
-#
-# i.e. query('select value from response_times')
-#
-# @see InfluxDB::Client#query
-# @see InfluxDBClient::Client.print_tabularize
-#
-# @param query [String] the query
-# @return [Hash] the number of points per time series i.e. { 'response_times.count' => 10 }
-def query(query)
-  result = db.query(query)
-  InfluxDBClient::Client.print_tabularize(result)
-end
-
 InfluxDBClientTasks.start
 
 # allow typing queries directly from console i.e.`select * from deploys` instead of `query('select * from deploys')`.
 # matches `delete from ...` and `select ... from ...`
 Pry::Commands.block_command InfluxDBClient::Client::QUERY_LANGUAGE_MATCHER, 'Execute a query' do |cmd|
-  query(cmd)
+  start     = Time.now
+  result    = db.query(cmd)
+  duration  = Time.now - start
+
+  InfluxDBClient::Client.print_tabularize(result)
+
+  # print query duration in seconds
+  puts "Query duration: #{duration.round(2)}s"
 end
 
 # awesome_print

data/lib/influxdb_client/client.rb

@@ -10,26 +10,33 @@ module InfluxDBClient
     # @param output [STDOUT] the output to `puts` the results
     # @return [Hash] the number of points per time series i.e. { 'response_times.count' => 10 }
     def self.print_tabularize(result, output=$stdout)
-      number_of_points = {}
-      result.keys.each do |series|
-        if result[series].any?
-          output.puts generate_table(series, result)
+      (result || {}).keys.each do |series|
+        result_series = result[series]
+
+        if result_series.any?
+          output.puts generate_table(series, result_series)
+          output.puts "#{result_series.size} #{pluralize(result_series.size, 'result')} found for #{series}"
         else
           output.puts "No results found for #{series}"
         end
-        # empty line between time series output
+        # print a line break between time series output
         output.puts
-        # count total per time series
-        number_of_points["#{series}.count"] = result[series].size
       end
-      number_of_points
     end
 
     private
 
-    def self.generate_table(series, result)
-      headings = result[series].first.keys
-      rows = result[series].collect(&:values)
+    def self.pluralize(count, singular, plural = nil)
+      if count > 1
+        plural ? plural : "#{singular}s"
+      else
+        singular
+      end
+    end
+
+    def self.generate_table(series, result_series)
+      headings = result_series.first.keys
+      rows = result_series.collect(&:values)
 
       Terminal::Table.new title: series, headings: headings, rows: rows
     end

data/lib/influxdb_client/version.rb

@@ -1,3 +1,3 @@
 module InfluxDBClient
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/spec/influxdb_client/client_spec.rb

@@ -30,10 +30,6 @@ module InfluxDBClient
                         series2: [{ value3: 3,   value4: 4, value5: nil, value6: nil },
                                   { value3: nil, value4: 4, value5: 5,   value6: 6   }] } }
 
-      it 'returns series count' do
-        expect(described_class.print_tabularize(result)).to eq({ 'series1.count' => 1, 'series2.count' => 2 })
-      end
-
       it 'generates tables' do
         expect(Terminal::Table).to receive(:new).
           with(title: :series1, headings: [:value1, :value2], rows: [[1, 2]])
@@ -44,13 +40,16 @@ module InfluxDBClient
         described_class.print_tabularize(result)
       end
 
-      it 'puts tables' do
+      it 'prints results' do
         output = double 'Output'
         table  = double 'Table'
         Terminal::Table.stub(new: table)
 
         # should print series1 and series2
         expect(output).to receive(:puts).twice.with(table)
+        # print results count
+        expect(output).to receive(:puts).once.with('1 result found for series1')
+        expect(output).to receive(:puts).once.with('2 results found for series2')
         # line break for series
         expect(output).to receive(:puts).twice.with(no_args)
 
@@ -61,13 +60,15 @@ module InfluxDBClient
         let(:result)  { { series1: [{ value1: 1, value2: 2 }],
                           series2: [] } }
 
-        it 'puts no results found' do
+        it 'prints no results found' do
           output = double 'Output'
           table  = double 'Table'
           Terminal::Table.stub(new: table)
 
           # should print series1
           expect(output).to receive(:puts).once.with(table)
+          # print results count
+          expect(output).to receive(:puts).once.with('1 result found for series1')
           # no results for series 2
           expect(output).to receive(:puts).once.with('No results found for series2')
           # line break for series
@@ -75,10 +76,6 @@ module InfluxDBClient
 
           described_class.print_tabularize(result, output)
         end
-
-        it 'returns series count' do
-          expect(described_class.print_tabularize(result)).to eq({ 'series1.count' => 1, 'series2.count' => 0 })
-        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Pablo Cantero