newrelic_rpm 2.13.0.beta4 → 2.13.0.beta5

data/lib/new_relic/control/instrumentation.rb

@@ -32,14 +32,25 @@ module NewRelic
           @instrumentation_files << pattern
         end
       end
+
+      def _delayed_instrumentation
+        Rails.configuration.after_initialize do
+          _install_instrumentation
+        end
+      rescue
+        _install_instrumentation
+      end
+
       def install_instrumentation
-        if defined?(Rails.initialized?) && !Rails.initialized?
-          Rails.configuration.after_initialize do
-            _install_instrumentation
-          end
+        if defined?(Rails) && !Rails.initialized?
+          _delayed_instrumentation
         else
           _install_instrumentation
         end
+      rescue NameError
+        # needed in the rails 3 case, where Rails.initialized? raises
+        # an error if rails has not been initialised. which is totally sane.
+        _delayed_instrumentation
       end
       
       def load_samplers

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 13
     TINY  = 0
-    BUILD = 'beta4' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta5' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
   

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.13.0.beta4"
+  s.version = "2.13.0.beta5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2010-07-09}
+  s.date = %q{2010-07-14}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 299253504
+  hash: 299253505
   prerelease: true
   segments: 
   - 2
   - 13
   - 0
-  - beta4
-  version: 2.13.0.beta4
+  - beta5
+  version: 2.13.0.beta5
 platform: ruby
 authors: 
 - Bill Kayser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -07:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency