aws-ec2-instance_types 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9adc7d959d4a03ad1a71178f00c994a35054175a
-  data.tar.gz: 8b15333f39d3ce202421acd32ecf768b8c28e38f
+  metadata.gz: caa316960c670b445c5ad37dc905ec031a34ee41
+  data.tar.gz: 77e89cbd893fa0cb3f93982c8d6adf37c5e50351
 SHA512:
-  metadata.gz: a403ef4e5b35df096b10904cd877b877883beb8658bdd71f7f79cd82c40baeee646b49e92d3727034bf4bc5c23950422ef41feb50edd96315fa76c58df676e9a
-  data.tar.gz: 73c8b992a8f47e0f482e9fc3986afc35bae45da90ffb0a37b86c9fc019cdbbcfa7c8e77b3efd0e248b323ccc4c1f92afb79b9b31931f387f4db397b967520b1f
+  metadata.gz: bc073cd502e92bf02f75e36b332d25c9728a75c4633d682d39e88e02944a5c592ef0378b97b6f849a6cafcb8ee3de6681717f48cb3a0b7cdf43bcc84d7558578
+  data.tar.gz: 50d0266df247bb3e6c1be7a8e87712b06a10052b56b58321a61f908ec47b8bdd85ee4088d88718ce524f3a7ba92b8ebf380df0d509274d9a3b041692dc74c01b

data/aws-ec2-instance_types.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path('../lib/aws/ec2/instance_types/version', __FILE__)
+require File.expand_path('../lib/dldinternet/aws/ec2/instance_types/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'aws-ec2-instance_types'
-  gem.version       = Aws::Ec2::InstanceTypes::VERSION
+  gem.version       = DLDInternet::AWS::EC2::Instance_Types::VERSION
   gem.summary       =
   gem.description   = %q{Retrieve an up to date list of valid AWS EC2 Instance Types directly from Amazon Web Services official site.}
   gem.license       = 'Apachev2'
@@ -21,9 +21,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.8'
   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_runtime_dependency(%q<awesome_print>, ['>= 1.2.0'])
-  gem.add_runtime_dependency(%q<colorize>, ['>= 0.7.2'])
+  gem.add_dependency 'awesome_print', '> 0'
+  gem.add_dependency 'inifile', '> 0'
+  gem.add_dependency 'colorize', '>= 0'
+  gem.add_dependency 'dldinternet-mixlib-logging', '>= 0.4.0'
+  gem.add_dependency 'psych'
+  gem.add_dependency 'json'
 
 end

data/bin/aws-ec2-instance_types

@@ -3,20 +3,14 @@
 # Adjust lib path
 _lib=File.expand_path(File.dirname(__FILE__) + '/../lib')
 $:.unshift(_lib) unless $:.include?(_lib)
+require 'dldinternet/aws/ec2/instance_types/cli'
 
-require "dldinternet/aws/ec2"
-include DLDInternet::AWS::EC2
-
-require 'mechanize'
-mechanize = Mechanize.new
-mechanize.open_timeout = 5
-mechanize.read_timeout = 10
-
-require 'awesome_print'
-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
+# =====================================================================================================================
+rc = DLDInternet::AWS::EC2::Instance_Types::Cli.start(ARGV)
+if rc.is_a?(Fixnum)
+  exit rc
+else
+  puts rc.ai
+  exit 0
 end
+

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

@@ -1,124 +1,17 @@
 module DLDInternet
   module AWS
     module EC2
-      class Error < StandardError ; end
-      # HEADINGS = [
-      #     :instance_family,         # [0]
-      #     :instance_type,           # [1]
-      #     :processor_arch,          # [2]
-      #     :vCPU,                    # [3]
-      #     :ECU,                     # [4]
-      #     :memory,                  # [5]
-      #     :instance_storage,        # [6]
-      #     :EBS_optimized_available, # [7]
-      #     :network_performance      # [8]
-      # ]
-      #'Instance Type','vCPU','Memory (GiB)',' Storage (GB)','Networking Performance','Physical Processor','Clock Speed (GHz)','Intel® AES-NI','Intel® AVX†','Intel® Turbo','EBS OPT','Enhanced Networking'
-      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
-      attr_reader :instance_types
+      module Instance_Types
 
-      # ---------------------------------------------------------------------------------------------------------------
-      def getInstanceTypes(options={})
-        unless @instance_types
-          @instance_types = {}
-          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/ec2/instance-types/instance-details/'
-
-          page = mechanize.get(url)
-
-          require 'nokogiri'
-
-          nk = Nokogiri::HTML(page.body)
-          # noinspection RubyAssignmentExpressionInConditionalInspection
-          if div = find_div(nk, %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 == ' Instance Types Matrix '
-                    itm = d
-                    break
-                  end
-                end
-                break if itm
-                idx += 1
-              end
-              itm = divs[idx+1+2]
-              table = itm.css('div table').first
-              # puts "#{idx}: #{table.to_s}"
-              @instance_types = scrapeTable(HEADINGS_CPU, table)
-            end
-          end
+        class << self
+          require 'dldinternet/aws/ec2/instance_types/mixins/ec2_instance_types'
+          include DLDInternet::AWS::EC2::Instance_Types::MixIns::EC2_Instance_Types
         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)
-        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] }
-
-        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

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

@@ -0,0 +1,72 @@
+require 'thor'
+require 'awesome_print'
+require 'colorize'
+require 'dldinternet/aws/ec2/instance_types/version'
+require 'dldinternet/aws/ec2/instance_types/error'
+require 'dldinternet/aws/ec2/instance_types/scraper'
+require 'dldinternet/aws/ec2/instance_types/cli'
+require 'dldinternet/aws/ec2/instance_types'
+
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+        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
+
+          no_commands do
+
+            require 'dldinternet/aws/ec2/instance_types/mixins/no_commands'
+            include DLDInternet::AWS::EC2::Instance_Types::MixIns::NoCommands
+
+          end
+
+          def self.start(argv = ARGV, config = {})
+            if argv.size == 0 or argv[0].match(%r'^--')
+              argv.unshift('get')
+            end
+            super(argv,config)
+          end
+
+          def initialize(args = [], local_options = {}, config = {})
+            super(args,local_options,config)
+            @log_level = :step
+          end
+
+          desc 'get', 'get instance types'
+          def get()
+            parse_options
+            puts 'get instance types' if options[:verbose]
+
+            puts DLDInternet::AWS::EC2::Instance_Types.getEC2_Instance_Types().ai
+            0
+          end
+
+          desc 'load ARGS', 'load instance types'
+          def load(path)
+            parse_options
+            puts 'load instance types' if options[:verbose]
+
+            it = DLDInternet::AWS::EC2::Instance_Types.loadEC2_Instance_Types(path)
+            ap it
+          end
+
+          desc 'save', 'save instance types'
+          def save(path)
+            parse_options
+            puts 'save instance types' if options[:verbose]
+
+            it = DLDInternet::AWS::EC2::Instance_Types.getEC2_Instance_Types()
+            DLDInternet::AWS::EC2::Instance_Types.saveEC2_Instance_Types(path, it)
+          end
+
+          default_task 'get'
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,9 @@
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+        class Error < StandardError ; end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'thor'
+require 'awesome_print'
+require 'dldinternet/aws/ec2/instance_types/scraper'
+require 'colorize'
+require 'json'
+require 'yaml'
+
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+        # noinspection RubyParenthesesAfterMethodCallInspection
+        class Get < ::Thor
+          no_commands do
+
+            require 'dldinternet/aws/ec2/instance_types/mixins/no_commands'
+            include DLDInternet::AWS::EC2::Instance_Types::MixIns::NoCommands
+
+          end
+
+          desc 'load ARGS', 'load instance types'
+          def load(path)
+            parse_options
+            puts 'load instance types' if options[:verbose]
+
+            it = loadEC2_Instance_Types(path)
+            ap it
+          end
+
+          desc 'save', 'save instance types'
+          def save(path)
+            parse_options
+            puts 'save instance types' if options[:verbose]
+
+            it = getEC2_Instance_Types()
+            saveEC2_Instance_Types(path, it)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+require 'thor'
+require 'awesome_print'
+require 'inifile'
+require 'colorize'
+
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+        module MixIns
+          module EC2_Instance_Types
+
+            def getFileFormat(path)
+              format = case File.extname(File.basename(path)).downcase
+                         when /json|js/
+                           'json'
+                         when /yaml|yml/
+                           'yaml'
+                         else
+                           raise DLDInternet::AWS::EC2::Instance_Types::Error.new("Unsupported file type: #{path}")
+                       end
+            end
+
+            def saveEC2_Instance_Types(path,it)
+              format = getFileFormat(path)
+              begin
+                File.open path, File::CREAT|File::TRUNC|File::RDWR, 0644 do |f|
+                  case format
+                    when /yaml/
+                      f.write it.to_yaml line_width: 1024, indentation: 4, canonical: false
+                    when /json/
+                      f.write JSON.pretty_generate(it, { indent: "\t", space: ' '})
+                    else
+                      abort! "Internal: Unsupported format #{format}. Should have noticed this earlier!"
+                  end
+                  f.close
+                end
+              rescue
+                abort! "!!! Could not write file #{path}: \nException: #{$!}\nParent directory exists? #{File.directory?(File.dirname(path))}\n"
+              end
+              0
+            end
+
+            def loadEC2_Instance_Types(path)
+              format = getFileFormat(path)
+              spec = File.read(path)
+              case format
+                when /json/
+                  JSON.parse(spec)
+                when /yaml/
+                  begin
+                    YAML.load(spec)
+                  rescue Psych::SyntaxError => e
+                    abort! "Error in the template specification: #{e.message}\n#{spec.split(/\n/).map{|l| "#{i+=1}: #{l}"}.join("\n")}"
+                  end
+                else
+                  abort! "Unsupported file type: #{path}"
+              end
+            end
+
+            def getEC2_Instance_Types(mechanize=nil)
+              unless mechanize
+                require 'mechanize'
+                mechanize = ::Mechanize.new
+                mechanize.open_timeout = 5
+                mechanize.read_timeout = 10
+              end
+
+              scraper = DLDInternet::AWS::EC2::Instance_Types::Scraper.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 nil
+              end
+            end
+
+            def abort!(msg)
+              raise DLDInternet::AWS::EC2::Instance_Types::Error.new msg
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,115 @@
+require 'thor'
+require 'awesome_print'
+require 'inifile'
+require 'colorize'
+
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+
+        LOG_LEVELS = [:trace, :debug, :info, :step, :warn, :error, :fatal, :todo]
+
+        module MixIns
+          module NoCommands
+            require 'dldinternet/mixlib/logging'
+            include DLDInternet::Mixlib::Logging
+
+            def validate_options
+              _options = options.dup
+              if options[:log_level]
+                log_level = options[:log_level].to_sym
+                raise "Invalid log-level: #{log_level}" unless LOG_LEVELS.include?(log_level)
+                _options[:log_level] = log_level
+              else
+                _options[:log_level] ||= :step
+              end
+              @options = _options
+            end
+
+            def parse_options
+              validate_options
+
+              lcs = ::Logging::ColorScheme.new( 'compiler', :levels => {
+                  :trace => :blue,
+                  :debug => :cyan,
+                  :info  => :green,
+                  :step  => :green,
+                  :warn  => :yellow,
+                  :error => :red,
+                  :fatal => :red,
+                  :todo  => :purple,
+              })
+              scheme = lcs.scheme
+              scheme['trace'] = "\e[38;5;33m"
+              scheme['fatal'] = "\e[38;5;89m"
+              scheme['todo']  = "\e[38;5;55m"
+              lcs.scheme scheme
+              @config         = @options.dup
+              @config[:log_opts] = lambda{|mlll| {
+                  :pattern      => "%#{mlll}l: %m %g\n",
+                  :date_pattern => '%Y-%m-%d %H:%M:%S',
+                  :color_scheme => 'compiler',
+                  :trace        => (@config[:trace].nil? ? false : @config[:trace]),
+                  # [2014-06-30 Christo] DO NOT do this ... it needs to be a FixNum!!!!
+                  # If you want to do ::Logging.init first then fine ... go ahead :)
+                  # :level        => @config[:log_level],
+              }
+              }
+              @logger = getLogger(@config)
+
+              if @options[:inifile]
+                @options[:inifile] = File.expand_path(@options[:inifile])
+                unless File.exist?(@options[:inifile])
+                  raise "#{@options[:inifile]} not found!"
+                end
+                begin
+                  ini = ::IniFile.load(@options[:inifile])
+                  ini['global'].each{ |key,value|
+                    @options[key.to_s]=value
+                  }
+                  def _expand(k,v,regex,rerun)
+                    matches = v.match(regex)
+                    if matches
+                      var = matches[1]
+                      if options[var]
+                        options[k]=v.gsub(/\%\(#{var}\)/,options[var]).gsub(/\%#{var}/,options[var])
+                      else
+                        rerun[var] = 1
+                      end
+                    end
+                  end
+
+                  pending = nil
+                  rerun = {}
+                  begin
+                    pending = rerun
+                    rerun = {}
+                    options.to_hash.each{|k,v|
+                      if v.to_s.match(/\%/)
+                        _expand(k,v,%r'[^\\]\%\((\w+)\)', rerun)
+                        _expand(k,v,%r'[^\\]\%(\w+)',     rerun)
+                      end
+                    }
+                    # Should break out the first time that we make no progress!
+                  end while pending != rerun
+                rescue ::IniFile::Error => e
+                  # noop
+                rescue ::Exception => e
+                  @logger.error "#{e.class.name} #{e.message}"
+                  raise e
+                end
+              end
+
+              if options[:verbose]
+                @logger.info "Options:\n#{options.ai}"
+              end
+
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,129 @@
+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

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

@@ -0,0 +1,10 @@
+module DLDInternet
+  module AWS
+    module EC2
+      module Instance_Types
+        # aws-ec2-instance_types version
+        VERSION = '1.3.0'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-instance_types
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -82,32 +96,88 @@ dependencies:
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
+  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: inifile
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: dldinternet-mixlib-logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: psych
+  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: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
 description: Retrieve an up to date list of valid AWS EC2 Instance Types directly
   from Amazon Web Services official site.
 email: rubygems@dldinternet.com
@@ -135,10 +205,15 @@ files:
 - features/step_definitions/.gitkeep
 - features/step_definitions/aws-ec2-instance_types_steps.rb
 - features/support/env.rb
-- lib/aws/ec2/instance_types.rb
-- lib/aws/ec2/instance_types/version.rb
 - lib/dldinternet/aws/ec2.rb
 - lib/dldinternet/aws/ec2/instance_types.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/helper.rb
 - test/test_aws-ec2-instance_types.rb
 homepage: https://rubygems.org/gems/aws-ec2-instance_types

data/lib/aws/ec2/instance_types.rb

@@ -1 +0,0 @@
-require 'aws/ec2/instance_types/version'

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

@@ -1,8 +0,0 @@
-module Aws
-  module Ec2
-    module InstanceTypes
-      # aws-ec2-instance_types version
-      VERSION = '1.1.0'
-    end
-  end
-end