influxdb 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35aa9d868bebe5d807a839115e59b08519d13acb5e9e9b5670ae993916046da
-  data.tar.gz: 72df33e054794f0037630183bfb355144d0c3fc049e76ebca4a86e90400bf709
+  metadata.gz: 4526b81c8b4e67ca797482a71d10df463feb3c2a6b2750f6038ab6a12d8b6723
+  data.tar.gz: b55ad197088776641d54822d6cada8b57428ddbd00e3441e46ffa841b27a24d6
 SHA512:
-  metadata.gz: 13de608b885545523c03fc1da9922e31c7e7499bac3c51790b174cb8a0611a9f66dc98e0d1f91d1a12bb088a928c11cdc21d1725555cba2b623ed0aa34f2877d
-  data.tar.gz: bf50560b3838a9092af6ee8fff18acea15281e81d3f7353677a7510a508852d637d971bc67258570e1afb753b8752b66f6533e3e946a7f845937cc567c1d0cc7
+  metadata.gz: e18c2cc024f308f89066f552826a2072904071ca3df33bc47cb4b4476712a9d3d744055667a21791d4eb1b3d521c2de7ba6b1c99d3491e4953287cee332a1b39
+  data.tar.gz: af2a5856340cd70147f95917784ae700e7ea68e53d9de38c115c4e8c4552f74cdb5dcdadb278aa569c4f6b367b3a10c56a9e54ab27ac808252617cd22adf6717

data/.github/workflows/tests.yml

@@ -0,0 +1,92 @@
+name: Tests
+
+# workflow_dispatch enables running workflow manually
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  rubocop:
+    name: RuboCop
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04]
+        ruby: [2.7]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle exec rake rubocop
+
+  specs:
+    name: ${{ matrix.os }} ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-16.04
+          - ubuntu-18.04
+          - ubuntu-20.04
+        ruby:
+          - 2.3
+          - 2.4
+          - 2.5
+          - 2.6
+          - 2.7
+          # YAML gotcha: https://github.com/actions/runner/issues/849
+          - '3.0'
+          - head
+        include:
+          - os: ubuntu-20.04
+            ruby: jruby-9.1
+            jruby_opts: '--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
+            allow-failure: true
+          - os: ubuntu-20.04
+            ruby: jruby-9.2
+            jruby_opts: '--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
+            allow-failure: true
+          - os: ubuntu-20.04
+            ruby: jruby-head
+            jruby_opts: '--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
+            allow-failure: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - run: bundle exec rake
+        continue-on-error: ${{ matrix.allow-failure || false }}
+
+  smoketests:
+    name: smoketest with influx ${{ matrix.influx_version }}
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { ruby: 2.7, influx_version: 1.0.2, pkghash: 88f6c30fec2c6e612e802e23b9161fdfc7c5c29f6be036f0376326445aff0037 }
+          - { ruby: 2.7, influx_version: 1.1.5, pkghash: 0ecb9385cc008f6e5094e6e8f8ea70522023a16d4397e401898f3973176d3b21 }
+          - { ruby: 2.7, influx_version: 1.2.4, pkghash: 2fac8391e04aa1bec9151e8f0d8f18df030c866af2b4963ab7d86c6ddc172182 }
+          - { ruby: 2.7, influx_version: 1.3.8, pkghash: 35c9cb2943bbde04aa5e94ad6d8caf5fc9b1480bdbcde7c34078de135cc4f788 }
+          - { ruby: 2.7, influx_version: 1.4.3, pkghash: 0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359 }
+          - { ruby: 2.7, influx_version: 1.5.4, pkghash: fa6f8d3196d13ffc376d533581b534692c738181ce3427c53484c138d9e6b902 }
+          - { ruby: 2.7, influx_version: 1.6.4, pkghash: dbfa13a0f9e38a8e7b19294c30144903bb681ac0aba0a3a8f4f349c37d5de5f9 }
+          - { ruby: 2.7, influx_version: 1.7.9, pkghash: 02759d70cef670d336768fd38a9cf2f046a1bf40618be78ba215e7ce75b5075f }
+          - { ruby: 2.7, influx_version: nightly, channel: nightlies, allow-failure: true }
+    env:
+      influx_version: ${{ matrix.influx_version }}
+      pkghash: ${{ matrix.pkghash }}
+      channel: ${{ matrix.channel }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - run: bin/provision.sh
+      - run: bundle exec rake spec
+        continue-on-error: ${{ matrix.allow-failure || false }}

data/.rubocop.yml

@@ -1,3 +1,7 @@
+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
   Include:
   - 'Rakefile'

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/commits/master).
 
+## v0.8.1, release 2021-02-17
+
+- Ensure workers can send data popped off the queue at shutdown (#239,
+  @onlynone)
+- Add support for special characters in password when using url keyword (#242,
+  @swistak35)
+- Add Ruby 3.0 support (#249, @dentarg, @paul and @track8)
+- Support characters that need quoting for usernames and database names (#248, @estheruary)
+
 ## v0.8.0, released 2020-02-05
 
 - Allow dropping of specific series from specific DBs (#233, @cantino)

data/README.md

@@ -1,11 +1,13 @@
 # influxdb-ruby
 
 [![Gem Version](https://badge.fury.io/rb/influxdb.svg)](https://badge.fury.io/rb/influxdb)
-[![Build Status](https://travis-ci.org/influxdata/influxdb-ruby.svg?branch=master)](https://travis-ci.org/influxdata/influxdb-ruby)
+[![Build Status](https://github.com/influxdata/influxdb-ruby/workflows/Tests/badge.svg)](https://github.com/influxdata/influxdb-ruby/actions)
 
 The official Ruby client library for [InfluxDB](https://influxdata.com/time-series-platform/influxdb/).
 Maintained by [@toddboom](https://github.com/toddboom) and [@dmke](https://github.com/dmke).
 
+#### Note: This library is for use with InfluxDB 1.x. For connecting to InfluxDB 2.x instances, please use the [influxdb-client-ruby](https://github.com/influxdata/influxdb-client-ruby) client.
+
 ## Contents
 
 - [Platform support](#platform-support)
@@ -295,7 +297,10 @@ async_options = {
   # checking if there are new jobs in the queue
   sleep_interval:      5,
   # whether client will block if queue is full
-  block_on_full_queue: false
+  block_on_full_queue: false,
+  # Max time (in seconds) the main thread will wait for worker threads to stop
+  # on shutdown. Defaults to 2x sleep_interval.
+  shutdown_timeout: 10
 }
 
 influxdb = InfluxDB::Client.new database, async: async_options

data/Rakefile

@@ -14,7 +14,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = FileList[file_pattern]
 end
 
-if ENV.key?("TRAVIS")
+if ENV.key?("CI")
   task default: %i[spec]
 else
   task default: %i[spec rubocop]

data/bin/provision.sh

@@ -63,7 +63,7 @@ echo "-- grant access"
 
 echo "== Download and import NOAA sample data"
 
-curl https://s3-us-west-1.amazonaws.com/noaa.water.database.0.9/NOAA_data.txt > noaa.txt
+curl https://s3.amazonaws.com/noaa.water-database/NOAA_data.txt > noaa.txt
 /usr/bin/influx -import -path noaa.txt -precision s
 
 echo "-- grant access"

data/lib/influxdb/client.rb

@@ -59,17 +59,19 @@ module InfluxDB
     end
 
     def stop!
-      if config.async?
-        # If retry was infinite (-1), set it to zero to give the main thread one
-        # last chance to flush the queue
-        config.retry = 0 if config.retry < 0
-        writer.worker.stop!
+      if @writer == self
+        @stopped = true
+      else
+        @writer.stop!
       end
-      @stopped = true
     end
 
     def stopped?
-      @stopped
+      if @writer == self
+        @stopped
+      else
+        @writer.stopped?
+      end
     end
 
     def now

data/lib/influxdb/config.rb

@@ -146,11 +146,11 @@ module InfluxDB
 
     def opts_from_non_params(url)
       {}.tap do |o|
-        o[:host]     = url.host        if url.host
-        o[:port]     = url.port        if url.port
-        o[:username] = url.user        if url.user
-        o[:password] = url.password    if url.password
-        o[:database] = url.path[1..-1] if url.path.length > 1
+        o[:host]     = url.host                                    if url.host
+        o[:port]     = url.port                                    if url.port
+        o[:username] = URI.decode_www_form_component(url.user)     if url.user
+        o[:password] = URI.decode_www_form_component(url.password) if url.password
+        o[:database] = url.path[1..-1]                             if url.path.length > 1
         o[:use_ssl]  = url.scheme == "https".freeze
 
         o[:udp] = { host: o[:host], port: o[:port] } if url.scheme == "udp"

data/lib/influxdb/query/batch.rb

@@ -27,7 +27,7 @@ module InfluxDB
       )
         return [] if statements.empty?
 
-        url = full_url "/query".freeze, query_params(statements.join(";"), opts)
+        url = full_url "/query".freeze, **query_params(statements.join(";"), **opts)
         series = fetch_series get(url, parse: true, json_streaming: !chunk_size.nil?)
 
         if denormalize
@@ -82,8 +82,14 @@ module InfluxDB
         denormalize_series
         denormalized_series_list
       ].each do |method_name|
-        define_method(method_name) do |*args|
-          client.send method_name, *args
+        if RUBY_VERSION < "2.7"
+          define_method(method_name) do |*args|
+            client.send method_name, *args
+          end
+        else
+          define_method(method_name) do |*args, **kwargs|
+            client.send method_name, *args, **kwargs
+          end
         end
       end
     end

data/lib/influxdb/query/cluster.rb

@@ -2,7 +2,7 @@ module InfluxDB
   module Query
     module Cluster # :nodoc:
       def create_cluster_admin(username, password)
-        execute("CREATE USER #{username} WITH PASSWORD '#{password}' WITH ALL PRIVILEGES")
+        execute("CREATE USER \"#{username}\" WITH PASSWORD '#{password}' WITH ALL PRIVILEGES")
       end
 
       def list_cluster_admins
@@ -10,7 +10,7 @@ module InfluxDB
       end
 
       def revoke_cluster_admin_privileges(username)
-        execute("REVOKE ALL PRIVILEGES FROM #{username}")
+        execute("REVOKE ALL PRIVILEGES FROM \"#{username}\"")
       end
     end
   end

data/lib/influxdb/query/continuous_query.rb

@@ -24,7 +24,7 @@ module InfluxDB
       end
 
       def delete_continuous_query(name, database)
-        execute("DROP CONTINUOUS QUERY #{name} ON #{database}")
+        execute("DROP CONTINUOUS QUERY \"#{name}\" ON \"#{database}\"")
       end
     end
   end

data/lib/influxdb/query/core.rb

@@ -26,7 +26,7 @@ module InfluxDB
       )
         query = builder.build(query, params)
 
-        url = full_url("/query".freeze, query_params(query, opts))
+        url = full_url("/query".freeze, **query_params(query, **opts))
         series = fetch_series(get(url, parse: true, json_streaming: !chunk_size.nil?))
 
         if block_given?
@@ -79,7 +79,7 @@ module InfluxDB
         }
 
         params[:rp] = retention_policy if retention_policy
-        url = full_url("/write", params)
+        url = full_url("/write", **params)
         post(url, data)
       end
 
@@ -133,7 +133,7 @@ module InfluxDB
       def execute(query, db: nil, **options)
         params = { q: query }
         params[:db] = db if db
-        url = full_url("/query".freeze, params)
+        url = full_url("/query".freeze, **params)
         get(url, options)
       end
 
@@ -147,7 +147,7 @@ module InfluxDB
         series.select { |k, _| %w[columns values].include?(k) }
       end
 
-      def full_url(path, params = {})
+      def full_url(path, **params)
         if config.auth_method == "params".freeze
           params[:u] = config.username
           params[:p] = config.password

data/lib/influxdb/query/database.rb

@@ -2,11 +2,11 @@ module InfluxDB
   module Query
     module Database # :nodoc:
       def create_database(name = nil)
-        execute("CREATE DATABASE #{name || config.database}")
+        execute("CREATE DATABASE \"#{name || config.database}\"")
       end
 
       def delete_database(name = nil)
-        execute("DROP DATABASE #{name || config.database}")
+        execute("DROP DATABASE \"#{name || config.database}\"")
       end
 
       def list_databases

data/lib/influxdb/query/user.rb

@@ -6,36 +6,36 @@ module InfluxDB
       def create_database_user(database, username, password, options = {})
         permissions = options.fetch(:permissions, :all)
         execute(
-          "CREATE user #{username} WITH PASSWORD '#{password}'; "\
-          "GRANT #{permissions.to_s.upcase} ON #{database} TO #{username}"
+          "CREATE user \"#{username}\" WITH PASSWORD '#{password}'; "\
+          "GRANT #{permissions.to_s.upcase} ON \"#{database}\" TO \"#{username}\""
         )
       end
 
       def update_user_password(username, password)
-        execute("SET PASSWORD FOR #{username} = '#{password}'")
+        execute("SET PASSWORD FOR \"#{username}\" = '#{password}'")
       end
 
       # permission => [:all]
       def grant_user_admin_privileges(username)
-        execute("GRANT ALL PRIVILEGES TO #{username}")
+        execute("GRANT ALL PRIVILEGES TO \"#{username}\"")
       end
 
       # permission => [:read|:write|:all]
       def grant_user_privileges(username, database, permission)
-        execute("GRANT #{permission.to_s.upcase} ON #{database} TO #{username}")
+        execute("GRANT #{permission.to_s.upcase} ON \"#{database}\" TO \"#{username}\"")
       end
 
       def list_user_grants(username)
-        execute("SHOW GRANTS FOR #{username}")
+        execute("SHOW GRANTS FOR \"#{username}\"")
       end
 
       # permission => [:read|:write|:all]
       def revoke_user_privileges(username, database, permission)
-        execute("REVOKE #{permission.to_s.upcase} ON #{database} FROM #{username}")
+        execute("REVOKE #{permission.to_s.upcase} ON \"#{database}\" FROM \"#{username}\"")
       end
 
       def delete_user(username)
-        execute("DROP USER #{username}")
+        execute("DROP USER \"#{username}\"")
       end
 
       # => [{"username"=>"usr", "admin"=>true}, {"username"=>"justauser", "admin"=>false}]

data/lib/influxdb/version.rb

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

data/lib/influxdb/writer/async.rb

@@ -9,6 +9,16 @@ module InfluxDB
       def initialize(client, config)
         @client = client
         @config = config
+        @stopped = false
+      end
+
+      def stopped?
+        @stopped
+      end
+
+      def stop!
+        worker.stop!
+        @stopped = true
       end
 
       def write(data, precision = nil, retention_policy = nil, database = nil)
@@ -29,7 +39,7 @@ module InfluxDB
         end
       end
 
-      class Worker
+      class Worker # rubocop:disable Metrics/ClassLength
         attr_reader :client,
                     :queue,
                     :threads,
@@ -37,7 +47,8 @@ module InfluxDB
                     :max_queue_size,
                     :num_worker_threads,
                     :sleep_interval,
-                    :block_on_full_queue
+                    :block_on_full_queue,
+                    :shutdown_timeout
 
         include InfluxDB::Logging
 
@@ -47,7 +58,7 @@ module InfluxDB
         SLEEP_INTERVAL      = 5
         BLOCK_ON_FULL_QUEUE = false
 
-        def initialize(client, config)
+        def initialize(client, config) # rubocop:disable Metrics/MethodLength
           @client = client
           config = config.is_a?(Hash) ? config : {}
 
@@ -56,10 +67,11 @@ module InfluxDB
           @num_worker_threads  = config.fetch(:num_worker_threads,  NUM_WORKER_THREADS)
           @sleep_interval      = config.fetch(:sleep_interval,      SLEEP_INTERVAL)
           @block_on_full_queue = config.fetch(:block_on_full_queue, BLOCK_ON_FULL_QUEUE)
+          @shutdown_timeout    = config.fetch(:shutdown_timeout,    2 * @sleep_interval)
 
           queue_class = @block_on_full_queue ? SizedQueue : InfluxDB::MaxQueue
           @queue = queue_class.new max_queue_size
-
+          @should_stop = false
           spawn_threads!
         end
 
@@ -68,11 +80,11 @@ module InfluxDB
         end
 
         def current_threads
-          Thread.list.select { |t| t[:influxdb] == object_id }
+          @threads
         end
 
         def current_thread_count
-          Thread.list.count { |t| t[:influxdb] == object_id }
+          @threads.count
         end
 
         # rubocop:disable Metrics/CyclomaticComplexity
@@ -87,7 +99,7 @@ module InfluxDB
             @threads << Thread.new do
               Thread.current[:influxdb] = object_id
 
-              until client.stopped?
+              until @should_stop
                 check_background_queue(thread_num)
                 sleep rand(sleep_interval)
               end
@@ -97,7 +109,7 @@ module InfluxDB
           end
         end
 
-        def check_background_queue(thread_num = 0)
+        def check_background_queue(thread_num = -1)
           log(:debug) do
             "Checking background queue on thread #{thread_num} (#{current_thread_count} active)"
           end
@@ -123,10 +135,10 @@ module InfluxDB
             return if data.values.flatten.empty?
 
             begin
-              log(:debug) { "Found data in the queue! (#{sizes(data)})" }
+              log(:debug) { "Found data in the queue! (#{sizes(data)}) on thread #{thread_num}" }
               write(data)
             rescue StandardError => e
-              log :error, "Cannot write data: #{e.inspect}"
+              log :error, "Cannot write data: #{e.inspect} on thread #{thread_num}"
             end
 
             break if queue.length > max_post_points
@@ -138,7 +150,22 @@ module InfluxDB
         # rubocop:enable Metrics/AbcSize
 
         def stop!
-          log(:debug) { "Thread exiting, flushing queue." }
+          log(:debug) { "Worker is being stopped, flushing queue." }
+
+          # If retry was infinite (-1), set it to zero to give the threads one
+          # last chance to write their data
+          client.config.retry = 0 if client.config.retry < 0
+
+          # Signal the background threads that they should exit.
+          @should_stop = true
+
+          # Wait for the threads to exit and then kill them
+          @threads.each do |t|
+            r = t.join(shutdown_timeout)
+            t.kill if r.nil?
+          end
+
+          # Flush any remaining items in the queue on the main thread
           check_background_queue until queue.empty?
         end
 

data/lib/influxdb/writer/udp.rb

@@ -11,6 +11,9 @@ module InfluxDB
         @port = port
       end
 
+      # No-op for UDP writers
+      def stop!; end
+
       def write(payload, _precision = nil, _retention_policy = nil, _database = nil)
         with_socket { |sock| sock.send(payload, 0) }
       end

data/spec/influxdb/cases/async_client_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require "timeout"
 
 describe InfluxDB::Client do
-  let(:async_options) { true }
+  let(:async_options) { { sleep_interval: 0.1 } }
   let(:client) { described_class.new(async: async_options) }
   let(:subject) { client }
   let(:stub_url) { "http://localhost:8086/write?db=&p=root&precision=s&u=root" }
@@ -18,14 +18,9 @@ describe InfluxDB::Client do
         subject.write_point('a', values: { i: i })
       end
 
-      # The timout code is fragile, and heavily dependent on system load
-      # (and scheduler decisions). On the CI, the system is less
-      # responsive and needs a bit more time.
-      timeout_stretch = ENV["TRAVIS"] == "true" ? 10 : 3
+      sleep 1 until worker.threads.none? { |t| t[:influxdb].nil? }
 
-      Timeout.timeout(timeout_stretch * worker.sleep_interval) do
-        subject.stop!
-      end
+      subject.stop!
 
       worker.threads.each do |t|
         expect(t.stop?).to be true
@@ -41,6 +36,7 @@ describe InfluxDB::Client do
       let(:precision)        { 'test_precision' }
       let(:retention_policy) { 'test_period' }
       let(:database)         { 'test_database' }
+      let(:async_options)    { { num_worker_threads: 1, sleep_interval: 0.1 } }
 
       it "writes aggregate payload to the client" do
         queue = Queue.new
@@ -51,9 +47,11 @@ describe InfluxDB::Client do
         subject.write_point(series, { values: { t: 60 } }, precision, retention_policy, database)
         subject.write_point(series, { values: { t: 61 } }, precision, retention_policy, database)
 
-        Timeout.timeout(worker.sleep_interval) do
-          expect(queue.pop).to eq ["#{series} t=60i\n#{series} t=61i", precision, retention_policy, database]
-        end
+        sleep 1 until worker.threads.none? { |t| t[:influxdb].nil? }
+
+        subject.stop!
+
+        expect(queue.pop).to eq ["#{series} t=60i\n#{series} t=61i", precision, retention_policy, database]
       end
 
       context 'when different precision, retention_policy and database are given' do
@@ -72,36 +70,62 @@ describe InfluxDB::Client do
           subject.write_point(series, { values: { t: 62 } }, precision,  retention_policy2, database)
           subject.write_point(series, { values: { t: 63 } }, precision,  retention_policy,  database2)
 
-          Timeout.timeout(worker.sleep_interval) do
-            expect(queue.pop).to eq ["#{series} t=60i", precision,  retention_policy,  database]
-            expect(queue.pop).to eq ["#{series} t=61i", precision2, retention_policy,  database]
-            expect(queue.pop).to eq ["#{series} t=62i", precision,  retention_policy2, database]
-            expect(queue.pop).to eq ["#{series} t=63i", precision,  retention_policy,  database2]
-          end
+          sleep 1 until worker.threads.none? { |t| t[:influxdb].nil? }
+
+          subject.stop!
+
+          expect(queue.pop).to eq ["#{series} t=60i", precision,  retention_policy,  database]
+          expect(queue.pop).to eq ["#{series} t=61i", precision2, retention_policy,  database]
+          expect(queue.pop).to eq ["#{series} t=62i", precision,  retention_policy2, database]
+          expect(queue.pop).to eq ["#{series} t=63i", precision,  retention_policy,  database2]
         end
       end
     end
   end
 
   describe "async options" do
-    let(:async_options) do
-      {
-        max_post_points:     10,
-        max_queue_size:      100,
-        num_worker_threads:  1,
-        sleep_interval:      0.5,
-        block_on_full_queue: false
-      }
-    end
-
     subject { worker }
     before { worker.stop! }
 
-    specify { expect(subject.max_post_points).to be 10 }
-    specify { expect(subject.max_queue_size).to be 100 }
-    specify { expect(subject.num_worker_threads).to be 1 }
-    specify { expect(subject.sleep_interval).to be_within(0.0001).of(0.5) }
-    specify { expect(subject.block_on_full_queue).to be false }
-    specify { expect(subject.queue).to be_kind_of(InfluxDB::MaxQueue) }
+    context 'when all options are given' do
+      let(:async_options) do
+        {
+          max_post_points:     10,
+          max_queue_size:      100,
+          num_worker_threads:  1,
+          sleep_interval:      0.5,
+          block_on_full_queue: false,
+          shutdown_timeout:    0.6,
+        }
+      end
+
+      it "uses the specified values" do
+        expect(subject.max_post_points).to be 10
+        expect(subject.max_queue_size).to be 100
+        expect(subject.num_worker_threads).to be 1
+        expect(subject.sleep_interval).to be_within(0.0001).of(0.5)
+        expect(subject.block_on_full_queue).to be false
+        expect(subject.queue).to be_kind_of(InfluxDB::MaxQueue)
+        expect(subject.shutdown_timeout).to be_within(0.0001).of(0.6)
+      end
+    end
+
+    context 'when only sleep_interval is given' do
+      let(:async_options) { { sleep_interval: 0.2 } }
+
+      it "uses a value for shutdown_timeout that is 2x sleep_interval" do
+        expect(subject.sleep_interval).to be_within(0.0001).of(0.2)
+        expect(subject.shutdown_timeout).to be_within(0.0001).of(0.4)
+      end
+    end
+
+    context 'when only shutdown_timeout is given' do
+      let(:async_options) { { shutdown_timeout: 0.3 } }
+
+      it "uses that value" do
+        expect(subject.sleep_interval).to be_within(0.0001).of(5)
+        expect(subject.shutdown_timeout).to be_within(0.0001).of(0.3)
+      end
+    end
   end
 end

data/spec/influxdb/cases/query_cluster_spec.rb

@@ -3,7 +3,7 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
+    described_class.new "database", **{
       host:           "influxdb.test",
       port:           9999,
       username:       "username",
@@ -17,7 +17,7 @@ describe InfluxDB::Client do
   describe "#create_cluster_admin" do
     let(:user) { 'adminadmin' }
     let(:pass) { 'passpass' }
-    let(:query) { "CREATE USER #{user} WITH PASSWORD '#{pass}' WITH ALL PRIVILEGES" }
+    let(:query) { "CREATE USER \"#{user}\" WITH PASSWORD '#{pass}' WITH ALL PRIVILEGES" }
 
     context 'with existing admin user' do
       before do
@@ -67,7 +67,7 @@ describe InfluxDB::Client do
 
   describe "#revoke_cluster_admin_privileges" do
     let(:user) { 'useruser' }
-    let(:query) { "REVOKE ALL PRIVILEGES FROM #{user}" }
+    let(:query) { "REVOKE ALL PRIVILEGES FROM \"#{user}\"" }
 
     before do
       stub_request(:get, "http://influxdb.test:9999/query").with(

data/spec/influxdb/cases/query_continuous_query_spec.rb

@@ -104,7 +104,7 @@ describe InfluxDB::Client do
   describe "#delete_continuous_query" do
     let(:name) { "event_counts_per_10m_by_type" }
     let(:database) { "testdb" }
-    let(:query) { "DROP CONTINUOUS QUERY #{name} ON #{database}" }
+    let(:query) { "DROP CONTINUOUS QUERY \"#{name}\" ON \"#{database}\"" }
 
     before do
       stub_request(:get, "http://influxdb.test:9999/query")

data/spec/influxdb/cases/query_database_spec.rb

@@ -23,7 +23,7 @@ describe InfluxDB::Client do
 
   describe "#create_database" do
     describe "from param" do
-      let(:query) { "CREATE DATABASE foo" }
+      let(:query) { "CREATE DATABASE \"foo\"" }
 
       it "should GET to create a new database" do
         expect(subject.create_database("foo")).to be_a(Net::HTTPOK)
@@ -31,7 +31,7 @@ describe InfluxDB::Client do
     end
 
     describe "from config" do
-      let(:query) { "CREATE DATABASE database" }
+      let(:query) { "CREATE DATABASE \"database\"" }
 
       it "should GET to create a new database using database name from config" do
         expect(subject.create_database).to be_a(Net::HTTPOK)
@@ -41,7 +41,7 @@ describe InfluxDB::Client do
 
   describe "#delete_database" do
     describe "from param" do
-      let(:query) { "DROP DATABASE foo" }
+      let(:query) { "DROP DATABASE \"foo\"" }
 
       it "should GET to remove a database" do
         expect(subject.delete_database("foo")).to be_a(Net::HTTPOK)
@@ -49,7 +49,7 @@ describe InfluxDB::Client do
     end
 
     describe "from config" do
-      let(:query) { "DROP DATABASE database" }
+      let(:query) { "DROP DATABASE \"database\"" }
 
       it "should GET to remove a database using database name from config" do
         expect(subject.delete_database).to be_a(Net::HTTPOK)

data/spec/influxdb/cases/query_series_spec.rb

@@ -5,7 +5,7 @@ describe InfluxDB::Client do
   let(:subject) do
     described_class.new(
       "database",
-      {
+      **{
         host:           "influxdb.test",
         port:           9999,
         username:       "username",

data/spec/influxdb/cases/query_user_spec.rb

@@ -24,7 +24,7 @@ describe InfluxDB::Client do
   describe "#update user password" do
     let(:user) { 'useruser' }
     let(:pass) { 'passpass' }
-    let(:query) { "SET PASSWORD FOR #{user} = '#{pass}'" }
+    let(:query) { "SET PASSWORD FOR \"#{user}\" = '#{pass}'" }
 
     it "should GET to update user password" do
       expect(subject.update_user_password(user, pass)).to be_a(Net::HTTPOK)
@@ -35,7 +35,7 @@ describe InfluxDB::Client do
     let(:user) { 'useruser' }
     let(:perm) { :write }
     let(:db) { 'foo' }
-    let(:query) { "GRANT #{perm.to_s.upcase} ON #{db} TO #{user}" }
+    let(:query) { "GRANT #{perm.to_s.upcase} ON \"#{db}\" TO \"#{user}\"" }
 
     it "should GET to grant privileges for a user on a database" do
       expect(subject.grant_user_privileges(user, db, perm)).to be_a(Net::HTTPOK)
@@ -44,7 +44,7 @@ describe InfluxDB::Client do
 
   describe "#grant_user_admin_privileges" do
     let(:user) { 'useruser' }
-    let(:query) { "GRANT ALL PRIVILEGES TO #{user}" }
+    let(:query) { "GRANT ALL PRIVILEGES TO \"#{user}\"" }
 
     it "should GET to grant privileges for a user on a database" do
       expect(subject.grant_user_admin_privileges(user)).to be_a(Net::HTTPOK)
@@ -55,7 +55,7 @@ describe InfluxDB::Client do
     let(:user) { 'useruser' }
     let(:perm) { :write }
     let(:db) { 'foo' }
-    let(:query) { "REVOKE #{perm.to_s.upcase} ON #{db} FROM #{user}" }
+    let(:query) { "REVOKE #{perm.to_s.upcase} ON \"#{db}\" FROM \"#{user}\"" }
 
     it "should GET to revoke privileges from a user on a database" do
       expect(subject.revoke_user_privileges(user, db, perm)).to be_a(Net::HTTPOK)
@@ -66,7 +66,7 @@ describe InfluxDB::Client do
     let(:user) { 'useruser' }
     let(:pass) { 'passpass' }
     let(:db) { 'foo' }
-    let(:query) { "CREATE user #{user} WITH PASSWORD '#{pass}'; GRANT ALL ON #{db} TO #{user}" }
+    let(:query) { "CREATE user \"#{user}\" WITH PASSWORD '#{pass}'; GRANT ALL ON \"#{db}\" TO \"#{user}\"" }
 
     context "without specifying permissions" do
       it "should GET to create a new database user with all permissions" do
@@ -76,7 +76,7 @@ describe InfluxDB::Client do
 
     context "with passing permission as argument" do
       let(:permission) { :read }
-      let(:query) { "CREATE user #{user} WITH PASSWORD '#{pass}'; GRANT #{permission.to_s.upcase} ON #{db} TO #{user}" }
+      let(:query) { "CREATE user \"#{user}\" WITH PASSWORD '#{pass}'; GRANT #{permission.to_s.upcase} ON \"#{db}\" TO \"#{user}\"" }
 
       it "should GET to create a new database user with permission set" do
         expect(subject.create_database_user(db, user, pass, permissions: permission)).to be_a(Net::HTTPOK)
@@ -86,7 +86,7 @@ describe InfluxDB::Client do
 
   describe "#delete_user" do
     let(:user) { 'useruser' }
-    let(:query) { "DROP USER #{user}" }
+    let(:query) { "DROP USER \"#{user}\"" }
 
     it "should GET to delete a user" do
       expect(subject.delete_user(user)).to be_a(Net::HTTPOK)
@@ -105,7 +105,7 @@ describe InfluxDB::Client do
 
   describe "#list_user_grants" do
     let(:user) { 'useruser' }
-    let(:list_query) { "SHOW GRANTS FOR #{user}" }
+    let(:list_query) { "SHOW GRANTS FOR \"#{user}\"" }
 
     before do
       stub_request(:get, "http://influxdb.test:9999/query")

data/spec/influxdb/cases/querying_issue_7000_spec.rb

@@ -6,7 +6,7 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
+    described_class.new "database", **{
       host:           "influxdb.test",
       port:           9999,
       username:       "username",

data/spec/influxdb/cases/querying_spec.rb

@@ -3,7 +3,7 @@ require "json"
 
 describe InfluxDB::Client do
   let(:subject) do
-    described_class.new "database", {
+    described_class.new "database", **{
       host:           "influxdb.test",
       port:           9999,
       username:       "username",

data/spec/influxdb/cases/retry_requests_spec.rb

@@ -5,7 +5,7 @@ describe InfluxDB::Client do
   let(:client) do
     described_class.new(
       "database",
-      {
+      **{
         host:           "influxdb.test",
         port:           9999,
         username:       "username",

data/spec/influxdb/client_spec.rb

@@ -5,7 +5,7 @@ describe InfluxDB::Client do
   let(:subject) do
     described_class.new(
       "database",
-      {
+      **{
         host:           "influxdb.test",
         port:           9999,
         username:       "username",

data/spec/influxdb/config_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 
 describe InfluxDB::Config do
-  let(:conf) do
-    InfluxDB::Client.new(*args).config
+  after { client.stop! }
+
+  let(:client) do
+    kwargs = args.last.is_a?(Hash) ? args.pop : {}
+    InfluxDB::Client.new(*args, **kwargs)
   end
+  let(:conf) { client.config }
 
-  let(:args) { {} }
+  let(:args) { [] }
 
   context "with no parameters specified" do
     specify { expect(conf.database).to be_nil }
@@ -26,13 +30,13 @@ describe InfluxDB::Config do
 
   context "with no database specified" do
     let(:args) do
-      [{
+      [
         host:           "host",
         port:           "port",
         username:       "username",
         password:       "password",
         time_precision: "m"
-      }]
+      ]
     end
 
     specify { expect(conf.database).to be_nil }
@@ -66,7 +70,7 @@ describe InfluxDB::Config do
   end
 
   context "with ssl option specified" do
-    let(:args) { [{ use_ssl: true }] }
+    let(:args) { [use_ssl: true] }
 
     specify { expect(conf.database).to be_nil }
     specify { expect(conf.hosts).to eq ["localhost"] }
@@ -77,7 +81,7 @@ describe InfluxDB::Config do
   end
 
   context "with multiple hosts specified" do
-    let(:args) { [{ hosts: ["1.1.1.1", "2.2.2.2"] }] }
+    let(:args) { [hosts: ["1.1.1.1", "2.2.2.2"]] }
 
     specify { expect(conf.database).to be_nil }
     specify { expect(conf.port).to eq 8086 }
@@ -87,7 +91,7 @@ describe InfluxDB::Config do
   end
 
   context "with auth_method basic auth specified" do
-    let(:args) { [{ auth_method: 'basic_auth' }] }
+    let(:args) { [auth_method: 'basic_auth'] }
 
     specify { expect(conf.database).to be_nil }
     specify { expect(conf.hosts).to eq ["localhost"] }
@@ -98,38 +102,38 @@ describe InfluxDB::Config do
   end
 
   context "with udp specified with params" do
-    let(:args) { [{ udp: { host: 'localhost', port: 4444 } }] }
+    let(:args) { [udp: { host: 'localhost', port: 4444 }] }
 
     specify { expect(conf).to be_udp }
   end
 
   context "with udp specified as true" do
-    let(:args) { [{ udp: true }] }
+    let(:args) { [udp: true] }
 
     specify { expect(conf).to be_udp }
   end
 
   context "with async specified with params" do
-    let(:args) { [{ async: { max_queue: 20_000 } }] }
+    let(:args) { [async: { max_queue: 20_000 }] }
 
     specify { expect(conf).to be_async }
   end
 
   context "with async specified as true" do
-    let(:args) { [{ async: true }] }
+    let(:args) { [async: true] }
 
     specify { expect(conf).to be_async }
   end
 
   context "with epoch specified as seconds" do
-    let(:args) { [{ epoch: 's' }] }
+    let(:args) { [epoch: 's'] }
 
     specify { expect(conf.epoch).to eq 's' }
   end
 
   context "given a config URL" do
     let(:url) { "https://foo:bar@influx.example.com:8765/testdb?open_timeout=42&unknown=false&denormalize=false" }
-    let(:args) { [{ url: url }] }
+    let(:args) { [url: url] }
 
     it "applies values found in URL" do
       expect(conf.database).to eq "testdb"
@@ -158,6 +162,15 @@ describe InfluxDB::Config do
       expect(conf).not_to be_async
     end
 
+    context "with encoded values" do
+      let(:url) { "https://weird%24user:weird%25pass@influx.example.com:8765/testdb" }
+
+      it "decode encoded values" do
+        expect(conf.username).to eq "weird$user"
+        expect(conf.password).to eq "weird%pass"
+      end
+    end
+
     context "UDP" do
       let(:url) { "udp://test.localhost:2345?discard_write_errors=1" }
       specify { expect(conf).to be_udp }
@@ -210,15 +223,13 @@ describe InfluxDB::Config do
 
   context "given explicit proxy information" do
     let(:args) do
-      [{
-        host:           "host",
-        port:           "port",
-        username:       "username",
-        password:       "password",
-        time_precision: "m",
-        proxy_addr:     "my.proxy.addr",
-        proxy_port:     8080
-      }]
+      [host:           "host",
+       port:           "port",
+       username:       "username",
+       password:       "password",
+       time_precision: "m",
+       proxy_addr:     "my.proxy.addr",
+       proxy_port:     8080]
     end
 
     specify { expect(conf.proxy_addr).to eq("my.proxy.addr") }

data/spec/influxdb/logging_spec.rb

@@ -38,6 +38,9 @@ describe InfluxDB::Logging do
   context "when logging is disabled" do
     subject { LoggerTest.new }
     it "does not log" do
+      pending "The test doesn't work since bugfix in rspec-mocks 3.10.1 " \
+              "(https://github.com/rspec/rspec-mocks/pull/1357)"
+
       InfluxDB::Logging.logger = false
       expect(InfluxDB::Logging.logger).not_to receive(:debug)
       subject.write_to_log(:debug, 'test')

data/spec/smoke/smoke_spec.rb

@@ -25,14 +25,14 @@ describe InfluxDB::Client, smoke: true do
 
   context "retrieves data from the NOAA database" do
     sample_data1 = {
-      "time"              => "2015-08-18T00:00:00Z",
+      "time"              => "2019-08-17T00:00:00Z",
       "level description" => "below 3 feet",
       "location"          => "santa_monica",
       "water_level"       => 2.064
     }
 
     sample_data2 = {
-      "time"              => "2015-08-18T00:12:00Z",
+      "time"              => "2019-08-17T00:12:00Z",
       "level description" => "below 3 feet",
       "location"          => "santa_monica",
       "water_level"       => 2.028

data/spec/spec_helper.rb

@@ -17,12 +17,12 @@ def min_influx_version(version)
 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"
+  config.color = ENV["CI"] != "true"
+  config.filter_run_excluding smoke: ENV["CI"] != "true" || !ENV.key?("influx_version")
+  puts "SMOKE TESTS ARE NOT CURRENTLY RUNNING" if ENV["CI"] != "true"
 
   # rubocop:disable Style/ConditionalAssignment
-  if config.files_to_run.one? || ENV["TRAVIS"] == "true"
+  if config.files_to_run.one? || ENV["CI"] == "true"
     config.formatter = :documentation
   else
     config.formatter = :progress

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Todd Persen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -152,7 +152,7 @@ homepage: http://influxdb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files:

data/.travis.yml

@@ -1,59 +0,0 @@
-sudo: required
-dist: trusty
-language: ruby
-before_install:
-  - gem update --system --no-doc
-  - bin/provision.sh
-rvm:
-  - "2.3"
-  - "2.4"
-  - "2.5"
-  - "2.6"
-  - "2.7"
-  - ruby-head
-env:
-  - TEST_TASK=spec
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: ruby-head
-    - rvm: jruby-9.1.17.0
-    - rvm: jruby-9.2.9.0
-    - rvm: "2.7"
-      env: influx_version=nightly channel=nightlies
-  include:
-    - rvm: "2.7"
-      env: TEST_TASK=rubocop
-
-    - rvm: jruby-9.1.17.0
-      env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-    - rvm: jruby-9.2.9.0
-      env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-    - rvm: jruby-head
-      env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-
-    - rvm: "2.7"
-      env: influx_version=1.0.2 pkghash=88f6c30fec2c6e612e802e23b9161fdfc7c5c29f6be036f0376326445aff0037
-    - rvm: "2.7"
-      env: influx_version=1.1.5 pkghash=0ecb9385cc008f6e5094e6e8f8ea70522023a16d4397e401898f3973176d3b21
-    - rvm: "2.7"
-      env: influx_version=1.2.4 pkghash=2fac8391e04aa1bec9151e8f0d8f18df030c866af2b4963ab7d86c6ddc172182
-    - rvm: "2.7"
-      env: influx_version=1.3.8 pkghash=35c9cb2943bbde04aa5e94ad6d8caf5fc9b1480bdbcde7c34078de135cc4f788
-    - rvm: "2.7"
-      env: influx_version=1.4.3 pkghash=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
-    - rvm: "2.7"
-      env: influx_version=1.5.4 pkghash=fa6f8d3196d13ffc376d533581b534692c738181ce3427c53484c138d9e6b902
-    - rvm: "2.7"
-      env: influx_version=1.6.4 pkghash=dbfa13a0f9e38a8e7b19294c30144903bb681ac0aba0a3a8f4f349c37d5de5f9
-    - rvm: "2.7"
-      env: influx_version=1.7.9 pkghash=02759d70cef670d336768fd38a9cf2f046a1bf40618be78ba215e7ce75b5075f
-    - rvm: "2.7"
-      env: influx_version=nightly channel=nightlies
-addons:
-  apt:
-    packages:
-      - haveged
-      - libgmp-dev
-script: travis_retry bundle exec rake $TEST_TASK