graphite-api 0.0.1.2 → 0.0.1.3

data/README.md

@@ -24,11 +24,11 @@ Graphite client and utilities for ruby
  	)
     
  	# Simple:
- 	client.add_metrics("webServer.web01.loadAvg" => 10.7)
+ 	client.metrics("webServer.web01.loadAvg" => 10.7)
  	# => example.prefix.webServer.web01.loadAvg 10.7 time.now.stamp
 	
  	# Multiple with time:
- 	client.add_metrics({
+ 	client.metrics({
  		"webServer.web01.loadAvg" => 10.7,
  		"webServer.web01.memUsage" => 40
  	},Time.at(1326067060))
@@ -37,7 +37,7 @@ Graphite client and utilities for ruby
  	
  	# Every 10 sec
  	client.every(10) do
- 	  client.add_metrics("webServer.web01.uptime" => `uptime`.split.first.to_i) 
+ 	  client.metrics("webServer.web01.uptime" => `uptime`.split.first.to_i) 
  	end
 	
  	client.join # wait...

data/lib/graphite-api/client.rb

@@ -11,11 +11,11 @@
 #    )
 #  
 #  # Simple:
-#  client.add_metrics("webServer.web01.loadAvg" => 10.7)
+#  client.metrics("webServer.web01.loadAvg" => 10.7)
 #  # => example.prefix.webServer.web01.loadAvg 10.7 time.now.stamp
 #  
 #  # Multiple with time:
-#  client.add_metrics({
+#  client.metrics({
 #	  "webServer.web01.loadAvg" => 10.7,
 #	  "webServer.web01.memUsage" => 40
 #  },Time.at(1326067060))
@@ -24,7 +24,7 @@
 #  
 #  # Every 10 sec
 #  client.every(10) do
-#    client.add_metrics("webServer.web01.uptime" => `uptime`.split.first.to_i) 
+#    client.metrics("webServer.web01.uptime" => `uptime`.split.first.to_i) 
 #  end
 #  
 #  client.join # wait...
@@ -45,17 +45,22 @@ module GraphiteAPI
     def add_metrics(m,time = Time.now)
       buffer.push(:metric => m, :time => time)
     end
-
+    alias :metrics :add_metrics
+    
     def join
       sleep 0.1 while buffer.new_records?
     end
     
+    def loop
+      Reactor.loop
+    end
+    
     def stop
-      Reactor::stop
+      Reactor.stop
     end
     
     def every(frequency,&block)
-      Reactor::every(frequency,&block)
+      Reactor.every(frequency,&block)
     end
 
     protected

data/lib/graphite-api/reactor.rb

@@ -26,6 +26,10 @@ module GraphiteAPI
         shutdown_hooks << block
       end
       
+      def loop
+        EventMachine.reactor_thread.join
+      end
+      
       private
       
       def start_reactor

data/lib/graphite-api/version.rb

@@ -1,5 +1,5 @@
 module GraphiteAPI
   class Version
-    VERSION = "0.0.1.2"
+    VERSION = "0.0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70179921763180 !ruby/object:Gem::Requirement
+  requirement: &70126297227100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70179921763180
+  version_requirements: *70126297227100
 description: Graphite API - A Simple ruby client, aggregator daemon and API tools
 email: eran@kontera.com
 executables:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: graphite-api
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Graphite Ruby Client