aptible-cli 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98fe860f7b66036c58baecc20b47e05f7e90c8d5
-  data.tar.gz: c55625c8927c3c629756a71980c55199bbaaad36
+  metadata.gz: daac13a8f95ed0d51f55b1facdaf8fb7d6777253
+  data.tar.gz: 289c5c14b294a2bc47ed05c6c51bd6dedcc8fb9d
 SHA512:
-  metadata.gz: 7f14bdbb7b46e25cbf583fbf9d88b26e15be35906721e22bdfc7b88797d4557b663d7742b66e176af774c8ae6ebb41da9a32fefd0dba3f39d4e6b6cd4fe83fee
-  data.tar.gz: a2ca7347b1f1f2af27899b34f68f5ac7d52b978399ef636d3228c2caeca5ff909abed05b19c27bef889519378711d6e0b0ff27d81428a20f087fd9246698f977
+  metadata.gz: 53d1ff2a1fd3987bf053c8779679eee38a369a1a0f39ed93e7880335d486e81f0ece0991e652276aab01554b1f3cb9eba4a3a794c74894cac9dd122b148ab1cb
+  data.tar.gz: 4e813f1040e3677a3a96f14c3788b6ba3564443e370bbec606ca7c3e5b9f9a9fc65fc53a078ae43cddea6496dd0b25f7ded2981d943abcfbf13f41430db5cba4

data/.travis.yml

@@ -1,10 +1,10 @@
 sudo: false
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
+  - "2.0"
+  - "2.1"
+  - "2.2"
+  - "2.3"
 
 script:
   - bundle exec rake

data/README.md

@@ -50,6 +50,7 @@ Commands:
   aptible db:reload HANDLE                                                                        # Reload a database
   aptible db:restart HANDLE [--container-size SIZE_MB] [--size SIZE_GB]                           # Restart a database
   aptible db:tunnel HANDLE                                                                        # Create a local tunnel to a database
+  aptible db:url HANDLE                                                                           # Display a database URL
   aptible deploy [OPTIONS] [VAR1=VAL1] [VAR=VAL2] ...                                             # Deploy an app
   aptible domains                                                                                 # Print an app's current virtual domains
   aptible help [COMMAND]                                                                          # Describe available commands or one specific command

data/lib/aptible/cli/helpers/database.rb

@@ -78,7 +78,7 @@ module Aptible
             raise Thor::Error, 'This command only works for PostgreSQL'
           end
 
-          credential = find_tunnel_credential(database)
+          credential = find_credential(database)
 
           with_local_tunnel(credential) do |tunnel_helper|
             yield local_url(credential, tunnel_helper.port)
@@ -93,7 +93,7 @@ module Aptible
           "localhost.aptible.in:#{local_port}#{uri.path}"
         end
 
-        def find_tunnel_credential(database, type = nil)
+        def find_credential(database, type = nil)
           unless database.provisioned?
             raise Thor::Error, "Database #{database.handle} is not provisioned"
           end

data/lib/aptible/cli/subcommands/db.rb

@@ -95,7 +95,7 @@ module Aptible
               desired_port = Integer(options[:port] || 0)
               database = ensure_database(options.merge(db: handle))
 
-              credential = find_tunnel_credential(database, options[:type])
+              credential = find_credential(database, options[:type])
 
               say "Creating #{credential.type} tunnel to #{database.handle}...",
                   :green
@@ -177,6 +177,16 @@ module Aptible
               op = database.create_operation!(opts)
               attach_to_operation_logs(op)
             end
+
+            desc 'db:url HANDLE', 'Display a database URL'
+            option :environment
+            option :type, type: :string
+            define_method 'db:url' do |handle|
+              database = ensure_database(options.merge(db: handle))
+              credential = find_credential(database, options[:type])
+
+              say(credential.connection_url)
+            end
           end
         end
       end

data/lib/aptible/cli/subcommands/ssh.rb

@@ -20,13 +20,6 @@ module Aptible
             def ssh(*args)
               app = ensure_app(options)
 
-              op = app.create_operation!(type: 'execute',
-                                         command: command_from_args(*args),
-                                         status: 'succeeded')
-
-              ENV['ACCESS_TOKEN'] = fetch_token
-              opts = ['-o', 'SendEnv=ACCESS_TOKEN']
-
               # SSH's default behavior is as follows:
               #
               # - If a TTY is forced, one is allocated.
@@ -48,15 +41,22 @@ module Aptible
               #
               # End users can always override this behavior with the
               # --force-tty option.
-              tty_mode = if options[:force_tty]
-                           '-tt'
-                         elsif [STDIN, STDOUT].all?(&:tty?)
-                           '-t'
-                         else
-                           '-T'
-                         end
-              opts << tty_mode
+              tty_mode, interactive = if options[:force_tty]
+                                        ['-tt', true]
+                                      elsif [STDIN, STDOUT].all?(&:tty?)
+                                        ['-t', true]
+                                      else
+                                        ['-T', false]
+                                      end
 
+              op = app.create_operation!(
+                type: 'execute',
+                command: command_from_args(*args),
+                interactive: interactive
+              )
+
+              ENV['ACCESS_TOKEN'] = fetch_token
+              opts = ['-o', 'SendEnv=ACCESS_TOKEN', tty_mode]
               exit_with_ssh_portal(op, *opts)
             end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.11.2'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -1,9 +1,11 @@
 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' }
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:token_file).and_return 'some.json'
+  end
 
   describe '#version' do
     it 'should print the version' do
@@ -32,20 +34,21 @@ describe Aptible::CLI::Agent do
     before do
       m = -> (code) { @code = code }
       OAuth2::Error.send :define_method, :initialize, m
+
+      allow(token).to receive(:access_token).and_return 'access_token'
+      allow(token).to receive(:created_at).and_return created_at
+      allow(token).to receive(:expires_at).and_return expires_at
+      allow(subject).to receive(:puts) { |v| output << v }
     end
-    before { token.stub(:access_token) { 'access_token' } }
-    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 }
+      allow(Aptible::Auth::Token).to receive(:create).and_return token
       expect(subject).to receive(:save_token).with('access_token')
       subject.login
     end
 
     it 'should output the token location and token lifetime' do
-      Aptible::Auth::Token.stub(:create) { token }
+      allow(Aptible::Auth::Token).to receive(:create).and_return token
       subject.login
       expect(output.size).to eq(3)
       expect(output[0]).to eq('')
@@ -54,7 +57,8 @@ describe Aptible::CLI::Agent do
     end
 
     it 'should raise an error if authentication fails' do
-      Aptible::Auth::Token.stub(:create).and_raise(OAuth2::Error, 'foo')
+      allow(Aptible::Auth::Token).to receive(:create)
+        .and_raise(OAuth2::Error, 'foo')
       expect do
         subject.login
       end.to raise_error 'Could not authenticate with given credentials: foo'
@@ -63,7 +67,7 @@ describe Aptible::CLI::Agent do
     it 'should use command line arguments if passed' do
       options = { email: 'test@example.com', password: 'password',
                   lifetime: '30 minutes' }
-      subject.stub(:options) { options }
+      allow(subject).to receive(:options).and_return options
       args = { email: options[:email], password: options[:password],
                expires_in: 30.minutes.seconds }
       expect(Aptible::Auth::Token).to receive(:create).with(args) { token }
@@ -72,7 +76,7 @@ describe Aptible::CLI::Agent do
 
     it 'should default to 1 week expiry when OTP is disabled' do
       options = { email: 'test@example.com', password: 'password' }
-      subject.stub(:options) { options }
+      allow(subject).to receive(:options).and_return options
       args = options.dup.merge(expires_in: 1.week.seconds)
       expect(Aptible::Auth::Token).to receive(:create).with(args) { token }
       subject.login
@@ -81,7 +85,7 @@ describe Aptible::CLI::Agent do
     it 'should fail if the lifetime is invalid' do
       options = { email: 'test@example.com', password: 'password',
                   lifetime: 'this is sparta' }
-      subject.stub(:options) { options }
+      allow(subject).to receive(:options).and_return options
 
       expect { subject.login }.to raise_error(/Invalid token lifetime/)
     end

data/spec/aptible/cli/subcommands/apps_spec.rb

@@ -17,10 +17,12 @@ def dummy_strategy_factory(app_handle, env_handle, usable,
 end
 
 describe Aptible::CLI::Agent do
-  before { subject.stub(:ask) }
-  before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { double 'token' } }
-  before { subject.stub(:attach_to_operation_logs) }
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:attach_to_operation_logs)
+    allow(subject).to receive(:fetch_token) { double 'token' }
+  end
 
   let!(:account) { Fabricate(:account) }
   let!(:app) { Fabricate(:app, handle: 'hello', account: account) }
@@ -196,14 +198,14 @@ describe Aptible::CLI::Agent do
   describe '#ensure_app' do
     it 'fails if no usable strategy is found' do
       strategies = [dummy_strategy_factory(nil, nil, false)]
-      subject.stub(:handle_strategies) { strategies }
+      allow(subject).to receive(:handle_strategies) { strategies }
 
       expect { subject.ensure_app }.to raise_error(/Could not find app/)
     end
 
     it 'fails if an environment is specified but not found' do
       strategies = [dummy_strategy_factory('hello', 'aptible', true)]
-      subject.stub(:handle_strategies) { strategies }
+      allow(subject).to receive(:handle_strategies) { strategies }
 
       expect(subject).to receive(:environment_from_handle).and_return(nil)
 
@@ -220,7 +222,7 @@ describe Aptible::CLI::Agent do
 
       it 'scopes the app search to an environment if provided' do
         strategies = [dummy_strategy_factory('hello', 'aptible', true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect(subject).to receive(:environment_from_handle).with('aptible')
           .and_return(account)
@@ -230,7 +232,7 @@ describe Aptible::CLI::Agent do
 
       it 'does not scope the app search to an environment if not provided' do
         strategies = [dummy_strategy_factory('hello', nil, true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect(subject.ensure_app).to eq(apps.first)
       end
@@ -239,7 +241,7 @@ describe Aptible::CLI::Agent do
         apps.pop
 
         strategies = [dummy_strategy_factory('hello', nil, true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect { subject.ensure_app }.to raise_error(/not find app hello/)
       end
@@ -248,7 +250,7 @@ describe Aptible::CLI::Agent do
         apps.pop
 
         strategies = [dummy_strategy_factory('hello', nil, true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect { subject.ensure_app }.to raise_error(/from dummy/)
       end
@@ -257,7 +259,7 @@ describe Aptible::CLI::Agent do
         apps.pop
 
         strategies = [dummy_strategy_factory('hello', 'aptible', true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect(subject).to receive(:environment_from_handle).with('aptible')
           .and_return(account)
@@ -269,7 +271,7 @@ describe Aptible::CLI::Agent do
         apps << Fabricate(:app, handle: 'hello')
 
         strategies = [dummy_strategy_factory('hello', nil, true)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect { subject.ensure_app }.to raise_error(/Multiple apps/)
       end
@@ -279,7 +281,7 @@ describe Aptible::CLI::Agent do
           dummy_strategy_factory('hello', nil, false),
           dummy_strategy_factory('hello', nil, true)
         ]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         expect(subject.ensure_app).to eq(apps.first)
       end
@@ -287,7 +289,7 @@ describe Aptible::CLI::Agent do
       it 'passes options to the strategy' do
         receiver = []
         strategies = [dummy_strategy_factory('hello', nil, false, receiver)]
-        subject.stub(:handle_strategies) { strategies }
+        allow(subject).to receive(:handle_strategies) { strategies }
 
         options = { app: 'foo', environment: 'bar' }
         expect { subject.ensure_app options }.to raise_error(/not find app/)

data/spec/aptible/cli/subcommands/db_spec.rb

@@ -4,9 +4,11 @@ class SocatHelperMock < OpenStruct
 end
 
 describe Aptible::CLI::Agent do
-  before { subject.stub(:ask) }
-  before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { double 'token' } }
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:fetch_token) { double 'token' }
+  end
 
   let(:handle) { 'foobar' }
   let(:database) { Fabricate(:database, handle: handle) }
@@ -20,7 +22,7 @@ describe Aptible::CLI::Agent do
     before do
       allow(Aptible::Api::Account).to receive(:all).and_return([account])
       allow(db).to receive(:reload).and_return(db)
-      op.stub(errors: Aptible::Resource::Errors.new)
+      allow(op).to receive(:errors).and_return(Aptible::Resource::Errors.new)
     end
 
     it 'creates a new DB' do
@@ -163,15 +165,17 @@ describe Aptible::CLI::Agent do
       end
 
       it 'fails when the database is not provisioned' do
-        database.stub(status: 'pending')
+        allow(database).to receive(:status) { 'pending' }
 
         expect { subject.send('db:tunnel', handle) }
           .to raise_error(/foobar is not provisioned/im)
       end
 
       context 'v1 stack' do
-        before { database.account.stack.stub(version: 'v1') }
-        before { allow(subject).to receive(:say) }
+        before do
+          allow(database.account.stack).to receive(:version) { 'v1' }
+          allow(subject).to receive(:say)
+        end
 
         it 'falls back to the database itself if no type is given' do
           expect(subject).to receive(:with_local_tunnel).with(database, 0)
@@ -180,7 +184,7 @@ describe Aptible::CLI::Agent do
 
         it 'falls back to the database itself if type matches' do
           subject.options = { type: 'bar' }
-          database.stub(type: 'bar')
+          allow(database).to receive(:type) { 'bar' }
 
           expect(subject).to receive(:with_local_tunnel).with(database, 0)
           subject.send('db:tunnel', handle)
@@ -188,7 +192,7 @@ describe Aptible::CLI::Agent do
 
         it 'does not fall back to the database itself if type mismatches' do
           subject.options = { type: 'bar' }
-          database.stub(type: 'foo')
+          allow(database).to receive(:type) { 'foo' }
 
           expect { subject.send('db:tunnel', handle) }
             .to raise_error(/no credential with type bar/im)
@@ -218,7 +222,7 @@ describe Aptible::CLI::Agent do
       end
 
       token = 'the-token'
-      allow(subject).to receive(:fetch_token).and_return(token)
+      allow(subject).to receive(:fetch_token) { token }
       allow(Aptible::Api::Account).to receive(:all).with(token: token)
         .and_return([staging, prod])
     end
@@ -353,4 +357,50 @@ describe Aptible::CLI::Agent do
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
   end
+
+  describe '#db:url' do
+    let(:databases) { [database] }
+    before { expect(Aptible::Api::Database).to receive(:all) { databases } }
+
+    it 'fails if the DB is not found' do
+      expect { subject.send('db:url', 'nope') }
+        .to raise_error(Thor::Error, 'Could not find database nope')
+    end
+
+    context 'valid database' do
+      it 'returns the URL of a specified DB' do
+        cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                               database: database)
+
+        expect(subject).to receive(:say).with(cred.connection_url)
+        expect(database).not_to receive(:connection_url)
+
+        subject.send('db:url', handle)
+      end
+
+      it 'fails if multiple DBs are found' do
+        databases << database
+
+        expect { subject.send('db:url', handle) }
+          .to raise_error(/Multiple databases/)
+      end
+
+      context 'v1 stack' do
+        before do
+          allow(database.account.stack).to receive(:version) { 'v1' }
+          allow(subject).to receive(:say)
+        end
+
+        it 'returns the URL of a specified DB' do
+          connection_url = 'postgresql://aptible-v1:password@lega.cy:4242/db'
+
+          expect(subject).to receive(:say).with(connection_url)
+          expect(database).to receive(:connection_url)
+            .and_return(connection_url)
+
+          subject.send('db:url', handle)
+        end
+      end
+    end
+  end
 end

data/spec/aptible/cli/subcommands/deploy_spec.rb

@@ -9,7 +9,7 @@ describe Aptible::CLI::Agent do
     before do
       allow(Aptible::Api::App).to receive(:all) { [app] }
       allow(Aptible::Api::Account).to receive(:all) { [account] }
-      subject.stub(:fetch_token) { double 'token' }
+      allow(subject).to receive(:fetch_token) { double'token' }
     end
 
     context 'with app' do
@@ -148,7 +148,7 @@ describe Aptible::CLI::Agent do
       it 'does not allow deploying nothing on an unprovisioned app' do
         stub_options
 
-        app.stub(status: 'pending')
+        allow(app).to receive(:status) { 'pending' }
 
         expect { subject.deploy }
           .to raise_error(/either from git.*docker/im)

data/spec/aptible/cli/subcommands/domains_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe Aptible::CLI::Agent do
-  before { subject.stub(:ask) }
-  before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { double 'token' } }
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:fetch_token) { double 'token' }
+  end
 
   let!(:account) { Fabricate(:account) }
   let!(:app) { Fabricate(:app, handle: 'hello', account: account) }

data/spec/aptible/cli/subcommands/logs_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
 describe Aptible::CLI::Agent do
-  before { subject.stub(:ask) }
-  before { subject.stub(:save_token) }
-  before { subject.stub(:fetch_token) { 'some token' } }
+  before do
+    allow(subject).to receive(:ask)
+    allow(subject).to receive(:save_token)
+    allow(subject).to receive(:fetch_token) { 'some token' }
+  end
 
   let(:app) { Fabricate(:app, handle: 'foo') }
   let(:database) { Fabricate(:database, handle: 'bar', status: 'provisioned') }

data/spec/aptible/cli/subcommands/ssh_spec.rb

@@ -6,22 +6,25 @@ describe Aptible::CLI::Agent do
     let(:operation) { double('operation') }
 
     context 'TTY control' do
+      let(:args) { { type: 'execute', command: '/bin/bash' } }
+
       before do
         expect(subject).to receive(:ensure_app).and_return(app)
         expect(subject).to receive(:fetch_token).and_return('some token')
-
-        expect(app).to receive(:create_operation!).with(
-          type: 'execute', command: '/bin/bash', status: 'succeeded'
-        ).and_return(operation)
       end
 
       it 'allocates a TTY if STDIN and STDOUT are TTYs' do
         allow(STDIN).to receive(:tty?).and_return(true)
         allow(STDOUT).to receive(:tty?).and_return(true)
 
+        expect(app).to receive(:create_operation!).with(
+          **args, interactive: true
+        ).and_return(operation)
+
         expect(subject).to receive(:exit_with_ssh_portal).with(
           operation, '-o', 'SendEnv=ACCESS_TOKEN', '-t'
         )
+
         subject.ssh
       end
 
@@ -30,9 +33,14 @@ describe Aptible::CLI::Agent do
         allow(STDOUT).to receive(:tty?).and_return(true)
         allow(STDERR).to receive(:tty?).and_return(false)
 
+        expect(app).to receive(:create_operation!).with(
+          **args, interactive: true
+        ).and_return(operation)
+
         expect(subject).to receive(:exit_with_ssh_portal).with(
           operation, '-o', 'SendEnv=ACCESS_TOKEN', '-t'
         )
+
         subject.ssh
       end
 
@@ -40,9 +48,14 @@ describe Aptible::CLI::Agent do
         allow(STDIN).to receive(:tty?).and_return(false)
         allow(STDOUT).to receive(:tty?).and_return(true)
 
+        expect(app).to receive(:create_operation!).with(
+          **args, interactive: false
+        ).and_return(operation)
+
         expect(subject).to receive(:exit_with_ssh_portal).with(
           operation, '-o', 'SendEnv=ACCESS_TOKEN', '-T'
         )
+
         subject.ssh
       end
 
@@ -50,9 +63,14 @@ describe Aptible::CLI::Agent do
         allow(STDIN).to receive(:tty?).and_return(true)
         allow(STDOUT).to receive(:tty?).and_return(false)
 
+        expect(app).to receive(:create_operation!).with(
+          **args, interactive: false
+        ).and_return(operation)
+
         expect(subject).to receive(:exit_with_ssh_portal).with(
           operation, '-o', 'SendEnv=ACCESS_TOKEN', '-T'
         )
+
         subject.ssh
       end
 
@@ -62,9 +80,14 @@ describe Aptible::CLI::Agent do
         allow(STDIN).to receive(:tty?).and_return(false)
         allow(STDOUT).to receive(:tty?).and_return(false)
 
+        expect(app).to receive(:create_operation!).with(
+          **args, interactive: true
+        ).and_return(operation)
+
         expect(subject).to receive(:exit_with_ssh_portal).with(
           operation, '-o', 'SendEnv=ACCESS_TOKEN', '-tt'
         )
+
         subject.ssh
       end
     end

data/spec/mock/ssh

@@ -1 +1 @@
-ssh_mock.rb
+spec/mock/ssh_mock.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services