awful 0.0.158 → 0.0.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64a33d63741aa2b4eced60d8e54255ca2b7fce1
-  data.tar.gz: 7c03f2f2db06f75724898fea0b80e8344bdbc08c
+  metadata.gz: fb6e7ca3e77e33a7ac755b4c5cc1997ed4c2a5e6
+  data.tar.gz: 89237af369dde02a1831430cc24db4434493d773
 SHA512:
-  metadata.gz: a05d120601d21ef058a76ef1eab81cef24c8170ebffe2004682b29398bd1736ef90fd5b63a4d32c88b4d7c092d7913e9d684bd66ad5c77b0bdd5ea8922e36777
-  data.tar.gz: 64d8328c03f27cabae26fca56f99b395344980f98f1e772e81d019d90c9d2ae1f193b3f58f06925484575210efff7784092467b3563afd40ca300ce30fdb707a
+  metadata.gz: dfac8dd0b55397b901b3bc1386c1fe50b7d0a0ab5e77034c51eb4510bdb7ea8e74354f4e3f3cc4209a173aa23640cc0dd2a4f12cab9ba66e63773e078c830a16
+  data.tar.gz: 6dcafed95b581ca2c2988d7f4d66094321b71f69390075e1bc831248a0868b1d23c4e2c010765f495290456006bbafcdc807c472162c5057f9b644fdf0c88a49

data/awful.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency('aws-sdk', '>= 2.7.2')
-  spec.add_dependency('thor', '< 0.19.2')
+  spec.add_dependency('thor')
   spec.add_dependency('dotenv')
 end

data/lib/awful.rb

@@ -16,9 +16,9 @@ end
 
 module Awful
   class Cli < Thor
-    class_option :env,   aliases: '-e', default: nil, desc: 'Load environment variables from file'
+    class_option :env,   aliases: '-e', type: :string,  default: nil,   desc: 'Load environment variables from file'
     class_option :quiet, aliases: '-q', type: :boolean, default: false, desc: 'Quieten output'
-    class_option :region,               default: nil, desc: 'Set region; can use AWS_REGION instead'
+    class_option :region,               type: :string,  default: nil,   desc: 'Set region; can use AWS_REGION instead'
 
     def initialize(args = [], local_options = {}, config = {})
       super

data/lib/awful/ami.rb

@@ -33,7 +33,7 @@ module Awful
     end
 
     desc 'ls [PATTERN]', 'list AMIs'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       images(options).select do |image|
         image.name.match(name)

data/lib/awful/api_gateway.rb

@@ -16,7 +16,7 @@ module Awful
   module ApiGateway
     class RestApi < Cli
       desc 'ls', 'list rest apis'
-      method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+      method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
       def ls
         api_gateway.get_rest_apis.items.output do |items|
           if options[:long]

data/lib/awful/api_gateway_deployments.rb

@@ -9,7 +9,7 @@ module Awful
 
     class Deployments < Cli
       desc 'ls REST_API_ID', 'list deployments for given rest api'
-      method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+      method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
       def ls(id)
         api_gateway.get_deployments(rest_api_id: id).items.output do |items|
           if options[:long]

data/lib/awful/api_gateway_methods.rb

@@ -9,7 +9,7 @@ module Awful
 
     class Methods < Cli
       desc 'dump REST_API_ID', 'list methods for given rest api and resource'
-      method_option :method, aliases: '-m', default: 'GET', desc: 'HTTP method to get'
+      method_option :method, aliases: '-m', type: :boolean, default: 'GET', desc: 'HTTP method to get'
       def dump(id, resource)
         api_gateway.get_method(rest_api_id: id, resource_id: resource, http_method: options[:method]).output do |response|
           puts YAML.dump(stringify_keys(response.to_hash))

data/lib/awful/api_gateway_resources.rb

@@ -9,7 +9,7 @@ module Awful
 
     class Resources < Cli
       desc 'ls REST_API_ID', 'list resources for given rest api'
-      method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+      method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
       def ls(id)
         api_gateway.get_resources(rest_api_id: id).items.output do |items|
           if options[:long]

data/lib/awful/api_gateway_stages.rb

@@ -9,7 +9,7 @@ module Awful
 
     class Stages < Cli
       desc 'ls REST_API_ID', 'list stages for given rest api'
-      method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+      method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
       def ls(id, deployment = nil)
         api_gateway.get_stages(rest_api_id: id, deployment_id: deployment).item.output do |items|
           if options[:long]

data/lib/awful/auto_scaling.rb

@@ -55,7 +55,7 @@ module Awful
     end
 
     desc 'ls NAMES', 'list autoscaling groups with given names'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(*names)
       autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).auto_scaling_groups.output do |asgs|
         if options[:long]
@@ -113,7 +113,7 @@ module Awful
     end
 
     desc 'ips NAMES', 'list IPs for instances in named groups'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ips(*names)
       asg_instance_details(*names).output do |instances|
         if options[:long]
@@ -161,11 +161,11 @@ module Awful
     end
 
     desc 'create [FILE]', 'create a new auto-scaling group'
-    method_option :auto_scaling_group_name,   aliases: '-n', default: nil, desc: 'Auto-scaling group name'
-    method_option :launch_configuration_name, aliases: '-l', default: nil, desc: 'Launch config name'
-    method_option :desired_capacity,          aliases: '-d', default: nil, desc: 'Set desired capacity'
-    method_option :min_size,                  aliases: '-m', default: nil, desc: 'Set minimum capacity'
-    method_option :max_size,                  aliases: '-M', default: nil, desc: 'Set maximum capacity'
+    method_option :auto_scaling_group_name,   aliases: '-n', type: :string,  default: nil, desc: 'Auto-scaling group name'
+    method_option :launch_configuration_name, aliases: '-l', type: :string,  default: nil, desc: 'Launch config name'
+    method_option :desired_capacity,          aliases: '-d', type: :numeric, default: nil, desc: 'Set desired capacity'
+    method_option :min_size,                  aliases: '-m', type: :numeric, default: nil, desc: 'Set minimum capacity'
+    method_option :max_size,                  aliases: '-M', type: :numeric, default: nil, desc: 'Set maximum capacity'
     def create(file = nil)
       opt = load_cfg(options, file)
       whitelist = %i[auto_scaling_group_name launch_configuration_name instance_id min_size max_size desired_capacity default_cooldown availability_zones
@@ -181,10 +181,10 @@ module Awful
     end
 
     desc 'update NAME [FILE]', 'update existing auto-scaling group'
-    method_option :desired_capacity,          aliases: '-d', default: nil, desc: 'Set desired capacity'
-    method_option :min_size,                  aliases: '-m', default: nil, desc: 'Set minimum capacity'
-    method_option :max_size,                  aliases: '-M', default: nil, desc: 'Set maximum capacity'
-    method_option :launch_configuration_name, aliases: '-l', default: nil, desc: 'Launch config name'
+    method_option :desired_capacity,          aliases: '-d', type: :numeric, default: nil, desc: 'Set desired capacity'
+    method_option :min_size,                  aliases: '-m', type: :numeric, default: nil, desc: 'Set minimum capacity'
+    method_option :max_size,                  aliases: '-M', type: :numeric, default: nil, desc: 'Set maximum capacity'
+    method_option :launch_configuration_name, aliases: '-l', type: :string,  default: nil, desc: 'Launch config name'
     def update(name, file = nil)
       opt = load_cfg(options, file)
 
@@ -313,7 +313,7 @@ module Awful
     end
 
     desc 'launch_configuration NAMES', 'get launch configs for given ASGs'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def launch_configuration(*names)
       autoscaling.describe_auto_scaling_groups(
         auto_scaling_group_names: names
@@ -329,12 +329,12 @@ module Awful
     end
 
     desc 'old_instances ASGS', 'Deal with instances that are not on their ASG current launch config'
-    method_option :long,       aliases: '-l', default: false, desc: 'Long listing'
-    method_option :groups,     aliases: '-g', default: false, desc: 'Just list names of ASGs with outdated instances'
-    method_option :detach,     aliases: '-D', default: false, desc: 'Detach old instances from this ASG'
-    method_option :decrement,  aliases: '-d', default: false, desc: 'should decrement desired capacity when detaching instances from ASG'
-    method_option :deregister, aliases: '-E', default: false, desc: 'Deregister old instances from ELB for this ASG'
-    method_option :terminate,  aliases: '-t', default: false, desc: 'Terminate old instances'
+    method_option :long,       aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :groups,     aliases: '-g', type: :boolean, default: false, desc: 'Just list names of ASGs with outdated instances'
+    method_option :detach,     aliases: '-D', type: :boolean, default: false, desc: 'Detach old instances from this ASG'
+    method_option :decrement,  aliases: '-d', type: :boolean, default: false, desc: 'should decrement desired capacity when detaching instances from ASG'
+    method_option :deregister, aliases: '-E', type: :boolean, default: false, desc: 'Deregister old instances from ELB for this ASG'
+    method_option :terminate,  aliases: '-t', type: :boolean, default: false, desc: 'Terminate old instances'
     def old_instances(*names)
       asgs = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: names).map(&:auto_scaling_groups).flatten
 
@@ -377,8 +377,8 @@ module Awful
     end
 
     desc 'activities ASG', 'describe recent scaling activities for group ASG'
-    method_option :long,  aliases: '-l', default: false, desc: 'Long listing'
-    method_option :cause, aliases: '-c', default: false, desc: 'Long listing with cause of activity'
+    method_option :long,  aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :cause, aliases: '-c', type: :boolean, default: false, desc: 'Long listing with cause of activity'
     def activities(name)
       autoscaling.describe_scaling_activities(auto_scaling_group_name: name).activities.output do |activities|
         if options[:long]

data/lib/awful/auto_scaling_notifications.rb

@@ -3,7 +3,7 @@ module Awful
   class AutoScalingNotifications < Cli
 
     desc 'ls [NAMES]', 'describe notification configurations for named groups'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(*names)
       autoscaling.describe_notification_configurations(auto_scaling_group_names: names).notification_configurations.tap do |notifications|
         if options[:long]

data/lib/awful/certs.rb

@@ -13,8 +13,8 @@ module Awful
     end
 
     desc 'ls [PATH_PREFIX]', 'list server certificates'
-    method_option :long, aliases: '-l', default: false, desc: 'long listing'
-    method_option :arns, aliases: '-a', default: false, desc: 'list ARNs'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'long listing'
+    method_option :arns, aliases: '-a', type: :boolean, default: false, desc: 'list ARNs'
     def ls(path = nil)
       marker = nil
       certs = []

data/lib/awful/changesets.rb

@@ -48,7 +48,7 @@ module Awful
     end
 
     desc 'ls STACK_NAME', 'list change sets for stack'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(stack_name)
       cf.list_change_sets(stack_name: stack_name).summaries.tap do |list|
         if options[:long]

data/lib/awful/cloudformation.rb

@@ -45,8 +45,8 @@ module Awful
     end
 
     desc 'ls [PATTERN]', 'list cloudformation stacks matching PATTERN'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    method_option :all,  aliases: '-a', default: false, desc: 'Show all, including stacks in DELETE_COMPLETE'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :all,  aliases: '-a', type: :boolean, default: false, desc: 'Show all, including stacks in DELETE_COMPLETE'
     def ls(name = /./)
       stacks = stack_summaries
 
@@ -218,7 +218,7 @@ module Awful
     end
 
     desc 'id NAME RESOURCE', 'get physical_resource_id from a logical_resource_id RESOURCE for stack with NAME'
-    method_option :all, aliases: '-a', default: false, desc: 'Return all details about resource as YAML'
+    method_option :all, aliases: '-a', type: :boolean, default: false, desc: 'Return all details about resource as YAML'
     def id(name, resource)
       detail = cf.describe_stack_resource(stack_name: name, logical_resource_id: resource).stack_resource_detail
       if options[:all]

data/lib/awful/cloudwatch_events.rb

@@ -22,7 +22,7 @@ module Awful
     end
 
     desc 'ls [PREFIX]', 'list events'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(prefix = nil)
       next_token = nil
       rules = []
@@ -57,7 +57,7 @@ module Awful
     end
 
     desc 'targets NAME', 'list targets for named rule'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def targets(name)
       next_token = nil
       targets = []

data/lib/awful/cloudwatch_logs.rb

@@ -24,7 +24,7 @@ module Awful
     end
 
     desc 'ls [PREFIX]', 'list log groups'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(prefix = nil)
       paginate(:log_groups) do |token|
         logs.describe_log_groups(log_group_name_prefix: prefix, next_token: token)
@@ -55,9 +55,9 @@ module Awful
     end
 
     desc 'streams GROUP [PREFIX]', 'list log streams for GROUP'
-    method_option :long,  aliases: '-l', default: false, desc: 'long listing'
-    method_option :limit, aliases: '-n', default: 50,    desc: 'limit number of results per page call'
-    method_option :alpha, aliases: '-a', default: false, desc: 'order by name'
+    method_option :long,  aliases: '-l', type: :boolean, default: false, desc: 'long listing'
+    method_option :limit, aliases: '-n', type: :numeric, default: 50,    desc: 'limit number of results per page call'
+    method_option :alpha, aliases: '-a', type: :boolean, default: false, desc: 'order by name'
     def streams(group, prefix = nil)
       paginate(:log_streams) do |token|
         logs.describe_log_streams(

data/lib/awful/datapipeline.rb

@@ -4,7 +4,7 @@ module Awful
   class DataPipeline < Cli
 
     desc 'ls [PATTERN]', 'list data pipelines'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       dps = datapipeline.list_pipelines.pipeline_id_list.select do |dp|
         dp.name.match(name)

data/lib/awful/dynamodb.rb

@@ -47,7 +47,7 @@ module Awful
     end
 
     desc 'ls [PATTERN]', 'list dynamodb tables [matching PATTERN]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       tables = all_matching_tables(name)
 
@@ -167,8 +167,8 @@ module Awful
     end
 
     desc 'enable_streams NAME', 'enable/disable streams on the table'
-    method_option :stream_view_type, aliases: '-t', default: 'NEW_IMAGE', desc: 'view type for the stream (NEW_IMAGE, OLD_IMAGE, NEW_AND_OLD_IMAGES, KEYS_ONLY)'
-    method_option :disable,          aliases: '-d', default: false,       desc: 'disable the stream'
+    method_option :stream_view_type, aliases: '-t', type: :string,  default: 'NEW_IMAGE', desc: 'view type (NEW_IMAGE, OLD_IMAGE, NEW_AND_OLD_IMAGES, KEYS_ONLY)'
+    method_option :disable,          aliases: '-d', type: :boolean, default: false,       desc: 'disable the stream'
     def enable_streams(name)
       stream_specification = {stream_enabled: !options[:disable]}
       stream_specification.merge!(stream_view_type: options[:stream_view_type].upcase) unless options[:disable]

data/lib/awful/dynamodb_streams.rb

@@ -13,7 +13,7 @@ module Awful
     end
 
     desc 'ls [NAME]', 'list dynamodb streams [for table NAME]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(table_name = nil, exclusive_start_stream_arn = nil)
       response = streams.list_streams(
         table_name: table_name,

data/lib/awful/ec2.rb

@@ -87,9 +87,9 @@ module Awful
     end
 
     desc 'create NAME', 'run new EC2 instance'
-    method_option :subnet,     :aliases => '-s', :default => nil,  :desc => 'VPC subnet to use; default nil (classic)'
-    method_option :public_ip,  :aliases => '-p', :default => true, :desc => 'Assign public IP to VPC instances'
-    method_option :elastic_ip, :aliases => '-e', :default => true, :desc => 'Assign new elastic IP to instances'
+    method_option :subnet,     aliases: '-s', type: :string,  default: nil,  desc: 'VPC subnet to use; default nil (classic)'
+    method_option :public_ip,  aliases: '-p', type: :boolean, default: true, desc: 'Assign public IP to VPC instances'
+    method_option :elastic_ip, aliases: '-e', type: :boolean, default: true, desc: 'Assign new elastic IP to instances'
     def create(name)
       opt = load_cfg.merge(symbolize_keys(options))
       whitelist = %i[image_id min_count max_count key_name security_group_ids user_data instance_type kernel_id
@@ -141,7 +141,7 @@ module Awful
     end
 
     desc 'az', 'list availability zones'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def az
       ec2.describe_availability_zones.availability_zones.output do |zones|
         if options[:long]

data/lib/awful/ecs.rb

@@ -28,8 +28,8 @@ module Awful
     end
 
     desc 'ls NAME', 'list ECS clusters'
-    method_option :arns, aliases: '-a', default: false, desc: 'List just ARNs'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :arns, aliases: '-a', type: :boolean, default: false, desc: 'List just ARNs'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = '.')
       arns = ecs.list_clusters.cluster_arns.select do |arn|
         arn.split('/').last.match(/#{name}/i)
@@ -61,7 +61,7 @@ module Awful
     end
 
     desc 'instances CLUSTER', 'list instances for CLUSTER'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def instances(cluster)
       arns = ecs.list_container_instances(cluster: cluster).container_instance_arns
       if options[:long]
@@ -90,8 +90,8 @@ module Awful
     end
 
     desc 'definitions [FAMILY_PREFIX]', 'task definitions [for FAMILY]'
-    method_option :arns,     aliases: '-a', default: false, desc: 'show full ARNs for tasks definitions'
-    method_option :inactive, aliases: '-i', default: false, desc: 'show INACTIVE instead of ACTIVE task definitions'
+    method_option :arns,     aliases: '-a', type: :boolean, default: false, desc: 'show full ARNs for tasks definitions'
+    method_option :inactive, aliases: '-i', type: :boolean, default: false, desc: 'show INACTIVE instead of ACTIVE task definitions'
     def definitions(family = nil)
       params = {family_prefix: family, status: options[:inactive] ? 'INACTIVE' : 'ACTIVE'}.reject{|_,v| v.nil?}
       arns = ecs.list_task_definitions(params).task_definition_arns
@@ -133,7 +133,7 @@ module Awful
     end
 
     desc 'dump TASK', 'describe details for TASK definition'
-    method_option :json, aliases: '-j', default: false, desc: 'dump as json instead of yaml'
+    method_option :json, aliases: '-j', type: :boolean, default: false, desc: 'dump as json instead of yaml'
     def dump(task)
       ecs.describe_task_definition(task_definition: task).task_definition.to_h.output do |hash|
         if options[:json]
@@ -145,8 +145,8 @@ module Awful
     end
 
     desc 'tasks CLUSTER', 'list tasks for CLUSTER'
-    method_option :long,   aliases: '-l', default: false,     desc: 'Long listing'
-    method_option :status, aliases: '-s', default: 'running', desc: 'choose status to show: running/pending/stopped'
+    method_option :long,   aliases: '-l', type: :boolean, default: false,     desc: 'Long listing'
+    method_option :status, aliases: '-s', type: :boolean, default: 'running', desc: 'choose status to show: running/pending/stopped'
     def tasks(cluster)
       status = %w[running pending stopped].find{ |s| s.match(/^#{options[:status]}/i) }
       arns = ecs.list_tasks(cluster: cluster, desired_status: status.upcase).task_arns
@@ -179,7 +179,7 @@ module Awful
     end
 
     desc 'services CLUSTER', 'list services for a cluster'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def services(cluster)
       arns = ecs.list_services(cluster: cluster).service_arns
       if options[:long]
@@ -218,7 +218,7 @@ module Awful
     end
 
     desc 'run_task CLUSTER TASK_DEFINITION', 'run a task on given cluster'
-    method_option :command, aliases: '-c', default: nil, desc: 'override container command as name:cmd,arg1,arg2'
+    method_option :command, aliases: '-c', type: :string, default: nil, desc: 'override container command as name:cmd,arg1,arg2'
     def run_task(cluster, task)
       container_overrides = {}
       if options[:command]

data/lib/awful/elasticache.rb

@@ -24,7 +24,7 @@ module Awful
     end
 
     desc 'ls [ID]', 'list clusters'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(id = nil)
       elasticache.describe_cache_clusters(cache_cluster_id: id).cache_clusters.tap do |clusters|
         if options[:long]

data/lib/awful/elb.rb

@@ -32,7 +32,7 @@ module Awful
     end
 
     desc 'ls [NAME]', 'list load-balancers matching NAME'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       all_matching_elbs(name).output do |elbs|
         if options[:long]
@@ -46,7 +46,7 @@ module Awful
     end
 
     desc 'instances NAME', 'list instances and states for elb NAME'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def instances(name)
       instances = all_matching_elbs(name).map do |e|
         elb.describe_instance_health(load_balancer_name: e.load_balancer_name).map(&:instance_states)
@@ -116,11 +116,11 @@ module Awful
     end
 
     desc 'health_check NAME', 'set health-check'
-    method_option :target,              aliases: '-t', default: nil, desc: 'Health check target'
-    method_option :interval,            aliases: '-i', default: nil, desc: 'Check interval'
-    method_option :timeout,             aliases: '-o', default: nil, desc: 'Check timeout'
-    method_option :unhealthy_threshold, aliases: '-u', default: nil, desc: 'Unhealthy threshold'
-    method_option :healthy_threshold,   aliases: '-h', default: nil, desc: 'Healthy threshold'
+    method_option :target,              aliases: '-t', type: :string,  default: nil, desc: 'Health check target'
+    method_option :interval,            aliases: '-i', type: :numeric, default: nil, desc: 'Check interval'
+    method_option :timeout,             aliases: '-o', type: :numeric, default: nil, desc: 'Check timeout'
+    method_option :unhealthy_threshold, aliases: '-u', type: :numeric, default: nil, desc: 'Unhealthy threshold'
+    method_option :healthy_threshold,   aliases: '-h', type: :numeric, default: nil, desc: 'Healthy threshold'
     def health_check(name)
       opt = load_cfg.merge(options.reject(&:nil?))
       hc = elb.configure_health_check(load_balancer_name: name, health_check: opt[:health_check])
@@ -147,7 +147,7 @@ module Awful
     end
 
     desc 'state [INSTANCE_IDS]', 'show health state for all instances, or listed instance ids'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def state(name, *instances)
       elb.describe_instance_health(load_balancer_name: name, instances: instance_ids(*instances)).instance_states.output do |list|
         if options[:long]

data/lib/awful/iam.rb

@@ -29,7 +29,7 @@ module Awful
     end
 
     desc 'mfa', 'list MFA devices'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def mfa
       iam.list_virtual_mfa_devices.virtual_mfa_devices.output do |devices|
         if options[:long]
@@ -44,8 +44,8 @@ module Awful
     end
 
     desc 'roles [NAME]', 'list IAM roles [matching NAME]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    method_option :arns, aliases: '-a', default: false, desc: 'Show ARNs instead of names'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :arns, aliases: '-a', type: :boolean, default: false, desc: 'Show ARNs instead of names'
     def roles(name = /./)
       iam.list_roles.roles.select do |role|
         role.role_name.match(name)
@@ -67,7 +67,7 @@ module Awful
     end
 
     desc 'policy {role,group,user} NAME', 'List or show policy(s) for {role,group,user} NAME'
-    method_option :pretty, aliases: '-p', default: false, desc: 'Pretty-print policy document'
+    method_option :pretty, aliases: '-p', type: :boolean, default: false, desc: 'Pretty-print policy document'
     def policy(type, name, policy = nil)
 
       ## first matching role, group or user

data/lib/awful/lambda.rb

@@ -23,8 +23,8 @@ module Awful
     end
 
     desc 'ls NAME', 'list lambda functions matching NAME pattern'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    method_option :arns, aliases: '-a', default: false, desc: 'List ARNs for functions'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :arns, aliases: '-a', type: :boolean, default: false, desc: 'List ARNs for functions'
     def ls(name = /./)
       lambda.list_functions.functions.select do |function|
         function.function_name.match(name)
@@ -51,7 +51,7 @@ module Awful
     end
 
     desc 'update [NAME]', 'update lambda function config [and code]'
-    method_option :zip_file, aliases: '-z', default: false, desc: 'Update code zip file (creates if necessary)'
+    method_option :zip_file, aliases: '-z', type: :boolean, default: false, desc: 'Update code zip file (creates if necessary)'
     def update(name = nil)
       opt = load_cfg
       opt[:function_name] = name unless name.nil?
@@ -83,7 +83,7 @@ module Awful
     end
 
     desc 'code NAME', 'get code for lambda function NAME'
-    method_option :url, aliases: '-u', default: false, desc: 'Return just URL instead of downloading code'
+    method_option :url, aliases: '-u', type: :boolean, default: false, desc: 'Return just URL instead of downloading code'
     def code(name)
       url = lambda.get_function(function_name: name).code.location
       if options[:url]

data/lib/awful/lambda_events.rb

@@ -20,7 +20,7 @@ module Awful
     end
 
     desc 'ls [FUNCTION_NAME]', 'list event source mappings'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = nil)
       lambda.list_event_source_mappings(function_name: name).event_source_mappings.tap do |sources|
         if options[:long]

data/lib/awful/launch_config.rb

@@ -5,7 +5,7 @@ module Awful
   class LaunchConfig < Cli
 
     desc 'ls [PATTERN]', 'list launch configs with name matching PATTERN'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ? %i[launch_configuration_name image_id instance_type created_time] : %i[launch_configuration_name]
       autoscaling.describe_launch_configurations.map(&:launch_configurations).flatten.select do |lc|
@@ -53,9 +53,9 @@ module Awful
     end
 
     desc 'create NAME [FILE]', 'create a new launch configuration'
-    method_option :timestamp,                 aliases: '-t', default: false, desc: 'Add timestamp to launch config name'
-    method_option :launch_configuration_name, aliases: '-n', default: nil,   desc: 'launch configuration name'
-    method_option :image_id,                  aliases: '-i', default: nil,   desc: 'image ID (AMI to use)'
+    method_option :timestamp,                 aliases: '-t', type: :boolean, default: false, desc: 'Add timestamp to launch config name'
+    method_option :launch_configuration_name, aliases: '-n', type: :string,  default: nil,   desc: 'launch configuration name'
+    method_option :image_id,                  aliases: '-i', type: :string,  default: nil,   desc: 'image ID (AMI to use)'
     def create(file = nil)
       opt = load_cfg(options, file)
 

data/lib/awful/rds.rb

@@ -3,7 +3,7 @@ module Awful
   class Rds < Cli
 
     desc 'ls [NAME]', 'list DB instances matching NAME'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ?
         ->(d) { [d.db_instance_identifier, d.availability_zone, d.db_instance_class, d.db_instance_status, d.preferred_maintenance_window, d.storage_type, d.allocated_storage,

data/lib/awful/route53.rb

@@ -45,7 +45,7 @@ module Awful
     end
 
     desc 'ls [NAME]', 'list hosted zones'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       route53.list_hosted_zones.hosted_zones.select do |zone|
         zone.name.match(name)

data/lib/awful/route_table.rb

@@ -3,7 +3,7 @@ module Awful
   class RouteTable < Cli
 
     desc 'ls [PATTERN]', 'list routes'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = nil)
       fields = options[:long] ?
         ->(r) { [ tag_name(r), r.route_table_id, r.vpc_id ] } :

data/lib/awful/s3.rb

@@ -20,7 +20,7 @@ module Awful
     end
 
     desc 'ls PATTERN', 'list buckets or objects'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = '.')
       if name.include?('/')
         bucket, prefix = name.split('/', 2)
@@ -31,7 +31,7 @@ module Awful
     end
 
     desc 'buckets [PATTERN]', 'list buckets'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def buckets(name = /./)
       s3.list_buckets.buckets.select do |bucket|
         bucket.name.match(/#{name}/)

data/lib/awful/security_group.rb

@@ -64,7 +64,7 @@ module Awful
     end
 
     desc 'inbound NAME', 'show inbound rules for named security group'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def inbound(name)
       first_matching_sg(name).ip_permissions.output do |perms|
         sources = ->(perm) { perm.ip_ranges.map(&:cidr_ip) + perm.user_id_group_pairs.map(&:group_id) }

data/lib/awful/sqs.rb

@@ -25,7 +25,7 @@ module Awful
     end
 
     desc 'ls [PATTERN]', 'list subnets [with any tags matching PATTERN]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(prefix = nil)
       queues = sqs.list_queues(queue_name_prefix: prefix).queue_urls
       attr = %w[QueueArn ApproximateNumberOfMessages ApproximateNumberOfMessagesNotVisible LastModifiedTimestamp]

data/lib/awful/subnet.rb

@@ -3,7 +3,7 @@ module Awful
   class Subnet < Cli
 
     desc 'ls [PATTERN]', 'list subnets [with any tags matching PATTERN]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ?
         ->(s) { [(tag_name(s) || '-'), s.subnet_id, s.state, s.cidr_block, s.available_ip_address_count, s.availability_zone] } :

data/lib/awful/trusted_advisor.rb

@@ -3,7 +3,7 @@ module Awful
   class TrustedAdvisor < Cli
 
     desc 'ls', 'list trusted advisor checks'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = '.')
       support.describe_trusted_advisor_checks(language: 'en').checks.select do |check|
         check.name.match(/#{name}/i)
@@ -17,8 +17,8 @@ module Awful
     end
 
     desc 'check ID', 'describe check result for given ID'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
-    method_option :all,  aliases: '-a', default: false, desc: 'List all flagged resources'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
+    method_option :all,  aliases: '-a', type: :boolean, default: false, desc: 'List all flagged resources'
     def check(id)
       support.describe_trusted_advisor_check_result(check_id: id).result.tap do |r|
         if options[:long]

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.158'
+  VERSION = '0.0.159'
 end

data/lib/awful/vpc.rb

@@ -3,7 +3,7 @@ module Awful
   class Vpc < Cli
 
     desc 'ls [PATTERN]', 'list vpcs [with any tags matching PATTERN]'
-    method_option :long, aliases: '-l', default: false, desc: 'Long listing'
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
     def ls(name = /./)
       fields = options[:long] ?
         ->(v) { [tag_name(v), v.vpc_id, v.state, v.cidr_block] } :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.158
+  version: 0.0.159
 platform: ruby
 authors:
 - Ric Lister
@@ -56,16 +56,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement