aws_auditor 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8fb7ab9b3d04b41fb21c6640e2c4de2a469799
-  data.tar.gz: b2ab26ed6fc4707deb07ae35d3f149d7e0340c7a
+  metadata.gz: 3aaac3737b9cf61e89d42dc0bb7d553a60190e79
+  data.tar.gz: e1b1852944cdf66ea8f4766ddcb297ad001e5ebe
 SHA512:
-  metadata.gz: d8826b6b49c204399655aa81c10be4364ff898f52c9318434fe20165b943927d9afe0d93bdb773c0b6de9e4c366d688ebb9c3caac4ab982dbcd15a3cc9a69d6f
-  data.tar.gz: eae728c9c0221dbc66d7d7559c588f5dfe15e79346ce77b77ed00dddbd6125b4ff5b98cf84833a4eef8ce77d62440cc381a46b0e30e2c93aae2dc7d08f2128af
+  metadata.gz: edb9b18f94fd362a32eefa44577cdb050985338bbcf93bed4c281103bb60578a42ebce033bbabf08187966a06971e72ab84b3b94bf1f87d77d1c338959d10711
+  data.tar.gz: 1d51d364acc3d5152a1da77e4e1d9ecfa5041ba0843d99a8ac437a814164143f165e9bbaddb186d98a5034f08da714728b34759b6e0d2f8444b67c0fe2f174b2

data/.gitignore

@@ -14,4 +14,5 @@
 mkmf.log
 
 .aws.yml
+.google.yml
 *.gem

data/README.md

@@ -18,27 +18,45 @@ Or install it yourself as:
 
     $ gem install aws_auditor
 
-## Usage
+## How-to
 
-Create a `.aws.yml` file in the root directory, with the following structure.
+### AWS Setup
+Create a `.aws.yml` file in the root directory with the following structure.
 
 ```yaml
 ---
 account1:
   access_key_id: 'ACCESS_KEY_ID'
-  secret_access_key: 'SECRET_ACCESS_KEY
+  secret_access_key: 'SECRET_ACCESS_KEY'
 account2:
   access_key_id: 'ACCESS_KEY_ID'
   secret_access_key: 'SECRET_ACCESS_KEY
 ```
 
+### Google Setup (optional)
+You can export audit information to a Google Spreadsheet, but you must first create a `.google.yml` in the root directory with the following structure.
+
+```yaml
+---
+login:
+  email: 'GOOGLE_EMAIL_ADDRESS'
+  password: 'GOOGLE_EMAIL_PASSWORD'
+file:
+  path: 'DESIRED_PATH_TO_FILE' #optional, creates in root directory otherwise
+  name: 'NAME_OF_FILE'
+```
+ 
 To find discrepancies between number of running instances and purchased instances, run:
 
     $ aws_auditor audit account1
 
-To list instances for all stacks in your account, run:
+To list running instances for all stacks in your account, run:
+
+    $ aws_auditor inspect account1
+
+To export audit information to a Google Spreadsheet, make sure you added a `.google.yml` and run:
 
-    $ aws_auditor stack-audit account1
+    $ aws_auditor export account1
     
 ## Contributing
 

data/aws_auditor.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '~>1'
   spec.add_dependency 'hashie', '~> 3.3'
   spec.add_dependency 'gli', '~> 2.10'
+  spec.add_dependency 'highline', '~> 1.6'
+  spec.add_dependency 'google_drive', '~> 0.3'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/aws_auditor/cache_instance.rb

@@ -0,0 +1,38 @@
+require_relative './instance_helper'
+
+module AwsAuditor
+  class CacheInstance
+    extend InstanceHelper
+    extend CacheWrapper
+
+    attr_accessor :id, :name, :instance_type, :engine, :count
+    def initialize(cache_instance)
+      @id = cache_instance[:cache_cluster_id] || cache_instance[:reserved_cache_node_id]
+      @name = cache_instance[:cache_cluster_id] || cache_instance[:reserved_cache_node_id]
+      @instance_type = cache_instance[:cache_node_type]
+      @engine = cache_instance[:engine] || cache_instance[:product_description]
+      @count = cache_instance[:cache_node_count] || 1
+    end
+
+    def to_s
+      "#{engine} #{instance_type}"
+    end
+
+    def self.get_instances
+      instances = cache.describe_cache_clusters[:cache_clusters]
+      instances.map do |instance|
+        next unless instance[:cache_cluster_status].to_s == 'available'
+        new(instance)
+      end if instances
+    end
+
+    def self.get_reserved_instances
+      instances = cache.describe_reserved_cache_nodes[:reserved_db_instances]
+      instances.map do |instance|
+        next unless instance[:state].to_s == 'active'
+        new(instance)
+      end if instances
+    end
+
+  end
+end

data/lib/aws_auditor/commands/audit.rb

@@ -1,7 +1,14 @@
+arg :aws_account
 desc 'Reviews Reserved Instances'
 command 'audit' do |c|
+	c.switch [:e, :ec2], :desc => "Only audit EC2 instances"
+	c.switch [:d, :rds], :desc => "Only audit RDS instances"
+	c.switch [:c, :cache], :desc => "Only audit ElastiCache instances"
+	c.switch [:r, :reserved], :desc => "Shows reserved instance counts"
+	c.switch [:i, :instances], :desc => "Shows current instance counts"
   c.action do |global_options, options, args|
     require_relative '../scripts/audit'
-    AwsAuditor::Scripts::Audit.execute args.first
+    raise ArgumentError, 'You must specify an AWS account' unless args.first
+    AwsAuditor::Scripts::Audit.execute(args.first,options)
   end
 end

data/lib/aws_auditor/commands/export.rb

@@ -0,0 +1,9 @@
+arg :aws_account
+desc 'Reviews Reserved Instances'
+command 'export' do |c|
+  c.action do |global_options, options, args|
+    require_relative '../scripts/export'
+    raise ArgumentError, 'You must specify an AWS account' unless args.first
+    AwsAuditor::Scripts::Export.execute(args.first, options)
+  end
+end

data/lib/aws_auditor/commands/inspect.rb

@@ -0,0 +1,12 @@
+arg :aws_account
+desc 'Reviews Stack Instances'
+command 'inspect' do |c|
+	c.switch [:e, :ec2], :desc => "Only audit EC2 instances"
+	c.switch [:d, :rds], :desc => "Only audit RDS instances"
+	c.switch [:c, :cache], :desc => "Only audit ElastiCache instances"
+  c.action do |global_options, options, args|
+    require_relative '../scripts/inspect'
+    raise ArgumentError, 'You must specify an AWS account' unless args.first
+    AwsAuditor::Scripts::Inspect.execute(args.first,options)
+  end
+end

data/lib/aws_auditor/convenience_wrappers.rb

@@ -1,4 +1,5 @@
 require_relative './aws'
+require_relative './google'
 
 module AwsAuditor
   module AWSWrapper
@@ -13,7 +14,7 @@ module AwsAuditor
     attr_accessor :ec2
 
     def ec2
-      @ec2 ||= AWS::EC2.new()
+      @ec2 ||= AWS::EC2.new
     end
   end
 
@@ -24,5 +25,29 @@ module AwsAuditor
       @opsworks ||= AWS::OpsWorks.new.client
     end
   end
+
+  module RDSWrapper
+    attr_accessor :rds
+
+    def rds
+      @rds ||= AWS::RDS.new.client
+    end
+  end
+    
+  module CacheWrapper
+    attr_accessor :cache
+
+    def cache
+      @cache ||= AWS::ElastiCache.new.client
+    end
+  end
+
+  module GoogleWrapper
+    attr_accessor :google
+
+    def google
+      @google ||= AwsAuditor::Google.configuration
+    end
+  end
   
 end

data/lib/aws_auditor/{instance.rb → ec2_instance.rb}

@@ -1,13 +1,16 @@
+require_relative './instance_helper'
+
 module AwsAuditor
-  class Instance
+  class EC2Instance
+    extend InstanceHelper
     extend EC2Wrapper
 
     attr_accessor :id, :platform, :availability_zone, :instance_type, :count
-    def initialize(aws_instance, count=1)
-      @id = aws_instance.id
-      @platform = platform_helper(aws_instance)
-      @availability_zone = aws_instance.availability_zone
-      @instance_type = aws_instance.instance_type
+    def initialize(ec2_instance, count=1)
+      @id = ec2_instance.id
+      @platform = platform_helper(ec2_instance)
+      @availability_zone = ec2_instance.availability_zone
+      @instance_type = ec2_instance.instance_type
       @count = count
     end
 
@@ -15,12 +18,12 @@ module AwsAuditor
       "#{@platform} #{@availability_zone} #{@instance_type}"
     end
 
-    def platform_helper(aws_instance)
-      if aws_instance.class.to_s == 'AWS::EC2::Instance'
-        if aws_instance.vpc? 
+    def platform_helper(ec2_instance)
+      if ec2_instance.class.to_s == 'AWS::EC2::Instance'
+        if ec2_instance.vpc? 
           return 'VPC'
-        elsif aws_instance.platform
-          if aws_instance.platform.downcase.include? 'windows' 
+        elsif ec2_instance.platform
+          if ec2_instance.platform.downcase.include? 'windows' 
             return 'Windows'
           else
             return 'Linux'
@@ -28,10 +31,10 @@ module AwsAuditor
         else
           return 'Linux'
         end
-      elsif aws_instance.class.to_s == 'AWS::EC2::ReservedInstances'
-        if aws_instance.product_description.downcase.include? 'vpc' 
+      elsif ec2_instance.class.to_s == 'AWS::EC2::ReservedInstances'
+        if ec2_instance.product_description.downcase.include? 'vpc' 
           return 'VPC'
-        elsif aws_instance.product_description.downcase.include? 'windows'
+        elsif ec2_instance.product_description.downcase.include? 'windows'
           return 'Windows'
         else
           return 'Linux'
@@ -43,7 +46,7 @@ module AwsAuditor
       instances = ec2.instances
       instances.map do |instance|
         next unless instance.status.to_s == 'running'
-        Instance.new(instance)
+        new(instance)
       end if instances
     end
 
@@ -51,12 +54,9 @@ module AwsAuditor
       reserved_instances = ec2.reserved_instances
       reserved_instances.map do |ri|
         next unless ri.state == 'active'
-        Instance.new(ri, ri.instance_count)
+        new(ri, ri.instance_count)
       end if reserved_instances
     end
 
-    def self.instance_hash
-      Hash[get_instances.map {|instance| [instance.id, instance]}]
-    end
   end
 end

data/lib/aws_auditor/google.rb

@@ -0,0 +1,40 @@
+module AwsAuditor
+	class GoogleConfig < Hash
+    include Hashie::Extensions::IndifferentAccess
+  end
+
+  class Google
+  FILE_NAMES = %w[.google.yml]
+
+    def self.configuration
+      credentials = load_config[:login]
+      GoogleDrive.login(credentials[:email],credentials[:password])
+    end
+
+    def self.file
+      load_config[:file]
+    end
+
+    def self.load_config
+      return @config if @config
+      @config = GoogleConfig[YAML.load_file(config_path)]
+    end
+
+    def self.config_path
+      if filepath = FILE_NAMES.detect {|filename| File.exists?(filename)}
+        File.join(Dir.pwd, filepath)
+      else
+        old_dir = Dir.pwd
+        Dir.chdir('..')
+        if old_dir != Dir.pwd
+          config_path
+        else
+          puts "Could not find #{FILE_NAMES.join(' or ')}"
+          exit
+        end
+      end
+    end
+
+  end
+end
+

data/lib/aws_auditor/google_sheet.rb

@@ -0,0 +1,80 @@
+require 'google_drive'
+
+module AwsAuditor
+	class GoogleSheet
+		extend GoogleWrapper
+
+		attr_accessor :sheet, :worksheet, :path
+		def initialize(title, path, environment)
+			@sheet = self.class.create_sheet(title, path)
+			@worksheet = self.class.worksheet(sheet, environment)
+		end
+
+		def write_header(header)
+			worksheet.list.keys = header.unshift('name')
+			worksheet.save
+		end
+
+		def write_row(value_hash)
+			worksheet.list.push(value_hash)
+			worksheet.save
+		end
+
+		def self.first_or_create(title)
+			spreadsheet = google.root_collection.files("title" => title, "title-exact" => true)[0]
+			spreadsheet ? spreadsheet : google.create_spreadsheet(title)
+		end
+
+		#returns a spreadsheet object
+		def self.create_sheet(title, path)
+			folder = go_to_collection(path) if path
+			if folder 
+				spreadsheet = folder.files("title" => title, "title-exact" => true)[0]
+				if spreadsheet 
+					return spreadsheet
+				else
+					file = first_or_create(title)
+					folder.add(file)
+					google.root_collection.remove(file)
+					return folder.files("title" => title, "title-exact" => true)[0]
+				end
+			else
+				first_or_create(title)
+			end
+		end
+
+		#returns a worksheet object
+		def self.worksheet(spreadsheet, title)
+			worksheet = spreadsheet.worksheet_by_title(title)
+			worksheet ? delete_all_rows(worksheet) : spreadsheet.add_worksheet(title)
+		end
+
+		#returns a collection object
+		def self.go_to_collection(directory)
+			if directory
+				path = directory.split('/')
+				go_to_subcollection(google.collection_by_title(path[0]),path[1..-1])
+			end
+		end
+
+		#returns a collection object
+		def self.go_to_subcollection(base, subs)
+			puts "Folder doesn't exist in specified path" and exit if base.nil?
+			if subs.empty?
+				return base
+			else
+				base = base.subcollection_by_title(subs[0])
+				go_to_subcollection(base,subs[1..-1])
+			end
+		end
+
+		def self.delete_all_rows(worksheet)
+			worksheet.list.each do |row|
+				row.clear
+			end
+			worksheet.save
+			worksheet
+		end
+
+	end
+end

data/lib/aws_auditor/instance_helper.rb

@@ -0,0 +1,28 @@
+module AwsAuditor
+	module InstanceHelper
+		def instance_hash
+      Hash[get_instances.map { |instance| instance.nil? ? next : [instance.id, instance]}.compact]
+    end
+
+    def instance_count_hash(instances)
+      instance_hash = Hash.new()
+      instances.each do |instance|
+        next if instance.nil?
+        instance_hash[instance.to_s] = instance_hash.has_key?(instance.to_s) ? instance_hash[instance.to_s] + instance.count : instance.count
+      end if instances
+      instance_hash
+    end
+
+    def compare
+      differences = Hash.new()
+      instances = instance_count_hash(get_instances)
+      ris = instance_count_hash(get_reserved_instances)
+      instances.keys.concat(ris.keys).uniq.each do |key|
+        instance_count = instances.has_key?(key) ? instances[key] : 0
+        ris_count = ris.has_key?(key) ? ris[key] : 0
+        differences[key] = ris_count - instance_count
+      end
+      differences
+    end
+	end
+end

data/lib/aws_auditor/rds_instance.rb

@@ -0,0 +1,51 @@
+require_relative './instance_helper'
+
+module AwsAuditor
+  class RDSInstance
+    extend InstanceHelper
+    extend RDSWrapper
+
+    attr_accessor :id, :name, :multi_az, :instance_type, :engine, :count
+    def initialize(rds_instance)
+      @id = rds_instance[:db_instance_identifier] || rds_instance[:reserved_db_instances_offering_id]
+      @name = rds_instance[:db_instance_identifier] || rds_instance[:db_name]
+      @multi_az = rds_instance[:multi_az]
+      @instance_type = rds_instance[:db_instance_class]
+      @engine = rds_instance[:engine] || rds_instance[:product_description]
+      @count = rds_instance[:db_instance_count] || 1
+    end
+
+    def to_s
+      "#{engine_helper} #{multi_az?} #{instance_type}"
+    end
+
+    def multi_az?
+      multi_az ? "Multi-AZ" : "Single-AZ"
+    end
+
+    def engine_helper
+      if engine.downcase.include? "post"
+        return "PostgreSQL"
+      elsif engine.downcase.include? "mysql"
+        return "MySQL"
+      end
+    end
+
+    def self.get_instances
+      instances = rds.describe_db_instances[:db_instances]
+      instances.map do |instance|
+        next unless instance[:db_instance_status].to_s == 'available'
+        new(instance)
+      end
+    end
+
+    def self.get_reserved_instances
+      instances = rds.describe_reserved_db_instances[:reserved_db_instances]
+      instances.map do |instance|
+        next unless instance[:state].to_s == 'active'
+        new(instance)
+      end
+    end
+
+  end
+end

data/lib/aws_auditor/scripts/audit.rb

@@ -1,36 +1,87 @@
+require 'highline/import'
+
 module AwsAuditor
   module Scripts
     class Audit
       extend AWSWrapper
-      extend EC2Wrapper
 
-      def self.execute(environment)
+      def self.execute(environment, options=nil)
         aws(environment)
-        compare.each do |key,value|
-          puts "#{key}: #{value}"
+        if options[:ec2]
+          audit_ec2(options)
+        elsif options[:rds]
+          audit_rds(options)
+        elsif options[:cache]
+          audit_cache(options)
+        else
+          audit_ec2(options)
+          audit_rds(options)
+          audit_cache(options)
+        end
+
+      end
+
+      def self.audit_rds(options)
+        puts "=============== RDS ==============="
+        if options[:instances]
+          RDSInstance.instance_count_hash(RDSInstance.get_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        elsif options[:reserved]
+          RDSInstance.instance_count_hash(RDSInstance.get_reserved_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        else
+          RDSInstance.compare.each do |key, value|
+            colorize(key,value)
+          end
         end
       end
 
-      def self.create_instance_hash(instance_type)
-        instance_hash = Hash.new()
-        instance_type.each do |instance|
-          next if instance.nil?
-          instance_hash[instance.to_s] = instance_hash.has_key?(instance.to_s) ? instance_hash[instance.to_s] + instance.count : instance.count
+      def self.audit_ec2(options)
+        puts "=============== EC2 ==============="
+        if options[:instances]
+          EC2Instance.instance_count_hash(EC2Instance.get_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        elsif options[:reserved]
+          EC2Instance.instance_count_hash(EC2Instance.get_reserved_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        else
+          EC2Instance.compare.each do |key,value|
+            colorize(key,value)
+          end
         end
-        instance_hash
       end
 
-      def self.compare
-        differences = Hash.new()
-        instances = create_instance_hash(Instance.get_instances)
-        ris = create_instance_hash(Instance.get_reserved_instances)
-        instances.keys.concat(ris.keys).uniq.each do |key|
-          instance_count = instances.has_key?(key) ? instances[key] : 0
-          ris_count = ris.has_key?(key) ? ris[key] : 0
-          differences[key] = ris_count - instance_count
+      def self.audit_cache(options)
+        puts "============== CACHE =============="
+        if options[:instances]
+          CacheInstance.instance_count_hash(CacheInstance.get_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        elsif options[:reserved]
+          CacheInstance.instance_count_hash(CacheInstance.get_reserved_instances).each do |key,value|
+            say "<%= color('#{key}: #{value}', :white) %>"
+          end
+        else
+          CacheInstance.compare.each do |key,value|
+            colorize(key,value)
+          end
         end
-        differences
       end
+
+      def self.colorize(key,value)
+        if value < 0
+          say "<%= color('#{key}: #{value}', :yellow) %>"
+        elsif value == 0
+          say "<%= color('#{key}: #{value}', :green) %>"
+        elsif value > 0 
+          say "<%= color('#{key}: #{value}', :red) %>"
+        end
+      end
+
     end
   end
 end

data/lib/aws_auditor/scripts/export.rb

@@ -0,0 +1,98 @@
+require_relative "../google"
+
+module AwsAuditor
+	module Scripts
+		class Export
+			extend GoogleWrapper
+			extend AWSWrapper
+
+			def self.execute(environment, options = nil)
+				aws(environment)
+				file = GoogleSheet.new(Google.file[:name], Google.file[:path], environment)
+				file.write_header(get_all_keys)
+				write_opsworks_stacks(file)
+				write_rds(file)
+				write_cache(file)
+				write_totals(file)
+				`open #{file.sheet.human_url}`
+			end
+
+			def self.write_opsworks_stacks(file)
+				file.write_row({name: "EC2"})
+				opsworks_stacks.each do |stack|
+					next if stack.instances.empty?
+					value_hash = EC2Instance.instance_count_hash(stack.instances)
+					value_hash[:name] = stack.name
+					file.write_row(value_hash)
+				end
+			end
+
+			def self.write_rds(file)
+				file.write_row({name: "RDS"})
+				rds_instances.each do |db|
+					value_hash = Hash({:name => db.name, :"#{db.to_s}" => '1'})
+					file.write_row(value_hash)
+				end
+			end
+
+			def self.write_cache(file)
+				file.write_row({name: "CACHE"})
+				cache_instances.each do |cache|
+					value_hash = Hash({:name => cache.name, :"#{cache.to_s}" => '1'})
+				 	file.write_row(value_hash)
+				end
+			end
+
+			def self.write_totals(file)
+				file.write_row({name: "TOTALS"})
+				instance_counts = get_all_instance_counts.merge({name: "Running Instances"})
+				file.write_row(instance_counts)
+				reserved_counts = get_all_reserved_counts.merge({name: "Reserved Instances"})
+				file.write_row(reserved_counts)
+				differences = get_difference_counts.merge({name: "Differences"})
+				file.write_row(differences)
+			end
+
+			def self.get_all_keys
+				ec2 = EC2Instance.instance_hash.values.map{ |x| x.to_s }.uniq.sort! { |a,b| a.downcase <=> b.downcase }
+				rds = RDSInstance.instance_hash.values.map{ |x| x.to_s }.uniq.sort! { |a,b| a.downcase <=> b.downcase }
+				cache = CacheInstance.instance_hash.values.map{ |x| x.to_s }.uniq.sort! { |a,b| a.downcase <=> b.downcase }
+				ec2.concat(rds).concat(cache).compact
+			end
+
+			def self.get_all_instance_counts
+				ec2 = EC2Instance.instance_count_hash(EC2Instance.get_instances)
+				rds = RDSInstance.instance_count_hash(RDSInstance.get_instances)
+				cache = CacheInstance.instance_count_hash(CacheInstance.get_instances)
+				ec2.merge(rds).merge(cache)
+			end
+
+			def self.get_all_reserved_counts
+				ec2 = EC2Instance.instance_count_hash(EC2Instance.get_reserved_instances)
+				rds = RDSInstance.instance_count_hash(RDSInstance.get_reserved_instances)
+				cache = CacheInstance.instance_count_hash(CacheInstance.get_reserved_instances)
+				ec2.merge(rds).merge(cache)
+			end
+
+			def self.get_difference_counts
+				ec2 = EC2Instance.compare
+				rds = RDSInstance.compare
+				cache = CacheInstance.compare
+				ec2.merge(rds).merge(cache)
+			end
+
+			def self.opsworks_stacks
+				@opsworks_stacks ||= Stack.all
+			end
+
+			def self.rds_instances
+				@rds_instances ||= RDSInstance.get_instances
+			end
+
+			def self.cache_instances
+				@cache_instances ||= CacheInstance.get_instances
+			end
+
+		end
+	end
+end

data/lib/aws_auditor/scripts/inspect.rb

@@ -0,0 +1,48 @@
+module AwsAuditor
+  module Scripts
+    class Inspect
+      extend AWSWrapper
+      extend OpsWorksWrapper
+
+      def self.execute(environment, options=nil)
+        aws(environment)
+        if options[:ec2]
+          inspect_stacks
+        elsif options[:rds]
+          inspect_dbs
+        elsif options[:cache]
+          inspect_caches
+        else
+          puts "You must use a switch. See `aws-auditor inspect --help` for more info."
+        end
+      end
+
+      def self.inspect_stacks
+        Stack.all.each do |stack|
+          stack.pretty_print
+        end
+      end
+
+      def self.inspect_dbs
+        RDSInstance.get_instances.each do |db|
+          puts "========================"
+          puts "#{db.name}"
+          puts "========================"
+          puts db.to_s
+          puts "\n"
+        end
+      end
+
+      def self.inspect_caches
+        CacheInstance.get_instances.each do |cache|
+          puts "========================"
+          puts "#{cache.name}"
+          puts "========================"
+          puts cache.to_s
+          puts "\n"
+        end
+      end
+
+    end
+  end
+end

data/lib/aws_auditor/stack.rb

@@ -1,3 +1,5 @@
+require 'highline/import'
+
 module AwsAuditor
   class Stack
     extend OpsWorksWrapper
@@ -14,7 +16,13 @@ module AwsAuditor
       instances = self.class.opsworks.describe_instances({stack_id: id})[:instances]
       instances.map do |instance|
         next unless instance[:status].to_s == 'online'
-        all_instances[instance[:ec2_instance_id]].to_s
+        self.class.all_instances[instance[:ec2_instance_id]]
+      end
+    end
+
+    def print_instances
+      EC2Instance.instance_count_hash(self.instances).each do |key,value|
+        say "<%= color('#{key}: #{value}', :white) %>"
       end
     end
 
@@ -22,14 +30,19 @@ module AwsAuditor
       puts "----------------------------------"
       puts "#{@name}"
       puts "----------------------------------"
-      instances.each do |instance|
-        puts instance.to_s
-      end
+      print_instances
       puts "\n"
     end
+    
+    def self.all
+      stacks = opsworks.describe_stacks
+      stacks.data[:stacks].map do |stack|
+        new(stack)
+      end.sort! { |a,b| a.name.downcase <=> b.name.downcase } if stacks
+    end
 
-    def all_instances
-      @all_instances ||= Instance.instance_hash
+    def self.all_instances
+      @all_instances ||= EC2Instance.instance_hash
     end
 
   end

data/lib/aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module AwsAuditor
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/aws_auditor.rb

@@ -1,7 +1,10 @@
 require 'aws_auditor/version'
 require_relative 'aws_auditor/convenience_wrappers'
-require_relative 'aws_auditor/instance'
+require_relative 'aws_auditor/ec2_instance'
+require_relative 'aws_auditor/rds_instance'
+require_relative 'aws_auditor/cache_instance'
 require_relative 'aws_auditor/stack'
+require_relative 'aws_auditor/google_sheet'
 
 module AwsAuditor
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_auditor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Elliot Hursh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: google_drive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -99,12 +127,19 @@ files:
 - bin/aws-auditor
 - lib/aws_auditor.rb
 - lib/aws_auditor/aws.rb
+- lib/aws_auditor/cache_instance.rb
 - lib/aws_auditor/commands/audit.rb
-- lib/aws_auditor/commands/stack-audit.rb
+- lib/aws_auditor/commands/export.rb
+- lib/aws_auditor/commands/inspect.rb
 - lib/aws_auditor/convenience_wrappers.rb
-- lib/aws_auditor/instance.rb
+- lib/aws_auditor/ec2_instance.rb
+- lib/aws_auditor/google.rb
+- lib/aws_auditor/google_sheet.rb
+- lib/aws_auditor/instance_helper.rb
+- lib/aws_auditor/rds_instance.rb
 - lib/aws_auditor/scripts/audit.rb
-- lib/aws_auditor/scripts/stack-audit.rb
+- lib/aws_auditor/scripts/export.rb
+- lib/aws_auditor/scripts/inspect.rb
 - lib/aws_auditor/stack.rb
 - lib/aws_auditor/version.rb
 homepage: https://github.com/elliothursh/aws_auditor

data/lib/aws_auditor/commands/stack-audit.rb

@@ -1,8 +0,0 @@
-arg :environment
-desc 'Reviews Stack Instances'
-command 'stack-audit' do |c|
-  c.action do |global_options, options, args|
-    require_relative '../scripts/stack-audit'
-    AwsAuditor::Scripts::StackAudit.execute args.first
-  end
-end

data/lib/aws_auditor/scripts/stack-audit.rb

@@ -1,24 +0,0 @@
-module AwsAuditor
-  module Scripts
-    class StackAudit
-      extend AWSWrapper
-      extend EC2Wrapper
-      extend OpsWorksWrapper
-
-      def self.execute(environment)
-        aws(environment)
-        get_stacks
-      end
-
-      def self.get_stacks
-        stacks = opsworks.describe_stacks
-        stacks.data[:stacks].map do |stack|
-          stck = Stack.new(stack)
-          stck.pretty_print
-          stck
-        end if stacks
-      end
-
-    end
-  end
-end