instrumental_agent 0.9.6 → 0.9.10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.9.10 [June 29th, 2012]
+* Fix flush command when there's nothing to flush
+* Support system_timer and SystemTimer gems.
+
 ### 0.9.6 [April 5th, 2012]
 * Documentation on reliable collection in Resque jobs
 * Fix for dead lock issuew

data/README.md

@@ -16,7 +16,7 @@ Visit [instrumentalapp.com](instrumentalapp.com) and create an account, then  in
 I = Instrumental::Agent.new('YOUR_API_KEY', :enabled => Rails.env.production?)
 ```
 
-You'll  probably want something like the above, only enabling the agent in production mode so you don't have development and produciton data writing to the same value. Or you can setup two projects, so that you can verify stats in one, and release them to production in another.
+You'll  probably want something like the above, only enabling the agent in production mode so you don't have development and production data writing to the same value. Or you can setup two projects, so that you can verify stats in one, and release them to production in another.
 
 Now you can begin to use Instrumental to track your application.
 

data/lib/instrumental/agent.rb

@@ -5,15 +5,22 @@ require 'thread'
 require 'socket'
 
 if RUBY_VERSION < "1.9" && RUBY_PLATFORM != "java"
-  begin
-    gem 'system_timer'
-    require 'system_timer'
-    InstrumentalTimeout = SystemTimer
-  rescue Exception => e
+  timeout_lib = nil
+  ["SystemTimer", "system_timer"].each do |lib|
+    begin
+      unless timeout_lib
+        gem lib
+        require "system_timer"
+        timeout_lib  = SystemTimer
+      end
+    rescue Exception => e
+    end
+  end
+  if !timeout_lib
     puts <<-EOMSG
 WARNING:: You do not currently have system_timer installed.
 It is strongly advised that you install this gem when using
-instrumental_agent with Ruby 1.8.x.  You can install it in 
+instrumental_agent with Ruby 1.8.x.  You can install it in
 your Gemfile via:
 gem 'system_timer'
 or manually via:
@@ -21,6 +28,8 @@ gem install system_timer
     EOMSG
     require 'timeout'
     InstrumentalTimeout = Timeout
+  else
+    InstrumentalTimeout = timeout_lib
   end
 else
   require 'timeout'
@@ -182,7 +191,7 @@ module Instrumental
       queue_message('flush', {
         :synchronous => true,
         :allow_reconnect => allow_reconnect
-      })
+      }) if running?
     end
 
     def enabled?
@@ -201,7 +210,7 @@ module Instrumental
       @logger ||= self.class.logger
     end
 
-    # Stopping the agent will immediately stop all communication 
+    # Stopping the agent will immediately stop all communication
     # to Instrumental.  If you call this and submit another metric,
     # the agent will start again.
     #

data/lib/instrumental/version.rb

@@ -1,3 +1,3 @@
 module Instrumental
-  VERSION = '0.9.6'
+  VERSION = '0.9.10'
 end

data/spec/agent_spec.rb

@@ -42,6 +42,12 @@ describe Instrumental::Agent, "disabled" do
     wait
     @server.commands.should be_empty
   end
+
+  it "should no op on an empty flush" do
+    @agent.flush(true)
+    wait
+    @server.commands.should be_empty
+  end
 end
 
 describe Instrumental::Agent, "enabled in test_mode" do
@@ -149,6 +155,12 @@ describe Instrumental::Agent, "enabled in test_mode" do
     @server.commands.join("\n").should include("increment foo.baz 1 #{tm.to_i}")
     @server.commands.join("\n").should_not include("increment foo.bar 1 #{tm.to_i}")
   end
+
+  it "should no op on an empty flush" do
+    @agent.flush(true)
+    wait
+    @server.commands.should be_empty
+  end
 end
 
 describe Instrumental::Agent, "enabled" do
@@ -376,6 +388,12 @@ describe Instrumental::Agent, "enabled" do
     wait
     @server.commands.grep(/^gauge a /).size.should == 100
   end
+
+  it "should no op on an empty flush" do
+    @agent.flush(true)
+    wait
+    @server.commands.should be_empty
+  end
 end
 
 describe Instrumental::Agent, "connection problems" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70181168630580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168630580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70181168630060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +40,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70181168630060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70181168629580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168629580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70181168629080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168629080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70181168628600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168628600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70181168628120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +104,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168628120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70181168627620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +120,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181168627620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Track anything.
 email:
 - support@instrumentalapp.com
@@ -128,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2735565330183687478
+      hash: 3430441242522826945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -137,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2735565330183687478
+      hash: 3430441242522826945
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Agent for reporting data to instrumentalapp.com