aws-ec2-list 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 288213b6d0677699be342357a0505356c85a34e3
-  data.tar.gz: fe59d92cdb81cc58ea5af7fd6799b018b7bf0d24
+  metadata.gz: 1de08a9a8b1f4c504df3445f2ea454ce959f5bc7
+  data.tar.gz: 11ba2503a070f5be5240932378adb594c9265595
 SHA512:
-  metadata.gz: f62b85e549bb732d470343c3831e03252eae6252b911a26ead3e2514b8ec9c4b44e3f00920d0d602bf696a35a9ded16b30f9b6d693016e9ffc70d202f871671e
-  data.tar.gz: 30e39213e3f654a80cc96b86ad6bdabf561eb51a2f56bc674df874afd76f1e5ba7e5b7c3bfc95f0a1a53240f5a4d3b6c31d9ddc542b365b215d791fb29f30212
+  metadata.gz: 01deb763c76ed17201811386ea2805b8f85d6a9c64f6f5ee2903ef90b546d43f5133170a8faae00d20a76ec72608061a91e3b7761588c3628cf568c665080f71
+  data.tar.gz: 2f584fb1235d150df3d2f5380d2a41bc6cfd7f34ecaa9a6c5a05b216016f5e284cf7f9f312bca60ce4e558ce54364672c7757b35beedbf178e6fcf46fb0e772a

data/README.md

@@ -1,8 +1,6 @@
 # Aws::Ec2::List
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/aws/ec2/list`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Get the information from your ec2 instances
 
 ## Installation
 
@@ -22,7 +20,13 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+AwsEc2List defaults to us-east-1
+
+```bash
+$> aws-ec2-list
+
+$> aws-ec2-list --region=us-west-1
+```
 
 ## Development
 

data/exe/aws-ec2-list

@@ -2,4 +2,4 @@
 
 require "aws_ec2_list"
 
-AwsEc2List.call
+AwsEc2List.call(ARGV)

data/lib/aws_ec2_list.rb

@@ -5,8 +5,44 @@ require 'tabularize'
 
 module AwsEc2List
   def self.call(*args)
-    Runner.new(*args).call
+    defaults = parse_args(args)
+    if defaults
+      DescribeInstances.new(defaults).call
+    else
+      DescribeInstances.new.call
+    end
+  end
+
+  private
+  def self.parse_args(args)
+    return nil if args.empty?
+    return args.first if args.first.is_a?(Hash)
+    option_string, default_args = args
+
+    option_string = option_string.first
+
+    if option_string && default_args
+      option_hash = option_string_to_hash(option_string)
+      option_hash.merge(default_args)
+
+    elsif option_string
+      option_string_to_hash(option_string)
+
+    end
+  end
+
+  def self.option_string_to_hash(option_string)
+    option_array = option_string.split("--").reject { |o| o.empty? }
+    option_array = option_array.map{ |opt| opt.split("=") }.flatten
+
+    option_hash = Hash[*option_array]
+
+    option_hash.keys.each do |key|
+      option_hash[key.to_sym] = option_hash.delete(key)
+    end
+
+    option_hash
   end
 end
 
-require_relative "aws_ec2_list/runner"
+require_relative "aws_ec2_list/describe_instances"

data/lib/aws_ec2_list/describe_instances.rb

@@ -0,0 +1,43 @@
+require_relative 'instance'
+
+class AwsEc2List::DescribeInstances
+  attr_reader :ec2, :stdout
+
+  def initialize(ec2: Aws::EC2::Client, region: 'us-east-1', stdout: $stdout)
+    @ec2 = ec2.new(region: region)
+    @stdout = stdout
+  end
+
+  def call
+    data_header = ["PROJECT", "STACK NAME", "PUBLIC DNS NAME", "LAUNCH TIME", "APP VERSION", "STATE"]
+    data = instances.map do |d|
+      [d.project, d.stack_name, d.public_dns_name, d.launch_time, d.app_version, d.state]
+    end
+    data = data.insert(0, data_header)
+    stdout.puts Tabularize.it(data, :align => :left).map { |row| row.join ' | ' }
+  end
+
+  private
+
+  def instances
+    reservations.map(&:instances).flatten.map do |instance|
+      AwsEc2List::Instance.new(
+        instance_id: instance.instance_id,
+        state: instance.state.name,
+        private_dns_name: instance.private_dns_name,
+        public_dns_name: instance.public_dns_name,
+        instance_type: instance.instance_type,
+        launch_time: instance.launch_time,
+        tags: instance.tags
+      )
+    end.sort{ |x, y| y.launch_time <=> x.launch_time }
+  end
+
+  def reservations
+    describe_instances.reservations
+  end
+
+  def describe_instances
+    ec2.describe_instances
+  end
+end

data/lib/aws_ec2_list/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2List
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-list
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - pauloancheta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -114,8 +114,8 @@ files:
 - bin/setup
 - exe/aws-ec2-list
 - lib/aws_ec2_list.rb
+- lib/aws_ec2_list/describe_instances.rb
 - lib/aws_ec2_list/instance.rb
-- lib/aws_ec2_list/runner.rb
 - lib/aws_ec2_list/version.rb
 homepage: https://github.com/pauloancheta/aws-ec2-list
 licenses:

data/lib/aws_ec2_list/runner.rb

@@ -1,73 +0,0 @@
-require_relative 'instance'
-
-class AwsEc2List::Runner
-  attr_reader :ec2, :stdout
-
-  def initialize(ec2: Aws::EC2::Client, region: 'us-east-1', stdout: $stdout)
-    @ec2 = ec2.new(region: region)
-    @stdout = stdout
-  end
-
-  def call
-    data_header = ["PROJECT", "STACK NAME", "PUBLIC DNS NAME", "LAUNCH TIME", "APP VERSION", "STATE"]
-    data = instances.map do |d|
-      [d.project, d.stack_name, d.public_dns_name, d.launch_time, d.app_version, d.state]
-    end
-    data = data.insert(0, data_header)
-    stdout.puts Tabularize.it(data, :align => :left).map { |row| row.join ' | ' }
-  end
-
-  private
-
-  def instances
-
-    #  Aws::EC2::Types::Instance
-    #  instance_id="i-0e5846a2b3988300d",
-    #  state=#<struct Aws::EC2::Types::InstanceState code=16, name="running">,
-    #  private_dns_name="ip-172-16-92-73.ec2.internal",
-    #  public_dns_name="ec2-54-157-47-22.compute-1.amazonaws.com",
-    #  instance_type="m4.xlarge",
-    #  launch_time=2017-01-12 19:46:29 UTC,
-    #  subnet_id="subnet-844ef9df",
-    #  vpc_id="vpc-2d583b48",
-    #  private_ip_address="172.16.92.73",
-    #  public_ip_address="54.157.47.22",
-    #  architecture="x86_64",
-    #  client_token="40459b52-177d-4e54-a3ed-e07e9d434ecc_subnet-844ef9df_5",
-    #  tags=[
-    #    #<struct Aws::EC2::Types::Tag key="Name", value="lp-webapp-product-0e5846a2b3988300d">,
-    #    #<struct Aws::EC2::Types::Tag key="aws:cloudformation:logical-id", value="WebASG">,
-    #    #<struct Aws::EC2::Types::Tag key="owner", value="a-team">,
-    #    #<struct Aws::EC2::Types::Tag key="environment", value="production">,
-    #    #<struct Aws::EC2::Types::Tag key="aws:autoscaling:groupName", value="lp-webapp-production-31-WebASG-RYQPV710NC8B">,
-    #    #<struct Aws::EC2::Types::Tag key="aws:cloudformation:stack-name", value="lp-webapp-production-31">,
-    #    #<struct Aws::EC2::Types::Tag key="app_version", value="9da8527">,
-    #    #<struct Aws::EC2::Types::Tag key="aws:cloudformation:stack-id", value="arn:aws:cloudformation:us-east-1:002682819933:stack/lp-webapp-production-31/09547990-d8ff-11e6-aedf-50fae9882035">,
-    #    #<struct Aws::EC2::Types::Tag key="datadog", value="true">,
-    #    #<struct Aws::EC2::Types::Tag key="project", value="lp-webapp">
-    #  ],
-    #  security_groups=[
-    #    #<struct Aws::EC2::Types::GroupIdentifier group_name="vpc-us-east-classic-link-ClassicLinkSecurityGroup-1H5UKPIA5IANJ", group_id="sg-87c20ce3">,
-    #    #<struct Aws::EC2::Types::GroupIdentifier group_name="shared-security-groups-mainvpc-SshSecurityGroup-15DV69GVO6M5F", group_id="sg-c5ba0db8">
-    #  ]
-    reservations.map(&:instances).flatten.map do |instance|
-      AwsEc2List::Instance.new(
-        instance_id: instance.instance_id,
-        state: instance.state.name,
-        private_dns_name: instance.private_dns_name,
-        public_dns_name: instance.public_dns_name,
-        instance_type: instance.instance_type,
-        launch_time: instance.launch_time,
-        tags: instance.tags
-      )
-    end.sort{ |x, y| y.launch_time <=> x.launch_time }
-  end
-
-  def reservations
-    describe_instances.reservations
-  end
-
-  def describe_instances
-    ec2.describe_instances
-  end
-end