fiveruns-dash-rails 0.7.5 → 0.7.6

data/README.rdoc

@@ -23,11 +23,19 @@ The FiveRuns Development Team & Dash community
 * The fiveruns-dash-ruby gem (see http://github.com/fiveruns/dash-ruby)
 * The json gem (as a dependency for fiveruns-dash-ruby)
 
+== Verifying your setup
+
+Once you've configured your app for Dash, you can run the following command to make sure everything is in order:
+
+  script/runner 'Fiveruns::Dash::Rails.verify'
+
+This will make sure dash-rails is properly loaded, there are no known compatibility problems and that you've properly set your token and your app can communicate with the Dash servers.
+
 == Rails versions
 
 Dash has been tested with Rails 2.2 and 2.1.  It may (or may not) work with Rails 2.0 applications.
 
-We haven't done a lot of testing with the gem being unpacked in Rails apps.  YMMV; please let us know if you have issues.
+We have verified an incompatibility that occurs when the +json+ gem is unpacked. The recommended workaround is to use a localized +GEM_HOME+ or a system gem.
 
 == Platforms
 

data/lib/fiveruns/dash/rails.rb

@@ -98,6 +98,65 @@ if START_FIVERUNS_DASH_RAILS
           ENV['RAILS_ENV'] # <= Rails 2.0 
         end
         
+        def self.verify
+          puts ""
+          puts "FiveRuns Dash installation verification"
+          puts "======================================="
+          puts ""
+          Fiveruns::Dash.logger = Logger.new(STDOUT)
+          Fiveruns::Dash.logger.level = Logger::WARN
+          test('FiveRuns Dash loaded',
+               'The FiveRuns Dash plugin has not been loaded.  Verify you are initializing Dash in config/initializers/dash.rb.') do
+            defined? ::Fiveruns::Dash::Rails
+          end
+          test('FiveRuns Dash configuration',
+               "No application token was found for the #{Rails.env} environment.") do
+            Fiveruns::Dash.configuration.options[:app]
+          end
+          test('FiveRuns Dash session running', "FiveRuns Dash session is not active") do
+            Fiveruns::Dash.session.reporter.alive?
+          end
+          test('JSON compatibility', "Looks like you've run afoul of an ActiveSupport and JSON incompatibility. The easiest way to fix this is to load json from a gem, instead of unpacking it. See http://support.fiveruns.com/faqs/dash/json-compatibility for details.") do
+            begin
+              info = Fiveruns::Dash.session.info
+              payload = Fiveruns::Dash::InfoPayload.new(info, Time.now)
+              result = payload.to_json
+            rescue ArgumentError
+              false
+            end
+          end
+          test('FiveRuns Dash network connectivity') do
+            Fiveruns::Dash.session.reporter.ping
+          end
+          puts ""
+          puts "All appears normal.  If you are experiencing a problem, please email support@fiveruns.com with details about the problem and your environment."
+          puts ""
+        rescue ArgumentError
+        end
+        
+        def self.test(test, fail=nil)
+          $test_count = ($test_count || 0) + 1
+          print "  #{$test_count}. #{test}..."
+          begin
+            result = yield
+            if result
+              puts "OK." if fail
+            else
+              if fail
+                puts "FAIL!"
+                puts fail
+              end
+              raise ArgumentError
+            end
+          rescue ArgumentError => ex
+            raise ex
+          rescue => e
+            puts "FAIL!"
+            puts fail
+            raise e
+          end
+        end
+        
         module ActionContext
       
           def self.included(base)

data/lib/fiveruns/dash/recipes/activerecord.rb

@@ -64,19 +64,19 @@ end
 # ActiveRecord ################################################################
 
 Fiveruns::Dash.register_recipe :activerecord, :url => 'http://dash.fiveruns.com' do |recipe|
-  recipe.time :ar_time, 'ActiveRecord Time', :methods => Fiveruns::Dash::ActiveRecordContext.all_methods, :reentrant => true
-  recipe.time :db_time, 'Database Time', :methods => %w(ActiveRecord::ConnectionAdapters::AbstractAdapter#log)
-
   # We need a way to get the total time for a request/operation so that we can
   # calculate the relative percentage used by AR/DB.  Default to "response_time" for the Rails
   # recipe but daemons can set this constant to provide their own total time metric.
   total_time = recipe.options[:ar_total_time] ? recipe.options[:ar_total_time] : "response_time"
 
+  recipe.time :ar_time, 'ActiveRecord Time', :methods => Fiveruns::Dash::ActiveRecordContext.all_methods, :reentrant => true, :only_within => total_time
+  recipe.time :db_time, 'Database Time', :methods => %w(ActiveRecord::ConnectionAdapters::AbstractAdapter#log), :only_within => total_time
+
   recipe.percentage :ar_util, 'ActiveRecord Utilization', :sources => ["ar_time", total_time] do |ar_time, all_time|
-    (ar_time / all_time) * 100.0
+    all_time == 0 ? 0 : (ar_time / all_time) * 100.0
   end
   recipe.percentage :db_util, 'Database Utilization', :sources => ["db_time", total_time] do |db_time, all_time|
-    (db_time / all_time) * 100.0
+    all_time == 0 ? 0 : (db_time / all_time) * 100.0
   end
 
   recipe.modify :recipe_name => :activerecord, :recipe_url => 'http://dash.fiveruns.com' do |metric|

data/lib/fiveruns/dash/recipes/rails.rb

@@ -15,7 +15,7 @@ end
 
 # ActionPack ##################################################################
 Fiveruns::Dash.register_recipe :actionpack, :url => 'http://dash.fiveruns.com' do |recipe|
-  recipe.time :response_time, :method => 'ActionController::Base#perform_action'
+  recipe.time :response_time, :method => 'ActionController::Base#perform_action', :mark => true
   recipe.counter :requests, 'Requests', :incremented_by => 'ActionController::Base#perform_action'
   
   targets = []

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 5
+:patch: 6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-rails
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -08:00
+date: 2009-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,6 @@ files:
 - lib/fiveruns/dash/recipes/rails.rb
 - lib/fiveruns/dash/template_context.rb
 - lib/fiveruns_dash_rails.rb
-- lib/tasks
-- lib/tasks/dash.rake
 - rails/init.rb
 - test/activerecord_test.rb
 - test/test_helper.rb

data/lib/tasks/dash.rake

@@ -1,57 +0,0 @@
-namespace :dash do
-  desc "Verify FiveRuns Dash connectivity and configuration"
-  task :test => :environment do
-    unless $tested
-      $tested = true
-      begin
-        puts ""
-        puts "FiveRuns Dash installation verification"
-        puts "======================================="
-        puts ""
-        RAILS_DEFAULT_LOGGER = Fiveruns::Dash.logger = Logger.new(STDOUT)
-        Fiveruns::Dash.logger.level = Logger::WARN
-        verify('FiveRuns Dash loaded',
-               'The FiveRuns Dash plugin has not been loaded.  Verify you are initializing Dash in config/initializers/dash.rb.') do
-          defined? ::Fiveruns::Dash::Rails
-        end
-        verify('FiveRuns Dash configuration',
-               "No application token was found for the #{Rails.env} environment.") do
-          Fiveruns::Dash.configuration.options[:app]
-        end
-        verify('FiveRuns Dash session running', "FiveRuns Dash session is not active") do
-          Fiveruns::Dash.session.reporter.alive?
-        end
-        verify('FiveRuns Dash network connectivity') do
-          Fiveruns::Dash.session.reporter.ping
-        end
-        puts ""
-        puts "All appears normal.  If you are experiencing a problem, please email support@fiveruns.com with details about the problem and your environment."
-        puts ""
-      rescue ArgumentError
-      end
-    end
-  end
-end
-
-def verify(test, fail=nil)
-  $test_count = ($test_count || 0) + 1
-  print "  #{$test_count}. #{test}..."
-  begin
-    result = yield
-    if result
-      puts "OK." if fail
-    else
-      if fail
-        puts "FAIL!"
-        puts fail
-      end
-      raise ArgumentError
-    end
-  rescue ArgumentError => ex
-    raise ex
-  rescue => e
-    puts "FAIL!"
-    puts fail
-    raise e
-  end
-end