earth 0.4.8 → 0.4.9

data/features/{data_center_company.feature → computation_carrier.feature}

@@ -1,14 +1,14 @@
-Feature: Data import for DataCenterCompany
+Feature: Data import for ComputationCarrier
   As a data user
-  I want to import DataCenterCompany data
-  So that I can perform data center company-based calculations
+  I want to import ComputationCarrier data
+  So that I can perform computation carrier-based calculations
 
   Scenario: Successfully verifying that power usage effectiveness >= 1.0
-    Given a "DataCenterCompany" data import fetches results listed in "data_center_company_good"
+    Given a "ComputationCarrier" data import fetches results listed in "computation_carrier_good"
     When a data import verifies "Power usage effectiveness should be one or more"
     Then the verification should be successful
 
   Scenario: Failing to verify that power usage effectiveness >= 1.0
-    Given a "DataCenterCompany" data import fetches results listed in "data_center_company_bad"
+    Given a "ComputationCarrier" data import fetches results listed in "computation_carrier_bad"
     When a data import verifies "Power usage effectiveness should be one or more"
     Then the verification should not be successful

data/features/computation_carrier_instance_class.feature

@@ -0,0 +1,24 @@
+Feature: Data import for ComputationCarrierInstanceClass
+  As a data user
+  I want to import ComputationCarrierInstanceClass data
+  So that I can perform computation carrier instance class-based calculations
+
+  Scenario: Successfully verifying that electricity intensity is more than zero
+    Given a "ComputationCarrierInstanceClass" data import fetches results listed in "computation_carrier_instance_class_good"
+    When a data import verifies "Electricity intensity should be more than zero"
+    Then the verification should be successful
+
+  Scenario: Successfully verifying that electricity intensity units are kilowatts
+    Given a "ComputationCarrierInstanceClass" data import fetches results listed in "computation_carrier_instance_class_good"
+    When a data import verifies "Electricity intensity units should be kilowatts"
+    Then the verification should be successful
+
+  Scenario: Failing to verify that electricity intensity is more than zero
+    Given a "ComputationCarrierInstanceClass" data import fetches results listed in "computation_carrier_instance_class_bad"
+    When a data import verifies "Electricity intensity should be more than zero"
+    Then the verification should not be successful
+
+  Scenario: Failing to verify that electricity intensity units are kilowatts
+    Given a "ComputationCarrierInstanceClass" data import fetches results listed in "computation_carrier_instance_class_bad"
+    When a data import verifies "Electricity intensity units should be kilowatts"
+    Then the verification should not be successful

data/features/support/imports/computation_carrier_instance_class_bad.csv

@@ -0,0 +1,2 @@
+name,computation_carrier_name,electricity_intensity,electricity_intensity_units
+Amazon m1.small,Amazon,0.0,joules

data/features/support/imports/computation_carrier_instance_class_good.csv

@@ -0,0 +1,2 @@
+name,computation_carrier_name,electricity_intensity,electricity_intensity_units
+Amazon m1.small,Amazon,1.0,kilowatts

data/lib/earth/computation.rb

@@ -1,4 +1,3 @@
-require 'earth/computation/computation_platform'
-require 'earth/computation/data_center_company'
-require 'earth/computation/server_type'
-require 'earth/computation/server_type_alias'
+require 'earth/computation/computation_carrier'
+require 'earth/computation/computation_carrier_region'
+require 'earth/computation/computation_carrier_instance_class'

data/lib/earth/computation/computation_carrier.rb

@@ -0,0 +1,10 @@
+class ComputationCarrier < ActiveRecord::Base
+  set_primary_key :name
+  
+  falls_back_on :name => 'fallback',
+                :power_usage_effectiveness => lambda { ComputationCarrier.maximum('power_usage_effectiveness') }
+  
+  data_miner do
+    tap "Brighter Planet's computation carrier data", Earth.taps_server
+  end
+end

data/lib/earth/computation/computation_carrier/data_miner.rb

@@ -0,0 +1,22 @@
+ComputationCarrier.class_eval do
+  data_miner do
+    schema Earth.database_options do
+      string 'name'
+      float  'power_usage_effectiveness'
+    end
+    
+    import "a list of computation carriers and their power usage effectiveness",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFlxZVZLai01WWJOOTFiaUd1blF6VkE&gid=0&output=csv' do
+      key   'name'
+      store 'power_usage_effectiveness'
+    end
+    
+    verify "Power usage effectiveness should be one or more" do
+      ComputationCarrier.all.each do |carrier|
+        unless carrier.power_usage_effectiveness >= 1.0
+          raise "Invalid power usage effectiveness for ComputationCarrier #{carrier.name}: #{carrier.power_usage_effectiveness} (should be >= 1.0)"
+        end
+      end
+    end
+  end
+end

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -0,0 +1,17 @@
+class ComputationCarrierInstanceClass < ActiveRecord::Base
+  set_primary_key :name
+  
+  belongs_to :computation_carrier, :foreign_key => 'computation_carrier_name'
+  
+  falls_back_on :name => 'fallback',
+                :electricity_intensity => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity },
+                :electricity_intensity_units => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity_units }
+  
+  data_miner do
+    tap "Brighter Planet's computation carrier instance class data", Earth.taps_server
+    
+    process "Pull dependencies" do
+      run_data_miner_on_belongs_to_associations
+    end
+  end
+end

data/lib/earth/computation/computation_carrier_instance_class/data_miner.rb

@@ -0,0 +1,37 @@
+ComputationCarrierInstanceClass.class_eval do
+  data_miner do
+    schema Earth.database_options do
+      string 'name'
+      string 'computation_carrier_name'
+      string 'instance_class'
+      float  'electricity_intensity'
+      string 'electricity_intensity_units'
+    end
+    
+    import "a list of computation carrier instance classes and their characteristics",
+           :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdGExaW1ic2c0d2s1ZmpzeUdOa2kyRlE&gid=0&output=csv' do
+      key   'name'
+      store 'computation_carrier_name'
+      store 'instance_class'
+      store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
+    end
+    
+    # FIXME TODO verify that computation carrier name appears in computation_carriers
+    
+    verify "Electricity intensity should be more than zero" do
+      ComputationCarrierInstanceClass.all.each do |instance_class|
+        unless instance_class.electricity_intensity > 0
+          raise "Invalid electricity intensity for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity} (should be > 0)"
+        end
+      end
+    end
+    
+    verify "Electricity intensity units should be kilowatts" do
+      ComputationCarrierInstanceClass.all.each do |instance_class|
+        unless instance_class.electricity_intensity_units == 'kilowatts'
+          raise "Invalid electricity intensity units for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity_units} (should be kilowatts)"
+        end
+      end
+    end
+  end
+end

data/lib/earth/computation/computation_carrier_region.rb

@@ -0,0 +1,13 @@
+class ComputationCarrierRegion < ActiveRecord::Base
+  set_primary_key :name
+  
+  belongs_to :egrid_subregion, :foreign_key => 'egrid_subregion_abbreviation'
+  
+  data_miner do
+    tap "Brighter Planet's computation carrier region data", Earth.taps_server
+    
+    process "Pull dependencies" do
+      run_data_miner_on_belongs_to_associations
+    end
+  end
+end

data/lib/earth/computation/computation_carrier_region/data_miner.rb

@@ -0,0 +1,21 @@
+ComputationCarrierRegion.class_eval do
+  data_miner do
+    schema Earth.database_options do
+      string 'name'
+      string 'computation_carrier_name'
+      string 'region'
+      string 'egrid_subregion_abbreviation'
+    end
+    
+    import "a list of computation carrier regions",
+           :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdGFEU1gtVzFPeS0tV1VnR05WZ2ZFUVE&gid=0&output=csv' do
+      key   'name'
+      store 'computation_carrier_name'
+      store 'region'
+      store 'egrid_subregion_abbreviation'
+    end
+    
+    # FIXME TODO verify carrier_name appears in Carrier
+    # FIXME TODO verify egrid_subregion_abbreviation appears in EgridSubregion
+  end
+end

data/lib/earth/computation/data_miner.rb

@@ -1,4 +1,3 @@
-require 'earth/computation/computation_platform/data_miner'
-require 'earth/computation/data_center_company/data_miner'
-require 'earth/computation/server_type/data_miner'
-require 'earth/computation/server_type_alias/data_miner'
+require 'earth/computation/computation_carrier/data_miner'
+require 'earth/computation/computation_carrier_region/data_miner'
+require 'earth/computation/computation_carrier_instance_class/data_miner'

data/lib/earth/locality/egrid_region.rb

@@ -12,5 +12,6 @@ class EgridRegion < ActiveRecord::Base
   end
   
   # FIXME TODO someday should calculate this from eGRID data: (USTNGN05 + USTNFI05 - USTCON05) / USTNGN05
-  falls_back_on :loss_factor => 0.061879 # calculated using above formula 2/21/2011
+  falls_back_on :name => 'fallback',
+                :loss_factor => 0.061879 # calculated using above formula 2/21/2011
 end

data/lib/earth/locality/egrid_subregion.rb

@@ -10,7 +10,8 @@ class EgridSubregion < ActiveRecord::Base
     end
   end
   
-  falls_back_on :egrid_region => lambda { EgridSubregion.fallback_egrid_region },
+  falls_back_on :name => 'fallback',
+                :egrid_region => lambda { EgridSubregion.fallback_egrid_region },
                 :electricity_co2_emission_factor => lambda { weighted_average(:electricity_co2_emission_factor, :weighted_by => :net_generation) },
                 :electricity_co2_emission_factor_units => 'kilograms_per_kilowatt_hour',
                 :electricity_co2_biogenic_emission_factor => lambda { weighted_average(:electricity_co2_biogenic_emission_factor, :weighted_by => :net_generation) },

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/spec/earth/bus/bus_class_spec.rb

@@ -5,8 +5,10 @@ describe 'BusFuel' do
     Earth.init :bus, :fuel, :apply_schemas => true
   end
 
-  it 'is related to fuels' do
-    BusFuel.run_data_miner!
-    BusFuel.last.fuel.should_not be_nil
+  describe 'import', :slow => true do
+    it 'is related to fuels' do
+      BusFuel.run_data_miner!
+      BusFuel.last.fuel.should_not be_nil
+    end
   end
 end

data/spec/earth_spec.rb

@@ -23,7 +23,7 @@ describe Earth do
   describe '.resources' do
     it 'should get a list of resources' do
       resources = Earth.resources
-      resources.keys.count.should == 76
+      resources.keys.count.should == 75
       resources['FuelType'][:domain].should == 'fuel'
     end
     it 'should exclude data_miner files' do
@@ -33,7 +33,7 @@ describe Earth do
 
   describe '.resource_names' do
     it 'should get a list of all resource names' do
-      Earth.resource_names.count.should == 76
+      Earth.resource_names.count.should == 75
       Earth.resource_names.should include('Aircraft')
       Earth.resource_names.should include('Industry')
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -249,16 +249,14 @@ files:
 - features/bus_fuel.feature
 - features/carrier.feature
 - features/carrier_mode.feature
-- features/computation_platform.feature
-- features/data_center_company.feature
+- features/computation_carrier.feature
+- features/computation_carrier_instance_class.feature
 - features/egrid_region.feature
 - features/egrid_subregion.feature
 - features/flight_segment.feature
 - features/fuel_year.feature
 - features/greenhouse_gas.feature
 - features/rail_class.feature
-- features/server_type.feature
-- features/server_type_alias.feature
 - features/shipment_mode.feature
 - features/step_definitions/data_steps.rb
 - features/support/env.rb
@@ -300,10 +298,10 @@ files:
 - features/support/imports/carrier_good.csv
 - features/support/imports/carrier_mode_bad.csv
 - features/support/imports/carrier_mode_good.csv
-- features/support/imports/computation_platform_bad.csv
-- features/support/imports/computation_platform_good.csv
-- features/support/imports/data_center_company_bad.csv
-- features/support/imports/data_center_company_good.csv
+- features/support/imports/computation_carrier_bad.csv
+- features/support/imports/computation_carrier_good.csv
+- features/support/imports/computation_carrier_instance_class_bad.csv
+- features/support/imports/computation_carrier_instance_class_good.csv
 - features/support/imports/egrid_region_bad.csv
 - features/support/imports/egrid_region_good.csv
 - features/support/imports/egrid_subregion_bad.csv
@@ -316,10 +314,6 @@ files:
 - features/support/imports/greenhouse_gas_good.csv
 - features/support/imports/rail_class_bad.csv
 - features/support/imports/rail_class_good.csv
-- features/support/imports/server_type_alias_bad.csv
-- features/support/imports/server_type_alias_good.csv
-- features/support/imports/server_type_bad.csv
-- features/support/imports/server_type_good.csv
 - features/support/imports/shipment_mode_bad.csv
 - features/support/imports/shipment_mode_good.csv
 - lib/earth.rb
@@ -389,15 +383,13 @@ files:
 - lib/earth/bus/bus_fuel_year_control/data_miner.rb
 - lib/earth/bus/data_miner.rb
 - lib/earth/computation.rb
-- lib/earth/computation/computation_platform.rb
-- lib/earth/computation/computation_platform/data_miner.rb
-- lib/earth/computation/data_center_company.rb
-- lib/earth/computation/data_center_company/data_miner.rb
+- lib/earth/computation/computation_carrier.rb
+- lib/earth/computation/computation_carrier/data_miner.rb
+- lib/earth/computation/computation_carrier_instance_class.rb
+- lib/earth/computation/computation_carrier_instance_class/data_miner.rb
+- lib/earth/computation/computation_carrier_region.rb
+- lib/earth/computation/computation_carrier_region/data_miner.rb
 - lib/earth/computation/data_miner.rb
-- lib/earth/computation/server_type.rb
-- lib/earth/computation/server_type/data_miner.rb
-- lib/earth/computation/server_type_alias.rb
-- lib/earth/computation/server_type_alias/data_miner.rb
 - lib/earth/conversions_ext.rb
 - lib/earth/data_miner.rb
 - lib/earth/diet.rb
@@ -562,7 +554,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4098503984188126677
+      hash: -1989203883064114868
       segments: 
       - 0
       version: "0"
@@ -571,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4098503984188126677
+      hash: -1989203883064114868
       segments: 
       - 0
       version: "0"
@@ -602,16 +594,14 @@ test_files:
 - features/bus_fuel.feature
 - features/carrier.feature
 - features/carrier_mode.feature
-- features/computation_platform.feature
-- features/data_center_company.feature
+- features/computation_carrier.feature
+- features/computation_carrier_instance_class.feature
 - features/egrid_region.feature
 - features/egrid_subregion.feature
 - features/flight_segment.feature
 - features/fuel_year.feature
 - features/greenhouse_gas.feature
 - features/rail_class.feature
-- features/server_type.feature
-- features/server_type_alias.feature
 - features/shipment_mode.feature
 - features/step_definitions/data_steps.rb
 - features/support/env.rb
@@ -653,10 +643,10 @@ test_files:
 - features/support/imports/carrier_good.csv
 - features/support/imports/carrier_mode_bad.csv
 - features/support/imports/carrier_mode_good.csv
-- features/support/imports/computation_platform_bad.csv
-- features/support/imports/computation_platform_good.csv
-- features/support/imports/data_center_company_bad.csv
-- features/support/imports/data_center_company_good.csv
+- features/support/imports/computation_carrier_bad.csv
+- features/support/imports/computation_carrier_good.csv
+- features/support/imports/computation_carrier_instance_class_bad.csv
+- features/support/imports/computation_carrier_instance_class_good.csv
 - features/support/imports/egrid_region_bad.csv
 - features/support/imports/egrid_region_good.csv
 - features/support/imports/egrid_subregion_bad.csv
@@ -669,10 +659,6 @@ test_files:
 - features/support/imports/greenhouse_gas_good.csv
 - features/support/imports/rail_class_bad.csv
 - features/support/imports/rail_class_good.csv
-- features/support/imports/server_type_alias_bad.csv
-- features/support/imports/server_type_alias_good.csv
-- features/support/imports/server_type_bad.csv
-- features/support/imports/server_type_good.csv
 - features/support/imports/shipment_mode_bad.csv
 - features/support/imports/shipment_mode_good.csv
 - spec/earth/air/aircraft_spec.rb

data/features/computation_platform.feature

@@ -1,14 +0,0 @@
-Feature: Data import for ComputationPlatform
-  As a data user
-  I want to import ComputationPlatform data
-  So that I can perform computation platform-based calculations
-
-  Scenario: Successfully verifying that data center company name is never missing
-    Given a "ComputationPlatform" data import fetches results listed in "computation_platform_good"
-    When a data import verifies "Data center company name should never be missing"
-    Then the verification should be successful
-
-  Scenario: Failing to verify that data center company name is never missing
-    Given a "ComputationPlatform" data import fetches results listed in "computation_platform_bad"
-    When a data import verifies "Data center company name should never be missing"
-    Then the verification should not be successful

data/features/server_type.feature

@@ -1,34 +0,0 @@
-Feature: Data import for ServerType
-  As a data user
-  I want to import ServerType data
-  So that I can perform server type-based calculations
-
-  Scenario: Successfully verifying that data center company name is never missing
-    Given a "ServerType" data import fetches results listed in "server_type_good"
-    When a data import verifies "Data center company name should never be missing"
-    Then the verification should be successful
-
-  Scenario: Successfully verifying that electricity draw is more than zero
-    Given a "ServerType" data import fetches results listed in "server_type_good"
-    When a data import verifies "Electricity draw should be more than zero"
-    Then the verification should be successful
-
-  Scenario: Successfully verifying that electricity draw units are kilowatts
-    Given a "ServerType" data import fetches results listed in "server_type_good"
-    When a data import verifies "Electricity draw units should be kilowatts"
-    Then the verification should be successful
-
-  Scenario: Failing to verify that data center company name is never missing
-    Given a "ServerType" data import fetches results listed in "server_type_bad"
-    When a data import verifies "Data center company name should never be missing"
-    Then the verification should not be successful
-
-  Scenario: Failing to verify that electricity draw is more than zero
-    Given a "ServerType" data import fetches results listed in "server_type_bad"
-    When a data import verifies "Electricity draw should be more than zero"
-    Then the verification should not be successful
-
-  Scenario: Failing to verify that electricity draw units are kilowatts
-    Given a "ServerType" data import fetches results listed in "server_type_bad"
-    When a data import verifies "Electricity draw units should be kilowatts"
-    Then the verification should not be successful

data/features/server_type_alias.feature

@@ -1,14 +0,0 @@
-Feature: Data import for ServerTypeAlias
-  As a data user
-  I want to import ServerTypeAlias data
-  So that I can perform server type alias-based calculations
-
-  Scenario: Successfully verifying that server type name and platform name are never missing
-    Given a "ServerTypeAlias" data import fetches results listed in "server_type_alias_good"
-    When a data import verifies "Server type name and platform name should never be missing"
-    Then the verification should be successful
-
-  Scenario: Failing to verify that server type name and platform name are never missing
-    Given a "ServerTypeAlias" data import fetches results listed in "server_type_alias_bad"
-    When a data import verifies "Server type name and platform name should never be missing"
-    Then the verification should not be successful

data/features/support/imports/computation_platform_bad.csv

@@ -1,3 +0,0 @@
-name,data_center_company_name
-Heroku,Amazon
-Engine Yard

data/features/support/imports/computation_platform_good.csv

@@ -1,3 +0,0 @@
-name,data_center_company_name
-Heroku,Amazon
-Engine Yard,Amazon

data/features/support/imports/server_type_alias_bad.csv

@@ -1,3 +0,0 @@
-name,server_type_name,platform_name
-Fugu,Normal,Heroku
-Large

data/features/support/imports/server_type_alias_good.csv

@@ -1,3 +0,0 @@
-name,server_type_name,platform_name
-Fugu,Normal,Heroku
-Large,Large,Engine Yard

data/features/support/imports/server_type_bad.csv

@@ -1,3 +0,0 @@
-name,memory,memory_units,cpu,cpu_units,electricity_draw,electricity_draw_units,data_center_company_name
-Normal,1.7,gigabytes,1,ec2_compute_units,2.3,kilowatts,Amazon
-Large,7.5,gigabytes,4,ec2_compute_units,0,gigawatts

data/features/support/imports/server_type_good.csv

@@ -1,3 +0,0 @@
-name,data_center_company_name,memory,memory_units,cpu,cpu_units,electricity_draw,electricity_draw_units
-Normal,Amazon,1.7,gigabytes,1,ec2_compute_units,2.3,kilowatts
-Large,Amazon,1.7,gigabytes,1,ec2_compute_units,4.0,kilowatts

data/lib/earth/computation/computation_platform.rb

@@ -1,9 +0,0 @@
-class ComputationPlatform < ActiveRecord::Base
-  set_primary_key :name
-  
-  belongs_to :data_center_company, :foreign_key => 'data_center_company_name'
-  
-  data_miner do
-    tap "Brighter Planet's computation platform data", Earth.taps_server
-  end
-end

data/lib/earth/computation/computation_platform/data_miner.rb

@@ -1,24 +0,0 @@
-ComputationPlatform.class_eval do
-  data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'data_center_company_name'
-    end
-    
-    import "a list of computation platforms and the data center company they use",
-           :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdG5zVER5THhXRlE4N0RXTklVaS03Ymc&gid=0&gid=0&output=csv' do
-      key   'name'
-      store 'data_center_company_name'
-    end
-    
-    verify "Data center company name should never be missing" do
-      ComputationPlatform.all.each do |platform|
-        unless platform.data_center_company_name.present?
-          raise "Invalid data center company name for DataCenterCompany #{platform.name}: #{platform.data_center_company_name}"
-        end
-      end
-    end
-    
-    # FIXME TODO verify that all data center company names appear in data_center_companies
-  end
-end

data/lib/earth/computation/data_center_company.rb

@@ -1,7 +0,0 @@
-class DataCenterCompany < ActiveRecord::Base
-  set_primary_key :name
-  
-  data_miner do
-    tap "Brighter Planet's data center company data", Earth.taps_server
-  end
-end

data/lib/earth/computation/data_center_company/data_miner.rb

@@ -1,22 +0,0 @@
-DataCenterCompany.class_eval do
-  data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'power_usage_effectiveness'
-    end
-    
-    import "a list of data center companies and their power usage effectiveness",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFlxZVZLai01WWJOOTFiaUd1blF6VkE&hl=en&gid=0&output=csv' do
-      key   'name'
-      store 'power_usage_effectiveness'
-    end
-    
-    verify "Power usage effectiveness should be one or more" do
-      DataCenterCompany.all.each do |company|
-        unless company.power_usage_effectiveness >= 1.0
-          raise "Invalid power usage effectiveness for DataCenterCompany #{company.name}: #{company.power_usage_effectiveness} (should be >= 1.0)"
-        end
-      end
-    end
-  end
-end

data/lib/earth/computation/server_type.rb

@@ -1,9 +0,0 @@
-class ServerType < ActiveRecord::Base
-  set_primary_key :name
-  
-  belongs_to :data_center_company, :foreign_key => 'data_center_company_name'
-  
-  data_miner do
-    tap "Brighter Planet's server type data", Earth.taps_server
-  end
-end

data/lib/earth/computation/server_type/data_miner.rb

@@ -1,49 +0,0 @@
-ServerType.class_eval do
-  data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'data_center_company_name'
-      float  'cpu'
-      string 'cpu_units'
-      float  'memory'
-      string 'memory_units'
-      float  'electricity_draw'
-      string 'electricity_draw_units'
-    end
-    
-    import "a list of server types and their characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdGExaW1ic2c0d2s1ZmpzeUdOa2kyRlE&hl=en&gid=0&output=csv' do
-      key   'name'
-      store 'data_center_company_name'
-      store 'cpu',              :units_field_name => 'cpu_units'
-      store 'memory',           :units_field_name => 'memory_units'
-      store 'electricity_draw', :units_field_name => 'electricity_draw_units'
-    end
-    
-    # FIXME TODO verify that data center company name appears in data_center_companies
-    
-    verify "Data center company name should never be missing" do
-      ServerType.all.each do |server|
-        unless server.data_center_company_name.present?
-          raise "Invalid data center company name for ServerType #{server.name}: #{server.data_center_company_name}"
-        end
-      end
-    end
-    
-    verify "Electricity draw should be more than zero" do
-      ServerType.all.each do |server|
-        unless server.electricity_draw > 0
-          raise "Invalid electricity draw for ServerType #{server.name}: #{server.electricity_draw} (should be > 0)"
-        end
-      end
-    end
-    
-    verify "Electricity draw units should be kilowatts" do
-      ServerType.all.each do |server|
-        unless server.electricity_draw_units == 'kilowatts'
-          raise "Invalid electricity draw units for ServerType #{server.name}: #{server.electricity_draw_units} (should be kilowatts)"
-        end
-      end
-    end
-  end
-end

data/lib/earth/computation/server_type_alias.rb

@@ -1,10 +0,0 @@
-class ServerTypeAlias < ActiveRecord::Base
-  set_primary_key :name
-  
-  belongs_to :server_type, :foreign_key => 'server_type_name'
-  belongs_to :platform,    :foreign_key => 'platform_name',   :class_name => 'ComputationPlatform'
-  
-  data_miner do
-    tap "Brighter Planet's server type data", Earth.taps_server
-  end
-end

data/lib/earth/computation/server_type_alias/data_miner.rb

@@ -1,30 +0,0 @@
-ServerTypeAlias.class_eval do
-  data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'server_type_name'
-      string 'platform_name'
-    end
-    
-    import "a list of server type aliases and their characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdDdkVlBzSUYweFN0OHBreEN6YTdTZ3c&hl=en&gid=0&output=csv' do
-      key   'name', :field_name => 'alias'
-      store 'server_type_name'
-      store 'platform_name'
-    end
-    
-    # FIXME TODO verify that server type name appears in server_types
-    # FIXME TODO verify that platform name appears in computation_platforms
-    
-    verify "Server type name and platform name should never be missing" do
-      ServerTypeAlias.all.each do |server_alias|
-        [:server_type_name, :platform_name].each do |x|
-          test_item = server_alias.send(x)
-          unless test_item.present?
-            raise "Invalid #{x} for ServerTypeAlias #{server_alias.name}: #{test_item}"
-          end
-        end
-      end
-    end
-  end
-end