aptible-cli 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b335a0f359338d92dff7ff3e0a267c0da5a6790
-  data.tar.gz: 28fa0a1b6c4129e361df287757fc8436f540fb9f
+  metadata.gz: cf860a7c589c2689289068a00ea10b4a2bb8cd10
+  data.tar.gz: 30a8504c9fdeddd33c67a23e775e08eae455cae9
 SHA512:
-  metadata.gz: e0c6bb5308aa87d7696a6b4cd1ae85923429084b5bfa3c6882114cbc0932c001e60f4e3045f686bc4e7c5827874c9a53e2685bee2268210baee5479395c1fd99
-  data.tar.gz: 9604c082e3d8a4b47ab0bad5bd1686fcf2dd27cefa0404f2fffd2f685b8c93fb8b3b19a9348a74aba98c4debfe6bfd14d539b16fec2f1dc67dba93b319a2c667
+  metadata.gz: 709bfbf15f9a1988a3bdbd7d6c04d88a7ac748c0f15d4550afdcdf80bdd11536cd1735ed7437c8188d3272e9890a265880b010f546367135d85bb1d956df6a81
+  data.tar.gz: 96ac24c260b42100c57639dcd8ee10e57ccbef49dcbf070ce3509f255b98835df0c2a10d9a99cbfe729c7a195adfac21b6070d622017f8cc55a5f40bf0980718

data/.travis.yml

@@ -1,2 +1,3 @@
 rvm:
   - 2.0.0
+  - 2.3.0

data/aptible-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aptible-api', '~> 0.9.7'
-  spec.add_dependency 'aptible-auth', '~> 0.11.7'
+  spec.add_dependency 'aptible-auth', '~> 0.11.8'
   spec.add_dependency 'aptible-resource', '~> 0.3.6'
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'git'

data/lib/aptible/cli/agent.rb

@@ -24,8 +24,6 @@ require_relative 'subcommands/backup'
 
 module Aptible
   module CLI
-    TOKEN_EXPIRY_WITH_OTP = 12 * 60 * 60  # 12 hours
-
     class Agent < Thor
       include Thor::Actions
 
@@ -54,6 +52,8 @@ module Aptible
       desc 'login', 'Log in to Aptible'
       option :email
       option :password
+      option :lifetime, desc: 'The duration the token should be valid for ' \
+                              '(example usage: 24h, 1d, 600s, etc.)'
       option :otp_token, desc: 'A token generated by your second-factor app'
       def login
         email = options[:email] || ask('Email: ')
@@ -66,8 +66,16 @@ module Aptible
         token_options[:otp_token] = otp_token if otp_token
 
         begin
-          token_options[:expires_in] = TOKEN_EXPIRY_WITH_OTP \
-              if token_options[:otp_token]
+          lifetime = '1w'
+          lifetime = '12h' if token_options[:otp_token]
+          lifetime = options[:lifetime] if options[:lifetime]
+
+          duration = ChronicDuration.parse(lifetime)
+          if duration.nil?
+            fail Thor::Error, "Invalid token lifetime requested: #{lifetime}"
+          end
+
+          token_options[:expires_in] = duration
           token = Aptible::Auth::Token.create(token_options)
         rescue OAuth2::Error => e
           if e.code == 'otp_token_required'
@@ -82,6 +90,12 @@ module Aptible
 
         save_token(token.access_token)
         puts "Token written to #{token_file}"
+
+        lifetime_format = { units: 2, joiner: ', ' }
+        token_lifetime = (token.expires_at - token.created_at).round
+        expires_in = ChronicDuration.output(token_lifetime, lifetime_format)
+        puts "This token will expire after #{expires_in} " \
+             '(use --lifetime to customize)'
       end
 
       private

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.7.0'
+    VERSION = '0.7.1'
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
+  before { allow(subject).to receive(:token_file).and_return 'some.json' }
 
   describe '#version' do
     it 'should print the version' do
@@ -14,13 +15,18 @@ describe Aptible::CLI::Agent do
 
   describe '#login' do
     let(:token) { double('Aptible::Auth::Token') }
+    let(:created_at) { Time.now }
+    let(:expires_at) { created_at + 1.week }
+    let(:output) { [] }
 
     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) {} }
+    before { token.stub(:created_at) { created_at } }
+    before { token.stub(:expires_at) { expires_at } }
+    before { allow(subject).to receive(:puts) { |m| output << m } }
 
     it 'should save a token to ~/.aptible/tokens' do
       Aptible::Auth::Token.stub(:create) { token }
@@ -28,6 +34,15 @@ describe Aptible::CLI::Agent do
       subject.login
     end
 
+    it 'should output the token location and token lifetime' do
+      Aptible::Auth::Token.stub(:create) { token }
+      subject.login
+      expect(output.size).to eq(3)
+      expect(output[0]).to eq('')
+      expect(output[1]).to match(/written to some\.json/)
+      expect(output[2]).to match(/will expire after 7 days/)
+    end
+
     it 'should raise an error if authentication fails' do
       Aptible::Auth::Token.stub(:create).and_raise(OAuth2::Error, 'foo')
       expect do
@@ -36,12 +51,31 @@ describe Aptible::CLI::Agent do
     end
 
     it 'should use command line arguments if passed' do
+      options = { email: 'test@example.com', password: 'password',
+                  lifetime: '30 minutes' }
+      subject.stub(:options) { options }
+      args = { email: options[:email], password: options[:password],
+               expires_in: 30.minutes.seconds }
+      expect(Aptible::Auth::Token).to receive(:create).with(args) { token }
+      subject.login
+    end
+
+    it 'should default to 1 week expiry when OTP is disabled' do
       options = { email: 'test@example.com', password: 'password' }
       subject.stub(:options) { options }
-      expect(Aptible::Auth::Token).to receive(:create).with(options) { token }
+      args = options.dup.merge(expires_in: 1.week.seconds)
+      expect(Aptible::Auth::Token).to receive(:create).with(args) { token }
       subject.login
     end
 
+    it 'should fail if the lifetime is invalid' do
+      options = { email: 'test@example.com', password: 'password',
+                  lifetime: 'this is sparta' }
+      subject.stub(:options) { options }
+
+      expect { subject.login }.to raise_error(/Invalid token lifetime/)
+    end
+
     context 'with OTP' do
       let(:email) { 'foo@example.org' }
       let(:password) { 'bar' }
@@ -56,7 +90,7 @@ describe Aptible::CLI::Agent do
         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)
+                  expires_in: 12.hours.seconds)
             .once
             .and_return(token)
 
@@ -77,28 +111,44 @@ describe Aptible::CLI::Agent do
 
         it 'should prompt for an OTP token and use it' do
           expect(Aptible::Auth::Token).to receive(:create)
-            .with(email: email, password: password)
+            .with(email: email, password: password, expires_in: 1.week.seconds)
+            .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: 12.hours.seconds)
+            .once
+            .and_return(token)
+
+          subject.login
+        end
+
+        it 'should let the user override the default lifetime' do
+          expect(Aptible::Auth::Token).to receive(:create)
+            .with(email: email, password: password, expires_in: 1.day.seconds)
             .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)
+                  expires_in: 1.day.seconds)
             .once
             .and_return(token)
 
+          allow(subject).to receive(:options).and_return(lifetime: '1d')
           subject.login
         end
 
         it 'should not retry non-OTP errors.' do
           expect(Aptible::Auth::Token).to receive(:create)
-            .with(email: email, password: password)
+            .with(email: email, password: password, expires_in: 1.week.seconds)
             .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)
+                  expires_in: 12.hours.seconds)
             .once
             .and_raise(OAuth2::Error, 'foo')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.11.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.7
+        version: 0.11.8
 - !ruby/object:Gem::Dependency
   name: aptible-resource
   requirement: !ruby/object:Gem::Requirement