tronprint 1.0.2 → 1.0.4

data/lib/tronprint/rails/tronprint_helper.rb

@@ -30,7 +30,7 @@ module TronprintHelper
 
     text = <<-HTML
       <p class="cm1-footprint">
-        <span class="cm1-total-footprint">Total footprint: #{total_electricity.to_i}W, #{footprint}lbs CO<sub>2</sub>e</span>
+        <span class="cm1-total-footprint">Total site footprint: #{total_electricity.to_i}W, #{footprint}lbs CO<sub>2</sub>e</span>
         |
         <span class="cm1-current-footprint">Current footprint: #{rate}lbs CO<sub>2</sub>e/min</span>
       </p>
@@ -41,7 +41,7 @@ module TronprintHelper
 
   # A link to more information about Tronprint
   def tronprint_badge
-    '<p class="cm1-tronprint-link">Footprint calculated by <a href="http://brighterplanet.github.com/tronprint">Tronprint</a></p>'.html_safe
+    %q{<p class="cm1-tronprint-link">Site footprint calculated by <a href="http://brighterplanet.github.com/tronprint">Tronprint</a></p>}.html_safe
   end
 
   # Let the world know that your app is powered by CM1

data/lib/tronprint/rails.rb

@@ -1,4 +1,5 @@
 require 'rails'
+require 'tronprint'
 require 'tronprint/rails/tronprint_helper'
 require 'tronprint/app'
 

data/lib/tronprint/version.rb

@@ -1,3 +1,3 @@
 module Tronprint
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/tronprint.rb

@@ -5,7 +5,7 @@ require 'tronprint/cpu_monitor'
 require 'tronprint/traffic_monitor'
 require 'tronprint/statistics'
 
-if defined?(Rails)
+if defined?(Rails) && Rails.const_defined?('Railtie')
   require 'tronprint/rails'
 end
 

data/tronprint.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version = Tronprint::VERSION
 
   s.authors = ['Derek Kastner']
-  s.date = "2011-06-15"
+  s.date = "2011-06-17"
   s.description = %q{A gem for monitoring the carbon footprint of your ruby app}
   s.email = %q{dkastner@gmail.com}
   s.homepage = %q{http://github.com/brighterplanet/tronprint}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tronprint
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-15 00:00:00.000000000Z
+date: 2011-06-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2159120960 !ruby/object:Gem::Requirement
+  requirement: &2153160640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2159120960
+  version_requirements: *2153160640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2159120360 !ruby/object:Gem::Requirement
+  requirement: &2153153320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2159120360
+  version_requirements: *2153153320
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2159119760 !ruby/object:Gem::Requirement
+  requirement: &2153152440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159119760
+  version_requirements: *2153152440
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2159115700 !ruby/object:Gem::Requirement
+  requirement: &2153149460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2159115700
+  version_requirements: *2153149460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2159114760 !ruby/object:Gem::Requirement
+  requirement: &2153148840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159114760
+  version_requirements: *2153148840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2159112820 !ruby/object:Gem::Requirement
+  requirement: &2153147840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2159112820
+  version_requirements: *2153147840
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2159111900 !ruby/object:Gem::Requirement
+  requirement: &2153146700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159111900
+  version_requirements: *2153146700
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2159110720 !ruby/object:Gem::Requirement
+  requirement: &2153141360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159110720
+  version_requirements: *2153141360
 - !ruby/object:Gem::Dependency
   name: carbon
-  requirement: &2159109560 !ruby/object:Gem::Requirement
+  requirement: &2153140000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2159109560
+  version_requirements: *2153140000
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2159108620 !ruby/object:Gem::Requirement
+  requirement: &2153138880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159108620
+  version_requirements: *2153138880
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2159107980 !ruby/object:Gem::Requirement
+  requirement: &2153137800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2159107980
+  version_requirements: *2153137800
 description: A gem for monitoring the carbon footprint of your ruby app
 email: dkastner@gmail.com
 executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1205001894599242316
+      hash: -3982672165111686729
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1205001894599242316
+      hash: -3982672165111686729
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5