influxdb 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a15d18aa85145172f0abb3333ef7ffb9641b4ada
-  data.tar.gz: 6146be97a07658dffb26b044d15ddca5adc8e8ac
-SHA512:
-  metadata.gz: 191c102bd7ad4f5e136763b16ba0efce9b2f6f1002bcea5e317cad36ad20918484c714e277a329890598bd1172469bf117013ed93e2db5ed7742aebbfaa7c8bc
-  data.tar.gz: 7cdbe3eefee7b679dae5c46d1a825cc36195d1bdb05326cf57dd005c1ce3663d57bd34414edaa289424281a726d9df6d25702fea527b4d8711bb6edac9d02151
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWViNjMyNTE1YzkxZTI1ODAyZjQ3YzdlNmRlYTcwNTY3OWRiNjUwMA==
+  data.tar.gz: !binary |-
+    ZjFiODMzNzA1MDU5YzQzNTk3Nzc3MDU5YzY3MmE3ZDVlYmI0OWE4ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTU4MmI5N2E0MTViYzc3MmIyYjM3MDc0YTE5NGExMWFkZWU4MjZiMTgyZTAz
+    YTJkNDIxM2MwNDJmYjcwMTRkYWU3YTRhMjQ3MTY5Y2UyNTk1ZWEzNjhmMThk
+    NWY0MjM4Y2VkMDgzN2MzMDAzNGI2ZmU5OWRmMDA0ZDMwN2NlZWE=
+  data.tar.gz: !binary |-
+    MTQxYzc2ZjFmNmYxNDI3MzI0MTZmNGVmNjZkZmEyYTk0Y2JhNmEyMTBhOWVl
+    NDc5NTQ5ZjhiYTIxMmMyOWRjMjc4MmUwYmM5NDZmOWJiM2Y3OWUyNmJjMTA2
+    MWEwMTRkMWZkNTAwZDgzN2JjZmM2MTUwYjY4MmM0ZjY2NGM0NTI=

data/README.md

@@ -40,6 +40,16 @@ new_password = 'bar'
 influxdb.create_database_user(database, new_username, new_password)
 ```
 
+Update a database user:
+
+``` ruby
+require 'influxdb'
+
+influxdb = InfluxDB::Client.new
+
+influxdb.update_database_user(database, username, :password => "new_password")
+```
+
 Write some data:
 
 ``` ruby
@@ -66,6 +76,16 @@ loop do
 end
 ```
 
+List cluster admins:
+
+``` ruby
+require 'influxdb'
+
+influxdb = InfluxDB::Client.new
+
+influxdb.get_cluster_admin_list
+```
+
 List databases:
 
 ``` ruby

data/lib/influxdb/client.rb

@@ -31,12 +31,12 @@ module InfluxDB
     # +:username+:: the username to use when executing commands
     # +:password+:: the password associated with the username
     def initialize *args
+      @database = args.first if args.first.is_a? String
       opts = args.last.is_a?(Hash) ? args.last : {}
       @host = opts[:host] || "localhost"
       @port = opts[:port] || 8086
       @username = opts[:username] || "root"
       @password = opts[:password] || "root"
-      @database = args.first
       @http = Net::HTTP.new(@host, @port)
       @queue = InfluxDB::MaxQueue.new
       spawn_threads!
@@ -57,7 +57,7 @@ module InfluxDB
     end
 
     def get_database_list
-      url = full_url("dbs")
+      url = full_url("db")
 
       response = @http.request(Net::HTTP::Get.new(url))
       JSON.parse(response.body)
@@ -85,6 +85,13 @@ module InfluxDB
       response = @http.request(Net::HTTP::Delete.new(url))
     end
 
+    def get_cluster_admin_list
+      url = full_url("cluster_admins")
+
+      response = @http.request(Net::HTTP::Get.new(url))
+      JSON.parse(response.body)
+    end
+
     def create_database_user(database, username, password)
       url = full_url("db/#{database}/users")
       data = JSON.generate({:name => username, :password => password})
@@ -115,11 +122,7 @@ module InfluxDB
     end
 
     def alter_database_privilege(database, username, admin=true)
-      url = full_url("db/#{database}/users/#{username}")
-      data = JSON.generate({:admin => admin})
-
-      headers = {"Content-Type" => "application/json"}
-      @http.request(Net::HTTP::Post.new(url, headers), data)
+      update_database_user(database, username, :admin => admin)
     end
 
     def write_point(name, data, async=false)
@@ -142,6 +145,8 @@ module InfluxDB
 
       headers = {"Content-Type" => "application/json"}
       response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      raise "Write failed with '#{response.message}'" unless (200...300).include?(response.code.to_i)
+      response
     end
 
     def query(query)

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/influxdb/worker.rb

@@ -52,7 +52,11 @@ module InfluxDB
           data.push p
         end
 
-        _write(data)
+        begin
+          _write(data)
+        rescue => e
+          puts "Cannot write data: #{e.inspect}"
+        end
       end while @queue.length > MAX_POST_POINTS
     end
   end

data/spec/influxdb/client_spec.rb

@@ -8,25 +8,62 @@ describe InfluxDB::Client do
   end
 
   describe "#new" do
-    it "should instantiate a new InfluxDB client and default to localhost" do
-      @influxdb = InfluxDB::Client.new
+    describe "with no parameters specified" do
+      it "should be initialzed with a nil database and the default options" do
+        @influxdb = InfluxDB::Client.new
+
+        @influxdb.should be_a InfluxDB::Client
+        @influxdb.database.should be_nil
+        @influxdb.host.should == "localhost"
+        @influxdb.port.should == 8086
+        @influxdb.username.should == "root"
+        @influxdb.password.should == "root"
+      end
+    end
 
-      @influxdb.should be_a(InfluxDB::Client)
-      @influxdb.host.should ==("localhost")
-      @influxdb.port.should ==(8086)
-      @influxdb.username.should ==("root")
-      @influxdb.password.should ==("root")
+    describe "with no database specified" do
+      it "should be initialized with a nil database and the specified options" do
+        @influxdb = InfluxDB::Client.new :hostname => "host",
+                                         :port => "port",
+                                         :username => "username",
+                                         :password => "password"
+
+        @influxdb.should be_a InfluxDB::Client
+        @influxdb.database.should be_nil
+        @influxdb.host.should == "localhost"
+        @influxdb.port.should == "port"
+        @influxdb.username.should == "username"
+        @influxdb.password.should == "password"
+      end
     end
 
-    it "should instantiate a new InfluxDB client" do
-      @influxdb = InfluxDB::Client.new "database", :hostname => "host",
-        :port => "port", :username => "username", :password => "password"
+    describe "with only a database specified" do
+      it "should be initialized with the specified database and the default options" do
+        @influxdb = InfluxDB::Client.new "database"
 
-      @influxdb.should be_a(InfluxDB::Client)
-      @influxdb.host.should ==("localhost")
-      @influxdb.port.should ==("port")
-      @influxdb.username.should ==("username")
-      @influxdb.password.should ==("password")
+        @influxdb.should be_a(InfluxDB::Client)
+        @influxdb.database.should == "database"
+        @influxdb.host.should == "localhost"
+        @influxdb.port.should == 8086
+        @influxdb.username.should == "root"
+        @influxdb.password.should == "root"
+      end
+    end
+
+    describe "with both a database and options specified" do
+      it "should be initialized with the specified database and options" do
+        @influxdb = InfluxDB::Client.new "database", :hostname => "host",
+                                                     :port => "port",
+                                                     :username => "username",
+                                                     :password => "password"
+
+        @influxdb.should be_a(InfluxDB::Client)
+        @influxdb.database.should == "database"
+        @influxdb.host.should == "localhost"
+        @influxdb.port.should == "port"
+        @influxdb.username.should == "username"
+        @influxdb.password.should == "password"
+      end
     end
   end
 
@@ -54,7 +91,7 @@ describe InfluxDB::Client do
   describe "#get_database_list" do
     it "should GET a list of databases" do
       database_list = [{"name" => "foobar"}]
-      stub_request(:get, "http://influxdb.test:9999/dbs").with(
+      stub_request(:get, "http://influxdb.test:9999/db").with(
         :query => {:u => "username", :p => "password"}
       ).to_return(:body => JSON.generate(database_list), :status => 200)
 
@@ -94,6 +131,17 @@ describe InfluxDB::Client do
     end
   end
 
+  describe "#get_cluster_admin_list" do
+    it "should GET a list of cluster admins" do
+      admin_list = [{"username"=>"root"}, {"username"=>"admin"}]
+      stub_request(:get, "http://influxdb.test:9999/cluster_admins").with(
+        :query => {:u => "username", :p => "password"}
+      ).to_return(:body => JSON.generate(admin_list), :status => 200)
+
+      @influxdb.get_cluster_admin_list.should == admin_list
+    end
+  end
+
   describe "#create_database_user" do
     it "should POST to create a new database user" do
       stub_request(:post, "http://influxdb.test:9999/db/foo/users").with(
@@ -166,6 +214,23 @@ describe InfluxDB::Client do
       @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
     end
 
+    it "raise an exception if the server didn't return 200" do
+      body = [{
+        "name" => "seriez",
+        "points" => [[87, "juan"]],
+        "columns" => ["age", "name"]
+      }]
+
+      stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
+        :query => {:u => "username", :p => "password"},
+        :body => body
+      ).to_return(:status => 401)
+
+      data = {:name => "juan", :age => 87}
+
+      expect { @influxdb.write_point("seriez", data) }.to raise_error
+    end
+
     it "should POST multiple points" do
       body = [{
         "name" => "seriez",
@@ -176,7 +241,7 @@ describe InfluxDB::Client do
       stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
         :query => {:u => "username", :p => "password"},
         :body => body
-      )
+      ).to_return(:status => 200)
 
       data = [{:name => "juan", :age => 87}, { :name => "shahid", :age => 99}]
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is the official Ruby library for InfluxDB.
@@ -115,17 +115,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.