influxdb 0.3.2 → 0.3.4

data/.travis.yml

@@ -4,6 +4,7 @@ language: ruby
 before_install:
   - gem update bundler
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.10
   - 2.2.4

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/commits/master).
 
+## Unreleased changes
+
+- None.
+
+## v0.3.4, released 2016-06-07
+
+- Added resample options to `Client#create_continuous_query` (#149).
+- Fixed resample options to be Ruby 1.9 compatible (#150, @SebastianCoetzee).
+- Mentioned in README, that 0.3.x series is the last one to support Ruby 1.9
+
+## v0.3.3, released 2016-06-06 (yanked)
+
+- Added resample options to `Client#create_continuous_query` (#149).
+
 ## v0.3.2, released 2016-06-02
 
 - Added config option to authenticate without credentials (#146, @pmenglund).

data/README.md

@@ -1,23 +1,34 @@
-influxdb-ruby
-=============
+# influxdb-ruby
 
 [![Build Status](https://travis-ci.org/influxdata/influxdb-ruby.svg?branch=master)](https://travis-ci.org/influxdata/influxdb-ruby)
 
-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).
+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).
 
-> **Support for InfluxDB v0.8.x is now deprecated**. The final version of this library that will support the older InfluxDB interface is `v0.1.9`, which is available as a gem and tagged on this repository. If you're reading this message, then you should only expect support for InfluxDB v0.9.1 and higher.
+## Platform support
 
-Install
--------
+> **Support for InfluxDB v0.8.x is now deprecated**. The final version of this library that
+> will support the older InfluxDB interface is `v0.1.9`, which is available as a gem and
+> tagged on this repository.
+>
+> If you're reading this message, then you should only expect support for InfluxDB v0.9.1
+> and higher.
+
+## Ruby support
+
+This gem should work with Ruby 1.9+, but starting with v0.4, we'll likely drop Ruby 1.9 support.
+
+## Install
 
 ```
 $ [sudo] gem install influxdb
 ```
 
-Or add it to your `Gemfile`, etc.
+Or add it to your `Gemfile`, and run `bundle install`.
 
-Usage
------
+## Usage
+
+### Creating a client
 
 Connecting to a single host:
 
@@ -37,6 +48,8 @@ require 'influxdb'
 influxdb = InfluxDB::Client.new hosts: ["influxdb1.domain.com", "influxdb2.domain.com"]
 ```
 
+### Administrative tasks
+
 Create a database:
 
 ``` ruby
@@ -139,6 +152,8 @@ username = 'foobar'
 influxdb.revoke_cluster_admin_privileges(username)
 ```
 
+### Continuous Queries
+
 List continuous queries of a database:
 
 ``` ruby
@@ -157,6 +172,12 @@ query = 'SELECT COUNT(name) INTO clicksCount_1h FROM clicks GROUP BY time(1h)'
 influxdb.create_continuous_query(name, database, query)
 ```
 
+Additionally, you can specify the resample interval and the time range over which the CQ runs:
+
+``` ruby
+influxdb.create_continuous_query(name, database, query, resample_every: "10m", resample_for: "65m")
+```
+
 Delete a continuous query from a database:
 
 ``` ruby
@@ -166,6 +187,8 @@ name = 'clicks_count'
 influxdb.delete_continuous_query(name, database)
 ```
 
+### Retention Policies
+
 List retention policies of a database:
 
 ``` ruby
@@ -205,6 +228,8 @@ replication = 2
 influxdb.alter_retention_policy(name, database, duration, replication)
 ```
 
+### Writing data
+
 Write some data:
 
 ``` ruby
@@ -397,6 +422,8 @@ data = {
 influxdb.write_point(name, data)
 ```
 
+### Reading data
+
 Querying:
 
 ``` ruby
@@ -460,16 +487,15 @@ end
 # time_series_1 [ {"region"=>"us"} ] => {"columns"=>["time", "count", "value"], "values"=>[["2015-07-09T09:02:54Z", 55, 0.4343]]}
 ```
 
-By default, InfluxDB::Client will keep trying to connect to the database when it gets connection denied, if you want to retry a finite number of times
-(or disable retries altogether), you should pass the `:retry`
-value. `:retry` can be either `true`, `false` or an `Integer` to retry
-infinite times, disable retries or retry a finite number of times,
-respectively. `0` is equivalent to `false`
+By default, InfluxDB::Client will keep trying to connect to the database when it gets connection denied,
+if you want to retry a finite number of times (or disable retries altogether), you should pass the `:retry`
+value.
 
-```
-> require 'influxdb'
-=> true
+`:retry` can be either `true`, `false` or an `Integer` to retry infinite times, disable retries or retry
+a finite number of times, respectively. `0` is equivalent to `false`
 
+```
+$ irb -r influxdb
 > influxdb = InfluxDB::Client.new 'database', :retry => 4
 => #<InfluxDB::Client:0x00000002bb5ce0 @database="database", @hosts=["localhost"],
 @port=8086, @username="root", @password="root", @use_ssl=false,
@@ -490,17 +516,28 @@ E, [2014-06-02T11:04:13.510853 #22825] ERROR -- : [InfluxDB] Failed to
 contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
 retrying in 0.08s.
 SocketError: Tried 4 times to reconnect but failed.
-
 ```
-If you pass `:retry => -1` it will keep trying forever
-until it gets the connection.
 
-Testing
--------
+If you pass `:retry => -1` it will keep trying forever until it gets the connection.
+
+## Testing
 
 ```
 git clone git@github.com:influxdata/influxdb-ruby.git
 cd influxdb-ruby
 bundle
-bundle exec rake
+bundle exec rake spec
+bundle exec rake rubocop
 ```
+
+## Contributing
+
+- Fork this repository on GitHub.
+- Make your changes.
+  - Add tests.
+  - Add an entry in the `CHANGELOG.md` in the "unreleased" section on top.
+- Run the tests: `bundle exec rake`.
+- Run Rubocop: `bundle exec rubocop`.
+- Send a pull request.
+  - Please rebase against the master branch.
+- If your changes look good, we'll merge them.

data/lib/influxdb/query/continuous_query.rb

@@ -10,8 +10,16 @@ module InfluxDB
           .map { |v| { 'name' => v.first, 'query' => v.last } }
       end
 
-      def create_continuous_query(name, database, query)
-        clause = ["CREATE CONTINUOUS QUERY #{name} ON #{database} BEGIN", query, "END"].join("\n")
+      def create_continuous_query(name, database, query, options = {})
+        clause = ["CREATE CONTINUOUS QUERY", name, "ON", database]
+
+        if options[:resample_every] || options[:resample_for]
+          clause << "RESAMPLE"
+          clause << "EVERY #{options[:resample_every]}" if options[:resample_every]
+          clause << "FOR #{options[:resample_for]}"     if options[:resample_for]
+        end
+
+        clause = clause.join(" ") << " BEGIN\n" << query << "\nEND"
         execute(clause)
       end
 

data/lib/influxdb/version.rb

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

data/spec/influxdb/cases/query_continuous_query_spec.rb

@@ -45,13 +45,24 @@ describe InfluxDB::Client do
   end
 
   describe "#create_continuous_query" do
-    let(:name) { "event_counts_per_10m_by_type" }
-    let(:database) { "testdb" }
-    let(:query) do
-      "SELECT COUNT(type) INTO typeCount_10m_byType FROM events GROUP BY time(10m), type"
-    end
+    let(:name)            { "event_counts_per_10m_by_type" }
+    let(:database)        { "testdb" }
+    let(:query)           { "SELECT COUNT(type) INTO typeCount_10m_byType FROM events GROUP BY time(10m), type" }
+    let(:every_interval)  { nil }
+    let(:for_interval)    { nil }
+
     let(:clause) do
-      ["CREATE CONTINUOUS QUERY #{name} ON #{database} BEGIN", query, "END"].join("\n")
+      c = "CREATE CONTINUOUS QUERY #{name} ON #{database}"
+
+      if every_interval && for_interval
+        c << " RESAMPLE EVERY #{every_interval} FOR #{for_interval}"
+      elsif every_interval
+        c << " RESAMPLE EVERY #{every_interval}"
+      elsif for_interval
+        c << " RESAMPLE FOR #{for_interval}"
+      end
+
+      c << " BEGIN\n#{query}\nEND"
     end
 
     before do
@@ -60,8 +71,37 @@ describe InfluxDB::Client do
       )
     end
 
-    it "should GET to create a new continuous query" do
-      expect(subject.create_continuous_query(name, database, query)).to be_a(Net::HTTPOK)
+    context "without resampling" do
+      it "should GET to create a new continuous query" do
+        expect(subject.create_continuous_query(name, database, query)).to be_a(Net::HTTPOK)
+      end
+    end
+
+    context "with resampling" do
+      context "EVERY <interval>" do
+        let(:every_interval) { "10m" }
+
+        it "should GET to create a new continuous query" do
+          expect(subject.create_continuous_query(name, database, query, resample_every: every_interval)).to be_a(Net::HTTPOK)
+        end
+      end
+
+      context "FOR <interval>" do
+        let(:for_interval) { "7d" }
+
+        it "should GET to create a new continuous query" do
+          expect(subject.create_continuous_query(name, database, query, resample_for: for_interval)).to be_a(Net::HTTPOK)
+        end
+      end
+
+      context "EVERY <interval> FOR <interval>" do
+        let(:every_interval)  { "5m" }
+        let(:for_interval)    { "3w" }
+
+        it "should GET to create a new continuous query" do
+          expect(subject.create_continuous_query(name, database, query, resample_for: for_interval, resample_every: every_interval)).to be_a(Net::HTTPOK)
+        end
+      end
     end
   end
 

data/spec/influxdb/cases/write_points_spec.rb

@@ -119,13 +119,13 @@ describe InfluxDB::Client do
 
       before do
         stub_request(:post, "http://influxdb.test:9999/write").with(
-          query: { u: "username", p: "password", precision: 'm', db: database },
+          query: { u: "username", p: "password", precision: 'ms', db: database },
           headers: { "Content-Type" => "application/octet-stream" },
           body: body
         ).to_return(status: 204)
       end
       it "should POST multiple points" do
-        expect(subject.write_points(data, 'm')).to be_a(Net::HTTPNoContent)
+        expect(subject.write_points(data, 'ms')).to be_a(Net::HTTPNoContent)
       end
     end
 

metadata

@@ -1,97 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
+  prerelease: 
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cause
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.24.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.39.0
 description: This is the official Ruby library for InfluxDB.
@@ -101,9 +130,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -151,26 +180,33 @@ files:
 homepage: http://influxdb.org
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4505690428131411783
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4505690428131411783
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby library for InfluxDB.
 test_files:
 - spec/influxdb/cases/async_client_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9175c1e5dc3934144b01c90acf625770219d052b
-  data.tar.gz: e06c8e8f3fa04429e58c97d4f4b2f30c0dcbc4da
-SHA512:
-  metadata.gz: 0cd3923bcbf70d4aef40062fbec6b8e924403a3b83631861bb0dc71e7eaefdd53ffaa7d38935a289045d20e337b0531a48173e558079da5cadbcc9a52ea088be
-  data.tar.gz: 9f2cca0b974e8fdb3342356645dbb75963cf03c23c672ed439566160ebbca8fbb76810fa46ceddfc943e0e0b65df62120afa9f12cbb2da9dcb898bba8819bfd1