awslist 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ebe1e0a348377c273f14f96e25d83eabcb16dbc
-  data.tar.gz: da77c0fc4588a573e4139a221be469ab2c229193
+  metadata.gz: 37bbf2e01ab82e3dbf4d9c6881cf224398ab4850
+  data.tar.gz: 538d5256694083ac519bc3dd0e69ce368758163c
 SHA512:
-  metadata.gz: 17238145bd85f8e7d28d2d199c36aa4ce83706bf03ec15f985be4fb49fffe7496074b6ec231aeb33f7b3e34def39dd9932d87520fe358fb1a0fb7960ea05d711
-  data.tar.gz: '0987468f19e490b18c10ab0d906c6541a554cf1106e293a879e4a5de4caa9d2df406975c02d80e2e4c1fac9f899120a37f2e9f00eb4b87a12485762293a94411'
+  metadata.gz: 73a86244bc4ad23d82ad8ce6ba4c7843eb411e60d3ad559bc6be6b3b92c32fa765a4623dcb2a9b21786afd0247e0c01ac924c105e402954b974befcf9f0dfe2c
+  data.tar.gz: 33d51a1ada721d40fd3a6c3abd3ab4bf6dd7a2de2f2f2dcac38805e85b3cd440d335b51fa2b10d2a3c16ba6b5136d61af5b973a471bb354032110ee3e4bf5093

data/README.md

@@ -97,7 +97,8 @@ The gem is available as open source under the terms of the [MIT License](http://
 ## Code of Conduct
 
 Everyone interacting in the Awslist project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Akkks/awslist/blob/master/CODE_OF_CONDUCT.md).
-=======
+
 # gems
+
 My Created gems
 >>>>>>> 2fc700980e3a1721970af1c0bf41cb4f7d75ebee97db75fc33044d6270a0521b

data/awslist.gemspec

@@ -1,10 +1,10 @@
 # coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "awslist/version"
+require 'awslist/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "awslist"
+  spec.name          = 'awslist'
   spec.version       = Awslist::VERSION
   spec.authors       = ["Akkks"]
   spec.email         = ["sngh.akanksha09@gmail.com"]
@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'bin'
+  spec.executables   = ['awslist']
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'rest-client'
   spec.add_dependency 'nokogiri'
@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+
 end

data/bin/awslist

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'awslist'
+
+hope = Awslist::AwsToolCli.new
+
+begin hope.parser.parse! ARGV
+rescue OptionParser::InvalidOption => e
+  puts e
+  puts hope.parser
+  exit 1
+end
+
+hope.what_to_call
+hope.reloaded_hash
+hope.refine_output
+hope.prints

data/lib/awslist.rb

@@ -0,0 +1,163 @@
+require 'awslist/version'
+require 'rest-client'
+require 'nokogiri'
+require 'json'
+require 'optparse'
+
+module Awslist
+  class AwsToolCli
+    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'}
+      @os_list = {
+          'linux' => 0,
+          'rhel' => 0,
+          'sles' => 0,
+          'mswin' => 0,
+          'mswinSQL' => 0,
+          'mswinSQLWeb' => 0,
+          'mswinSQLEnterprise' => 0
+          }
+      @region_list = {
+           'us-east-1' => 0,
+           'us-east-2' => 0,
+           'us-west-2' => 0,
+           'us-west-1' => 0,
+           'ca-central-1' => 0,
+           'eu-west-1' => 0,
+           'eu-west-2' => 0,
+           'eu-central-1' => 0,
+           'ap-southeast-1' => 0,
+           'ap-northeast-1' => 0,
+           'ap-southeast-2' => 0,
+           'ap-northeast-2' => 0,
+           'ap-south-1' => 0,
+           'sa-east-1' => 0,
+           'us-gov-west-1' => 0
+         }
+
+      @parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: awslist [options]'
+        opts.on('-os OPERATING_SYSTEM', 'OS list :  linux , rhel , sles , mswin , mswinSQL , mswinSQLWeb , mswinSQLEnterprise' ) do |os|
+          @options[:os] = os.strip.downcase;
+        end
+        opts.on('-c', '--cpu CPU_REQUIREMENT', 'Basic value of cpu required in integer') do |cpu|
+          @options[:cpu_req] = cpu.strip;
+        end
+        opts.on('-m', '--mem MEMORY_REQUIREMENT', 'Basic value of memory required in integer') do |memory|
+          @options[:mem_req] = memory.strip;
+        end
+        opts.on('-r', '--region REGION', 'Required region , list : us-east-1 , us-east-2 , us-west-2 , us-west-1 , ca-central-1 , eu-west-1 , eu-west-2 , eu-central-1 , ap-southeast-1 , ap-northeast-1 , ap-southeast-2 , ap-northeast-2 , ap-south-1 , sa-east-1 , us-gov-west-1') do |reg|
+          @options[:region] = reg.strip.downcase;
+        end
+        opts.on('--reload y/n' , 'Fetch fresh data from website') do |get|
+          @options[:reload] = get.strip.downcase;
+          @set = 'y'
+        end
+        opts.on('-h', '--help', 'Displays Help') do
+  		    puts opts
+  		    exit
+  	    end
+      end
+    end
+    def reload_files
+      ['linux','rhel','sles','mswin','mswinSQL','mswinSQLWeb','mswinSQLEnterprise'].each do |x|
+        s = RestClient.get "https://a0.awsstatic.com/pricing/1/ec2/#{x}-od.min.js"
+        s.gsub!(/^.*callback\(/, '') # removes the comment and callback function from the start of the string
+        s.gsub!(/\);$/, '') # removes the end of the callback function
+        s.gsub!(/(\w+):/, '"\1":')
+        hash = JSON.parse(s)
+        File.open("#{x}","w") { |file| file.write(hash.to_json) }
+      end
+    end
+
+    def reload_hash
+      ['linux','rhel','sles','mswin','mswinSQL','mswinSQLWeb','mswinSQLEnterprise'].each do |x|
+        s = JSON.parse(File.read(x))
+        @hash[x] = @hash.fetch(x,{})
+        s['config']['regions'].each do |region_spec|
+          str = region_spec['region']
+          @hash[x][str] = @hash[x].fetch(str,{})
+          @hash[x][str]['vCPU'] = @hash[x][str].fetch('vCPU',{})
+          @hash[x][str]['memoryGiB'] = @hash[x][str].fetch('memoryGiB',{})
+
+          region_spec['instanceTypes'].each do |type|
+            type['sizes'].each do |instance_spec|
+              instance_hash = {}
+              instance_hash['size'] = instance_spec['size']
+              instance_hash['vCPU'] = instance_spec['vCPU']
+              instance_hash['ECU'] = instance_spec['ECU']
+              instance_hash['memoryGiB'] = instance_spec['memoryGiB']
+              instance_hash['storageGB'] = instance_spec['storageGB']
+              instance_hash['price'] = instance_spec['valueColumns'][0]['prices']['USD']
+
+              cpu = instance_hash['vCPU']
+              mem = instance_hash['memoryGiB']
+
+              @hash[x][str]['vCPU'][cpu] = @hash[x][str]['vCPU'].fetch(cpu,[])
+              @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
+            end
+          end
+        end
+      end
+      File.open('Complete_Data','w'){ |file| file.write(@hash.to_json) }
+    end
+
+    def reloaded_hash
+      @hash = JSON.parse(File.read('Complete_Data'))
+    end
+
+    def refine_output
+      a = []
+      b = []
+      @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
+          end
+        end
+      end
+
+      @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
+          end
+        end
+      end
+      @output = a & b
+    end
+
+    def prints
+      @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'
+      end
+    end
+
+    def what_to_call
+      if @options[:reload] == 'y' || !File.exist?('Complete_Data')
+        reload_files
+        reload_hash
+      elsif @set == 'y' && @options[:reload] != 'n'
+        puts @parser
+        exit
+      else
+        reloaded_hash
+      end
+      begin
+        raise  if !Integer(@options[:cpu_req])
+        raise  if !Integer(@options[:mem_req])
+        raise  if !@os_list.key?(@options[:os])
+        raise  if !@region_list.key?(@options[:region])
+      rescue
+        puts @parser
+        exit
+      end
+    end
+  end
+end

data/lib/awslist/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awslist
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Akkks
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -97,7 +97,8 @@ dependencies:
 description: Filter instances according to your choices
 email:
 - sngh.akanksha09@gmail.com
-executables: []
+executables:
+- awslist
 extensions: []
 extra_rdoc_files: []
 files:
@@ -110,10 +111,11 @@ files:
 - README.md
 - Rakefile
 - awslist.gemspec
+- bin/awslist
 - bin/console
 - bin/setup
+- lib/awslist.rb
 - lib/awslist/version.rb
-- lib/awstool
 homepage: https://github.com/Akkks/awslist
 licenses:
 - MIT

data/lib/awstool

@@ -1,177 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'awslist/version'
-require 'rest-client'
-require 'nokogiri'
-require 'json'
-require 'optparse'
-
-class Awslist
-  # Your code goes here...
-  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'}
-    @os_list = {
-        'linux' => 0,
-        'rhel' => 0,
-        'sles' => 0,
-        'mswin' => 0,
-        'mswinSQL' => 0,
-        'mswinSQLWeb' => 0,
-        'mswinSQLEnterprise' => 0
-        }
-    @region_list = {
-         'us-east-1' => 0,
-         'us-east-2' => 0,
-         'us-west-2' => 0,
-         'us-west-1' => 0,
-         'ca-central-1' => 0,
-         'eu-west-1' => 0,
-         'eu-west-2' => 0,
-         'eu-central-1' => 0,
-         'ap-southeast-1' => 0,
-         'ap-northeast-1' => 0,
-         'ap-southeast-2' => 0,
-         'ap-northeast-2' => 0,
-         'ap-south-1' => 0,
-         'sa-east-1' => 0,
-         'us-gov-west-1' => 0
-       }
-
-    @parser = OptionParser.new do |opts|
-      opts.banner = 'Usage: awslist [options]'
-      opts.on('-os OPERATING_SYSTEM', 'OS list :  linux , rhel , sles , mswin , mswinSQL , mswinSQLWeb , mswinSQLEnterprise' ) do |os|
-        @options[:os] = os.strip.downcase;
-      end
-      opts.on('-c', '--cpu CPU_REQUIREMENT', 'Basic value of cpu required in integer') do |cpu|
-        @options[:cpu_req] = cpu.strip;
-      end
-      opts.on('-m', '--mem MEMORY_REQUIREMENT', 'Basic value of memory required in integer') do |memory|
-        @options[:mem_req] = memory.strip;
-      end
-      opts.on('-r', '--region REGION', 'Required region , list : us-east-1 , us-east-2 , us-west-2 , us-west-1 , ca-central-1 , eu-west-1 , eu-west-2 , eu-central-1 , ap-southeast-1 , ap-northeast-1 , ap-southeast-2 , ap-northeast-2 , ap-south-1 , sa-east-1 , us-gov-west-1') do |reg|
-        @options[:region] = reg.strip.downcase;
-      end
-      opts.on('--reload y/n' , 'Fetch fresh data from website') do |get|
-        @options[:reload] = get.strip.downcase;
-        @set = 'y'
-      end
-      opts.on('-h', '--help', 'Displays Help') do
-		    puts opts
-		    exit
-	    end
-    end
-  end
-
-  def reload_files
-    ['linux','rhel','sles','mswin','mswinSQL','mswinSQLWeb','mswinSQLEnterprise'].each do |x|
-      s = RestClient.get "https://a0.awsstatic.com/pricing/1/ec2/#{x}-od.min.js"
-      s.gsub!(/^.*callback\(/, '') # removes the comment and callback function from the start of the string
-      s.gsub!(/\);$/, '') # removes the end of the callback function
-      s.gsub!(/(\w+):/, '"\1":')
-      hash = JSON.parse(s)
-      File.open("#{x}","w") { |file| file.write(hash.to_json) }
-    end
-  end
-
-  def reload_hash
-    ['linux','rhel','sles','mswin','mswinSQL','mswinSQLWeb','mswinSQLEnterprise'].each do |x|
-      s = JSON.parse(File.read(x))
-      @hash[x] = @hash.fetch(x,{})
-      s['config']['regions'].each do |region_spec|
-        str = region_spec['region']
-        @hash[x][str] = @hash[x].fetch(str,{})
-        @hash[x][str]['vCPU'] = @hash[x][str].fetch('vCPU',{})
-        @hash[x][str]['memoryGiB'] = @hash[x][str].fetch('memoryGiB',{})
-
-        region_spec['instanceTypes'].each do |type|
-          type['sizes'].each do |instance_spec|
-            instance_hash = {}
-            instance_hash['size'] = instance_spec['size']
-            instance_hash['vCPU'] = instance_spec['vCPU']
-            instance_hash['ECU'] = instance_spec['ECU']
-            instance_hash['memoryGiB'] = instance_spec['memoryGiB']
-            instance_hash['storageGB'] = instance_spec['storageGB']
-            instance_hash['price'] = instance_spec['valueColumns'][0]['prices']['USD']
-
-            cpu = instance_hash['vCPU']
-            mem = instance_hash['memoryGiB']
-
-            @hash[x][str]['vCPU'][cpu] = @hash[x][str]['vCPU'].fetch(cpu,[])
-            @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
-          end
-        end
-      end
-    end
-    File.open('Complete_Data','w'){ |file| file.write(@hash.to_json) }
-  end
-
-  def reloaded_hash
-    @hash = JSON.parse(File.read('Complete_Data'))
-  end
-
-  def refine_output
-    a = []
-    b = []
-    @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
-        end
-      end
-    end
-
-    @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
-        end
-      end
-    end
-    @output = a & b
-  end
-
-  def prints
-    @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'
-    end
-  end
-
-  def what_to_call
-    if @options[:reload] == 'y' || !File.exist?('Complete_Data')
-      reload_files
-      reload_hash
-    elsif @set == 'y' && @options[:reload] != 'n'
-      puts @parser
-      exit
-    end
-    begin
-      raise  if !Integer(@options[:cpu_req])
-      raise  if !Integer(@options[:mem_req])
-      raise  if !@os_list.key?(@options[:os])
-      raise  if !@region_list.key?(@options[:region])
-    rescue
-      puts @parser
-      exit
-    end
-    reloaded_hash
-  end
-end
-
-hope = Awslist.new
-#hope.initialize
-begin hope.parser.parse! ARGV
-rescue OptionParser::InvalidOption => e
-  puts e
-  puts hope.parser
-  exit 1
-end
-hope.what_to_call
-hope.reloaded_hash
-hope.refine_output
-hope.prints