aws-ec2-instance_types 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTYxZTFlM2U5MWMyMDNhZjNmM2M5MjhmODcxYWQ2Yzk2MTkxYjkzNQ==
+    OGEyNTViMmMxZDgwMDMyZjExMTA2YjgwZWRmYjAwMTY0MGVhYjgwYg==
   data.tar.gz: !binary |-
-    OTdmY2EyNTRkNWE4Y2JlOTE3OTJjZDA1Y2FkNTNjMTUwMzQ1Yjk5OA==
+    NGFiZjM3MmM5NTlmOWE2NmRlYmRiYWMwOThlMGEyYmQ0ZTU3YTVkMQ==
 SHA512:
   metadata.gz: !binary |-
-    NWFiZWFjMzI0YzZkNTkzZTljNWQ1MWQ4MzhkNjA4ODE3ZDMzNmVkZWRhZjli
-    NDgxZTgyZTkzOTIxNzI5YTMyZDdlM2NiMmM0MGVkYTc2Y2RjYTk3MzM0NTY4
-    MzllNTcyNzA5NDk3ZjRlZjc3NTNkMGRjODNhNmU0MGIwNjMxNDU=
+    MjU1YTA2Mjg4M2IwMjU1OTBmZDkyMGFmMmNhZTc3NzFhNGQ2MzNmYWE2YWI4
+    YzNhNTczNTcwMjAxMjZhMzZmYTRlNDM3Y2Q0NGEwZmNmOWRlYTg4ZWY4ZGZl
+    OGQ0Y2E5NWMzMzU3ZmEzNDk5MDM5YWVmMzJmNDQzNjk3MTBlYjE=
   data.tar.gz: !binary |-
-    MjRlZjY0NDg0OWU3YzNjNzk2NzEzYjg1YmU3NzU0MTUxNjAzN2E2ZmUzMTNm
-    M2MwMDBiZTIzOTAzZWM2YTE5ZDhiODE0NWUxZTk5OTEwOGVjNjJmNzllZmQx
-    OGMzOTk1MzRkM2IwYjQ4OGU2NTJhMjYzMWE3MTI4MDFlMzU3Mjc=
+    MGY1NmFhYzliYTZhMTdlOWIwOTU2ZjI0M2NlODljNjMxNGM3ZDUzYWI3MjY2
+    OWY3MTI5NDdiZDIxYThkZjdhNzk1MTI3YzYwNGU1OGFlZDE0MGE5MzIwZTE1
+    MWJjM2RkNDk2MGMyYWViY2Q0MDA1M2I1MzVlM2ZiODFhNGMwNzY=

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/aws-ec2-instance_types.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: aws-ec2-instance_types 1.0.3 ruby lib
+# stub: aws-ec2-instance_types 1.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "aws-ec2-instance_types"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christo De Lange"]

data/bin/aws-ec2-instance_types

@@ -16,7 +16,7 @@ require "awesome_print"
 require "colorize"
 
 begin
-  puts getInstanceTypes(:mechanize => mechanize).ai
+  puts getInstanceTypes(:mechanize => mechanize)[:instance_type_details].ai
 rescue Timeout::Error => e
   puts "Unable to retrieve instance type details in a reasonable time (#{mechanize.open_timeout}s). Giving up ...".light_red
 end

data/lib/dldinternet/aws/ec2/instance_types.rb

@@ -1,6 +1,7 @@
 module DLDInternet
   module AWS
     module EC2
+      class Error < StandardError ; end
       HEADINGS = [
           :instance_family,         # [0]
           :instance_type,           # [1]
@@ -12,9 +13,22 @@ module DLDInternet
           :EBS_optimized_available, # [7]
           :network_performance      # [8]
       ]
+      HEADINGS_CPU = [
+          :instance_family,			    # [0]
+          :instance_type,				    # [1]
+          :processor_arch,			    # [2]
+          :vCPU,						        # [3]
+          :ECU,						          # [4]
+          :physical_processor,	    # [5]
+          :Intel_AES_NI,				    # [6]
+          :Intel_AVX,						    # [7]
+          :Intel_Turbo,					    # [8]
+
+      ]
 
       attr_reader :instance_types
 
+      # ---------------------------------------------------------------------------------------------------------------
       def getInstanceTypes(options={})
         unless @instance_types
           @instance_types = {}
@@ -30,34 +44,43 @@ module DLDInternet
 
           require "nokogiri"
           nk = Nokogiri::HTML(page.body)
-          table = nk.css("div#yui-main div.yui-b table")
-          raise AWSEC2Error.new "Cannot find instance type table" unless table.is_a?(Nokogiri::XML::NodeSet)
-          rows = table.search('tr')[0..-1]
-          head = rows.shift
+          div = nk.css("div#yui-main div.yui-b")
+          tables = div.search('table')
 
-          cols = head.search('td').collect { |td|
-            text = td.text.to_s
-            text = text.gsub(%r/(\r?\n)+/, ' ').strip
-            CGI.unescapeHTML(text)
-          }
+          @instance_types[:instance_type_details] = scrapeTable(HEADINGS,     tables[0])
+          @instance_types[:processor_details]     = scrapeTable(HEADINGS_CPU, tables[1])
+        end
+        @instance_types
+      end
 
-          @instance_types[:headings] = {}
-          (0..cols.size-1).map{|i| @instance_types[:headings][HEADINGS[i]] = cols[i] }
+      # ---------------------------------------------------------------------------------------------------------------
+      def scrapeTable(cHeadings,table)
+        raise Error.new "Cannot find instance type table" unless table.is_a?(Nokogiri::XML::Element)
+        rows = table.search('tr')[0..-1]
+        head = rows.shift
 
-          @instance_types[:details] = []
-          rows.each do |row|
+        cols = head.search('td').collect { |td|
+          text = td.text.to_s
+          text = text.gsub(%r/(\r?\n)+/, ' ').strip
+          CGI.unescapeHTML(text)
+        }
+        instance_types = {
+            :headings => {},
+            :details  => []
+        }
+        (0..cols.size-1).map { |i| instance_types[:headings][cHeadings[i]] = cols[i] }
 
-            cells = row.search('td').collect { |td|
-              CGI.unescapeHTML(td.text.to_s.gsub(%r/(\r?\n)+/, ' ').strip.gsub('32-bit or64-bit', '32-bit or 64-bit'))
-            }
-            raise StandardError.new "This row does not have the same number of cells as the table header: #{row.text.to_s.strip}" unless cells.size == cols.size
-            instance = {}
-            (0..cells.size-1).map{|i| instance[HEADINGS[i]] = cells[i] }
-            @instance_types[:details] << instance
+        rows.each do |row|
 
-          end
+          cells = row.search('td').collect { |td|
+            CGI.unescapeHTML(td.text.to_s.gsub(%r/(\r?\n)+/, ' ').strip.gsub('32-bit or64-bit', '32-bit or 64-bit'))
+          }
+          raise StandardError.new "This row does not have the same number of cells as the table header: #{row.text.to_s.strip}" unless cells.size == cols.size
+          instance = {}
+          (0..cells.size-1).map { |i| instance[cHeadings[i]] = cells[i] }
+          instance_types[:details] << instance
         end
-        @instance_types
+        instance_types
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-instance_types
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Christo De Lange