brighter_planet_deploy 0.0.5 → 0.0.6

data/brighter_planet_deploy.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'net-dns'
   s.add_development_dependency 'activesupport'
   s.add_development_dependency 'i18n'
+  s.add_development_dependency 'rake'
   s.add_dependency 'thor'
   s.add_dependency 'eat'
 end

data/lib/brighter_planet_deploy/{emission_estimate_service.rb → cm1.rb}

@@ -1,6 +1,6 @@
 module BrighterPlanet
   class Deploy
-    class EmissionEstimateService
+    class Cm1
       include ::Singleton
       include ReadsFromPublicUrl
 
@@ -19,6 +19,10 @@ module BrighterPlanet
         :service
       ]
 
+      def service
+        self.class.to_s.demodulize
+      end
+
       def domain
         'carbon.brighterplanet.com'
       end
@@ -27,12 +31,8 @@ module BrighterPlanet
         "http://#{domain}"
       end
 
-      def name
-        'EmissionEstimateService'
-      end
-      
       def color
-        if Deploy.instance.servers.me.service == 'EmissionEstimateService'
+        if Deploy.instance.servers.me.service.to_s.underscore == 'cm1'
           (AuthoritativeDnsResolver.getaddress(domain) == RED_IP) ? 'red' : 'blue'
         else
           from_public_url :color

data/lib/brighter_planet_deploy/server.rb

@@ -48,7 +48,7 @@ module BrighterPlanet
       # can't be saved
       attr_writer :status
       def status
-        @status || (color == service_class.color ? :active : :standby)
+        @status || (color == service_model.color ? :active : :standby)
       end
 
       attr_writer :environment
@@ -61,10 +61,10 @@ module BrighterPlanet
         @hostname || lookup(:hostname) || local_hostname
       end
 
-      def service_class
-        case service.to_sym
-        when :EmissionEstimateService, :cm1
-          EmissionEstimateService.instance
+      def service_model
+        case service.to_s.underscore
+        when 'cm1'
+          Cm1.instance
         end
       end
 

data/lib/brighter_planet_deploy/version.rb

@@ -1,5 +1,5 @@
 module BrighterPlanet
   class Deploy
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/lib/brighter_planet_deploy.rb

@@ -10,7 +10,7 @@ module BrighterPlanet
     include ::Singleton
     
     autoload :Server, 'brighter_planet_deploy/server'
-    autoload :EmissionEstimateService, 'brighter_planet_deploy/emission_estimate_service'
+    autoload :Cm1, 'brighter_planet_deploy/cm1'
     autoload :AuthoritativeDnsResolver, 'brighter_planet_deploy/authoritative_dns_resolver'
     
     # mixins
@@ -21,8 +21,8 @@ module BrighterPlanet
       Server
     end
     
-    def emission_estimate_service
-      EmissionEstimateService.instance
+    def cm1
+      Cm1.instance
     end
   end
 end

data/test/helper.rb

@@ -4,6 +4,7 @@ Bundler.setup
 require 'test/unit'
 require 'fakefs/safe'
 require 'fakeweb'
+require 'net/dns/resolver'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'brighter_planet_deploy'

data/test/test_cm1.rb

@@ -31,12 +31,12 @@ class TestCm1 < Test::Unit::TestCase
   
   def test_001_color
     assert_equal 'blue', @me.color
-    assert_equal 'blue', BrighterPlanet.deploy.emission_estimate_service.color
+    assert_equal 'blue', BrighterPlanet.deploy.cm1.color
   end
     
   def test_003_service
-    assert_equal 'EmissionEstimateService', BrighterPlanet.deploy.emission_estimate_service.name
-    assert_equal 'EmissionEstimateService', @me.service_class.name
+    assert_equal 'Cm1', BrighterPlanet.deploy.cm1.service
+    assert_equal 'Cm1', @me.service_model.service
   end
   
   def test_004_status
@@ -71,9 +71,9 @@ class TestCm1 < Test::Unit::TestCase
   def test_009_color_from_cm1_itself
     FakeFS.deactivate!
     Rails.root = File.expand_path("../tmp", __FILE__)
-    @me.service = 'EmissionEstimateService'
+    @me.service = 'Cm1'
     @me.save
-    assert_equal 'red', BrighterPlanet.deploy.emission_estimate_service.color
+    assert_equal 'red', BrighterPlanet.deploy.cm1.color
   ensure
     FileUtils.rm_rf File.expand_path("../tmp", __FILE__)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brighter_planet_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-13 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2153886680 !ruby/object:Gem::Requirement
+  requirement: &2153990020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153886680
+  version_requirements: *2153990020
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153886260 !ruby/object:Gem::Requirement
+  requirement: &2153989600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153886260
+  version_requirements: *2153989600
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2153885840 !ruby/object:Gem::Requirement
+  requirement: &2153989180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153885840
+  version_requirements: *2153989180
 - !ruby/object:Gem::Dependency
   name: net-dns
-  requirement: &2153885420 !ruby/object:Gem::Requirement
+  requirement: &2153988760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153885420
+  version_requirements: *2153988760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153885000 !ruby/object:Gem::Requirement
+  requirement: &2153988340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153885000
+  version_requirements: *2153988340
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153884580 !ruby/object:Gem::Requirement
+  requirement: &2153987920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153884580
+  version_requirements: *2153987920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153987500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153987500
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153884160 !ruby/object:Gem::Requirement
+  requirement: &2153987080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153884160
+  version_requirements: *2153987080
 - !ruby/object:Gem::Dependency
   name: eat
-  requirement: &2153883740 !ruby/object:Gem::Requirement
+  requirement: &2153986660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153883740
+  version_requirements: *2153986660
 description: Brighter Planet deployment system, published as the gem brighter_planet_deploy.
   Internal use.
 email:
@@ -116,7 +127,7 @@ files:
 - brighter_planet_deploy.gemspec
 - lib/brighter_planet_deploy.rb
 - lib/brighter_planet_deploy/authoritative_dns_resolver.rb
-- lib/brighter_planet_deploy/emission_estimate_service.rb
+- lib/brighter_planet_deploy/cm1.rb
 - lib/brighter_planet_deploy/reads_from_local_filesystem.rb
 - lib/brighter_planet_deploy/reads_from_public_url.rb
 - lib/brighter_planet_deploy/server.rb
@@ -144,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: brighter_planet_deploy
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Brighter Planet deployment system, published as the gem brighter_planet_deploy