aws-ec2-instance_types 1.0.1 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMzNTBlYjc5NjI4ODRhNmJlN2FiMTEwNGNiM2RhOTJiZTllNTBjYQ==
+    NTYxZTFlM2U5MWMyMDNhZjNmM2M5MjhmODcxYWQ2Yzk2MTkxYjkzNQ==
   data.tar.gz: !binary |-
-    OTE2YzhjMDM1ZDAxZTQwZDhhNzVmMTI2YWVlMDQxYmQ5NjFjNTFkMA==
+    OTdmY2EyNTRkNWE4Y2JlOTE3OTJjZDA1Y2FkNTNjMTUwMzQ1Yjk5OA==
 SHA512:
   metadata.gz: !binary |-
-    MjgzNTE2NTUyZDNlOWU3MzUyMzA1ODdkNTMyNjA0ZDg4YzY0Njc5YjEzNzdi
-    OTRlYzZhOTE3YWFhN2NmOTc2YzljMTQxMjZkMzAxNmYzZTZkMzcyNmJmZWEz
-    ZWJhNjg3MTcxZjBhM2JjMDU4ZmFkZjNjNGQ3MDAwMDFmZmZlMmM=
+    NWFiZWFjMzI0YzZkNTkzZTljNWQ1MWQ4MzhkNjA4ODE3ZDMzNmVkZWRhZjli
+    NDgxZTgyZTkzOTIxNzI5YTMyZDdlM2NiMmM0MGVkYTc2Y2RjYTk3MzM0NTY4
+    MzllNTcyNzA5NDk3ZjRlZjc3NTNkMGRjODNhNmU0MGIwNjMxNDU=
   data.tar.gz: !binary |-
-    ZDQ3MDE4YjRkNDlkMDRlN2E2NGY3MjI4Yjg2ZmRjMWQyNTcxY2ZmMDQ2ZTJj
-    MGQxOWFmMjMxZDIxNTMyMTFhMTg1MGEzZjQ3MWJmZjNkMjY3MjI5NGQ1NDk0
-    MjdmN2Y1ZTE5ZGJkZDFmZWYwNmE0YTg3MjVlMmQ5YjllN2FlMWU=
+    MjRlZjY0NDg0OWU3YzNjNzk2NzEzYjg1YmU3NzU0MTUxNjAzN2E2ZmUzMTNm
+    M2MwMDBiZTIzOTAzZWM2YTE5ZDhiODE0NWUxZTk5OTEwOGVjNjJmNzllZmQx
+    OGMzOTk1MzRkM2IwYjQ4OGU2NTJhMjYzMWE3MTI4MDFlMzU3Mjc=

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.3

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.1 ruby lib
+# stub: aws-ec2-instance_types 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "aws-ec2-instance_types"
-  s.version = "1.0.1"
+  s.version = "1.0.3"
 
   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

@@ -7,5 +7,16 @@ $:.unshift(_lib) unless $:.include?(_lib)
 require "dldinternet/aws/ec2"
 include DLDInternet::AWS::EC2
 
+require "mechanize"
+mechanize = Mechanize.new
+mechanize.open_timeout = 5
+mechanize.read_timeout = 10
+
 require "awesome_print"
-puts getInstanceTypes.ai
+require "colorize"
+
+begin
+  puts getInstanceTypes(:mechanize => mechanize).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

@@ -15,46 +15,46 @@ module DLDInternet
 
       attr_reader :instance_types
 
-      def getInstanceTypes()
+      def getInstanceTypes(options={})
         unless @instance_types
           @instance_types = {}
           require "mechanize"
-          agent = Mechanize.new
-          agent.user_agent_alias = 'Mac Safari' # Pretend to use a Mac
-          begin
-            page = agent.get('http://aws.amazon.com/ec2/instance-types/instance-details/')
-            #body = page.body.gsub('<br>', " \n")
-            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
-            #br   = nbsp = Nokogiri::HTML("<br>").text
-            cols = head.search('td').collect { |td|
-              text = td.text.to_s
-              text = text.gsub(%r/(\r?\n)+/, ' ').strip
-              CGI.unescapeHTML(text)
-            } #.select{ |col| col unless col == '' }
+          mechanize = options[:mechanize]
+          unless mechanize
+            mechanize = Mechanize.new
+            mechanize.user_agent_alias = 'Mac Safari' # Pretend to use a Mac
+          end
+          url = options[:url] || 'http://aws.amazon.com/ec2/instance-types/instance-details/'
+
+          page = mechanize.get(url)
+
+          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
+
+          cols = head.search('td').collect { |td|
+            text = td.text.to_s
+            text = text.gsub(%r/(\r?\n)+/, ' ').strip
+            CGI.unescapeHTML(text)
+          }
 
-            @instance_types[:headings] = {}
-            (0..cols.size-1).map{|i| @instance_types[:headings][HEADINGS[i]] = cols[i] }
+          @instance_types[:headings] = {}
+          (0..cols.size-1).map{|i| @instance_types[:headings][HEADINGS[i]] = cols[i] }
 
-            @instance_types[:details] = []
-            rows.each do |row|
+          @instance_types[:details] = []
+          rows.each do |row|
 
-              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
+            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
 
-            end
-          rescue Net::HTTPNotFound => e
-            @logger.error "Unable to retrieve list of flavors! #{FLAVORS_URL} was not found! (#{e.message})"
-            raise e
           end
         end
         @instance_types

metadata

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