ec2ctl 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3295ca73bd89c2cc15d3b8d66afddc03999fd3a1
-  data.tar.gz: 8d0a77f8b71f742b03f907dff0cdbdcec38fb4ca
+  metadata.gz: d5dab3ddeac4018a3031e936b10a76e691dd0d05
+  data.tar.gz: 25ddb0b8b1b57f6141a60f0087a447adbd36a266
 SHA512:
-  metadata.gz: 7a6afe01532aabdd4a690cb7af08a2c697413b79e643a19771fdfd8258b2676e87d74738c0b8fb432821d7db1ba19c1e36243cd669fbf71c5b739f505402b31c
-  data.tar.gz: 1873d16a54c70737982852abed955d91c28ceb98af26644d5f16dc1c2b69cb6ecd03c0f522e68a9f849323b5a9432cfdf52d411bd870b5bc26b30077786e3926
+  metadata.gz: 26698b541f6ef89a600af5ff0a153cb8121a670749bd14bb6f05fdd125fd7406c674fe83159ed6bb2246ab0527c96e4e086609480a17e4d4c45c8fee56e58a24
+  data.tar.gz: 9930e4a4e93b9d780c5571a3c1a550f23292b2c6c027281bf76010ed74c8fd91e40ebf4fc2f2f92eacc0724db13adb65c7cb1c6e9e664759b2a9e5635b81343e

data/lib/ec2ctl/cli.rb

@@ -12,7 +12,7 @@ module EC2Ctl
     OPTION_FILE_NAME = ".ec2ctlrc".freeze
 
     DEFAULT_OPTIONS = {
-      "ec2 list" => {
+      :"ec2 list" => {
         attributes: %w(instance_id tag:Name instance_type public_dns_name state.name ssm:ping_status),
       },
     }
@@ -42,9 +42,7 @@ module EC2Ctl
         c.option "-S", "--sort KEY",                    String, "(Optional) Sort instances by this attribute."
 
         c.action do |args, options|
-          handle_options c, options
-
-          invoke options do
+          invoke c, options do
             @client.ec2_list
           end
         end
@@ -58,9 +56,7 @@ module EC2Ctl
         ssm_options c
 
         c.action do |args, options|
-          handle_options c, options
-
-          invoke options do
+          invoke c, options do
             mandatory options, :commands
             @client.ec2_execute
           end
@@ -72,9 +68,7 @@ module EC2Ctl
         c.description = "List load balancers."
 
         c.action do |args, options|
-          handle_options c, options
-
-          invoke options do
+          invoke c, options do
             @client.elb_list
           end
         end
@@ -87,9 +81,7 @@ 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
+          invoke c, options do
             mandatory options, :load_balancer_name
             @client.elb_status
           end
@@ -104,9 +96,7 @@ 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
+          invoke c, options do
             mandatory options, :load_balancer_name, :instance_ids
             @client.elb_attach
           end
@@ -121,9 +111,7 @@ 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
+          invoke c, options do
             mandatory options, :load_balancer_name, :instance_ids
             @client.elb_detach
           end
@@ -137,9 +125,7 @@ module EC2Ctl
         elb_execute_options c
 
         c.action do |args, options|
-          handle_options c, options
-
-          invoke options do
+          invoke c, options do
             mandatory options, :load_balancer_name, :commands
             @client.elb_execute
           end
@@ -153,9 +139,7 @@ module EC2Ctl
         elb_execute_options c
 
         c.action do |args, options|
-          handle_options c, options
-
-          invoke options do
+          invoke c, options do
             mandatory options, :load_balancer_name, :commands
             @client.elb_graceful
           end
@@ -190,10 +174,11 @@ module EC2Ctl
       )
     end
 
-    def invoke(options, &block)
+    def invoke(cmd, opt, &block)
       begin
-        debug_init options
-        init_client options
+        handle_options cmd, opt
+        debug_init opt
+        init_client opt
         block.call
       rescue => ex
         logger.error(
@@ -232,49 +217,50 @@ module EC2Ctl
       logger.debug aws_env: aws_env
     end
 
-    def elb_execute_options(_command)
-      _command.option "-b", "--load-balancer-name STRING",               String,  "The name of the load balancer."
-      _command.option       "--rolling-group-size INTEGER",              Integer, "(Optional) The count of instances to register/deregister/execute simultaneously."
-      _command.option       "--skip-draining-waits",                              "(Optional) Skip waiting connection draining after deregistering instances from load balancer."
-      _command.option       "--skip-inservice-waits",                             "(Optional) Skip waiting `InService` state after registering instances to load balancer."
-      _command.option       "--inservice-wait-timeout INTEGER",          Integer, "(Optional) The time in seconds for instances to be `InService` state after registering to load balancer."
-      _command.option "-i", "--instance-ids STRING1,STRING2",            Array,   "(Optional) The IDs of the instances. If specified, the commands will be executed only on these instances."
+    def elb_execute_options(cmd)
+      cmd.option "-b", "--load-balancer-name STRING",               String,  "The name of the load balancer."
+      cmd.option       "--rolling-group-size INTEGER",              Integer, "(Optional) The count of instances to register/deregister/execute simultaneously."
+      cmd.option       "--skip-draining-waits",                              "(Optional) Skip waiting connection draining after deregistering instances from load balancer."
+      cmd.option       "--skip-inservice-waits",                             "(Optional) Skip waiting `InService` state after registering instances to load balancer."
+      cmd.option       "--inservice-wait-timeout INTEGER",          Integer, "(Optional) The time in seconds for instances to be `InService` state after registering to load balancer."
+      cmd.option "-i", "--instance-ids STRING1,STRING2",            Array,   "(Optional) The IDs of the instances. If specified, the commands will be executed only on these instances."
 
-      ssm_options(_command)
+      ssm_options(cmd)
     end
 
-    def ssm_options(_command)
-      _command.option "-c", "--commands 'STRING1','STRING2',...",        Array,   "The commands to execute."
-      _command.option       "--platform-type Linux|Windows",             String,  "(Optional) Platform type: `Linux` or `Windows`. Default is `Linux`."
-      _command.option       "--skip-ping-check",                                  "(Optional) Skip SSM ping check."
-      _command.option       "--skip-command-waits",                               "(Optional) Skip waiting command success."
-      _command.option       "--wait-interval INTEGER",                   Integer, "(Optional) Waiting interval."
-      _command.option       "--working-directory STRING",                String,  "(Optional) The path to the working directory on your instance."
-      _command.option       "--execution-timeout INTEGER",               Integer, "(Optional) The time in seconds for a command to be completed before it is considered to have failed. Default is 3600 (1 hour). Maximum is 28800 (8 hours)."
-      _command.option       "--timeout-seconds INTEGER",                 Integer, "(Optional) If this time is reached and the command has not already started executing, it will not execute."
-      _command.option       "--comment STRING",                          String,  "(Optional) User-specified information about the command, such as a brief description of what the command should do."
-      _command.option       "--output-s3-bucket-name STRING",            String,  "(Optional) The name of the S3 bucket where command execution responses should be stored."
-      _command.option       "--output-s3-key-prefix STRING",             String,  "(Optional) The directory structure within the S3 bucket where the responses should be stored."
-      _command.option       "--service-role-arn STRING",                 String,  "(Optional) The IAM role that SSM uses to send notifications."
-      _command.option       "--notification-arn STRING",                 String,  "(Optional) An Amazon Resource Name (ARN) for a Simple Notification Service (SNS) topic."
-      _command.option       "--notification-events STRING1,STRING2,...", Array,   "(Optional) The different events for which you can receive notifications."
-      _command.option       "--notification-type STRING",                String,  "(Optional) Command: Receive notification when the status of a command changes."
+    def ssm_options(cmd)
+      cmd.option "-c", "--commands 'STRING1','STRING2',...",        Array,   "The commands to execute."
+      cmd.option       "--platform-type Linux|Windows",             String,  "(Optional) Platform type: `Linux` or `Windows`. Default is `Linux`."
+      cmd.option       "--skip-ping-check",                                  "(Optional) Skip SSM ping check."
+      cmd.option       "--skip-command-waits",                               "(Optional) Skip waiting command success."
+      cmd.option       "--wait-interval INTEGER",                   Integer, "(Optional) Waiting interval."
+      cmd.option       "--working-directory STRING",                String,  "(Optional) The path to the working directory on your instance."
+      cmd.option       "--execution-timeout INTEGER",               Integer, "(Optional) The time in seconds for a command to be completed before it is considered to have failed. Default is 3600 (1 hour). Maximum is 28800 (8 hours)."
+      cmd.option       "--timeout-seconds INTEGER",                 Integer, "(Optional) If this time is reached and the command has not already started executing, it will not execute."
+      cmd.option       "--comment STRING",                          String,  "(Optional) User-specified information about the command, such as a brief description of what the command should do."
+      cmd.option       "--output-s3-bucket-name STRING",            String,  "(Optional) The name of the S3 bucket where command execution responses should be stored."
+      cmd.option       "--output-s3-key-prefix STRING",             String,  "(Optional) The directory structure within the S3 bucket where the responses should be stored."
+      cmd.option       "--service-role-arn STRING",                 String,  "(Optional) The IAM role that SSM uses to send notifications."
+      cmd.option       "--notification-arn STRING",                 String,  "(Optional) An Amazon Resource Name (ARN) for a Simple Notification Service (SNS) topic."
+      cmd.option       "--notification-events STRING1,STRING2,...", Array,   "(Optional) The different events for which you can receive notifications."
+      cmd.option       "--notification-type STRING",                String,  "(Optional) Command: Receive notification when the status of a command changes."
     end
 
-    def ec2_options(_command)
-      _command.option "-f", "--filters KEY1=VALUE1,KEY2=VALUE2...", Array, "(Optional) The key-value pairs to filter instances."
-      _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."
+    def ec2_options(cmd)
+      cmd.option "-f", "--filters KEY1=VALUE1,KEY2=VALUE2...", Array, "(Optional) The key-value pairs to filter instances."
+      cmd.option "-s", "--search KEY1=VALUE1,KEY2=VALUE2...",  Array, "(Optional) The key-value pairs to search instances by Regexp."
+      cmd.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]
-      file_opt    = options_from_file[_command.name]
+    def handle_options(cmd, opt)
+      o           = {}
+      default_opt = DEFAULT_OPTIONS[cmd.name.intern]
+      file_opt    = options_from_file[cmd.name.intern]
 
-      [default_opt, file_opt].each do |o|
-        o.each {|k, v| opt.default k.intern => v} if o
-      end
+      o.update default_opt if default_opt
+      o.update file_opt if file_opt
 
+      opt.default o
       handle_global_options opt
     end
 
@@ -302,7 +288,7 @@ module EC2Ctl
       end
 
       pathnames.each do |pathname|
-        return JSON.load File.read(pathname) if File.exists? pathname
+        return JSON.parse(File.read(pathname), symbolize_names: true) if File.exists? pathname
       end
 
       {}

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module EC2Ctl
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Yoriki Yamaguchi