influxdb-cli 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b568164a56da1eae7c93bbcde1166c19f2faa1
-  data.tar.gz: 548d3721361e117c98f497e6d6201d07733f85ea
+  metadata.gz: 99c5faca92da1f2362bcd999e8007d92d3b91e82
+  data.tar.gz: 7eee7f66b1b30f644d1a9b29c51142bdb909e989
 SHA512:
-  metadata.gz: af16d981b18cae9e55794bbd2c4cdde9857ee1a947480591d49c76e4f6c66d71f177afe3bb0a863ac99595d7ec27cde6297f859f3983e8e4ab7cea19459db906
-  data.tar.gz: 2c37000746bd70fb357e99ef5fd846f7faaf30c4d1d0245e58f04f91dcff03ba1f0f81f5121dcbda7be35ee3e32caa3aee453c5f5cdf163e020c1deaab4aa472
+  metadata.gz: 7839991a77721868443e099662cf3aec93a14a883158594c09584fbb7dbff239b2a7c86649558a1eeb359654950d522a61898b55cbec6a15d3b26086be0fd4b3
+  data.tar.gz: 0b9b02d642bbe109775e395499ac63e01030ca426d3b28aa813f6770e344236babcbc1377008bbb98c0687239041378d09e22c7c3b9571eb893efe5de9e3b93b

data/README.md

@@ -1,7 +1,7 @@
 InfluxDB-CLI
 ============
 
-Ruby CLI for InfluxDB is a simple Ruby console (empowered with [Pry](https://github.com/pry/pry)) connected to an InfluxDB server with supplied parameters. In order to connect to InfluxDB, it uses [influxdb-ruby](https://github.com/influxdb/influxdb-ruby), so you can access any avaiable method from influxdb-ruby in the console through the `db` variable i.e.: `db.write_point(name, data)`, `db.query('SELECT value FROM response_times')` etc.
+Ruby CLI for InfluxDB is a simple Ruby console (empowered with [Pry](https://github.com/pry/pry)) connected to an InfluxDB server using given parameters. In order to connect to InfluxDB, it uses [influxdb-ruby](https://github.com/influxdb/influxdb-ruby), so you can access any avaiable method from influxdb-ruby in the console through the `db` variable i.e.: `db.write_point(name, data)`, `db.query('SELECT value FROM response_times')` etc.
 
 [![Build Status](https://secure.travis-ci.org/phstc/influxdb-cli.png)](http://travis-ci.org/phstc/influxdb-cli)
 
@@ -43,7 +43,7 @@ or
 
 ```shell
 influxdb-cli -u user -p password -d database -h sandbox.influxdb.org --port 9061
-Connecting to {"host"=>"sandbox.influxdb.org", "port"=>"9061", "username"=>"phstc", "password"=>"RggLimEQfK36or", "database"=>"spree"}
+Connecting to {"host"=>"sandbox.influxdb.org", "port"=>"9061", "username"=>"username", "password"=>"password", "database"=>"database"}
 ✔ ready
 ```
 

data/bin/influxdb-cli

@@ -48,7 +48,9 @@ def db; InfluxDBClientTasks.db; end
 # 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)

data/lib/influxdb_client/client.rb

@@ -4,13 +4,19 @@ module InfluxDBClient
   class Client
     QUERY_LANGUAGE_MATCHER = /\A\s*((delete\s+from|select\s+.+\s+from)\s.+)\z/i
 
+    # Prints a tabularized output from a query result.
+    #
+    # @param result [Hash] the {InfluDB::Client#query result}
+    # @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|
-        headings = result[series].first.keys
-        rows = result[series].collect(&:values)
-        table = Terminal::Table.new title: series, headings: headings, rows: rows
-        output.puts table
+        if result[series].any?
+          output.puts generate_table(series, result)
+        else
+          output.puts "No results found for #{series}"
+        end
         # empty line between time series output
         output.puts
         # count total per time series
@@ -18,6 +24,15 @@ module InfluxDBClient
       end
       number_of_points
     end
+
+    private
+
+    def self.generate_table(series, result)
+      headings = result[series].first.keys
+      rows = result[series].collect(&:values)
+
+      Terminal::Table.new title: series, headings: headings, rows: rows
+    end
   end
 end
 

data/lib/influxdb_client/version.rb

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

data/spec/influxdb_client/client_spec.rb

@@ -56,6 +56,30 @@ module InfluxDBClient
 
         described_class.print_tabularize(result, output)
       end
+
+      context 'when empty results' do
+        let(:result)  { { series1: [{ value1: 1, value2: 2 }],
+                          series2: [] } }
+
+        it 'puts 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)
+          # no results for series 2
+          expect(output).to receive(:puts).once.with('No results found for series2')
+          # line break for series
+          expect(output).to receive(:puts).twice.with(no_args)
+
+          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
 end

metadata

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