ec2-host 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc25b078ef99bec51f8d6d3d34c847c12482dab
-  data.tar.gz: 942cbde8877b6f20681cd3d098bf0ae04133ea3e
+  metadata.gz: d0bc795de2c9dd28b237cf8a442d13434532d13e
+  data.tar.gz: 417e73f78134b37a660bc614dfc07e74ebfd1890
 SHA512:
-  metadata.gz: 0c5e37497cbc0b41c888ed077542a1b5659631152f0de62678ad2ed5db6df45cfd77d7ab54efa093d603ab3fb638ed2cbacb626e60753d0af3c077e66b11135e
-  data.tar.gz: 8bb986e56f4508a652942a16e28ee0ba9f0f110d40e6640d064d866e76c0d983873b9336f4a2d581a81b156849e446e0056aafc2d2f561cee544618b04fa1529
+  metadata.gz: 19efa5260b4e445e9f3024c7228a02e8477736feb678aa52ed6596846551b520f74c97f82c04044fa93d4f3b52b2322179379db63841f1622c2001daca2f12fc
+  data.tar.gz: 720fa2e40471c42fd373a6bba4a00dd16eb596d548f325e376fa693da6cb6d54e0610537190d6d9a26d82d6e3bca99e8b16cba4b44524aa6f426103a65264ffc

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+# 0.1.0 (2015/08/11)
+
+Enhancements:
+
+* Alias `--json` to `-j` option
+* Possible speed up for instance_id, role, role1, role2, role3 condition
+
 # 0.0.9 (2015/08/10)
 
 Enhancements:
 
-* Add --state and --monitoring option
+* Add `--state` and `--monitoring` option
 * Remove terminated instances from list as default
 * Support nested key such as instance.instance_id (as library)
 

data/README.md

@@ -58,13 +58,17 @@ Usage:
 
 Options:
   -h, [--hostname=one two three]                 # name or private_dns_name
-  --usage, [--role=one two three]                # role
+  -r, --usage, -u, [--role=one two three]        # role
   --r1, --usage1, --u1, [--role1=one two three]  # role1, the 1st part of role delimited by :
   --r2, --usage2, --u2, [--role2=one two three]  # role2, the 2nd part of role delimited by :
   --r3, --usage3, --u3, [--role3=one two three]  # role3, the 3rd part of role delimited by :
+              [--instance-id=one two three]      # instance_id
+              [--state=one two three]            # state
+              [--monitoring=one two three]       # monitoring
   --ip, [--private-ip], [--no-private-ip]        # show private ip address instead of hostname
               [--public-ip], [--no-public-ip]    # show public ip address instead of hostname
   -i, [--info], [--no-info]                      # show host info, not only hostname
+  -j, [--json], [--no-json]                      # show detailed host info in json
               [--debug], [--no-debug]            # debug mode
 
 Search EC2 hosts

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.0.9'
+  gem.version       = '0.1.0'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'

data/lib/ec2/host.rb

@@ -40,7 +40,7 @@ class EC2
 
     # @return [Host::Data] representing myself
     def self.me
-      new(instance_id: ClientUtil.get_instance_id).each do |d|
+      new(instance_id: ClientUtil.instance_id).each do |d|
         return d
       end
       raise 'Not Found'
@@ -92,7 +92,7 @@ class EC2
     # @yieldparam [Host::Data] data entry
     def each(&block)
       @conditions.each do |condition|
-        search(ClientUtil.get_instances, condition, &block)
+        search(ClientUtil.instances(condition), condition, &block)
       end
       return self
     end

data/lib/ec2/host/cli.rb

@@ -51,6 +51,7 @@ class EC2
         :type => :boolean,
         :desc => "show host info, not only hostname"
       option :json,
+        :aliases => %w[-j],
         :type => :boolean,
         :desc => "show detailed host info in json"
       option :debug,

data/lib/ec2/host/client_util.rb

@@ -4,15 +4,33 @@ require 'aws-sdk'
 class EC2
   class Host
     class ClientUtil
-      def self.get_instances
-        # I do not use describe_instances(filter:) because it does not support array tag ..
-        return @instances if @instances
-        Aws.config.update(region: Config.aws_region, credentials: Config.aws_credentials)
-        ec2 = Aws::EC2::Client.new
-        @instances = ec2.describe_instances.reservations.map(&:instances).flatten
+      def self.ec2(reload = false)
+        if @ec2.nil? || reload
+          Aws.config.update(region: Config.aws_region, credentials: Config.aws_credentials)
+          @ec2 = Aws::EC2::Client.new
+        end
+        @ec2
+      end
+
+      def self.instances(condition)
+        describe_instances =
+          if instance_id = condition[:instance_id]
+            ec2.describe_instances(instance_ids: Array(instance_id))
+          elsif role = (condition[:role] || condition[:usage]) and role.size == 1
+            ec2.describe_instances(filters: [{name: "tag:#{Config.roles_tag}", values: ["*#{role.first}*"]}])
+          elsif role1 = (condition[:role1] || condition[:usage1]) and role1.size == 1
+            ec2.describe_instances(filters: [{name: "tag:#{Config.roles_tag}", values: ["*#{role1.first}*"]}])
+          elsif role2 = (condition[:role2] || condition[:usage2]) and role2.size == 1
+            ec2.describe_instances(filters: [{name: "tag:#{Config.roles_tag}", values: ["*#{role2.first}*"]}])
+          elsif role3 = (condition[:role3] || condition[:usage3]) and role3.size == 1
+            ec2.describe_instances(filters: [{name: "tag:#{Config.roles_tag}", values: ["*#{role3.first}*"]}])
+          else
+            ec2.describe_instances
+          end
+        describe_instances.reservations.map(&:instances).flatten
       end
 
-      def self.get_instance_id
+      def self.instance_id
         return @instance_id if @instance_id
         begin
           http_conn = Net::HTTP.new('169.254.169.254')

data/spec/host_spec.rb

@@ -39,6 +39,14 @@ describe EC2::Host do
     end
   end
 
+  context 'by instance_id' do
+    let(:hosts) { EC2::Host.new(instance_id: 'i-85900780').to_a }
+    let(:subject)  { hosts.first }
+    it_should_behave_like 'host'
+    it { expect(hosts.size).to eq(1) }
+    it { expect(subject.hostname).to eq('test') }
+  end
+
   context 'by hostname' do
     let(:hosts) { EC2::Host.new(hostname: 'test').to_a }
     let(:subject)  { hosts.first }
@@ -49,6 +57,11 @@ describe EC2::Host do
 
   context 'by role' do
     context 'by a role' do
+      let(:subject) { EC2::Host.new(role: 'admin:ami').first }
+      it_should_behave_like 'host'
+    end
+
+    context 'by a role1' do
       let(:subject) { EC2::Host.new(role1: 'admin').first }
       it_should_behave_like 'host'
     end
@@ -74,6 +87,11 @@ describe EC2::Host do
   # This is for DeNA use
   context 'by usage (an alias of usage)' do
     context 'by a usage' do
+      let(:subject) { EC2::Host.new(usage: 'admin:ami').first }
+      it_should_behave_like 'host'
+    end
+
+    context 'by a usage1' do
       let(:subject) { EC2::Host.new(usage1: 'admin').first }
       it_should_behave_like 'host'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Naotoshi Seo