influxdb 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef1ebbbcacc05c56d8bbabdbd22848361b6ac3f6
-  data.tar.gz: 737cc1c7fb163655ccec58afdb6261084646b620
+  metadata.gz: 8d85c5412cee2eed247a9dc36cdd93063dab1006
+  data.tar.gz: fb4ea80422af475ec2af1d94918e7682a424537d
 SHA512:
-  metadata.gz: 4c1e764c646a040c133c7bf9f2ce299fee0da7091a872437ee2586de8496aea944d9994f57aa3b83c30e4cb0ebf297cf69b4e4cbb910d99a1da2cb5b8218cee5
-  data.tar.gz: c753626ee6dde17ed931febfe12656e5d7c3c5ab380ad333f28930d464808595805d12649e908383cf2d7287e9281a17f8b1826f236d912c95aa51ea73c5da59
+  metadata.gz: 738b8b9a2ce516b1957c4afcdf7a4ab2ef710ddb088bd711ef55f815f11d57a1422bbc67db1d83574fb81ae98441c70d12c4c8a8cfe7bbc3029724d5c3156dae
+  data.tar.gz: d70c7129fc4e0f4a7a3b5732826128f168dedd3dcabfe7affdc5816c6c2718fea289368d3d3749aa6956deec7d899ebf9e5334af93293eed38e22635a5ff4e4b

data/.rubocop.yml

@@ -15,24 +15,21 @@ AllCops:
 Rails:
   Enabled: false
 
-Style/FrozenStringLiteralComment:
+Layout/EmptyLinesAroundArguments:
   Enabled: false
 
-Style/NumericPredicate:
-  Enabled: false
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyleForEmptyBraces: space
 
-Style/StringLiterals:
-  Enabled: false
-
-Style/RescueModifier:
-  Enabled: false
+Metrics/AbcSize:
+  Max: 20
 
-Metrics/LineLength:
-  Max: 100
+Metrics/BlockLength:
   Exclude:
   - 'spec/**/*.rb'
 
-Metrics/BlockLength:
+Metrics/LineLength:
+  Max: 100
   Exclude:
   - 'spec/**/*.rb'
 
@@ -43,13 +40,23 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
+Style/FormatStringToken:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
   Exclude:
   - "spec/**/*.rb"
 
-Metrics/AbcSize:
-  Max: 20
-
-Style/FormatStringToken:
-  Enabled: false

data/.travis.yml

@@ -5,7 +5,7 @@ before_install:
   - gem update --system --no-doc
   - gem install bundler --no-doc
   - gem update bundler --no-doc
-  - smoke/provision.sh
+  - bin/provision.sh
 rvm:
   - 2.2.8
   - 2.3.5
@@ -20,23 +20,25 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-9.1.5.0
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=nightly channel=nightlies
+      env: influx_version=nightly channel=nightlies
   include:
     - rvm: 2.4.2
       env: TEST_TASK=rubocop
     - rvm: jruby-9.1.5.0
     - rvm: jruby-head
-      env: TEST_TASK=spec JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
+      env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
+      env: influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
+      env: influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
+      env: influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=1.3.6 pkghash256=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
+      env: influx_version=1.3.6 pkghash256=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
     - rvm: 2.4.2
-      env: TEST_TASK=smoke influx_version=nightly channel=nightlies
+      env: influx_version=1.4.2 pkghash256=96ced90cfc436da7833721fd635b9942f9175cff2f897c113ef068f224cf8605
+    - rvm: 2.4.2
+      env: influx_version=nightly channel=nightlies
   fail_fast: true
 addons:
   apt:

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.5.3, released 2018-01-19
+
+- Fix `NoMethodError` in `InfluxDB::Client#list_retention_policies` when
+  the database has no RPs defined (#213, @djoos)
+
 ## v0.5.2, released 2017-11-28
 
 - Add async option to block on full queue (#209, @davemt)

data/README.md

@@ -145,21 +145,36 @@ influxdb.write_point(name, data)
 influxdb.write_point(name, data, time_precision)
 ```
 
-> ### A Note About Time Precision
->
-> The default precision (in this Rubygem) is `"s"` (second), as Ruby's
-> `Time#to_i` operates on this resolution.
->
-> If you write data points with sub-second resolution (for example
-> via `Time#to_r`), you need to configure your client instance with an
-> appropiate `time_precision` option **and** you'll need to provide a
-> timestamp value which reflects this precision:
->
-> ```ruby
-> influxdb = InfluxDB::Client.new time_precision: "ms"
-> time = (Time.now.to_r * 1000).to_i
-> influxdb.write_point("foobar", { values: { n: 42 }, timestamp: time })
-> ```
+### A Note About Time Precision
+
+The default precision in this gem is `"s"` (second), as Ruby's `Time#to_i`
+operates on this resolution.
+
+If you write data points with sub-second resolution, you _have_ to configure
+your client instance with a more granular `time_precision` option **and** you
+need to provide timestamp values which reflect this precision. **If you don't do
+this, your points will be squashed!**
+
+> A point is uniquely identified by the measurement name, tag set, and
+> timestamp. If you submit a new point with the same measurement, tag set, and
+> timestamp as an existing point, the field set becomes the union of the old
+> field set and the new field set, where any ties go to the new field set. This
+> is the intended behavior.
+
+See [How does InfluxDB handle duplicate
+points?](https://docs.influxdata.com/influxdb/v1.3/troubleshooting/frequently-asked-questions/#how-does-influxdb-handle-duplicate-points)
+for details.
+
+For example, this is how to specify millisecond precision (which moves the
+pitfall from the second- to the millisecond barrier):
+
+```ruby
+influxdb = InfluxDB::Client.new(time_precision: "ms")
+time = (Time.now.to_r * 1000).to_i
+# A faster, albeit less readable alternative:
+# time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+influxdb.write_point("foobar", { values: { n: 42 }, timestamp: time })
+```
 
 Allowed values for `time_precision` are:
 

data/Rakefile

@@ -14,12 +14,12 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList[file_pattern]
 end
 
-Rake::TestTask.new(:smoke) do |t|
-  t.test_files = FileList["smoke/*.rb"]
+if ENV.key?("TRAVIS")
+  task default: %i[spec]
+else
+  task default: %i[spec rubocop]
 end
 
-task default: %i[spec rubocop]
-
 task :console do
   lib = File.expand_path("../lib", __FILE__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -44,9 +44,3 @@ task :console do
     IRB.start
   end
 end
-
-if !ENV.key?("influx_version") || ENV["influx_version"] == ""
-  task default: :spec
-elsif ENV["TRAVIS"] == "true"
-  task default: :smoke
-end

data/influxdb.gemspec

@@ -2,7 +2,6 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'influxdb/version'
 
-# rubocop:disable Style/SpecialGlobalVars
 Gem::Specification.new do |spec|
   spec.name          = "influxdb"
   spec.version       = InfluxDB::VERSION
@@ -13,8 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://influxdb.org"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files`.split($/) # rubocop:disable Style/SpecialGlobalVars
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|smoke)/})
   spec.require_paths = ["lib"]
 

data/lib/influxdb/client/http.rb

@@ -78,10 +78,12 @@ module InfluxDB
     end
 
     def resolve_error(response)
-      if response =~ /Couldn\'t find series/
+      case response
+      when /Couldn\'t find series/
         raise InfluxDB::SeriesNotFound, response
+      else
+        raise InfluxDB::Error, response
       end
-      raise InfluxDB::Error, response
     end
 
     def handle_successful_response(response, options)
@@ -130,4 +132,6 @@ module InfluxDB
       store
     end
   end
+  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/AbcSize
 end

data/lib/influxdb/point_value.rb

@@ -36,6 +36,7 @@ module InfluxDB
         invalid: :replace,
         undef: :replace,
         replace: "".freeze
+      # rubocop:enable Layout/AlignParameters
 
       ESCAPES[type].each do |ch|
         s = s.gsub(ch) { "\\#{ch}" }

data/lib/influxdb/query/core.rb

@@ -2,7 +2,6 @@ require_relative 'builder'
 
 module InfluxDB
   module Query # :nodoc: all
-    # rubocop:disable Metrics/AbcSize
     module Core
       def builder
         @builder ||= Builder.new
@@ -17,8 +16,7 @@ module InfluxDB
         ping.header['x-influxdb-version']
       end
 
-      # rubocop:disable Metrics/MethodLength
-      def query(
+      def query( # rubocop:disable Metrics/MethodLength
         query,
         params:       nil,
         denormalize:  config.denormalize,
@@ -147,11 +145,16 @@ module InfluxDB
           params[:p] = config.password
         end
 
-        query = params.map do |k, v|
+        URI::Generic.build(
+          path:  File.join(config.prefix, path),
+          query: cgi_escape_params(params)
+        ).to_s
+      end
+
+      def cgi_escape_params(params)
+        params.map do |k, v|
           [CGI.escape(k.to_s), "=".freeze, CGI.escape(v.to_s)].join
         end.join("&".freeze)
-
-        URI::Generic.build(path: File.join(config.prefix, path), query: query).to_s
       end
     end
   end

data/lib/influxdb/query/retention_policy.rb

@@ -17,9 +17,9 @@ module InfluxDB
 
       def list_retention_policies(database)
         resp = execute("SHOW RETENTION POLICIES ON \"#{database}\"", parse: true)
-        data = fetch_series(resp).fetch(0)
+        data = fetch_series(resp).fetch(0, {})
 
-        data['values'.freeze].map do |policy|
+        data.fetch("values".freeze, []).map do |policy|
           policy.each.with_index.inject({}) do |hash, (value, index)|
             hash.tap { |h| h[data['columns'.freeze][index]] = value }
           end

data/lib/influxdb/version.rb

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

data/lib/influxdb/writer/async.rb

@@ -131,6 +131,10 @@ module InfluxDB
           end
         end
 
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/AbcSize
+
         def stop!
           log(:debug) { "Thread exiting, flushing queue." }
           check_background_queue until queue.empty?

data/spec/influxdb/cases/query_retention_policy_spec.rb

@@ -27,11 +27,23 @@ describe InfluxDB::Client do
 
   describe "#list_retention_policies" do
     let(:query) { "SHOW RETENTION POLICIES ON \"database\"" }
-    let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w[name duration replicaN default], "values" => [["default", "0", 1, true], ["another", "1", 2, false]] }] }] } }
-    let(:expected_result) { [{ "name" => "default", "duration" => "0", "replicaN" => 1, "default" => true }, { "name" => "another", "duration" => "1", "replicaN" => 2, "default" => false }] }
 
-    it "should GET a list of retention policies" do
-      expect(subject.list_retention_policies('database')).to eq(expected_result)
+    context "database with RPs" do
+      let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w[name duration replicaN default], "values" => [["default", "0", 1, true], ["another", "1", 2, false]] }] }] } }
+      let(:expected_result) { [{ "name" => "default", "duration" => "0", "replicaN" => 1, "default" => true }, { "name" => "another", "duration" => "1", "replicaN" => 2, "default" => false }] }
+
+      it "should GET a list of retention policies" do
+        expect(subject.list_retention_policies('database')).to eq(expected_result)
+      end
+    end
+
+    context "database without RPs" do
+      let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w[name duration shardGroupDuration replicaN default] }] }] } }
+      let(:expected_result) { [] }
+
+      it "should GET a list of retention policies" do
+        expect(subject.list_retention_policies('database')).to eq(expected_result)
+      end
     end
   end
 

data/spec/smoke/smoke_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+describe InfluxDB::Client, smoke: true do
+  before do
+    WebMock.allow_net_connect!
+  end
+
+  after do
+    WebMock.disable_net_connect!
+  end
+
+  let(:client) do
+    InfluxDB::Client.new(database: "NOAA_water_database",
+                         username: "test_user",
+                         password: "resu_tset",
+                         retry: 4)
+  end
+
+  context "connects to the database" do
+    it "returns the version number" do
+      expect(client.version).to be_truthy
+    end
+  end
+
+  context "retrieves data from the NOAA database" do
+    sample_data1 = {
+      "time"              => "2015-08-18T00:00:00Z",
+      "level description" => "below 3 feet",
+      "location"          => "santa_monica",
+      "water_level"       => 2.064
+    }
+
+    sample_data2 = {
+      "time"              => "2015-08-18T00:12:00Z",
+      "level description" => "below 3 feet",
+      "location"          => "santa_monica",
+      "water_level"       => 2.028
+    }
+
+    it "returns all five measurements" do
+      result = client.query("show measurements")[0]["values"].map { |v| v["name"] }
+      expect(result).to eq(%w[average_temperature h2o_feet h2o_pH h2o_quality h2o_temperature])
+    end
+
+    it "counts the number of non-null values of water level in h2o feet" do
+      result = client.query("select count(water_level) from h2o_feet")[0]["values"][0]["count"]
+      expect(result).to eq(15_258)
+    end
+
+    it "selects the first five observations in the measurement h2o_feet" do
+      result = client
+               .query("select * from h2o_feet WHERE location = 'santa_monica'")
+               .first["values"]
+      expect(result.size). to eq(7654)
+      expect(result).to include(sample_data1)
+      expect(result).to include(sample_data2)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,8 @@ end
 
 RSpec.configure do |config|
   config.color = ENV["TRAVIS"] != "true"
-
+  config.filter_run_excluding smoke: ENV["TRAVIS"] != "true" || !ENV.key?("influx_version")
+  puts "SMOKE TESTS ARE NOT CURRENTLY RUNNING" if ENV["TRAVIS"] != "true"
   # rubocop:disable Style/ConditionalAssignment
   if config.files_to_run.one? || ENV["TRAVIS"] == "true"
     config.formatter = :documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/provision.sh
 - influxdb.gemspec
 - lib/influxdb.rb
 - lib/influxdb/client.rb
@@ -115,9 +116,6 @@ files:
 - lib/influxdb/version.rb
 - lib/influxdb/writer/async.rb
 - lib/influxdb/writer/udp.rb
-- smoke/connect-and-get-version.rb
-- smoke/noaa-sample-data.rb
-- smoke/provision.sh
 - spec/influxdb/cases/async_client_spec.rb
 - spec/influxdb/cases/query_cluster_spec.rb
 - spec/influxdb/cases/query_continuous_query_spec.rb
@@ -142,6 +140,7 @@ files:
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb/query_builder_spec.rb
 - spec/influxdb/worker_spec.rb
+- spec/smoke/smoke_spec.rb
 - spec/spec_helper.rb
 homepage: http://influxdb.org
 licenses:
@@ -168,9 +167,6 @@ signing_key:
 specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files:
-- smoke/connect-and-get-version.rb
-- smoke/noaa-sample-data.rb
-- smoke/provision.sh
 - spec/influxdb/cases/async_client_spec.rb
 - spec/influxdb/cases/query_cluster_spec.rb
 - spec/influxdb/cases/query_continuous_query_spec.rb
@@ -195,4 +191,5 @@ test_files:
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb/query_builder_spec.rb
 - spec/influxdb/worker_spec.rb
+- spec/smoke/smoke_spec.rb
 - spec/spec_helper.rb

data/smoke/connect-and-get-version.rb

@@ -1,18 +0,0 @@
-require "influxdb"
-
-puts __FILE__
-puts "\tThis file contains some sanity checks."
-puts
-
-client = InfluxDB::Client.new \
-  username: "test_user",
-  password: "resu_tset",
-  retry:    4
-
-version = client.version
-
-if version
-  puts "Got version: #{version}"
-else
-  raise "version is empty"
-end

data/smoke/noaa-sample-data.rb

@@ -1,79 +0,0 @@
-require "influxdb"
-
-puts __FILE__
-puts "\tThis is basically a test whether the examples in documented on"
-puts "\thttp://docs.influxdata.com/influxdb/v0.13/sample_data/data_download/"
-puts "\twork with the Ruby client."
-puts
-
-client = InfluxDB::Client.new \
-  database: "NOAA_water_database",
-  username: "test_user",
-  password: "resu_tset",
-  retry:    4
-
-TestFailure         = Class.new StandardError
-TestAllowedFailure  = Class.new StandardError
-
-def test_case(name)
-  print name
-  yield
-  puts " [ OK ]"
-
-rescue TestAllowedFailure
-  puts " [WARN]"
-  puts $!.message
-
-rescue TestFailure
-  puts " [FAIL]"
-  puts $!.message
-  exit 1
-end
-
-test_case "See all five measurements?" do
-  result      = client.query "show measurements"
-  expected    = %w[ average_temperature h2o_feet h2o_pH h2o_quality h2o_temperature ]
-  actual      = result[0]["values"].map{|v| v["name"] }
-  unexpected  = actual - expected
-  if unexpected.any?
-    raise TestFailure, "unexpected measurements: #{unexpected.join(", ")}"
-  end
-end
-
-test_case "Count the number of non-null values of water_level in h2o_feet" do
-  result      = client.query "select count(water_level) from h2o_feet"
-  expected    = 15258
-  actual      = result[0]["values"][0]["count"]
-  if expected != actual
-    raise TestFailure, "expected to find #{expected} points, got #{actual}"
-  end
-end
-
-test_case "Select the first five observations in the measurement h2o_feet" do
-  result    = client.query("select * from h2o_feet limit 5").first["values"]
-  expected  = 5
-  actual    = result.size
-  if expected != actual
-    raise TestFailure, "expected #{expected} observations, got #{actual}"
-  end
-
-  expected = {
-    "time"              => "2015-08-18T00:00:00Z",
-    "level description" => "between 6 and 9 feet",
-    "location"          => "coyote_creek",
-    "water_level"       => 8.12
-  }
-  if expected != result[0]
-    raise TestAllowedFailure, "unexpected first result, got #{result[0]}"
-  end
-
-  expected = {
-    "time"              => "2015-08-18T00:12:00Z",
-    "level description" => "between 6 and 9 feet",
-    "location"          => "coyote_creek",
-    "water_level"       => 7.887
-  }
-  if expected != result[-1]
-    raise TestAllowedFailure, "unexpected last result, got #{result[-1]}"
-  end
-end