awful 0.0.171 → 0.0.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e271b33a82255cbcf89c429f453e6898f18f6f
-  data.tar.gz: a5574862027dbbca488ecca8cda684afc67b2b8c
+  metadata.gz: 11f3cb0c491ac167ce83ba7326586888a905752f
+  data.tar.gz: c2801481c9b3c861b41ec6e4441bb9c853883c59
 SHA512:
-  metadata.gz: cdb6f4c673893747db30f3737946427a0362c8c7bde149db3619aa325d83a0896b7cfbd8152dcce21f60c96a653b9444e22351a0efae24cbd00e5e87260cf9d1
-  data.tar.gz: 7e834c77e5219254544e709d37a4d135b5b75b0a9a9249c3312572702b7144eff090dbda5585b98d8d8c23aee19704a80783c38babf4067f68b159e7203a26d6
+  metadata.gz: 8fb2c497bddc4ea72cd40ed37dd0bf08c824cd4acb44aba51120ff0768064ae029485ad194fc968e159403850a67d233cbd680bd82fb6ecf4b14c94730ac9b81
+  data.tar.gz: 8e89918143775690bdd23bca9060198e54c68916bdc20d048116a7c4544df8846f18f14732a59cffdcf6eb8b571e5bef440d9a852937df90c423c1c6c82e51b4

data/lib/awful.rb

@@ -1,4 +1,4 @@
-require "awful/version"
+require 'awful/version'
 
 require 'dotenv'
 require 'aws-sdk'
@@ -18,6 +18,7 @@ module Awful
   class Cli < Thor
     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 :yes,                  type: :boolean, default: false, desc: 'Always answer yes to prompts'
     class_option :region,               type: :string,  default: nil,   desc: 'Set region; can use AWS_REGION instead'
 
     def initialize(args = [], local_options = {}, config = {})
@@ -27,6 +28,11 @@ module Awful
     end
 
     no_commands do
+      ## override thor yes? method to handle our yes option
+      def yes?(statement, color = nil)
+        options[:yes] ? say("#{statement} yes", color) : super(statement, color)
+      end
+
       def ec2
         @ec2 ||= Aws::EC2::Client.new
       end

data/lib/awful/ecr.rb

@@ -78,15 +78,16 @@ module Awful
     end
 
     desc 'login [REGISTRIES]', 'run docker login for registry'
-    method_option :email, aliases: '-E', type: :string,  default: 'none', desc: 'Email for docker login command'
+    method_option :email,                type: :string,  default: nil,    desc: 'Email for docker login command'
     method_option :print, aliases: '-p', type: :boolean, default: false,  desc: 'Print docker login command instead of running it'
     def login(*registries)
       cmd = options[:print] ? :puts : :system
       registries = nil if registries.empty?
+      email = options[:email] ? "-e #{options[:email]}" : ''  # -e deprecated as of 1.14, here for older docker clients
       ecr.get_authorization_token(registry_ids: registries).authorization_data.output do |auths|
         auths.each do |auth|
           user, pass = Base64.decode64(auth.authorization_token).split(':')
-          send(cmd, "docker login -u #{user} -p #{pass} -e #{options[:email]} #{auth.proxy_endpoint}")
+          send(cmd, "docker login -u #{user} -p #{pass} #{email} #{auth.proxy_endpoint}")
         end
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.171'
+  VERSION = '0.0.172'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.171
+  version: 0.0.172
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler