awslist 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37bbf2e01ab82e3dbf4d9c6881cf224398ab4850
-  data.tar.gz: 538d5256694083ac519bc3dd0e69ce368758163c
+  metadata.gz: 0ff627b621cf8728e13045bb277355a50e055ea8
+  data.tar.gz: 456d37bbe7c8cecf1ab5530e5c67fc11605a187e
 SHA512:
-  metadata.gz: 73a86244bc4ad23d82ad8ce6ba4c7843eb411e60d3ad559bc6be6b3b92c32fa765a4623dcb2a9b21786afd0247e0c01ac924c105e402954b974befcf9f0dfe2c
-  data.tar.gz: 33d51a1ada721d40fd3a6c3abd3ab4bf6dd7a2de2f2f2dcac38805e85b3cd440d335b51fa2b10d2a3c16ba6b5136d61af5b973a471bb354032110ee3e4bf5093
+  metadata.gz: 5d891158546fd516a838a81460ed73adb252255a2a769242179b2370498a8cdd2852052ce3852308c695246a1359f65ec126e724a64b4a68675cc94611978849
+  data.tar.gz: 8eb3f546a33b9842d1fc63d70dbdeb2cf247c76443213f81d54d5262df3478e091dd7d2497ef0a6578dbd8a12ca9ade5a3e33024f53721b07384a5218a4b8aa3

data/awslist.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'json'
+  spec.add_dependency 'terminal-table'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/awslist.rb

@@ -3,14 +3,16 @@ require 'rest-client'
 require 'nokogiri'
 require 'json'
 require 'optparse'
+require 'terminal-table'
 
 module Awslist
-  class AwsToolCli
+  class AwsToolCli < StandardError
     attr_accessor :parser , :hash , :output
     def initialize
       @hash = {}
       @set = 'n'
-      @options = {:os => 'linux' , :region => 'us-west-1' , :cpu_req => 0 , :mem_req => 0 , :reload => 'n'}
+      @instance_list = {}
+      @options = {:os => 'linux' , :region => 'us-east-1' , :cpu_req => 0 , :mem_req => 0 , :reload => 'n' , :instance => 'nil'}
       @os_list = {
           'linux' => 0,
           'rhel' => 0,
@@ -40,6 +42,9 @@ module Awslist
 
       @parser = OptionParser.new do |opts|
         opts.banner = 'Usage: awslist [options]'
+        opts.on('-t' , '--type INSTANCE_TYPE') do |instance|
+          @options[:instance] = instance.strip
+        end
         opts.on('-os OPERATING_SYSTEM', 'OS list :  linux , rhel , sles , mswin , mswinSQL , mswinSQLWeb , mswinSQLEnterprise' ) do |os|
           @options[:os] = os.strip.downcase;
         end
@@ -100,15 +105,19 @@ module Awslist
               @hash[x][str]['vCPU'][cpu] << instance_hash
               @hash[x][str]['memoryGiB'][mem] = @hash[x][str]['memoryGiB'].fetch(mem,[])
               @hash[x][str]['memoryGiB'][mem] << instance_hash
+
+              @instance_list[instance_hash['size']] = 1
             end
           end
         end
       end
       File.open('Complete_Data','w'){ |file| file.write(@hash.to_json) }
+      File.open('Instance_list','w'){ |file| file.write(@instance_list.to_json)}
     end
 
     def reloaded_hash
       @hash = JSON.parse(File.read('Complete_Data'))
+      @instance_list = JSON.parse(File.read('Instance_list'))
     end
 
     def refine_output
@@ -117,7 +126,9 @@ module Awslist
       @hash[@options[:os]][@options[:region]]['vCPU'].each do |k,v|
         if k.to_f >= @options[:cpu_req].to_s.strip.to_f
           v.each do |c|
-            a << c
+            if (@options[:instance] != 'nil' && c['size'] == @options[:instance]) || @options[:instance] == 'nil'
+              a << c
+            end
           end
         end
       end
@@ -125,7 +136,9 @@ module Awslist
       @hash[@options[:os]][@options[:region]]['memoryGiB'].each do |k,v|
         if k.to_f >= @options[:mem_req].to_s.strip.to_f
           v.each do |c|
-            b << c
+            if (@options[:instance] != 'nil' && c['size'] == @options[:instance]) || @options[:instance] == 'nil'
+              b << c
+            end
           end
         end
       end
@@ -133,14 +146,17 @@ module Awslist
     end
 
     def prints
+      yo = []
       @output.each do |hashes_everywhere|
         value = hashes_everywhere['price'].to_f
-        puts hashes_everywhere['size'] + ' -c ' + hashes_everywhere['vCPU'] + ' -m ' + hashes_everywhere['memoryGiB'] + ' -p ' + value.to_s + '$ per/hr and ' + (value*24*30).round(3).to_s + '$ per/month'
+        yo << [hashes_everywhere['size'],hashes_everywhere['vCPU'],hashes_everywhere['memoryGiB'],value.round(3),(value*24*30).round(3)]
       end
+      table = Terminal::Table.new :headings => ['Instance Type' , 'vCPU' , 'memoryGiB' , 'Price per hr(in USD $)' , 'Price per month(in USD $)'], :rows => yo
+      puts table
     end
 
     def what_to_call
-      if @options[:reload] == 'y' || !File.exist?('Complete_Data')
+      if @options[:reload] == 'y' || !File.exist?('Complete_Data') || !File.exist?('Instance_list')
         reload_files
         reload_hash
       elsif @set == 'y' && @options[:reload] != 'n'
@@ -154,6 +170,16 @@ module Awslist
         raise  if !Integer(@options[:mem_req])
         raise  if !@os_list.key?(@options[:os])
         raise  if !@region_list.key?(@options[:region])
+        raise  AwsToolCli if @options[:instance] != 'nil' && !@instance_list.key?(@options[:instance])
+      rescue AwsToolCli
+        puts sprintf('Wrong instance name. Please try :')
+        yo = []
+        @instance_list.each do |k,v|
+          yo << [k]
+        end
+        table = Terminal::Table.new :headings => ['Instance Type'], :rows => yo
+        puts table
+        exit
       rescue
         puts @parser
         exit

data/lib/awslist/version.rb

@@ -1,3 +1,3 @@
 module Awslist
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslist
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Akkks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  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: bundler
   requirement: !ruby/object:Gem::Requirement