influxdb-cli 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee6c28061fbb73ce08132bce8f324e50d84f3e4
-  data.tar.gz: 7aa0b0fcd32f70564339e928e1da503f23b8704d
+  metadata.gz: 38b568164a56da1eae7c93bbcde1166c19f2faa1
+  data.tar.gz: 548d3721361e117c98f497e6d6201d07733f85ea
 SHA512:
-  metadata.gz: 43daad92887c4ff7d7bdbf35bfa647a9159f26edf52f792ba96c71087f097788d55384d19e08634e040823aac1afd6bc29b59a24fcc10351a705ad29251e1517
-  data.tar.gz: ff157af73651e607020e348e7d3d1fde35bc3818e29e8ef655465defb37d58db8bca92017449fe464debe795dd6b321b23d50f4393ca870411dc6e1ebf0ca6c2
+  metadata.gz: af16d981b18cae9e55794bbd2c4cdde9857ee1a947480591d49c76e4f6c66d71f177afe3bb0a863ac99595d7ec27cde6297f859f3983e8e4ab7cea19459db906
+  data.tar.gz: 2c37000746bd70fb357e99ef5fd846f7faaf30c4d1d0245e58f04f91dcff03ba1f0f81f5121dcbda7be35ee3e32caa3aee453c5f5cdf163e020c1deaab4aa472

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
+
+script: bundle exec rspec spec

data/README.md

@@ -3,6 +3,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.
 
+[![Build Status](https://secure.travis-ci.org/phstc/influxdb-cli.png)](http://travis-ci.org/phstc/influxdb-cli)
 
 ### Installation
 ```shell

data/bin/influxdb-cli

@@ -5,9 +5,11 @@ require 'influxdb'
 require 'pry'
 require 'thor'
 require 'awesome_print'
-require 'terminal-table'
 
-Dir['../lib/**/*.rb'].each &method(:require)
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'influxdb_client/version'
+require 'influxdb_client/client'
 
 class InfluxDBClientTasks < Thor
   desc 'db', 'Connect to InfluxDB'
@@ -23,6 +25,13 @@ class InfluxDBClientTasks < Thor
     puts '✔ ready'
   end
 
+  desc 'version', 'Show influxdb-cli version'
+  def version
+    puts "influxdb-cli #{InfluxDBClient::VERSION}"
+    # skip `pry` console
+    exit 0
+  end
+
   def self.db; @@db; end
 
   default_task :db
@@ -43,30 +52,20 @@ def db; InfluxDBClientTasks.db; end
 # @return [Hash] the number of points per time series i.e. { 'response_times.count' => 10 }
 def query(query)
   result = db.query(query)
-  number_of_points = {}
-  result.to_h.keys.each do |series|
-    headings = result[series].first.keys
-    rows = result[series].collect(&:values)
-    table = Terminal::Table.new title: series, headings: headings, rows: rows
-    puts table
-    # empty line between time series output
-    puts
-    # count total per time series
-    number_of_points["#{series}.count"] = result[series].size
-  end
-  number_of_points
+  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 /\A\s*((delete\s+from|select\s+.+\s+from)\s*.+)\z/i, 'Execute a query' do |cmd|
+Pry::Commands.block_command InfluxDBClient::Client::QUERY_LANGUAGE_MATCHER, 'Execute a query' do |cmd|
   query(cmd)
 end
 
-InfluxDBClientTasks.start
-
 # awesome_print
 Pry.config.print = proc { |output, value| Pry::Helpers::BaseHelpers.stagger_output("=> #{value.ai}", output) }
 
+# TODO start `pry` only in case of `db` command, `help` and `version` should not start `pry`
 pry
 

data/lib/influxdb_client.rb

@@ -1,3 +1,6 @@
+require 'influxdb_client/version'
+require 'influxdb_client/client'
+
 module InfluxDBClient
 end
 

data/lib/influxdb_client/client.rb

@@ -0,0 +1,23 @@
+require 'terminal-table'
+
+module InfluxDBClient
+  class Client
+    QUERY_LANGUAGE_MATCHER = /\A\s*((delete\s+from|select\s+.+\s+from)\s.+)\z/i
+
+    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
+        # empty line between time series output
+        output.puts
+        # count total per time series
+        number_of_points["#{series}.count"] = result[series].size
+      end
+      number_of_points
+    end
+  end
+end
+

data/lib/influxdb_client/version.rb

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

data/spec/influxdb_client/client_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module InfluxDBClient
+  describe Client do
+    describe '.QUERY_LANGUAGE_MATCHER' do
+      subject { Client::QUERY_LANGUAGE_MATCHER }
+      context 'when SELECT queries' do
+        it { should match('SELECT value1, value2 FROM response_times') }
+        it { should match('select * from response_times') }
+        it { should match('SELECT * FROM series1, series2') }
+        it { should match('SELECT * FROM series1, series2 LIMIT 1') }
+
+        it { should_not match('SELECT value1, value2FROM response_times') }
+        it { should_not match('select from response_times') }
+        it { should_not match('SELECT * FROM') }
+      end
+
+      context 'when DELETE queries' do
+        it { should match('DELETE FROM response_times') }
+        it { should match('delete from series1, series2') }
+
+        it { should_not match('DELETEFROM response_times') }
+        it { should_not match('delete value1, value2 from series1, series2') }
+        it { should_not match('DELETE * FROM series1, series2') }
+      end
+    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   }] } }
+
+      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]])
+
+        expect(Terminal::Table).to receive(:new).
+          with(title: :series2, headings: [:value3, :value4, :value5, :value6], rows: [[3, 4, nil, nil], [nil, 4, 5, 6]])
+
+        described_class.print_tabularize(result)
+      end
+
+      it 'puts tables' 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)
+        # line break for series
+        expect(output).to receive(:puts).twice.with(no_args)
+
+        described_class.print_tabularize(result, output)
+      end
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require 'tempfile'
 
 Dir['../lib/**/*.rb'].each &method(:require)
 
+require './lib/influxdb_client'
+
 RSpec.configure do |config|
   config.color_enabled = true
   config.formatter = 'progress'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -139,7 +140,9 @@ files:
 - bin/influxdb-cli
 - influxdb-cli.gemspec
 - lib/influxdb_client.rb
+- lib/influxdb_client/client.rb
 - lib/influxdb_client/version.rb
+- spec/influxdb_client/client_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/phstc/influxdb-cli
 licenses: []
@@ -165,4 +168,5 @@ signing_key:
 specification_version: 4
 summary: Ruby CLI for InfluxDB
 test_files:
+- spec/influxdb_client/client_spec.rb
 - spec/spec_helper.rb