influxdb 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4126a6d8021cd7ae64f6ebc12bd9760ef482c9df
-  data.tar.gz: 33c78e146fc49a8d0302ae0f4704837d1f3f5b9d
+  metadata.gz: e1335ca5adba19fcf5c4e9aefaa7860ccbfe5cc8
+  data.tar.gz: dd6c3fafc967d12eb4854db1ae7e0a3604257301
 SHA512:
-  metadata.gz: 0b9ec022755c6e03bb0c2473102358c3f60b64eb80a44160ae5b0398d413e5f90c293e596a0996935a35e2ef50a2c90d091a6cb0690eab380bdca5e24b9b06e7
-  data.tar.gz: 0058ee385c54b9b0a70bf794ab16b5a94a617825b58f4a9821fbdc668b0fa37bddea415fb762eab1b6cd7e3d517c2dc5da8d8ed9d9e35ea5fb50d796d27d9de0
+  metadata.gz: 4a0e9060cd27e1700f8bc814f0aff76ef41baa592a906ec1da2b61eb7d4bc558ca1cb6edc3297b057f5482334b6f855ffea36ee6b14f725882f80973d9bf2816
+  data.tar.gz: 7282436fe2ae3b971910561851c3c2ea1d328185ea08dcc6a1b666d477a99f8142df36dc7dd6b79546f9ea9392a7851a066a95417b543578f34de2204aa127a9

data/.rubocop.yml

@@ -6,6 +6,7 @@ AllCops:
     - 'spec/**/*.rb'
   Exclude:
     - 'bin/**/*'
+    - 'smoke/**/*'
   DisplayCopNames: true
   StyleGuideCopsOnly: false
 

data/.travis.yml

@@ -4,6 +4,7 @@ language: ruby
 before_install:
   - gem install bundler
   - gem update bundler
+  - smoke/provision.sh
 rvm:
   - 1.9.3
   - 2.0.0
@@ -13,11 +14,14 @@ rvm:
   - ruby-head
 env:
   - TEST_TASK=spec
+
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: jruby-9.0.5.0
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=nightly channel=nightlies
   include:
     - rvm: 2.3.1
       env: TEST_TASK=rubocop
@@ -25,6 +29,18 @@ matrix:
       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.3.1
+      env: TEST_TASK=smoke influx_version=0.10.3-1 pkghash=96244557d9bb7485ddc9d084ff7ce783
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=0.11.1-1 pkghash=f4cf8363125038dff038ced6b16bcafd
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=0.12.2-1 pkghash=f28bb1c57d52dc1593dca45b86be5913
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=0.13.0 pkghash=4f0aa76fee22cf4c18e2a0779ba4f462
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=1.0.0 pkghash=a25daf049d2482166b248fe2d0be4b69
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=nightly channel=nightlies
   fail_fast: true
 addons:
   apt:

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.3.10, released 2016-10-03
+
+- Bugfix in `Query::Builder#quote` (#168, @cthulhu666).
+
 ## v0.3.9, released 2016-09-20
 
 - Changed retry behaviour slightly. When the server responds with an incomplete

data/Rakefile

@@ -1,22 +1,27 @@
+require "rake/testtask"
 require "bundler/gem_tasks"
-require 'rubocop/rake_task'
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
 targeted_files = ARGV.drop(1)
-file_pattern = targeted_files.empty? ? 'spec/**/*_spec.rb' : targeted_files
+file_pattern   = targeted_files.empty? ? "spec/**/*_spec.rb" : targeted_files
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 
 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"]
+end
+
 task default: [:spec, :rubocop]
 
 task :console do
-  lib = File.expand_path('../lib', __FILE__)
+  lib = File.expand_path("../lib", __FILE__)
   $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
   require "influxdb"
 
@@ -24,14 +29,13 @@ task :console do
     require "pry-byebug"
     Pry.start
   rescue LoadError
-    puts <<-TEXT.gsub(/^\s{6}([^ ])/, '\1')
+    puts <<-TEXT.gsub(/^\s{6}([^ ])/, "\1"), ""
       Could not load pry-byebug. Create a file Gemfile.local with
       the following line, if you want to get rid of this message:
 
       \tgem "pry-byebug"
 
       (don't forget to run bundle afterwards). Falling back to IRB.
-
     TEXT
 
     require "irb"
@@ -39,3 +43,9 @@ 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

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features|smoke)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"

data/lib/influxdb/query/builder.rb

@@ -22,7 +22,7 @@ module InfluxDB
         when Integer, Float, TrueClass, FalseClass
           param.to_s
         else
-          raise ArgumentError, "Unexpected parameter type #{p.class} (#{p.inspect})"
+          raise ArgumentError, "Unexpected parameter type #{param.class} (#{param.inspect})"
         end
       end
 

data/lib/influxdb/version.rb

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

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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,61 @@
+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
+
+def test_case(name)
+  print name
+  yield
+  puts " [ OK ]"
+rescue
+  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
+  raise "unexpected measurements: #{unexpected.join(", ")}" if unexpected.any?
+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"]
+  raise "expected to find #{expected} points, got #{actual}" if expected != actual
+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
+  raise "expected #{expected} observations, got #{actual}" if expected != actual
+
+  expected = {
+    "time"              => "2015-08-18T00:00:00Z",
+    "level description" => "between 6 and 9 feet",
+    "location"          => "coyote_creek",
+    "water_level"       => 8.12
+  }
+  raise "unexpected first result, got #{result[0]}" if expected != result[0]
+
+  expected = {
+    "time"              => "2015-08-18T00:12:00Z",
+    "level description" => "between 6 and 9 feet",
+    "location"          => "coyote_creek",
+    "water_level"       => 7.887
+  }
+  raise "unexpected last result, got #{result[-1]}" if expected != result[-1]
+end

data/smoke/provision.sh

@@ -0,0 +1,92 @@
+#!/bin/sh -e
+
+if [ -z "$influx_version" ]; then
+  echo "== Provisioning InfluxDB: Skipping, influx_version is empty"
+  exit 0
+else
+  echo "== Provisioning InfluxDB ${influx_version}"
+fi
+
+package_name="influxdb_${influx_version}_amd64.deb"
+[ -z "${channel}" ] && channel="releases"
+download_url="https://dl.influxdata.com/influxdb/${channel}/${package_name}"
+
+
+echo "== Downloading package"
+
+if which curl 2>&1 >/dev/null; then
+  curl "${download_url}" > "${HOME}/${package_name}"
+else
+  echo >&2 "E: Could not find curl"
+  exit 1
+fi
+
+echo "== Download verification"
+hash_sum=$(md5sum "${HOME}/${package_name}" | awk '{ print $1 }')
+
+if [ -z "${pkghash}" ]; then
+  echo "-- Skipping, pkghash is empty"
+else
+  if [ "${hash_sum}" != "${pkghash}" ]; then
+    echo >&2 "E: Hash sum mismatch (got ${hash_sum}, expected ${pkghash})"
+    exit 1
+  fi
+fi
+echo "-- Download has MD5 hash: ${hash_sum}"
+
+
+echo "== Installing"
+
+sudo dpkg -i "${HOME}/${package_name}"
+sudo /etc/init.d/influxdb start
+
+echo "-- waiting for daemon to start"
+while ! curl --head --fail --silent http://localhost:8086/ping; do
+  echo -n "."
+  sleep 1
+done
+
+
+echo "== Configuring"
+
+echo "-- create admin user"
+/usr/bin/influx -execute "CREATE USER root WITH PASSWORD 'toor' WITH ALL PRIVILEGES"
+
+echo "-- create non-admin user"
+/usr/bin/influx -execute "CREATE USER test_user WITH PASSWORD 'resu_tset'"
+
+echo "-- create databases"
+/usr/bin/influx -execute "CREATE DATABASE db_one"
+/usr/bin/influx -execute "CREATE DATABASE db_two"
+
+echo "-- grant access"
+/usr/bin/influx -execute "GRANT ALL ON db_two TO test_user"
+
+
+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
+/usr/bin/influx -import -path noaa.txt -precision s
+
+echo "-- grant access"
+/usr/bin/influx -execute "GRANT ALL ON NOAA_water_database TO test_user"
+
+
+echo "== Enable authentication"
+
+if [ ! -f /etc/influxdb/influxdb.conf ]; then
+  echo >&2 "E: config file not found"
+  exit 1
+fi
+
+sudo sed -i 's/auth-enabled = false/auth-enabled = true/' /etc/influxdb/influxdb.conf
+sudo /etc/init.d/influxdb restart
+
+echo "-- waiting for daemon to restart"
+while ! curl --head --fail --silent http://localhost:8086/ping; do
+  echo -n "."
+  sleep 1
+done
+
+
+echo "== Done"

data/spec/influxdb/query_builder_spec.rb

@@ -18,6 +18,8 @@ RSpec.describe InfluxDB::Query::Builder do
       expect(subject.quote(0 || 1)).to eq "0"
 
       expect(subject.quote(:symbol)).to eq "'symbol'"
+
+      expect { subject.quote(/regex/) }.to raise_error(ArgumentError, /Unexpected parameter type Regex/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -142,6 +142,9 @@ 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
@@ -191,6 +194,9 @@ 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