aws-ec2-instance_types 1.4.1 → 2.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-instance_types
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,34 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.2
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -192,12 +164,12 @@ files:
 - ".ruby-version"
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - LICENSE.txt
 - README.md
 - README.rdoc
 - Rakefile
-- VERSION
 - aws-ec2-instance_types.gemspec
 - bin/aws-ec2-instance_types
 - features/.gitkeep
@@ -207,13 +179,14 @@ files:
 - features/support/env.rb
 - lib/dldinternet/aws/ec2.rb
 - lib/dldinternet/aws/ec2/instance_types.rb
+- lib/dldinternet/aws/ec2/instance_types/aws-pricing-api-client.rb
 - lib/dldinternet/aws/ec2/instance_types/cli.rb
 - lib/dldinternet/aws/ec2/instance_types/error.rb
 - lib/dldinternet/aws/ec2/instance_types/get.rb
 - lib/dldinternet/aws/ec2/instance_types/mixins/ec2_instance_types.rb
 - lib/dldinternet/aws/ec2/instance_types/mixins/no_commands.rb
-- lib/dldinternet/aws/ec2/instance_types/scraper.rb
 - lib/dldinternet/aws/ec2/instance_types/version.rb
+- test/doc.html
 - test/helper.rb
 - test/test_aws-ec2-instance_types.rb
 homepage: https://rubygems.org/gems/aws-ec2-instance_types
@@ -236,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Retrieve an up to date list of valid AWS EC2 Instance Types directly from
@@ -247,5 +220,6 @@ test_files:
 - features/step_definitions/.gitkeep
 - features/step_definitions/aws-ec2-instance_types_steps.rb
 - features/support/env.rb
+- test/doc.html
 - test/helper.rb
 - test/test_aws-ec2-instance_types.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.4

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

@@ -1,129 +0,0 @@
-module DLDInternet
-  module AWS
-    module EC2
-
-      module Instance_Types
-        HEADINGS_CPU = [
-            :instance_type,				    # [0]
-            :vCPU,                    # [1]
-            :memory,                  # [2]
-            :instance_storage,        # [3]
-            :networking_performance,	# [4]
-            :physical_processor,	    # [5]
-            :clock_speed,       	    # [6]
-            :Intel_AES_NI,				    # [7]
-            :Intel_AVX,						    # [8]
-            :Intel_Turbo,					    # [9]
-            :EBS_OPT,                 # [10]
-            :enhanced_networking      # [11]
-        ]
-        DEBUG = true
-        class Scraper
-          attr_reader :instance_types
-
-          def initialize
-            @instance_types = {}
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def getInstanceTypes(options={})
-            unless @instance_types.size > 0
-              mechanize = options[:mechanize]
-              unless mechanize
-                require '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)
-              div = nk.css('div#aws-page-content')
-              div = nk.css('div.page-content') unless div.to_s.match %r'^<div id="'m
-              # noinspection RubyAssignmentExpressionInConditionalInspection
-              if div = find_div(div, %r'^<div\s+class="nine columns content-with-nav'm )
-                # noinspection RubyAssignmentExpressionInConditionalInspection
-                if div = find_div(div, %r'^<div\s+class="content parsys'm )
-                  divs = div.css('div').to_a
-                  itm = nil
-                  idx = 0
-                  divs.each do |d|
-                    as = d.css('div div h2 a')
-                    as.each do |a|
-                      # puts "'#{a.text}'"
-                      if a.text.match %r'\s*Instance Types Matrix\s*'
-                        itm = d
-                        break
-                      end
-                    end
-                    break if itm
-                    idx += 1
-                  end
-                  if idx < divs.count
-                    divs = divs[idx..-1]
-                    table = nil
-                    divs.each do |d|
-                      table = d.css('div.aws-table table')
-                      break if table.to_s.match(%r'^<table'i)
-                    end
-
-                    @instance_types = scrapeTable(HEADINGS_CPU, table) if table
-                  end
-                end
-              end
-            end
-            @instance_types
-          end
-
-          def find_div(nk,regex)
-            ret = nil
-            divs = nk.search('div').to_a
-            if divs.count > 0
-              nine = divs.select{ |div|
-                div.to_s.gsub(%r'\n',' ').match(regex)
-              }
-              if nine.count >= 1
-                nine = nine.shift
-                ret = nine
-              end
-            end
-            ret
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def scrapeTable(cHeadings,table)
-            raise Error.new 'Cannot find instance type table' unless (table.is_a?(Nokogiri::XML::Element) or table.is_a?(Nokogiri::XML::NodeSet))
-            rows = table.search('tr')[0..-1].to_a
-            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 => {},
-                :details  => []
-            }
-            (0..cols.size-1).map { |i| instance_types[:headings][cHeadings[i]] = cols[i] }
-
-            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[cHeadings[i]] = cells[i] }
-              instance_types[:details] << instance
-            end
-            instance_types
-          end
-        end
-      end
-    end
-  end
-end