influxdb 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c280c4f839a7d00e2c716226f06987df217edebbf7149bf309906b8b34ea2e26
-  data.tar.gz: 3dc453ebb5a914de3e364da388255d7d38e266a468dce14dc9a7e5f9e7a2b273
+  metadata.gz: 9b1a5b7dc10839360a584d7b4eee0c6163c2b0cdcb653a0963cdfe2b5612fcb4
+  data.tar.gz: ab5b75766b41b32edf7669e7efc521540d407f17b7148c285b673b93db96d86d
 SHA512:
-  metadata.gz: b4b0f7d6475d31e3506e4c3979548c56cd70bd9c632ba77b6d3a8fae26cc3b2885c34662848ed1096a456b2156347c8f6b8b7746ca5b68cd170f877d6b5409c4
-  data.tar.gz: 72a5903843c25150e2daf01c31f57f3636a3f7730183704c111a6c6be5c42ed84cd42970087087292328f6ecce7ffa20313a87e09644b8199eadcd639f5c6733
+  metadata.gz: 55a4402f0355c7bb6269e05d487d5d941e8d72675653ada7a8f41903b67040c2602738aa3eb2f4619530f49f9202595ed258a4ace8e0ec130d2ba64bfec66a4f
+  data.tar.gz: a134972af2b74c6704a08485ac784cf54f9696cd0b3db7788b7d14156ecd51a36110763565f2b115c116e949a7d503e630b33b4e08018632900bf3516719ca62

data/.travis.yml

@@ -29,17 +29,19 @@ matrix:
     - rvm: jruby-head
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
     - rvm: 2.5.1
-      env: influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
+      env: influx_version=1.0.2 pkghash=88f6c30fec2c6e612e802e23b9161fdfc7c5c29f6be036f0376326445aff0037
     - rvm: 2.5.1
-      env: influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
+      env: influx_version=1.1.0 pkghash=f1520a2e18e0ab47e8a8810671e07d5a47960e54f7553b78bebe7d3c7594742f
     - rvm: 2.5.1
-      env: influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
+      env: influx_version=1.2.4 pkghash=2fac8391e04aa1bec9151e8f0d8f18df030c866af2b4963ab7d86c6ddc172182
     - rvm: 2.5.1
-      env: influx_version=1.3.6 pkghash256=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
+      env: influx_version=1.3.6 pkghash=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
     - rvm: 2.5.1
-      env: influx_version=1.4.3 pkghash256=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
+      env: influx_version=1.4.3 pkghash=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
     - rvm: 2.5.1
-      env: influx_version=1.5.2 pkghash256=42fede7b497bdf30d4eb5138db218d1add986fca4fce4a8bcd9c7d6dabaf572a
+      env: influx_version=1.5.2 pkghash=42fede7b497bdf30d4eb5138db218d1add986fca4fce4a8bcd9c7d6dabaf572a
+    - rvm: 2.5.1
+      env: influx_version=1.6.1 pkghash=a833ac16890182a75983c61e5fe6471ae27cbab7984d7b7361034887b7428de2
     - rvm: 2.5.1
       env: influx_version=nightly channel=nightlies
   fail_fast: true

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/commits/master).
 
+## v0.6.1, released 2018-08-23
+
+- Fix `InfluxDB::Client#delete_retention_policy`: the database name
+  argument is now quoted (#221, #222 @AishwaryaRK).
+- Add `InfluxDB::Client#list_measurements` and `#delete_measuerment`
+  (#220)
+
 ## v0.6.0, released 2018-07-10
 
 - Add batch query support via `InfluxDB::Client#batch` (and using

data/bin/provision.sh

@@ -22,21 +22,14 @@ else
 fi
 
 echo "== Download verification"
-hash_sum=$(md5sum "${HOME}/${package_name}" | awk '{ print $1 }')
 sha2_sum=$(sha256sum "${HOME}/${package_name}" | awk '{ print $1 }')
 
-if [ -z "${pkghash}" ] || [ -z "${pkghash256}"]; then
+if [ -z "${pkghash}" ]; then
   echo "-- Skipping, pkghash is empty"
-else
-  if [ -n "${pkghash256}" ] && [ "${sha2_sum}" != "${pkghash256}" ]; then
-    echo >&2 "E: Hash sum mismatch (got ${sha2_sum}, expected ${pkghash256})"
-    exit 1
-  elif [ "${hash_sum}" != "${pkghash}" ]; then
-    echo >&2 "E: Hash sum mismatch (got ${hash_sum}, expected ${pkghash})"
-    exit 1
-  fi
+elif [ -n "${pkghash}" ] && [ "${sha2_sum}" != "${pkghash}" ]; then
+  echo >&2 "E: Hash sum mismatch (got ${sha2_sum}, expected ${pkghash})"
+  exit 1
 fi
-echo "-- Download has MD5 hash: ${hash_sum}"
 echo "-- Download has SHA256 hash: ${sha2_sum}"
 
 

data/lib/influxdb.rb

@@ -15,6 +15,7 @@ require "influxdb/query/continuous_query"
 require "influxdb/query/core"
 require "influxdb/query/core"
 require "influxdb/query/database"
+require "influxdb/query/measurement"
 require "influxdb/query/retention_policy"
 require "influxdb/query/series"
 require "influxdb/query/user"

data/lib/influxdb/client.rb

@@ -14,6 +14,7 @@ module InfluxDB
     include InfluxDB::Query::ContinuousQuery
     include InfluxDB::Query::RetentionPolicy
     include InfluxDB::Query::Series
+    include InfluxDB::Query::Measurement
 
     # Initializes a new InfluxDB client
     #

data/lib/influxdb/query/measurement.rb

@@ -0,0 +1,16 @@
+module InfluxDB
+  module Query
+    module Measurement # :nodoc:
+      def list_measurements(database = config.database)
+        data = execute("SHOW MEASUREMENTS", db: database, parse: true)
+        return nil if data.nil? || data["results"][0]["series"].nil?
+        data["results"][0]["series"][0]["values"].flatten
+      end
+
+      def delete_measurement(measurement_name, database = config.database)
+        execute "DROP MEASUREMENT \"#{measurement_name}\"", db: database
+        true
+      end
+    end
+  end
+end

data/lib/influxdb/query/retention_policy.rb

@@ -8,7 +8,7 @@ module InfluxDB
                                   default = false,
                                   shard_duration: nil)
         execute(
-          "CREATE RETENTION POLICY \"#{name}\" ON #{database} " \
+          "CREATE RETENTION POLICY \"#{name}\" ON \"#{database}\" " \
           "DURATION #{duration} REPLICATION #{replication}" \
           "#{shard_duration ? " SHARD DURATION #{shard_duration}" : ''}" \
           "#{default ? ' DEFAULT' : ''}"
@@ -27,7 +27,7 @@ module InfluxDB
       end
 
       def delete_retention_policy(name, database)
-        execute("DROP RETENTION POLICY \"#{name}\" ON #{database}")
+        execute("DROP RETENTION POLICY \"#{name}\" ON \"#{database}\"")
       end
 
       def alter_retention_policy(name,
@@ -37,7 +37,7 @@ module InfluxDB
                                  default = false,
                                  shard_duration: nil)
         execute(
-          "ALTER RETENTION POLICY \"#{name}\" ON #{database} " \
+          "ALTER RETENTION POLICY \"#{name}\" ON \"#{database}\" " \
           "DURATION #{duration} REPLICATION #{replication}" \
           "#{shard_duration ? " SHARD DURATION #{shard_duration}" : ''}" \
           "#{default ? ' DEFAULT' : ''}"

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.6.0".freeze
+  VERSION = "0.6.1".freeze
 end

data/spec/influxdb/cases/query_measurements.rb

@@ -0,0 +1,53 @@
+require "spec_helper"
+require "json"
+
+describe InfluxDB::Client do
+  let(:subject) do
+    described_class.new \
+      database:       "database",
+      host:           "influxdb.test",
+      port:           9999,
+      username:       "username",
+      password:       "password",
+      time_precision: "s"
+  end
+
+  let(:query) { nil }
+  let(:response) { { "results" => [{ "statement_id" => 0 }] } }
+
+  before do
+    stub_request(:get, "http://influxdb.test:9999/query")
+      .with(query: { u: "username", p: "password", q: query })
+      .to_return(body: JSON.generate(response))
+  end
+
+  describe "#list_measuremtns" do
+    let(:query) { "SHOW MEASUREMENTS" }
+
+    context "with measurements" do
+      let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => "name", "values" => [["average_temperature"], ["h2o_feet"], ["h2o_pH"], ["h2o_quality"], ["h2o_temperature"]] }] }] } }
+      let(:expected_result) { %w[average_temperature h2o_feet h2o_pH h2o_quality h2o_temperature] }
+
+      it "should GET a list of measurements" do
+        expect(subject.list_measurements).to eq(expected_result)
+      end
+    end
+
+    context "without measurements" do
+      let(:response) { { "results" => [{ "statement_id" => 0 }] } }
+      let(:expected_result) { nil }
+
+      it "should GET a list of measurements" do
+        expect(subject.list_measurements).to eq(expected_result)
+      end
+    end
+  end
+
+  describe "#delete_retention_policy" do
+    let(:query) { "DROP MEASUREMENT \"foo\"" }
+
+    it "should GET to remove a database" do
+      expect(subject.delete_measurement('foo')).to be true
+    end
+  end
+end

data/spec/influxdb/cases/query_retention_policy_spec.rb

@@ -45,7 +45,7 @@ describe InfluxDB::Client do
 
   describe "#create_retention_policy" do
     context "default" do
-      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT" }
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 1h REPLICATION 2 DEFAULT" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '1h', 2, true)).to be_a(Net::HTTPOK)
@@ -53,7 +53,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default" do
-      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2" }
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 1h REPLICATION 2" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '1h', 2)).to be_a(Net::HTTPOK)
@@ -61,7 +61,7 @@ describe InfluxDB::Client do
     end
 
     context "default_with_shard_duration" do
-      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 48h REPLICATION 2 SHARD DURATION 1h DEFAULT" }
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 48h REPLICATION 2 SHARD DURATION 1h DEFAULT" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '48h', 2, true, shard_duration: '1h')).to be_a(Net::HTTPOK)
@@ -69,7 +69,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default_with_shard_duration" do
-      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 48h REPLICATION 2 SHARD DURATION 1h" }
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 48h REPLICATION 2 SHARD DURATION 1h" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '48h', 2, shard_duration: '1h')).to be_a(Net::HTTPOK)
@@ -78,7 +78,7 @@ describe InfluxDB::Client do
   end
 
   describe "#delete_retention_policy" do
-    let(:query) { "DROP RETENTION POLICY \"1h.cpu\" ON foo" }
+    let(:query) { "DROP RETENTION POLICY \"1h.cpu\" ON \"foo\"" }
 
     it "should GET to remove a database" do
       expect(subject.delete_retention_policy('1h.cpu', 'foo')).to be_a(Net::HTTPOK)
@@ -87,7 +87,7 @@ describe InfluxDB::Client do
 
   describe "#alter_retention_policy" do
     context "default" do
-      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT" }
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 1h REPLICATION 2 DEFAULT" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '1h', 2, true)).to be_a(Net::HTTPOK)
@@ -95,7 +95,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default" do
-      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2" }
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 1h REPLICATION 2" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '1h', 2)).to be_a(Net::HTTPOK)
@@ -103,7 +103,7 @@ describe InfluxDB::Client do
     end
 
     context "default_with_shard_duration" do
-      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 48h REPLICATION 2 SHARD DURATION 1h DEFAULT" }
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 48h REPLICATION 2 SHARD DURATION 1h DEFAULT" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '48h', 2, true, shard_duration: '1h')).to be_a(Net::HTTPOK)
@@ -111,7 +111,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default_with_shard_duration" do
-      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 48h REPLICATION 2 SHARD DURATION 1h" }
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON \"foo\" DURATION 48h REPLICATION 2 SHARD DURATION 1h" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '48h', 2, shard_duration: '1h')).to be_a(Net::HTTPOK)

data/spec/spec_helper.rb

@@ -9,7 +9,9 @@ end
 # rubocop:enable Lint/HandleExceptions
 
 def min_influx_version(version)
-  current = Gem::Version.new ENV.fetch("influx_version", "0")
+  v = ENV.fetch("influx_version", "0")
+  return true if v == "nightly"
+  current = Gem::Version.new(v)
   current >= Gem::Version.new(version)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/influxdb/query/continuous_query.rb
 - lib/influxdb/query/core.rb
 - lib/influxdb/query/database.rb
+- lib/influxdb/query/measurement.rb
 - lib/influxdb/query/retention_policy.rb
 - lib/influxdb/query/series.rb
 - lib/influxdb/query/user.rb
@@ -123,6 +124,7 @@ files:
 - spec/influxdb/cases/query_continuous_query_spec.rb
 - spec/influxdb/cases/query_core_spec.rb
 - spec/influxdb/cases/query_database_spec.rb
+- spec/influxdb/cases/query_measurements.rb
 - spec/influxdb/cases/query_retention_policy_spec.rb
 - spec/influxdb/cases/query_series_spec.rb
 - spec/influxdb/cases/query_shard_spec.rb
@@ -175,6 +177,7 @@ test_files:
 - spec/influxdb/cases/query_continuous_query_spec.rb
 - spec/influxdb/cases/query_core_spec.rb
 - spec/influxdb/cases/query_database_spec.rb
+- spec/influxdb/cases/query_measurements.rb
 - spec/influxdb/cases/query_retention_policy_spec.rb
 - spec/influxdb/cases/query_series_spec.rb
 - spec/influxdb/cases/query_shard_spec.rb