aws-rds-instance_types 0.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 468e8652846b86a4aa820d52e3e04203c7616dc4
-  data.tar.gz: 08e7cab7c747c40c1e08b798d6925adc67c40083
+  metadata.gz: bcba97319bcf1b19cf050082339a48a67db82430
+  data.tar.gz: fdc641c8c55dc49d294079529e6ccbb95c3068ef
 SHA512:
-  metadata.gz: 70689caca4a449a1d0a957c27fe167b61810e535f20cf2d88df5595f249e1c6527243d34d80188d0808b44f7f909a6c410b7745df3437d076a6971cd6bdf25f9
-  data.tar.gz: 49392ce18dad312035d657251fe650e42d4abd97efab7bb92ccaa382022c2cc41882bb76ab45cc7709d8842c957e726c8e1f1673a2bcf926b43d62c4b9129b18
+  metadata.gz: a660e45d24bdf893b61b769a02eb8b627eaaf7efa1d6f7259741a4a6968fa80bf84dcfb251a624cf2756e22cf395cec84c8b395ee13e28214208a7c17395fee1
+  data.tar.gz: da17e8027c5f54ecaa5fe3da2efb62d86d4511ab389929931ff7ea0ae9e3f6d3d1400cb7de1af9e9b7e172d5a847ad29d542f1714c5f81722811c19d9f7777d6

data/Gemfile.lock

@@ -1,72 +1,55 @@
 PATH
   remote: .
   specs:
-    aws-rds-instance_types (0.5.0)
+    aws-rds-instance_types (2.0.0)
       awesome_print (> 0)
+      aws-ec2-instance_types (>= 2.0.0)
       colorize
-      dldinternet-mixlib-logging (>= 0.4.3)
+      dldinternet-mixlib-logging (>= 0.7.1)
       inifile (> 0)
       json
-      mechanize (>= 2.7.2)
-      nokogiri (>= 1.5.0)
       psych
       thor (>= 0.19.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    awesome_print (1.2.0)
-    builder (3.2.2)
-    colorize (0.7.3)
+    awesome_print (1.8.0)
+    aws-ec2-instance_types (2.0.0)
+      awesome_print (> 0)
+      colorize
+      dldinternet-mixlib-logging (>= 0.7.1)
+      inifile (> 0)
+      json
+      psych
+      thor (>= 0.19.1)
+    builder (3.2.3)
+    colorize (0.8.1)
     cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    diff-lcs (1.2.5)
-    dldinternet-mixlib-logging (0.4.3)
-      logging (~> 1.8, >= 1.8.2)
-    domain_name (0.5.22)
-      unf (>= 0.0.5, < 1.0.0)
+    diff-lcs (1.3)
+    dldinternet-mixlib-logging (0.7.1)
+      logging (~> 2.1, >= 2.1.0)
     gherkin (2.4.21)
       json (>= 1.4.6)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
     inifile (3.0.0)
-    json (1.8.1)
-    little-plugger (1.1.3)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    mechanize (2.7.3)
-      domain_name (~> 0.5, >= 0.5.1)
-      http-cookie (~> 1.0)
-      mime-types (~> 2.0)
-      net-http-digest_auth (~> 1.1, >= 1.1.1)
-      net-http-persistent (~> 2.5, >= 2.5.2)
-      nokogiri (~> 1.4)
-      ntlm-http (~> 0.1, >= 0.1.1)
-      webrobots (>= 0.0.9, < 0.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    multi_json (1.10.1)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9.4)
-    nokogiri (1.6.4.1)
-      mini_portile (~> 0.6.0)
-    ntlm-http (0.1.1)
-    psych (2.0.6)
+    json (2.1.0)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    multi_json (1.13.1)
+    psych (3.0.2)
     rake (0.9.6)
     rubygems-tasks (0.2.4)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    thor (0.19.1)
-    tins (1.3.3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.6)
-    webrobots (0.1.1)
+    thor (0.20.0)
+    tins (1.16.3)
 
 PLATFORMS
   ruby
@@ -77,3 +60,6 @@ DEPENDENCIES
   cucumber (~> 0.10.2)
   rake (~> 0.8)
   rubygems-tasks (~> 0.2)
+
+BUNDLED WITH
+   1.16.1

data/aws-rds-instance_types.gemspec

@@ -22,12 +22,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
 
   gem.add_runtime_dependency('thor', ['>= 0.19.1'])
-  gem.add_runtime_dependency(%q<mechanize>, ['>= 2.7.2'])
-  gem.add_runtime_dependency(%q<nokogiri>, ['>= 1.5.0'])
   gem.add_dependency 'awesome_print', '> 0'
   gem.add_dependency 'inifile', '> 0'
   gem.add_dependency 'colorize', '>= 0'
-  gem.add_dependency 'dldinternet-mixlib-logging', '>= 0.4.3'
+  gem.add_dependency 'dldinternet-mixlib-logging', '>= 0.7.1'
+  gem.add_dependency 'aws-ec2-instance_types', '>= 2.0.0'
   gem.add_dependency 'psych'
   gem.add_dependency 'json'
 end

data/bin/aws-rds-instance_types

@@ -7,10 +7,13 @@ require 'dldinternet/aws/rds/instance_types/cli'
 
 # =====================================================================================================================
 rc = DLDInternet::AWS::RDS::Instance_Types::Cli.start(ARGV)
-if rc.is_a?(Fixnum)
+if rc.is_a?(Integer)
   exit rc
+elsif rc.is_a?(IO)
+  exit 0
 else
-  puts rc.ai
+  $stderr.write "\n#{File.basename(__FILE__)}: \$? was '" + rc.ai + "'\n\n"
   exit 0
 end
 
+

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

@@ -1,3 +1,7 @@
+require 'dldinternet/aws/rds/instance_types/version'
+require 'dldinternet/aws/rds/instance_types/error'
+require 'dldinternet/aws/rds/instance_types/cli'
+
 module DLDInternet
   module AWS
     module RDS

data/lib/dldinternet/aws/rds/instance_types/cli.rb

@@ -1,23 +1,20 @@
 require 'thor'
 require 'awesome_print'
 require 'colorize'
-require 'dldinternet/aws/rds/instance_types/version'
-require 'dldinternet/aws/rds/instance_types/error'
-require 'dldinternet/aws/rds/instance_types/scraper'
-require 'dldinternet/aws/rds/instance_types/cli'
 require 'dldinternet/aws/rds/instance_types'
 
 module DLDInternet
   module AWS
     module RDS
       module Instance_Types
+        # noinspection RubyParenthesesAfterMethodCallInspection
         class Cli < Thor
           class_option :verbose,      :type => :boolean
           class_option :debug,        :type => :boolean
           class_option :log_level,    :type => :string, :banner => 'Log level ([:trace, :debug, :info, :step, :warn, :error, :fatal, :todo])'
           class_option :inifile,      :type => :string
           class_option :help,         :type => :boolean
-          class_option :format,       :type => :string, :default => 'pretty', :banner => '[:pretty, :yaml, :json]'
+          class_option :format,       :type => :string, :default => 'pretty', :banner => '[:pretty, :yaml, :json]', :aliases => ['--output']
 
           no_commands do
 
@@ -48,7 +45,7 @@ module DLDInternet
             parse_options
             puts 'get instance types' if options[:verbose]
 
-            it = DLDInternet::AWS::RDS::Instance_Types.getRDS_Instance_Types()
+            it = DLDInternet::AWS::RDS::Instance_Types.get_rds_instance_types()
             case options[:format]
             when /yaml/
               puts it.to_yaml line_width: 1024, indentation: 4, canonical: false
@@ -60,22 +57,22 @@ module DLDInternet
             0
           end
 
-          desc 'load ARGS', 'load instance types'
+          desc 'load PATH', 'load instance types'
           def load(path)
             parse_options
             puts 'load instance types' if options[:verbose]
 
-            it = DLDInternet::AWS::RDS::Instance_Types.loadRDS_Instance_Types(path)
+            it = DLDInternet::AWS::RDS::Instance_Types.load_rds_instance_types(path)
             ap it
           end
 
-          desc 'save', 'save instance types'
+          desc 'save PATH', 'save instance types'
           def save(path)
             parse_options
             puts 'save instance types' if options[:verbose]
 
-            it = DLDInternet::AWS::Rds::Instance_Types.getRDS_Instance_Types()
-            DLDInternet::AWS::Rds::Instance_Types.saveRDS_Instance_Types(path, it)
+            it = DLDInternet::AWS::RDS::Instance_Types.get_rds_instance_types()
+            DLDInternet::AWS::RDS::Instance_Types.save_rds_instance_types(path, it)
           end
 
           default_task 'get'
@@ -84,4 +81,3 @@ module DLDInternet
     end
   end
 end
-

data/lib/dldinternet/aws/rds/instance_types/mixins/rds_instance_types.rb

@@ -2,7 +2,8 @@ require 'thor'
 require 'awesome_print'
 require 'inifile'
 require 'colorize'
-require 'dldinternet/aws/rds/instance_types/scraper'
+require 'dldinternet/aws/ec2/instance_types/aws-pricing-api-client'
+require 'yaml'
 
 module DLDInternet
   module AWS
@@ -11,7 +12,7 @@ module DLDInternet
         module MixIns
           module RDS_Instance_Types
 
-            def getFileFormat(path)
+            def get_file_format(path)
               format = case File.extname(File.basename(path)).downcase
                          when /json|js/
                            'json'
@@ -22,8 +23,8 @@ module DLDInternet
                        end
             end
 
-            def saveRDS_Instance_Types(path,it)
-              format = getFileFormat(path)
+            def save_rds_instance_types(path, it)
+              format = get_file_format(path)
               begin
                 File.open path, File::CREAT|File::TRUNC|File::RDWR, 0644 do |f|
                   case format
@@ -43,13 +44,14 @@ module DLDInternet
               0
             end
 
-            def loadRDS_Instance_Types(path)
-              format = getFileFormat(path)
+            def load_rds_instance_types(path)
+              format = get_file_format(path)
               spec = File.read(path)
               case format
                 when /json/
                   JSON.parse(spec)
-                #when /yaml/
+              when /yaml/
+                  YAML.load File.read(path)
                 else
                   begin
                     YAML.load(spec)
@@ -61,20 +63,15 @@ module DLDInternet
               end
             end
 
-            def getRDS_Instance_Types(mechanize=nil)
-              unless mechanize
-                require 'mechanize'
-                mechanize = ::Mechanize.new
-                mechanize.open_timeout = 5
-                mechanize.read_timeout = 10
-              end
+            # noinspection RubyParenthesesAfterMethodCallInspection
+            def get_rds_instance_types()
 
-              scraper = DLDInternet::AWS::RDS::Instance_Types::Scraper.new()
+              client = DLDInternet::AWS::EC2::Instance_Types::AWSPricingAPIClient.new()
 
               begin
-                return scraper.getInstanceTypes(:mechanize => mechanize)
-              rescue Timeout::Error => e
-                puts "Unable to retrieve instance type details in a reasonable time (#{mechanize.open_timeout}s). Giving up ...".light_red
+                return client.get_instance_types(url: 'https://ec2instances.info/rds/instances.json')
+              rescue Exception => e
+                puts "Unable to retrieve instance type details. Giving up ...".light_red
                 return nil
               end
             end

data/lib/dldinternet/aws/rds/instance_types/version.rb

@@ -3,7 +3,7 @@ module DLDInternet
     module RDS
       module Instance_Types
           # aws-rds-instance_types version
-        VERSION = '0.5.0'
+        VERSION = '2.0.0'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-rds-instance_types
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,35 +67,21 @@ 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
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
@@ -109,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: dldinternet-mixlib-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: dldinternet-mixlib-logging
+  name: aws-ec2-instance_types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +194,6 @@ files:
 - lib/dldinternet/aws/rds/instance_types/error.rb
 - lib/dldinternet/aws/rds/instance_types/mixins/no_commands.rb
 - lib/dldinternet/aws/rds/instance_types/mixins/rds_instance_types.rb
-- lib/dldinternet/aws/rds/instance_types/scraper.rb
 - lib/dldinternet/aws/rds/instance_types/version.rb
 homepage: https://rubygems.org/gems/aws-rds-instance_types
 licenses:
@@ -230,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Retrieve an up to date list of valid AWS RDS Instance Types directly from

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

@@ -1,128 +0,0 @@
-module DLDInternet
-  module AWS
-    module RDS
-      module Instance_Types
-        HEADINGS = [
-            :Instance_Type,
-            :vCPU,
-            :Memory,
-            :PIOPS_Optimized,
-            :Network_Performance,
-            :Generation,
-        ]
-        DEBUG = true
-        class Scraper
-          attr_reader :instance_types
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def initialize
-            @instance_types = {}
-          end
-
-          # ---------------------------------------------------------------------------------------------------------------
-          def getInstanceTypes(options={})
-            unless @instance_types.size > 0
-              require 'mechanize'
-              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/rds/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')
-                # noinspection RubyAssignmentExpressionInConditionalInspection
-                if div = find_div(div, %r'^<div\s+class="content parsys')
-                  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*DB Instance Classes\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, table) if table
-                  end
-                end
-              end
-            end
-            @instance_types
-          end
-
-          def find_div(nk,regex)
-            ret = nil
-            divs = nk.search('div')
-            if divs.count > 0
-              nine = divs.select { |div| div.to_s.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]
-            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] }
-            instance_types[:headings][cHeadings[-1]] = 'Generation'
-            instance_set = nil
-            rows.each do |row|
-
-              cells = row.search('td').collect { |td|
-                CGI.unescapeHTML(td.text.to_s.gsub(%r/(\r?\n)+/, ' ').strip)
-              }
-              if cells.count == 1 or (cells[1] == cells[2] and cells[2] == cells[4])
-                instance_set = cells[0]
-              else
-                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[cHeadings[-1]] = instance_set
-                instance_types[:details] << instance
-              end
-            end
-            instance_types
-          end
-
-        end
-      end
-    end
-  end
-end