aptible-cli 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7800411b1c246c299e73b915d9352b3f3ba2ce47
-  data.tar.gz: 84b8ca4a819ba20f99887b10af6fb6921256fe80
+  metadata.gz: 1a3f6b5e9a9f9f325832789f7bbac423de2276c8
+  data.tar.gz: 328b06f1dcf9cb13c0df4f63f587fb4b79145a57
 SHA512:
-  metadata.gz: 6b1d82455c6c2d2eea71366923ce913dc6a2678bc1aaef7222177c643d44088f14273aac3441bad4225044668c06f343aa52379cbb0241f1591f596437dc61cf
-  data.tar.gz: 0bddfeb029c33710957829594e08635c5e42811c46fd0b45dfd06994eb1a7e13c2c1a50173d4f387fd01f6ab26275aed9508aa21d0e48647abd29fbffb473c94
+  metadata.gz: 8618af8eaf81ca409c8dfd680a00744f265a72da22d87767d679b93c6deadc6d8edf2951fcd488521d68a92ffdbb60f2969a995fb5ad0f3c30afc0ee2858ff48
+  data.tar.gz: 9da5825e8c2d8e2476ffce6268406f421cc357edd7fc8290801b1b342fe760351082f0f4864e782b113a0a1e8291b3226d815af3b50d23d0438cc0b97106e5d9

data/aptible-cli.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aptible-api', '>= 0.9.5'
+  spec.add_dependency 'aptible-auth', '>= 0.11.3'
   spec.add_dependency 'thor', '>= 0.19.0'
   spec.add_dependency 'git'
   spec.add_dependency 'term-ansicolor'

data/lib/aptible/cli/agent.rb

@@ -21,6 +21,8 @@ require_relative 'subcommands/ssh'
 
 module Aptible
   module CLI
+    TOKEN_EXPIRY_WITH_OTP = 12 * 60 * 60  # 12 hours
+
     class Agent < Thor
       include Thor::Actions
 
@@ -48,15 +50,30 @@ module Aptible
       desc 'login', 'Log in to Aptible'
       option :email
       option :password
+      option :otp_token, desc: 'A token generated by your second-factor app'
       def login
         email = options[:email] || ask('Email: ')
         password = options[:password] || ask('Password: ', echo: false)
         puts ''
 
+        token_options = { email: email, password: password }
+
+        otp_token = options[:otp_token]
+        token_options[:otp_token] = otp_token if otp_token
+
         begin
-          token = Aptible::Auth::Token.create(email: email, password: password)
-        rescue OAuth2::Error
-          raise Thor::Error, 'Could not authenticate with given credentials'
+          token_options[:expires_in] = TOKEN_EXPIRY_WITH_OTP \
+              if token_options[:otp_token]
+          token = Aptible::Auth::Token.create(token_options)
+        rescue OAuth2::Error => e
+          if e.code == 'otp_token_required'
+            token_options[:otp_token] = options[:otp_token] ||
+                                        ask('2FA Token: ')
+            retry
+          end
+
+          raise Thor::Error, 'Could not authenticate with given credentials: ' \
+                             "#{e.code}"
         end
 
         save_token(token.access_token)

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.6.7'
+    VERSION = '0.6.8'
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -15,8 +15,12 @@ describe Aptible::CLI::Agent do
   describe '#login' do
     let(:token) { double('Aptible::Auth::Token') }
 
-    before { OAuth2::Error.send :define_method, :initialize, -> {} }
+    before do
+      m = -> (code) { @code = code }
+      OAuth2::Error.send :define_method, :initialize, m
+    end
     before { token.stub(:access_token) { 'access_token' } }
+    before { subject.stub(:puts) {} }
 
     it 'should save a token to ~/.aptible/tokens' do
       Aptible::Auth::Token.stub(:create) { token }
@@ -25,10 +29,10 @@ describe Aptible::CLI::Agent do
     end
 
     it 'should raise an error if authentication fails' do
-      Aptible::Auth::Token.stub(:create).and_raise OAuth2::Error
+      Aptible::Auth::Token.stub(:create).and_raise(OAuth2::Error, 'foo')
       expect do
         subject.login
-      end.to raise_error 'Could not authenticate with given credentials'
+      end.to raise_error 'Could not authenticate with given credentials: foo'
     end
 
     it 'should use command line arguments if passed' do
@@ -37,5 +41,70 @@ describe Aptible::CLI::Agent do
       expect(Aptible::Auth::Token).to receive(:create).with(options) { token }
       subject.login
     end
+
+    context 'with OTP' do
+      let(:email) { 'foo@example.org' }
+      let(:password) { 'bar' }
+      let(:token) { '123456' }
+
+      context 'with options' do
+        before do
+          allow(subject).to receive(:options)
+            .and_return(email: email, password: password, otp_token: token)
+        end
+
+        it 'should authenticate without otp_token_required feedback' do
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  expires_in: Aptible::CLI::TOKEN_EXPIRY_WITH_OTP)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+      end
+
+      context 'with prompts' do
+        before do
+          [
+            [['Email: '], email],
+            [['Password: ', echo: false], password],
+            [['2FA Token: '], token]
+          ].each do |prompt, val|
+            expect(subject).to receive(:ask).with(*prompt).once.and_return(val)
+          end
+        end
+
+        it 'should prompt for an OTP token and use it' do
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password)
+            .once
+            .and_raise(OAuth2::Error, 'otp_token_required')
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  expires_in: Aptible::CLI::TOKEN_EXPIRY_WITH_OTP)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+
+        it 'should not retry non-OTP errors.' do
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password)
+            .once
+            .and_raise(OAuth2::Error, 'otp_token_required')
+
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, otp_token: token,
+                  expires_in: Aptible::CLI::TOKEN_EXPIRY_WITH_OTP)
+            .once
+            .and_raise(OAuth2::Error, 'foo')
+
+          expect { subject.login }.to raise_error(/Could not authenticate/)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.5
+- !ruby/object:Gem::Dependency
+  name: aptible-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement