ec2ctl 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca3cd233af8d3490fe1413140d69c929b01eb71
-  data.tar.gz: 81b7947de057b8b75c4ac890319d17a98bf1e5dc
+  metadata.gz: b2e08c5db7580a3b3be676e4974d7186c98eacbe
+  data.tar.gz: 15c9f9525fc194337ec5ece48ae94fe05cc7282b
 SHA512:
-  metadata.gz: 71417debb54cb974406b6e0c54018351d5a1a41714ad5e8012db8b4411f6b5c361530aa797fb50d45fade38c78554f5262ad210f01c34113911a455caff44fe0
-  data.tar.gz: 73a82751440cf841115c8734a9297ce79da58434843a29d09a2f2c6e4861f2cde82a65256d5100a65cf9cf64236d76d5b0984e390047113f843ed856c04a7d77
+  metadata.gz: 68f22cba95a82b4069cc33fef991cd92d01a52f49857f7f2971b78895b7eac3fcbe56b1fc013b23d77900014f18371e20d25e42c6b87ed6169774cb11391026f
+  data.tar.gz: 8ffc388529bd49ed70573cd2f107e2446cd0a4999c919a048eeb4ee0ac48de5f64c0a05a9153580a2102eca572f97ee7af85c8424994bf8db63a54803c823c23

data/lib/ec2ctl/cli.rb

@@ -1,5 +1,6 @@
 require "commander"
 require "ec2ctl/logger"
+require "pathname"
 
 module EC2Ctl
   class CLI
@@ -7,16 +8,24 @@ module EC2Ctl
 
     OptionError = Class.new RuntimeError
 
+    USER_OPTION_FILE_PATH = Pathname.new(ENV["HOME"]) / ".ec2ctlrc"
+
+    DEFAULT_OPTIONS = {
+      "ec2 list" => {
+        attributes: %w(instance_id tag:Name instance_type public_dns_name state.name ssm:ping_status),
+      },
+    }
+
     def run
       program :name,        self.class.to_s
       program :version,     VERSION
       program :description, "A small command line tool for managing EC2/ELB."
 
-      global_option("-V", "--verbose",                                 "Debug output.")       {@verbose = true}
-      global_option("-P", "--pretty",                                  "Pretty JSON output.") {@pretty  = true}
-      global_option("-o", "--output #{EC2Ctl::Logger::VALID_FORMATS}", "Log output format.")  {|v| @output_format     = v.intern}
-      global_option("-p", "--profile PROFILE_NAME",                    "AWS profile name.")   {|v| ENV["AWS_PROFILE"] = v}
-      global_option("-r", "--region REGION_NAME",                      "AWS region name.")    {|v| ENV["AWS_REGION"]  = v}
+      global_option "-V", "--verbose",                                 "Debug output."
+      global_option "-P", "--pretty",                                  "Pretty JSON output."
+      global_option "-o", "--output #{EC2Ctl::Logger::VALID_FORMATS}", "Log output format."
+      global_option "-p", "--profile PROFILE_NAME",                    "AWS profile name."
+      global_option "-r", "--region REGION_NAME",                      "AWS region name."
 
       default_command :"ec2 list"
 
@@ -31,7 +40,7 @@ module EC2Ctl
         c.option       "--platform-type Linux|Windows", String, "(Optional) Platform type: `Linux` or `Windows`. Default is `Linux`."
 
         c.action do |args, options|
-          options.default attributes: %w(instance_id tag:Name instance_type public_dns_name state.name ssm:ping_status)
+          handle_options c, options
 
           invoke options do
             @client.ec2_list
@@ -47,6 +56,8 @@ module EC2Ctl
         ssm_options c
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :commands
             @client.ec2_execute
@@ -59,6 +70,8 @@ module EC2Ctl
         c.description = "List load balancers."
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             @client.elb_list
           end
@@ -72,6 +85,8 @@ module EC2Ctl
         c.option "-b", "--load-balancer-name VALUE", String, "The name of the load balancer."
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :load_balancer_name
             @client.elb_status
@@ -87,6 +102,8 @@ module EC2Ctl
         c.option "-i", "--instance-ids STRING1,STRING2", Array,   "(Optional) The IDs of the instances to attach."
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :load_balancer_name, :instance_ids
             @client.elb_attach
@@ -102,6 +119,8 @@ module EC2Ctl
         c.option "-i", "--instance-ids STRING1,STRING2", Array,   "(Optional) The IDs of the instances to detach."
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :load_balancer_name, :instance_ids
             @client.elb_detach
@@ -116,6 +135,8 @@ module EC2Ctl
         elb_execute_options c
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :load_balancer_name, :commands
             @client.elb_execute
@@ -130,6 +151,8 @@ module EC2Ctl
         elb_execute_options c
 
         c.action do |args, options|
+          handle_options c, options
+
           invoke options do
             mandatory options, :load_balancer_name, :commands
             @client.elb_graceful
@@ -241,5 +264,31 @@ module EC2Ctl
       _command.option "-s", "--search KEY1=VALUE1,KEY2=VALUE2...",  Array, "(Optional) The key-value pairs to search instances by Regexp."
       _command.option "-i", "--instance-ids STRING1,STRING2",       Array, "(Optional) The IDs of the instances."
     end
+
+    def handle_options(_command, opt)
+      default_opt = DEFAULT_OPTIONS[_command.name]
+
+      user_options = if File.exists? USER_OPTION_FILE_PATH
+        require "json"
+        JSON.load(File.read(USER_OPTION_FILE_PATH))
+      end
+
+      if user_options && user_options[_command.name]
+        user_options[_command.name].each do |k, v|
+          default_opt.update k.intern => v
+        end
+      end
+
+      opt.default default_opt if default_opt
+      handle_global_options opt
+    end
+
+    def handle_global_options(opt)
+      @verbose           = true        if opt.verbose
+      @pretty            = true        if opt.pretty
+      @output_format     = opt.output  if opt.output
+      ENV["AWS_PROFILE"] = opt.profile if opt.profile
+      ENV["AWS_REGION"]  = opt.region  if opt.region
+    end
   end
 end

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module EC2Ctl
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Yoriki Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk