aws-mfa 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7acea0de7d157dcacffc45761829147d3928f4ff
-  data.tar.gz: 18a947ec9f627b2e303585149c68e0a3393510b2
+  metadata.gz: 8e529f0ad78a90cfd6692e5a2a73f037701e1212
+  data.tar.gz: 3ef7f95f65837e93ba3c6a2c36e9279f9fd38be9
 SHA512:
-  metadata.gz: b6a4b52a6a3ce238876ddffdcf9ea3d428e9c75e41069a9394be4fe7b477d9971fb0d42d7841d6e9503724096d5a446d20727ff124e9ec969fa506172de7db04
-  data.tar.gz: 4adc1bc7e1171f840e855264f05eec5ccda076404fddbb8e95f55ef945d9ce222af1cb79d20701fd5b3e1a4818cd204373ccc24c2abd9d4f77dbd49b1d3f446b
+  metadata.gz: 4922a7081513a55505a136498b8d24ac24d5ca33873eb940e62a047d7a48fbeb92023d932f6904518c04b13cd216206a82940cab79259bf91a74fd04a7ddc70c
+  data.tar.gz: d91fdce8ce9c9ec6560ffa436c5324808ec5c0f5dd4c7a3195f383943878caf74ffeb8097ff3026bf10b0589dd0573e9f648ec2a35a7d517bac3593706231c5a

data/bin/aws-mfa

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+
 require 'aws_mfa'
 
 begin

data/lib/aws_mfa.rb

@@ -1,5 +1,7 @@
 require 'json'
 require 'aws_mfa/errors'
+require 'aws_mfa/shell_command'
+require 'aws_mfa/shell_command_result'
 
 class AwsMfa
   attr_reader :aws_config_dir
@@ -72,7 +74,15 @@ class AwsMfa
   end
 
   def mfa_devices(profile='default')
-    @mfa_devices ||= JSON.parse(`aws --profile #{profile} --output json iam list-mfa-devices`).fetch('MFADevices')
+    @mfa_devices ||= begin
+      list_mfa_devices_command = "aws --profile #{profile} --output json iam list-mfa-devices"
+      result = AwsMfa::ShellCommand.new(list_mfa_devices_command).call
+      if result.succeeded?
+        JSON.parse(result.output).fetch('MFADevices')
+      else
+        raise Errors::Error, 'There was a problem fetching MFA devices from AWS'
+      end
+    end
   end
 
   def write_arn_to_file(arn_file, arn)
@@ -104,7 +114,13 @@ class AwsMfa
   def load_credentials_from_aws(arn, profile='default')
     code = request_code_from_user
     unset_environment
-    `aws --profile #{profile} --output json sts get-session-token --serial-number #{arn} --token-code #{code}`
+    credentials_command = "aws --profile #{profile} --output json sts get-session-token --serial-number #{arn} --token-code #{code}"
+    result = AwsMfa::ShellCommand.new(credentials_command).call
+    if result.succeeded?
+      result.output
+    else
+      raise Errors::InvalidCode, 'There was a problem validating the MFA code with AWS'
+    end
   end
 
   def write_credentials_to_file(credentials_file, credentials)

data/lib/aws_mfa/shell_command.rb

@@ -0,0 +1,14 @@
+class AwsMfa
+  class ShellCommand
+    attr_reader :command
+
+    def initialize(command)
+      @command = command
+    end
+
+    def call
+      output = `#{command}`
+      ShellCommandResult.new(output, $?)
+    end
+  end
+end

data/lib/aws_mfa/shell_command_result.rb

@@ -0,0 +1,18 @@
+class AwsMfa
+  class ShellCommandResult
+    attr_reader :output
+
+    def initialize(command_output, process_status)
+      @output = command_output
+      @process_status = process_status
+    end
+
+    def succeeded?
+      process_status.success?
+    end
+
+    private
+
+    attr_reader :process_status
+  end
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: aws-mfa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Brian Pitts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Run AWS commands with MFA
@@ -59,9 +59,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/aws-mfa
 - lib/aws_mfa.rb
 - lib/aws_mfa/errors.rb
+- lib/aws_mfa/shell_command.rb
+- lib/aws_mfa/shell_command_result.rb
+- bin/aws-mfa
 homepage: http://www.github.com/lonelyplanet/aws-mfa
 licenses:
 - Apache-2.0
@@ -72,19 +74,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - aws-cli
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Run AWS commands with MFA
 test_files: []
+has_rdoc: