amazon-pricing 0.1.59 → 0.1.60

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmEwYzAwNTg2ZDFkYThhYzIyMjBhMzRkMjQxNjA5NTdjYmQzMGFiYw==
+    YjA5OTU4ZjcwZmQ3MGRiZGEwYTM2YWNhOGE0ZWNhOGU1MzZjMDc2NQ==
   data.tar.gz: !binary |-
-    MjBlNDYzMjc3NThjYWJlZGMwZjUxOTM4NzI0YzU5NDc0N2M4YTMzZg==
+    N2YxYTc2ZTM4OGIxNjU5OTA5YWU4YzJiYjA1NDYwNjUwY2ZhZTU3MA==
 SHA512:
   metadata.gz: !binary |-
-    NWU5OTViOWI1OGViZWEzM2RlYjMwYTExMjBlNzlmMWIxMjhkYTVhOTUwN2Q5
-    NTJiNTZjOTdkYzRjYjgxM2IyNDIxMGVlOWMzZWNkNTBiOGE4YzY4NWI5YzZi
-    MWE2ZDNkMmFkODg4OTkxNzJjODdjMjQzYzU5OWU5MjEwZGVjMTM=
+    MGNkYzk4YTBkNTM3N2RkOTY1ODBhMjVjOGNlYzFmNmQ0MDdiYzUyMDZkYjkw
+    ZDMyNzBlN2NmMmYwZmE1MGVkOTAzMDIzMWIzY2I2MjFiMTNjZGM3M2I5YzQ3
+    ZGYyYmIyOTdiNjI5NzVmZTY4MjBmY2JjOGY5Y2ZmMDc0OTJjM2I=
   data.tar.gz: !binary |-
-    Y2U4ZTZiZmJhZGMyOTU2ZjQ1MWU2ZDA1ZTIzMmI0NGZiNDhiOTUyNTk4Nzdi
-    MWIwMTAzMjE4ZDI0N2I2MTBkNmMwYjFlZGVmMjg4ODZjM2YwYTFhMWQ1NTY0
-    OTQ0NDk2ODYzNjllMzIzZDEyYzY0OWRlOTJiZjdhMGVkZTI5YTY=
+    YWFkYjI5N2I3YjM4OTYyMDM5ZjFkMzY2YTEwZjFlYWQzNTgwZDU2MzE2ZTIy
+    YjY4ZTRkZjQ3MTdjYzQ0NDIwNjU5NjU2ODViNzY4MWMwNWJhZDBhMTQ5MDNi
+    MzllOTEzYzhlYmY4YmY4YzAyNTgzZjZiM2MwMmIzZGE1ZDI5NjQ=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amazon-pricing (0.1.59)
+    amazon-pricing (0.1.60)
       mechanize (~> 2.7.2)
 
 GEM

data/README.md

@@ -2,9 +2,9 @@ Amazon Web Services Pricing Ruby Gem
 ====================================
 
 [![](https://api.tddium.com:443/cloudhealthtech/amazon-pricing/badges/48071.png?badge_token=26071a8988b20f68cb9723defd7012fc33a180bc)](https://api.tddium.com:443/cloudhealthtech/amazon-pricing/suites/48071)
-[![Gem Version](https://badge.fury.io/rb/amazon-pricing.png)](http://badge.fury.io/rb/amazon-pricing)
-[![Code Climate](https://codeclimate.com/github/CloudHealth/amazon-pricing.png)](https://codeclimate.com/github/CloudHealth/amazon-pricing)
-[![Coverage Status](https://coveralls.io/repos/CloudHealth/amazon-pricing/badge.png?branch=master)](https://coveralls.io/r/CloudHealth/amazon-pricing?branch=master)
+[![Gem Version](https://badge.fury.io/rb/amazon-pricing.svg)](http://badge.fury.io/rb/amazon-pricing)
+[![Code Climate](https://codeclimate.com/github/CloudHealth/amazon-pricing/badges/gpa.svg)](https://codeclimate.com/github/CloudHealth/amazon-pricing)
+[![Coverage Status](https://coveralls.io/repos/CloudHealth/amazon-pricing/badge.svg?branch=master)](https://coveralls.io/r/CloudHealth/amazon-pricing?branch=master)
 
 About amazon-pricing
 --------------------

data/lib/amazon-pricing/definitions/instance-type.rb

@@ -107,7 +107,7 @@ module AwsPricing
                 @@Compute_Units_Lookup[api_name] = size["ECU"].to_i 
                 @@Virtual_Cores_Lookup[api_name] = size["vCPU"].to_i 
               rescue UnknownTypeError
-                $stderr.puts "WARNING: encountered #{$!.message}"
+                $stderr.puts "[populate_lookups] WARNING: encountered #{$!.message}"
               end
             end
           end
@@ -175,6 +175,7 @@ module AwsPricing
       'g2.2xlarge' => 'Cluster GPU Double Extra Large',
       'c3.large' => 'High-Compute Large', 'c3.xlarge' => 'High-Compute Extra Large', 'c3.2xlarge' => 'High-Compute Double Extra Large', 'c3.4xlarge' => 'High-Compute Quadruple Extra Large', 'c3.8xlarge' => 'High-Compute Eight Extra Large',
       'i2.xlarge' => 'High I/O Extra Large', 'i2.2xlarge' => 'High I/O Double Extra Large', 'i2.4xlarge' => 'High I/O Quadruple Extra Large', 'i2.8xlarge' => 'High I/O Eight Extra Large',
+      'd2.xlarge' => 'Dense Storage Extra Large', 'd2.2xlarge' => 'Dense Storage Double Extra Large', 'd2.4xlarge' => 'Dense Storage Quadruple Extra Large', 'd2.8xlarge' => 'Dense Storage Eight Extra Large',
       'r3.large' => 'Memory Optimized Large', 'r3.xlarge' => 'Memory Optimized Extra Large', 'r3.2xlarge' => 'Memory Optimized Double Extra Large', 'r3.4xlarge' => 'Memory Optimized Quadruple Extra Large', 'r3.8xlarge' => 'Memory Optimized Eight Extra Large',
       't2.micro' => 'Burstable Performance Instance Micro', 't2.small' => 'Burstable Performance Instance Small', 't2.medium' => 'Burstable Performance Instance Medium',
       'c4.large' => 'Compute Optimized Large', 'c4.xlarge' => 'Compute Optimized Extra Large', 'c4.2xlarge' => 'Compute Optimized Double Extra Large', 'c4.4xlarge' => 'Compute Optimized Quadruple Extra Large', 'c4.8xlarge' => 'Compute Optimized Eight Extra Large',
@@ -196,6 +197,7 @@ module AwsPricing
       'db.t1.micro' => 160,
       'c3.large' => 32, 'c3.xlarge' => 80, 'c3.2xlarge' => 160, 'c3.4xlarge' => 320, 'c3.8xlarge' => 640, 
       'i2.large' => 360, 'i2.xlarge' => 720, 'i2.2xlarge' => 1440, 'i2.4xlarge' => 2880, 'i2.8xlarge' => 5760,
+      'd2.xlarge' => 6000, 'd2.2xlarge' => 12000, 'd2.4xlarge' => 24000, 'd2.8xlarge' => 48000,
       'r3.large' => 32, 'r3.xlarge' => 80, 'r3.2xlarge' => 160, 'r3.4xlarge' => 320, 'r3.8xlarge' => 640,
       't2.micro' => 0, 't2.small' => 0, 't2.medium' => 0,
       'c4.large' => 0, 'c4.xlarge' => 0, 'c4.2xlarge' => 0, 'c4.4xlarge' => 0, 'c4.8xlarge' => 0, 
@@ -217,6 +219,7 @@ module AwsPricing
       'db.t1.micro' => 64,
       'c3.large' => 64, 'c3.xlarge' => 64, 'c3.2xlarge' => 64, 'c3.4xlarge' => 64, 'c3.8xlarge' => 64, 
       'i2.large' => 64, 'i2.xlarge' => 64, 'i2.2xlarge' => 64, 'i2.4xlarge' => 64, 'i2.8xlarge' => 64,
+      'd2.xlarge' => 64, 'd2.2xlarge' => 64, 'd2.4xlarge' => 64, 'd2.8xlarge' => 64,
       'r3.large' => 64, 'r3.xlarge' => 64, 'r3.2xlarge' => 64, 'r3.4xlarge' => 64, 'r3.8xlarge' => 64,
       't2.micro' => 64, 't2.small' => 64, 't2.medium' => 64,
       'c4.large' => 64, 'c4.xlarge' => 64, 'c4.2xlarge' => 64, 'c4.4xlarge' => 64, 'c4.8xlarge' => 64, 
@@ -239,11 +242,14 @@ module AwsPricing
       'db.t1.micro' => :ebs,
       'c3.large' => :ssd, 'c3.xlarge' => :ssd, 'c3.2xlarge' => :ssd, 'c3.4xlarge' => :ssd, 'c3.8xlarge' => :ssd, 
       'i2.large' => :ssd, 'i2.xlarge' => :ssd, 'i2.2xlarge' => :ssd, 'i2.4xlarge' => :ssd, 'i2.8xlarge' => :ssd,
+      'd2.xlarge' => :ephemeral, 'd2.2xlarge' => :ephemeral, 'd2.4xlarge' => :ephemeral, 'd2.8xlarge' => :ephemeral,
       'r3.large' => :ssd, 'r3.xlarge' => :ssd, 'r3.2xlarge' => :ssd, 'r3.4xlarge' => :ssd, 'r3.8xlarge' => :ssd,
       't2.micro' => :ebs, 't2.small' => :ebs, 't2.medium' => :ebs,
       'c4.large' => :ebs, 'c4.xlarge' => :ebs, 'c4.2xlarge' => :ebs, 'c4.4xlarge' => :ebs, 'c4.8xlarge' => :ebs, 
     }
-    # Sigh... AWS does not always provide memory info (e.g. t2, r3)
+
+    # NOTE: These are populated by "populate_lookups"
+    #       But... AWS does not always provide memory info (e.g. t2, r3), so those are hardcoded below
     @@Memory_Lookup = {
       'r3.large' => 15250, 'r3.xlarge' => 30500, 'r3.2xlarge' => 61000, 'r3.4xlarge' => 122000, 'r3.8xlarge' => 244000,
       't2.micro' => 1000, 't2.small' => 2000, 't2.medium' => 4000,

data/lib/amazon-pricing/ec2-price-list.rb

@@ -54,34 +54,6 @@ module AwsPricing
         url = "#{EC2_BASE_URL}previous-generation/ri-v2/#{target}-shared.min.js"
         fetch_ec2_instance_pricing_ri_v2(url, operating_system)
       end
-
-    end
-
-    # Retrieves the EC2 on-demand instance pricing.
-    # type_of_instance = :ondemand, :light, :medium, :heavy
-    def fetch_ec2_instance_pricing(url, type_of_instance, operating_system)
-      res = PriceList.fetch_url(url)
-      res['config']['regions'].each do |reg|
-        region_name = reg['region']
-        region = get_region(region_name)
-        # e.g. type = {"type"=>"hiCPUODI", "sizes"=>[{"size"=>"med", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"N/A"}}]}, {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}]}
-        reg['instanceTypes'].each do |type|
-          # e.g. size = {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}
-          # Amazon now can return array or hash here (hash = only 1 item)
-          items = type['sizes']
-          items = [type] if items.nil?
-          items.each do |size|
-            begin
-              api_name, name = Ec2InstanceType.get_name(type["type"], size["size"], type_of_instance != :ondemand)
-              
-              instance_type = region.add_or_update_ec2_instance_type(api_name, name)
-              instance_type.update_pricing(operating_system, type_of_instance, size)
-            rescue UnknownTypeError
-              $stderr.puts "WARNING: encountered #{$!.message}"
-            end
-          end
-        end
-      end
     end
 
     # Retrieves the EC2 on-demand instance pricing.
@@ -92,7 +64,7 @@ module AwsPricing
         region_name = reg['region']
         region = get_region(region_name)
         if region.nil?
-          $stderr.puts "WARNING: unable to find region #{region_name}"
+          $stderr.puts "[fetch_ec2_instance_pricing] WARNING: unable to find region #{region_name}"
           next
         end
         # e.g. type = {"type"=>"hiCPUODI", "sizes"=>[{"size"=>"med", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"N/A"}}]}, {"size"=>"xl", "valueColumns"=>[{"name"=>"mswinSQL", "prices"=>{"USD"=>"2.427"}}]}]}
@@ -107,7 +79,7 @@ module AwsPricing
               instance_type = region.add_or_update_ec2_instance_type(api_name, name)
               instance_type.update_pricing(operating_system, type_of_instance, size)
             rescue UnknownTypeError
-              $stderr.puts "WARNING: encountered #{$!.message}"
+              $stderr.puts "[fetch_ec2_instance_pricing] WARNING: encountered #{$!.message}"
             end
           end
         end
@@ -121,14 +93,14 @@ module AwsPricing
         region_name = reg['region']
         region = get_region(region_name)
         if region.nil?
-          $stderr.puts "WARNING: unable to find region #{region_name}"
+          $stderr.puts "[fetch_ec2_instance_pricing_ri_v2] WARNING: unable to find region #{region_name}"
           next
         end
         reg['instanceTypes'].each do |type|
           api_name = type["type"]
           instance_type = region.get_instance_type(api_name)
           if instance_type.nil?
-            $stderr.puts "WARNING: new reserved instances not found for #{api_name} in #{region_name}"
+            $stderr.puts "[fetch_ec2_instance_pricing_ri_v2] WARNING: new reserved instances not found for #{api_name} in #{region_name}"
             next
           end
 

data/lib/amazon-pricing/helpers/instance-type.rb

@@ -0,0 +1,161 @@
+module AwsPricing
+  module Helper
+    module InstanceType
+
+      @@INSTANCE_TYPES_BY_CLASSIFICATION = {
+        'GeneralPurpose' => {
+            'CurrentGen' => {
+                'M3' => ['m3.medium', 'm3.large', 'm3.xlarge', 'm3.2xlarge']
+            },
+            'PreviousGen' => {
+                'M1' => ['m1.small', 'm1.medium', 'm1.large', 'm1.xlarge']
+            }
+        },
+        'BurstableInstances' => {
+            'CurrentGen' => {
+                'T2' => ['t2.micro', 't2.small', 't2.medium']
+            }
+        },
+        'ComputeOptimized' => {
+            'CurrentGen' => {
+                'C3' => ['c3.large', 'c3.xlarge', 'c3.2xlarge', 'c3.4xlarge', 'c3.8xlarge'],
+                'C4' => ['c4.large', 'c4.xlarge', 'c4.2xlarge', 'c4.4xlarge', 'c4.8xlarge']
+            },
+            'PreviousGen' => {
+                'C1' => ['c1.medium', 'c1.xlarge'],
+                'C2' => ['cc2.8xlarge']
+            }
+        },
+        'MemoryOptimized' => {
+            'CurrentGen' => {
+                'R3'  => ['r3.large', 'r3.xlarge', 'r3.2xlarge', 'r3.4xlarge', 'r3.8xlarge']
+            },
+            'PreviousGen' => {
+                'M2'  => ['m2.xlarge', 'm2.2xlarge', 'm2.4xlarge'],
+                'CR1' => ['cr1.8xlarge']
+            }
+        },
+        'StorageOptimized' => {
+            'CurrentGen' => {
+                'HS1' => ['hs1.8xlarge'],
+                'I2'  => ['i2.xlarge', 'i2.2xlarge', 'i2.4xlarge', 'i2.8xlarge'],
+                'D2'  => ['d2.xlarge', 'd2.2xlarge', 'd2.4xlarge', 'd2.8xlarge']
+            },
+            'PreviousGen' => {
+                'HI1' => ['hi1.4xlarge']
+            }
+        },
+        'GPUInstances' => {
+            'CurrentGen' => {
+                'G2'  => ['g2.2xlarge']
+            },
+            'PreviousGen' => {
+                'CG1' => ['cg1.4xlarge']
+            }
+        },
+        'MicroInstances' => {
+            'PreviousGen' => {
+                'T1' => ['t1.micro']
+            }
+        }
+      }
+
+      # Important: Members of a family must be kept in 'size' order (small, medium, large, etc.)
+      # AWS Docs: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
+      def instance_types
+        @@INSTANCE_TYPES_BY_CLASSIFICATION
+      end
+
+      def general_purpose_instances
+        instance_types['GeneralPurpose']
+      end
+
+      def burstable_instances
+        instance_types['BurstableInstances']
+      end
+
+      def compute_optimized_instances
+        instance_types['ComputeOptimized']
+      end
+
+      def memory_optimized_instances
+        instance_types['MemoryOptimized']
+      end
+
+      def storage_optimized_instances
+        instance_types['StorageOptimized']
+      end
+
+      def gpu_instances
+        instance_types['GPUInstances']
+      end
+
+      def micro_instances
+        instance_types['MicroInstances']
+      end
+
+      def previous_generation_instances
+        [
+          general_purpose_instances['PreviousGen'],
+          compute_optimized_instances['PreviousGen'],
+          compute_optimized_instances['PreviousGen'],
+          memory_optimized_instances['PreviousGen'],
+          memory_optimized_instances['PreviousGen'],
+          storage_optimized_instances['PreviousGen'],
+          gpu_instances['PreviousGen'],
+          micro_instances['PreviousGen']
+        ].inject({}) do |instances, family|
+          instances.merge(family)
+        end
+      end
+
+      def current_generation_instances
+        [
+          general_purpose_instances['CurrentGen'],
+          burstable_instances['CurrentGen'],
+          compute_optimized_instances['CurrentGen'],
+          compute_optimized_instances['CurrentGen'],
+          memory_optimized_instances['CurrentGen'],
+          memory_optimized_instances['CurrentGen'],
+          storage_optimized_instances['CurrentGen'],
+          gpu_instances['CurrentGen']
+        ].inject({}) do |instances, family|
+          instances.merge(family)
+        end
+      end
+
+      def all_instances
+        @all_instances ||= begin
+          [previous_generation_instances, current_generation_instances].inject({}) do |instances, family|
+            instances.merge(family)
+          end
+        end
+      end
+
+      def family(api_name)
+        all_instances.select { |family, instances| instances.include?(api_name) }.keys.first
+      end
+
+      def family_members(api_name)
+        all_instances.select { |family, instances| instances.include?(api_name) }.values.first
+      end
+
+      def size_to_nf
+        {
+          'micro'   => 0.5,
+          'small'   => 1,
+          'medium'  => 2,
+          'large'   => 4,
+          'xlarge'  => 8,
+          '2xlarge' => 16,
+          '4xlarge' => 32,
+          '8xlarge' => 64
+        }
+      end
+
+      def api_name_to_nf(name)
+        size_to_nf[name.split('.').last]
+      end
+    end
+  end
+end

data/lib/amazon-pricing/rds-price-list.rb

@@ -142,7 +142,7 @@ module AwsPricing
               instance_type = region.add_or_update_rds_instance_type(api_name, name)
               instance_type.update_pricing(db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
-              $stderr.puts "WARNING: encountered #{$!.message}"
+              $stderr.puts "[fetch_on_demand_rds_instance_pricing] WARNING: encountered #{$!.message}"
             end
           end
         end                        
@@ -163,7 +163,7 @@ module AwsPricing
                 instance_type = region.add_or_update_rds_instance_type(api_name, name)
                 instance_type.update_pricing(db_type, type_of_rds_instance, tier, is_multi_az, is_byol)
             rescue UnknownTypeError
-              $stderr.puts "WARNING: encountered #{$!.message}"
+              $stderr.puts "[fetch_reserved_rds_instance_pricing] WARNING: encountered #{$!.message}"
             end
           end
         end

data/lib/amazon-pricing/version.rb

@@ -8,5 +8,5 @@
 # Home::      http://github.com/CloudHealth/amazon-pricing
 #++
 module AwsPricing
-  VERSION = '0.1.59'
+  VERSION = '0.1.60'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-pricing
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.60
 platform: ruby
 authors:
 - Joe Kinsella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -58,6 +58,7 @@ files:
 - lib/amazon-pricing/definitions/region.rb
 - lib/amazon-pricing/dynamo-db-price-list.rb
 - lib/amazon-pricing/ec2-price-list.rb
+- lib/amazon-pricing/helpers/instance-type.rb
 - lib/amazon-pricing/rds-price-list.rb
 - lib/amazon-pricing/version.rb
 - spec/lib/amazon-pricing/definitions/database-type_spec.rb
@@ -96,3 +97,4 @@ signing_key:
 specification_version: 4
 summary: Amazon Web Services Pricing Ruby gem
 test_files: []
+has_rdoc: