influxdb-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281b2fa707050411c4122d9d0baec8bb71eb7df9
-  data.tar.gz: 7c8db30a7593ce61d5568b736db0e14d5a89deea
+  metadata.gz: c973d4bc6e8ab8bd0671edabb94494404fff84ee
+  data.tar.gz: cd28988ee12a4ca03682f1a9ecef55865c13deb6
 SHA512:
-  metadata.gz: 0755bf563ec3a8bcf1d3253b833f76668ac72e67f474cdaa6304e2247cc0cb17b292f601830bf6676eee4deba3e356185182d6b328e2d4fa7ba64f076050f2a6
-  data.tar.gz: ebb47210f603cad89deee719c23681db14695a999c39a8218922972b0ca75d38f57f42dbc74aed8a81ac80a89edee192e618130a91fd847f3321da149dd3b095
+  metadata.gz: 8ef30a9b139ad42ea041d8622ea9287dfab0e0b1064ff3a68b4096c1415576c82dcffe9bb4cfb9a84663b4cc8a9312aa4cb3d13a242693dee99ac694c2a3f74e
+  data.tar.gz: e167e953a7ae1ad706c8d803ca8284781b4f3b2c58b29ce415d8be17e8b9f04845d236ca5e498c13b4be62f6835dec0c153143c50422bd09ca23de9eb5192a89

data/.travis.yml

@@ -2,8 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 1.9.2
+  - 2.0.0
+  # - 2.1.0
+  # - ruby-head
   - jruby-19mode
-  - ruby-head
   - jruby-head
 
 notifications:

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 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.
+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 available 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)
 
@@ -17,7 +17,7 @@ Usage:
   influxdb-cli
 
 Options:
-  -h, [--host=HOST]          # Hostname
+      [--host=HOST]          # Hostname
                              # Default: localhost
       [--port=PORT]          # Port
                              # Default: 8086
@@ -27,6 +27,7 @@ Options:
                              # Default: root
   -d, [--database=DATABASE]  # Database
                              # Default: db
+      [--pretty=PRETTY]      # Human readable times
 ```
 
 ### Usage
@@ -42,7 +43,7 @@ Connecting to {"host"=>"localhost", "port"=>8086, "username"=>"root", "password"
 or
 
 ```shell
-$ influxdb-cli -u user -p password -d database -h sandbox.influxdb.org --port 9061
+$ influxdb-cli -u user -p password -d database --host sandbox.influxdb.org --port 9061
 Connecting to {"host"=>"sandbox.influxdb.org", "port"=>"9061", "username"=>"username", "password"=>"password", "database"=>"database"}
 ✔ ready
 ```
@@ -73,18 +74,18 @@ Connecting to {"host"=>"sandbox.influxdb.org", "port"=>"9061", "username"=>"user
 #### Write a point
 
 ```ruby
-2.0.0 (main)> db.write_point('test', { message: 'Hello Pablo' })
+2.0.0 (main)> db.write_point('tests', { message: 'Hello Pablo' })
 
-2.0.0 (main)> SELECT * FROM test
+2.0.0 (main)> SELECT * FROM tests
 
 +---------------+-----------------+-------------+
-|                     test                      |
+|                     tests                     |
 +---------------+-----------------+-------------+
 | time          | sequence_number | message     |
 +---------------+-----------------+-------------+
 | 1387287723816 | 1               | Hello Pablo |
 +---------------+-----------------+-------------+
-1 result found for test
+1 result found for tests
 
 Query duration: 0.0s
 ```
@@ -92,7 +93,19 @@ Query duration: 0.0s
 #### Return the last point from every time series in the database
 
 ```ruby
-2.0.0 (main)> SELECT * FROM /.*/
+2.0.0 (main)> SELECT * FROM /.*/ LIMIT 1
+```
+
+or to get only the name from every time series in the database.
+
+```ruby
+2.0.0 (main)> db.query('SELECT * FROM /.*/ LIMIT 1').keys
+=> [
+    [0] "tests",
+    [1] "response_times",
+    [2] "deploys",
+    [3] "..."
+]
 ```
 
 
@@ -145,7 +158,7 @@ instance variables: @database  @host  @http  @password  @port  @queue  @username
 
 ### Pry commands
 
-As influxdb-cli is empowered with Pry, all Pry awesome commands are avaiable in the console.
+As influxdb-cli is empowered with Pry, all Pry awesome commands are available in the console.
 
 #### show-source
 

data/bin/influxdb-cli

@@ -15,15 +15,18 @@ class InfluxDBClientTasks < Thor
   @@db = nil
 
   desc 'db', 'Connect to InfluxDB (default command)'
-  method_option :host,      :default => 'localhost',  :aliases => '-h',  :desc => 'Hostname'
+  method_option :host,      :default => 'localhost',  :desc => 'Hostname'
   method_option :port,      :default => 8086,         :desc => 'Port'
-  method_option :username,  :default => 'root',       :aliases => '-u',  :desc => 'Username'
-  method_option :password,  :default => 'root',       :aliases => '-p',  :desc => 'Password'
-  method_option :database,  :default => 'db',         :aliases => '-d',  :desc => 'Database'
+  method_option :username,  :default => 'root',       :desc => 'Username', :aliases => '-u'
+  method_option :password,  :default => 'root',       :desc => 'Password', :aliases => '-p'
+  method_option :database,  :default => 'db',         :desc => 'Database', :aliases => '-d'
+  method_option :pretty,    :default => nil,          :desc => 'Human readable times (UTC)'
+
   def db
     puts "Connecting to #{options.inspect}"
     @@db ||= InfluxDB::Client.new options[:database],
       { username: options[:username], password: options[:password], host: options[:host], port: options[:port] }
+    InfluxDBClient::Client.pretty = options[:pretty]
     puts '✔ ready'
   end
 

data/influxdb-cli.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'terminal-table'
 
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency "bundler"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'bundler'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'pry-byebug'
 end
 

data/lib/influxdb_client/client.rb

@@ -31,6 +31,10 @@ module InfluxDBClient
       end
     end
 
+    def self.pretty=(pretty)
+      @pretty = !!pretty
+    end
+
     private
 
     def self.pluralize(count, singular, plural = nil)
@@ -43,7 +47,10 @@ module InfluxDBClient
 
     def self.generate_table(series, result_series)
       headings = result_series.first.keys
-      rows = result_series.collect(&:values)
+      rows = result_series.map do |row|
+        row['time'] = Time.at(row['time'] / 1000).utc.to_s if @pretty
+        row.values
+      end
 
       Terminal::Table.new title: series, headings: headings, rows: rows
     end

data/lib/influxdb_client/version.rb

@@ -1,3 +1,3 @@
 module InfluxDBClient
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/influxdb_client/client_spec.rb

@@ -37,20 +37,34 @@ module InfluxDBClient
     end
 
     describe '.print_tabularize' do
-      let(:result)  { { series1: [{ value1: 1, value2: 2 }],
-                        series2: [{ value3: 3,   value4: 4, value5: nil, value6: nil },
-                                  { value3: nil, value4: 4, value5: 5,   value6: 6   }] } }
+      let(:result)  { { series1: [{ 'time' => 1387287723816, 'value1' => 1,   'value2' => 2 }],
+                        series2: [{ 'time' => 1394552447955, 'value3' => 3,   'value4' => 4, 'value5' => nil, 'value6' => nil },
+                                  { 'time' => 1394664358980, 'value3' => nil, 'value4' => 4, 'value5' => 5,   'value6' => 6   }] } }
 
       it 'generates tables' do
         expect(Terminal::Table).to receive(:new).
-          with(title: :series1, headings: [:value1, :value2], rows: [[1, 2]])
+          with(title: :series1, headings: %w[time value1 value2], rows: [[1387287723816, 1, 2]])
 
         expect(Terminal::Table).to receive(:new).
-          with(title: :series2, headings: [:value3, :value4, :value5, :value6], rows: [[3, 4, nil, nil], [nil, 4, 5, 6]])
+          with(title: :series2, headings: %w[time value3 value4 value5 value6], rows: [[1394552447955, 3, 4, nil, nil], [1394664358980, nil, 4, 5, 6]])
 
         described_class.print_tabularize(result)
       end
 
+      context 'when pretty' do
+        before(:all) { described_class.pretty = true }
+        after(:all)  { described_class.pretty = false }
+        it 'generates tables' do
+          expect(Terminal::Table).to receive(:new).
+            with(title: :series1, headings: %w[time value1 value2], rows: [['2013-12-17 13:42:03 UTC', 1, 2]])
+
+          expect(Terminal::Table).to receive(:new).
+            with(title: :series2, headings: %w[time value3 value4 value5 value6], rows: [['2014-03-11 15:40:47 UTC', 3, 4, nil, nil], ['2014-03-12 22:45:58 UTC', nil, 4, 5, 6]])
+
+          described_class.print_tabularize(result)
+        end
+      end
+
       it 'prints results' do
         output = double 'Output'
         table  = double 'Table'

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'fileutils'
 require 'tempfile'
+require 'pry-byebug'
 
 Dir['../lib/**/*.rb'].each &method(:require)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby CLI for InfluxDB
 email:
 - pablo@pablocantero.com