ec2-host 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71fdb977a6c700081fd8af2f3274b70778854458
-  data.tar.gz: 380fbcf200f1fb57fca95d1b8a8a1f5f8a431873
+  metadata.gz: 111eba0b58ae0c88e7c0c8dc2fa342f8f397d594
+  data.tar.gz: cfddfadf8447f1cc751ef005c7173a3b64480cc1
 SHA512:
-  metadata.gz: b9deed0d8a1921c188193536c519f3be9f918767c174e4cf2116517a5ae1bc8403d33d5f82d434e0b2d7d62236f8f4a2686be45fab71ba40823289d15e2b991c
-  data.tar.gz: 901615c730d1a69786586c864a55a53f1e00d6da90c0f8e924cd02f4fedabc3deaf8a4e0e6410f9a9e920b0e5ba5b8f4254772701ec1ce6fd763329e325fecc9
+  metadata.gz: 80e09e433370bfd266977ce286de1969dff6137b152745e510937903f0a481b58ef7af01a5d70d97221d0f3912e04d17181cff94e9e18c3ea78a5659f45c806d
+  data.tar.gz: 54d9dca3656d00d3f32d35210bc98e7c9ec40ef1e91985edcb20a4d6ded4280515ad2f32f858cb2ab05464da1cc004e7c8e69f8349fec0f03b28db7724661317

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.2.0 (2015/08/19)
+
+Changes:
+
+* Use optparse instead of thor
+  * Format to specify array option arguments are changed from --option a b c to --option a,b,c
+  * --long_option (underscore) is no longer available, only --long-option (dash) is available
+
 # 0.1.1 (2015/08/11)
 
 Changes:

data/README.md

@@ -44,38 +44,104 @@ See [sampel.conf](./sample.conf)
 
 ## CLI Usage
 
+### CLI Example
+
+```
+$ ec2-host -j
+{"hostname":"test","roles":["admin:ami","test"],"region":"ap-northeast-1","instance_id":"i-85900780","private_ip_address":"172.31.23.50","public_ip_address":null,"launch_time":"2013-09-16 06:14:20 UTC","state":"stopped","monitoring":"disabled"}
+{"hostname":"ip-172-31-6-194","roles":["isucon4:qual"],"region":"ap-northeast-1","instance_id":"i-f88cc8e1","private_ip_address":"172.31.6.194","public_ip_address":null,"launch_time":"2014-10-20 15:57:23 UTC","state":"stopped","monitoring":"disabled"}
+```
+
+```
+$ ec2-host
+test
+ip-172-31-6-194 # if Name tag is not available
+```
+
 ```
 $ ec2-host --role1 admin
-host1
-ip-XXX-XXX-XXX-XXX # if Name tag is not assigned
+test
+```
+
+```
+$ ec2-host --role admin:ami
+test
 ```
 
-See `ec2-host help get-hosts` for details:
+```
+$ ec2-host --pretty-json
+[
+  {
+    "hostname": "test",
+    "roles": [
+      "admin:ami",
+      "test"
+    ],
+    "region": "ap-northeast-1",
+    "instance_id": "i-85900780",
+    "private_ip_address": "172.31.23.50",
+    "public_ip_address": null,
+    "launch_time": "2013-09-16 06:14:20 UTC",
+    "state": "stopped",
+    "monitoring": "disabled"
+  },
+  {
+    "hostname": "ip-172-31-6-194",
+    "roles": [
+      "isucon4:qual"
+    ],
+    "region": "ap-northeast-1",
+    "instance_id": "i-f88cc8e1",
+    "private_ip_address": "172.31.6.194",
+    "public_ip_address": null,
+    "launch_time": "2014-10-20 15:57:23 UTC",
+    "state": "stopped",
+    "monitoring": "disabled"
+  }
+]
+```
+
+### CLI Help
 
 ```
-Usage:
-  ec2-host get-hosts
-
-Options:
-  -h, [--hostname=one two three]                 # name or private_dns_name
-  -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
+$ bin/ec2-host --help
+Usage: ec2-host [options]
+        --hostname one,two,three     name or private_dns_name
+    -r, --role one,two,three         role
+        --r1, --role1 one,two,three  role1, the 1st part of role delimited by :
+        --r2, --role2 one,two,three  role2, the 2st part of role delimited by :
+        --r3, --role3 one,two,three  role3, the 3st part of role delimited by :
+        --instance-id one,two,three  instance_id
+        --state one,two,three        state
+        --monitoring one,two,three   monitoring
+        --tag one,two,three          tag
+        --service one,two,three      service
+        --status one,two,three       status
+        --private-ip, --ip           show private ip address instead of hostname
+        --public-ip                  show public ip address instead of hostname
+    -i, --info                       show host info
+    -j, --line-delimited-json        show host info in line delimited json
+        --json                       show host info in json
+        --pretty-json                show host info in pretty json
+        --debug                      debug mode
+    -h, --help                       show help
 ```
 
 ## Library Usage
 
+### Library Example
+
+```ruby
+require 'ec2-host'
+
+hosts = EC2::Host.new(role: 'admin:ami')
+hosts.each do |host|
+  puts host
+end
+```
+
+### Library Reference
+
 See http://sonots.github.io/ec2-host/doc/frames.html.
 
 ## ChangeLog

data/bin/ec2-host

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/ec2/host/cli'
-EC2::Host::CLI.start(ARGV)
+EC2::Host::CLI.new(ARGV).run

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.1.1'
+  gem.version       = '0.2.0'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'
@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'aws-sdk'
   gem.add_runtime_dependency 'hashie'
-  gem.add_runtime_dependency 'thor'
   gem.add_runtime_dependency 'dotenv'
 
   gem.add_development_dependency 'yard'

data/lib/ec2/host/cli.rb

@@ -1,69 +1,96 @@
-require 'thor'
 require 'ec2-host'
+require 'optparse'
 
 class EC2
   class Host
-    class CLI < Thor
-      default_command :get_hosts
+    class CLI
+      attr_reader :options
 
-      desc 'get-hosts', 'Search EC2 hosts (default)'
-      option :hostname,
-        :aliases => '-h',
-        :type => :array,
-        :desc => "name or private_dns_name"
-      option :role,
-        :aliases => %w[-r --usage -u],
-        :type => :array,
-        :desc => "role"
-      option :role1,
-        :aliases => %w[--r1 --usage1 --u1], # hmm, -r1 is not suppored by thor
-        :type => :array,
-        :desc => "role1, the 1st part of role delimited by #{Config.role_tag_delimiter}"
-      option :role2,
-        :aliases => %w[--r2 --usage2 --u2],
-        :type => :array,
-        :desc => "role2, the 2nd part of role delimited by #{Config.role_tag_delimiter}"
-      option :role3,
-        :aliases => %w[--r3 --usage3 --u3],
-        :type => :array,
-        :desc => "role3, the 3rd part of role delimited by #{Config.role_tag_delimiter}"
-      option :instance_id,
-        :type => :array,
-        :desc => "instance_id"
-      option :state,
-        :type => :array,
-        :desc => "state"
-      option :monitoring,
-        :type => :array,
-        :desc => "monitoring"
-      Config.optional_options.each do |opt, tag|
-        option opt, :type => :array, :desc => opt
+      def initialize(argv = ARGV)
+        @options = parse_options(argv)
       end
-      option :private_ip,
-        :aliases => %w[--ip],
-        :type => :boolean,
-        :desc => 'show private ip address instead of hostname'
-      option :public_ip,
-        :type => :boolean,
-        :desc => 'show public ip address instead of hostname'
-      option :info,
-        :aliases => %w[-i],
-        :type => :boolean,
-        :desc => "show host info"
-      option :line_delimited_json,
-        :aliases => %w[-j],
-        :type => :boolean,
-        :desc => "show host info in line delimited json"
-      option :json,
-        :type => :boolean,
-        :desc => "show host info in json"
-      option :pretty_json,
-        :type => :boolean,
-        :desc => "show host info in pretty json"
-      option :debug,
-        :type => :boolean,
-        :desc => "debug mode"
-      def get_hosts
+
+      def parse_options(argv = ARGV)
+        op = OptionParser.new
+
+        self.class.module_eval do
+          define_method(:usage) do |msg = nil|
+            puts op.to_s
+            puts "error: #{msg}" if msg
+            exit 1
+          end
+        end
+
+        opts = {}
+
+        op.on('--hostname one,two,three', Array, "name or private_dns_name") {|v|
+          opts[:hostname] = v
+        }
+        op.on('-r', '--role one,two,three', Array, "role") {|v|
+          opts[:role] = v
+        }
+        op.on('--r1', '--role1 one,two,three', Array, "role1, the 1st part of role delimited by #{Config.role_tag_delimiter}") {|v|
+          opts[:role1] = v
+        }
+        op.on('--r2', '--role2 one,two,three', Array, "role2, the 2st part of role delimited by #{Config.role_tag_delimiter}") {|v|
+          opts[:role2] = v
+        }
+        op.on('--r3', '--role3 one,two,three', Array, "role3, the 3st part of role delimited by #{Config.role_tag_delimiter}") {|v|
+          opts[:role3] = v
+        }
+        op.on('--instance-id one,two,three', Array, "instance_id") {|v|
+          opts[:instance_id] = v
+        }
+        op.on('--state one,two,three', Array, "state") {|v|
+          opts[:state] = v
+        }
+        op.on('--monitoring one,two,three', Array, "monitoring") {|v|
+          opts[:monitoring] = v
+        }
+        Config.optional_options.each do |opt, tag|
+          op.on("--#{opt.to_s.gsub('_', '-')} one,two,three", Array, opt) {|v|
+            opts[opt.to_sym] = v
+          }
+        end
+        op.on('--private-ip', '--ip', "show private ip address instead of hostname") {|v|
+          opts[:private_ip] = v
+        }
+        op.on('--public-ip', "show public ip address instead of hostname") {|v|
+          opts[:public_ip] = v
+        }
+        op.on('-i', '--info', "show host info") {|v|
+          opts[:info] = v
+        }
+        op.on('-j', '--line-delimited-json', "show host info in line delimited json") {|v|
+          opts[:line_delimited_json] = v
+        }
+        op.on('--json', "show host info in json") {|v|
+          opts[:json] = v
+        }
+        op.on('--pretty-json', "show host info in pretty json") {|v|
+          opts[:pretty_json] = v
+        }
+        op.on('--debug', "debug mode") {|v|
+          opts[:debug] = v
+        }
+        op.on('-h', '--help', "show help") {|v|
+          opts[:help] = v
+        }
+
+        begin
+          args = op.parse(argv)
+        rescue OptionParser::InvalidOption => e
+          usage e.message
+        end
+
+        if opts[:help]
+          usage
+        end
+
+        opts
+      end
+
+      def run
         hosts = EC2::Host.new(condition)
         if options[:info]
           hosts.each do |host|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  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