yle-aws-role 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b0f1070a9587c8e21af9afbdc5fe81b0f93d4015c1c3abc37835df1ea0c9e1
-  data.tar.gz: fd04107ea86be718b2c1859fd526d93a3326bc7c0cafd24f990eed4dd77ea4e3
+  metadata.gz: 487ba074255efe194b3ce4a0c111cccb7131ce92f2cae0e04820d255aa22a1c2
+  data.tar.gz: 6e58f555b729400c092e8a47e25a1b584deb291ad988ab591471c1f402827e1b
 SHA512:
-  metadata.gz: b0c4ad64c3b2b79f4eb791f570ff293e003bcb6f654cc3348d6733f9bdac915905f9bf1b7bd1856e82c73af65cae4dcde998655d05ea4a9adbb6f8ebda95b0db
-  data.tar.gz: 491d7a7c1c44b4d228c31b6262487dfdb138865c3741811e25cf931c0a4a10df780c28ac559429987148d9c7155678e0cfc4417922c0f4a655e8905e9d711648
+  metadata.gz: 06f11aed7628aa9dbdd25853bb6eb25515763e1158edb7a67af63f27e71b5b8adaddc0ffc24ffa6c0258b22ae742b18578a1dfd5d43b92bdefe5fa4c6300cfde
+  data.tar.gz: 60103da98186ed41858ad14171e9bf2bbc2e4009f682f2ad8332ba7e5f06d6c1c67c3321d8a7e3567ed1191ca9b2a638d8608d40859846f9671dcdac496e5583

data/lib/yle/aws/role/cli.rb

@@ -10,6 +10,7 @@ module Yle
 
         def initialize(argv)
           parse_args(argv)
+          verify_args
         end
 
         # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
@@ -39,63 +40,71 @@ module Yle
             end
           end
 
-          @account_name = opts.args.shift
-          @command = opts.args
-
-          if !@opts[:list]
-            if !@account_name
-              STDERR.puts @opts
-              exit 64
-            elsif !(@opts[:role] || Role.default_role_name)
-              STDERR.puts 'Role name must be passed with `--role` or set in the config'
-              exit 64
-            end
-          end
+          @account_name = @opts.args.shift
+          @command = @opts.args
         rescue Slop::Error => e
           STDERR.puts e
           exit 64
         end
         # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-        # rubocop:disable Metrics/AbcSize
-        def execute
-          return list_accounts if opts[:list]
+        def verify_args
+          return if opts[:list]
 
-          assume_role(account_name, opts[:role], opts[:duration]) do |role|
-            STDERR.puts("Assumed role #{role.name}") if !opts[:quiet]
+          if !account_name
+            STDERR.puts opts
+            exit 64
+          end
 
-            if opts[:env]
-              role.print_env_vars
-            else
-              run_command
-            end
+          if !(opts[:role] || Role.default_role_name)
+            STDERR.puts 'Role name must be passed with `--role` or set in the config'
+            exit 64
+          end
+        end
+
+        def execute
+          if opts[:list]
+            list_accounts
+          elsif opts[:env]
+            print_env_vars
+          else
+            run_command
           end
         end
-        # rubocop:enable Metrics/AbcSize
 
         def list_accounts
           puts Role.accounts
         end
 
-        def assume_role(account_name, role_name, duration, &block)
-          Role.assume_role(account_name, role_name, duration, &block)
-        rescue Errors::AssumeRoleError => e
-          STDERR.puts e
-          exit 1
+        def print_env_vars
+          assume_role(&:print_env_vars)
         end
 
         def run_command
-          ret = system(*command)
-          STDERR.puts "Failed to execute '#{command.first}'" if ret.nil?
-          exit(1) if !ret
+          assume_role do
+            ret = system(*command)
+            STDERR.puts "Failed to execute '#{command.first}'" if ret.nil?
+            exit(1) if !ret
+          end
+        end
+
+        def assume_role
+          Role.assume_role(account_name, opts[:role], opts[:duration]) do |role|
+            STDERR.puts("Assumed role #{role.name}") if !opts[:quiet]
+            yield role
+          end
+        rescue Errors::AssumeRoleError => e
+          STDERR.puts e
+          exit 1
         end
 
         def command
-          @command ||= [shell]
+          @command = shell if @command.empty?
+          @command
         end
 
         def shell
-          shell = ENV.fetch('SHELL', 'bash')
+          shell = default_shell
 
           if !opts[:quiet]
             puts "Executing shell '#{shell}' with the assumed role"
@@ -105,6 +114,10 @@ module Yle
 
           [shell]
         end
+
+        def default_shell
+          ENV.fetch('SHELL', 'bash')
+        end
       end
     end
   end

data/lib/yle/aws/role/version.rb

@@ -1,7 +1,7 @@
 module Yle
   module AWS
     class Role
-      VERSION = '2.0.0'.freeze
+      VERSION = '2.0.1'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yle-aws-role
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Yleisradio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core