ec2-host 0.3.1 → 0.4.0

data/lib/ec2/host/role_data.rb

@@ -1,14 +1,18 @@
 class EC2
   class Host
-    RoleData = Struct.new(
-      :role1, :role2, :role3
-    )
-
     # Represents each role
     class RoleData
-      def self.initialize(role)
-        role1, role2, role3 = role.split(Config.role_tag_delimiter)
-        self.new(role1, role2, role3)
+      attr_reader :role1, :role2, :role3
+
+      def initialize(role1, role2 = nil, role3 = nil)
+        @role1 = role1
+        @role2 = role2
+        @role3 = role3
+      end
+
+      def self.build(role)
+        role1, role2, role3 = role.split(Config.role_tag_delimiter, 3)
+        new(role1, role2, role3)
       end
 
       # @return [String] something like "admin:jenkins:slave"

data/spec/host_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 shared_examples_for 'host' do
-  it 'should have parameters' do
+  it 'should respond_to' do
     [ :hostname,
       :roles,
+      :region,
+      :service,
       :status,
       :tags,
-      :service,
-      :region,
       :instance,
       :instance_id,
       :private_ip_address,
@@ -19,7 +19,7 @@ shared_examples_for 'host' do
       :start_date,
       :usages,
     ].each do |k|
-      expect{ subject.__send__(k) }.not_to raise_error
+      expect(subject.respond_to?(k)).to be_truthy
     end
   end
 end
@@ -27,48 +27,71 @@ end
 describe EC2::Host do
   describe 'options' do
     context do
-      let(:subject) { EC2::Host.new(hostname: 'test', options: {foo:'bar'}) }
+      let(:subject) { EC2::Host.new(hostname: 'ec2-host-web', options: {foo:'bar'}) }
       it { expect(subject.options).to eq({foo:'bar'}) }
-      it { expect(subject.conditions).to eq([{hostname: ['test']}]) }
+      it { expect(subject.conditions).to eq([{hostname: ['ec2-host-web']}]) }
     end
 
     context do
-      let(:subject) { EC2::Host.new({hostname: 'foo'}, {hostname: 'bar'}, options: {foo:'bar'}) }
+      let(:subject) { EC2::Host.new({hostname: 'ec2-host-web'}, {hostname: 'ec2-host-db'}, options: {foo:'bar'}) }
       it { expect(subject.options).to eq({foo:'bar'}) }
-      it { expect(subject.conditions).to eq([{hostname: ['foo']}, {hostname: ['bar']}]) }
+      it { expect(subject.conditions).to eq([{hostname: ['ec2-host-web']}, {hostname: ['ec2-host-db']}]) }
     end
   end
 
-  describe '#get_value' do
-    let(:hosts) { EC2::Host.new(instance_id: 'i-85900780').to_a }
-    let(:subject)  { hosts.first }
-    it { expect(subject.get_value('instance.instance_id')).to eql('i-85900780') }
+  context '#to_hash' do
+    let(:subject) { EC2::Host.new(service: 'ec2-host').first.to_hash }
+
+    it 'keys' do
+      expect(subject.keys).to eq([
+        'hostname',
+        'roles',
+        'region',
+        'service',
+        'status',
+        'tags',
+        'instance_id',
+        'private_ip_address',
+        'public_ip_address',
+        'launch_time',
+        'state',
+        'monitoring'
+      ])
+    end
+
+    it 'values are not empty' do
+      expect(subject.values.any? {|v| v.nil? or (v.respond_to?(:empty?) and v.empty?) }).to be_falsey
+    end
   end
 
-  context 'by instance_id' do
-    let(:hosts) { EC2::Host.new(instance_id: 'i-85900780').to_a }
+  context 'by hostname' do
+    let(:hosts) { EC2::Host.new(hostname: 'ec2-host-web').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') }
+    it { expect(subject.hostname).to eq('ec2-host-web') }
   end
 
-  context 'by hostname' do
-    let(:hosts) { EC2::Host.new(hostname: 'test').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') }
+  context 'by instance_id' do
+    let(:instance_id) { EC2::Host.new(service: 'ec2-host').first.instance_id }
+
+    context 'by instance_id' do
+      let(:hosts)   { EC2::Host.new(instance_id: instance_id).to_a }
+      let(:subject) { hosts.first }
+      it_should_behave_like 'host'
+      it { expect(hosts.size).to eq(1) }
+      it { expect(subject.instance_id).to eq(instance_id) }
+    end
   end
 
   context 'by role' do
     context 'by a role' do
-      let(:subject) { EC2::Host.new(role: 'admin:ami').first }
+      let(:subject) { EC2::Host.new(role: 'web:test').first }
       it_should_behave_like 'host'
     end
 
     context 'by a role1' do
-      let(:subject) { EC2::Host.new(role1: 'admin').first }
+      let(:subject) { EC2::Host.new(role1: 'web').first }
       it_should_behave_like 'host'
     end
 
@@ -76,12 +99,13 @@ describe EC2::Host do
       let(:hosts) {
         EC2::Host.new(
           {
-            role1: 'admin',
-            role2: 'ami',
+            role1: 'web',
+            role2: 'test',
           },
           {
-            role1: 'isucon4',
-          }
+            role1: 'db',
+            role2: 'test',
+          },
         ).to_a
       }
       let(:subject) { hosts.first }
@@ -90,15 +114,15 @@ describe EC2::Host do
     end
   end
 
-  # This is for DeNA use
-  context 'by usage (an alias of usage)' do
+  # for compatibility with dino-host
+  context 'by usage' do
     context 'by a usage' do
-      let(:subject) { EC2::Host.new(usage: 'admin:ami').first }
+      let(:subject) { EC2::Host.new(usage: 'web:test').first }
       it_should_behave_like 'host'
     end
 
     context 'by a usage1' do
-      let(:subject) { EC2::Host.new(usage1: 'admin').first }
+      let(:subject) { EC2::Host.new(usage1: 'web').first }
       it_should_behave_like 'host'
     end
 
@@ -106,12 +130,13 @@ describe EC2::Host do
       let(:hosts) {
         EC2::Host.new(
           {
-            usage1: 'admin',
-            usage2: 'ami',
+            usage1: 'web',
+            usage2: 'test',
           },
           {
-            usage1: 'isucon4',
-          }
+            usage1: 'db',
+            usage2: 'test',
+          },
         ).to_a
       }
       let(:subject) { hosts.first }
@@ -120,7 +145,7 @@ describe EC2::Host do
     end
   end
 
-  context 'by status' do
+  context 'by status (optional array tags)' do
     context 'by a status' do
       let(:subject) { EC2::Host.new(status: :active).first }
       it_should_behave_like 'host'
@@ -146,14 +171,14 @@ describe EC2::Host do
     end
   end
 
-  context 'by service' do
+  context 'by service (optional string tags)' do
     context 'by a service' do
-      let(:subject) { EC2::Host.new(service: 'isucon4').first }
+      let(:subject) { EC2::Host.new(service: 'ec2-host').first }
       it_should_behave_like 'host'
     end
 
     context 'by multiple services (or)' do
-      let(:hosts) { EC2::Host.new(service: ['test', 'isucon4']) }
+      let(:hosts) { EC2::Host.new(service: ['test', 'ec2-host']) }
       let(:subject) { hosts.first }
       it_should_behave_like 'host'
     end
@@ -161,18 +186,18 @@ describe EC2::Host do
 
   context 'by region' do
     context 'by a region' do
-      let(:subject) { EC2::Host.new(region: 'ap-northeast-1').first }
+      let(:subject) { EC2::Host.new(region: ENV['AWS_DEFAULT_REGION']).first }
       it_should_behave_like 'host'
     end
 
     context 'by multiple regions (or)' do
-      let(:hosts) { EC2::Host.new(region: ['ap-northeast-1']) }
+      let(:hosts) { EC2::Host.new(region: [ENV['AWS_DEFAULT_REGION']]) }
       let(:subject) { hosts.first }
       it_should_behave_like 'host'
     end
   end
 
-  context 'by tags' do
+  context 'by tags (optional array tags)' do
     context 'by a tag' do
       let(:subject) { EC2::Host.new(tags: 'master').first }
       it_should_behave_like 'host'

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 ENV['RACK_ENV'] = 'test'
 Bundler.require :test
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter 'vendor/'
-  add_filter 'spec/'
-  add_group 'libs', 'lib'
-end
+# require 'simplecov'
+# SimpleCov.start do
+#   add_filter 'vendor/'
+#   add_filter 'spec/'
+#   add_group 'libs', 'lib'
+# end
 
 Bundler.require :default # <- need this *after* simplecov
 require 'pry'

data/terraform.tf

@@ -0,0 +1,39 @@
+provider "aws" {
+}
+
+data "aws_ami" "ubuntu" {
+  most_recent = true
+  filter {
+    name = "name"
+    values = ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*"]
+  }
+  filter {
+    name = "virtualization-type"
+    values = ["hvm"]
+  }
+  owners = ["099720109477"] # Canonical
+}
+
+resource "aws_instance" "ec2-host-web" {
+  ami = "${data.aws_ami.ubuntu.id}"
+  instance_type = "t2.nano"
+  tags {
+      Name = "ec2-host-web"
+      Roles = "foo,web:test"
+      Service = "ec2-host"
+      Status = "reserve"
+      Tags = "standby"
+  }
+}
+
+resource "aws_instance" "ec2-host-db" {
+  ami = "${data.aws_ami.ubuntu.id}"
+  instance_type = "t2.nano"
+  tags {
+      Name = "ec2-host-db"
+      Roles = "foo,db:test"
+      Service = "ec2-host"
+      Status = "active"
+      Tags = "master"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  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: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -173,29 +159,53 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/ec2-host
-- doc.sh
+- docs/EC2.html
+- docs/EC2/Host.html
+- docs/EC2/Host/CLI.html
+- docs/EC2/Host/Config.html
+- docs/EC2/Host/EC2Client.html
+- docs/EC2/Host/HashUtil.html
+- docs/EC2/Host/HostData.html
+- docs/EC2/Host/RoleData.html
+- docs/EC2/Host/StringUtil.html
+- docs/_index.html
+- docs/class_list.html
+- docs/css/common.css
+- docs/css/full_list.css
+- docs/css/style.css
+- docs/file.LICENSE.html
+- docs/file.README.html
+- docs/file_list.html
+- docs/frames.html
+- docs/index.html
+- docs/js/app.js
+- docs/js/full_list.js
+- docs/js/jquery.js
+- docs/method_list.html
+- docs/top-level-namespace.html
 - ec2-host.gemspec
 - example/aws-sdk.rb
+- example/example.conf
 - example/example.rb
 - lib/ec2-host.rb
 - lib/ec2/host.rb
 - lib/ec2/host/cli.rb
-- lib/ec2/host/client_util.rb
 - lib/ec2/host/config.rb
+- lib/ec2/host/ec2_client.rb
 - lib/ec2/host/hash_util.rb
 - lib/ec2/host/host_data.rb
 - lib/ec2/host/role_data.rb
 - lib/ec2/host/string_util.rb
-- sample.conf
-- spec/README.md
 - spec/host_spec.rb
 - spec/spec_helper.rb
+- terraform.tf
 homepage: https://github.com/sonots/ec2-host
 licenses:
 - MIT
@@ -216,12 +226,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Search hosts on AWS EC2
 test_files:
-- spec/README.md
 - spec/host_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/doc.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-bundle exec yardoc
-rsync -au --delete doc/ /tmp/doc
-git checkout gh-pages
-rsync -au --delete /tmp/doc/ doc

data/lib/ec2/host/client_util.rb

@@ -1,44 +0,0 @@
-require 'net/http'
-require 'aws-sdk'
-
-class EC2
-  class Host
-    class ClientUtil
-      def self.ec2(reload = false)
-        if @ec2.nil? || reload
-          @ec2 = Aws::EC2::Client.new(region: Config.aws_region, credentials: Config.aws_credentials)
-        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.instance_id
-        return @instance_id if @instance_id
-        begin
-          http_conn = Net::HTTP.new('169.254.169.254')
-          http_conn.open_timeout = 5
-          @instance_id = http_conn.start {|http| http.get('/latest/meta-data/instance-id').body }
-        rescue Net::OpenTimeout
-          raise "HTTP connection to 169.254.169.254 is timeout. Probably, not an EC2 instance?"
-        end
-      end
-    end
-  end
-end