aptible-cli 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b91df96ab6a1f0df93fa8c72e66c6a6a5099e71
-  data.tar.gz: b1eaf8c6e6d4977757d69056257ebb127bba4b62
+  metadata.gz: afe6307751ef50d084ce1b378adc2f94b203c289
+  data.tar.gz: 99a3c232ebef3b35e327f958fc4c61628ef6639b
 SHA512:
-  metadata.gz: 0c464c35948b299c8ea1dbdba6eb6aaa09ecdee76410b7e9ea80337fbbc9fc25c0b1cf5c53e400cd0aa810933b585230beb1bbdd9684531c1f15db3d09d248a7
-  data.tar.gz: a8b6e992a70e29e3fcb5ec9682d1527ab11b72f13f2b19732d4b90420adbe9db2a8e5b5b83f5e950adcdf10aaa6b330761f08d66d3821b69ca68325bad5df402
+  metadata.gz: 7f6b5177638c5c3a69215e8bee64e7d560fd22cae00db83112b51b0f53098c2737a92dbf666817b6d0689d513c0d27533e642d9af2a8fb06ed3a981afe30d0b7
+  data.tar.gz: 5f7ed6c2a95c266fe018a7fcb026f5b6ad21d28d005a86b4e013c8eefc4a9d47b3ad4e3d401bdcce72410279cc8624c7934a2cfee19c4471649e68d2ec02b39c

data/lib/aptible/cli/agent.rb

@@ -32,6 +32,11 @@ module Aptible
       include Subcommands::Restart
       include Subcommands::SSH
 
+      # Forward return codes on failures.
+      def self.exit_on_failure?
+        true
+      end
+
       desc 'version', 'Print Aptible CLI version'
       def version
         puts "aptible-cli v#{Aptible::CLI::VERSION}"

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

@@ -19,6 +19,23 @@ module Aptible
             operation.get
           end
         end
+
+        def attach_to_operation_logs(operation)
+          host = operation.resource.account.bastion_host
+          port = operation.resource.account.dumptruck_port
+
+          set_env('ACCESS_TOKEN', fetch_token)
+          set_env('APTIBLE_OPERATION', operation.id.to_s)
+          set_env('APTIBLE_CLI_COMMAND', 'oplog')
+
+          opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
+                 '-o UserKnownHostsFile=/dev/null -o LogLevel=quiet'
+          result = Kernel.system "ssh #{opts} -p #{port} root@#{host}"
+          # If Dumptruck is down, fall back to polling for success. If the
+          # operation failed, poll_for_success will immediately fall through to
+          # the error message.
+          poll_for_success(operation) unless result
+        end
       end
     end
   end

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

@@ -45,8 +45,7 @@ module Aptible
               app = ensure_app(options)
               service = app.services.find { |s| s.process_type == type }
               op = service.create_operation(type: 'scale', container_count: num)
-              poll_for_success(op)
-              say "Scaled #{app.handle} to #{num} instances."
+              attach_to_operation_logs(op)
             end
 
             option :app

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

@@ -28,7 +28,7 @@ module Aptible
               env = Hash[args.map { |arg| arg.split('=', 2) }]
               operation = app.create_operation(type: 'configure', env: env)
               puts 'Updating configuration and restarting app...'
-              poll_for_success(operation)
+              attach_to_operation_logs(operation)
             end
 
             desc 'config:set', 'Alias for config:add'
@@ -47,7 +47,7 @@ module Aptible
               env = Hash[args.map { |arg| [arg, ''] }]
               operation = app.create_operation(type: 'configure', env: env)
               puts 'Updating configuration and restarting app...'
-              poll_for_success(operation)
+              attach_to_operation_logs(operation)
             end
 
             desc 'config:unset', 'Alias for config:rm'

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

@@ -14,7 +14,7 @@ module Aptible
               app = ensure_app(options)
               operation = app.create_operation(type: 'rebuild')
               puts 'Rebuilding app...'
-              poll_for_success(operation)
+              attach_to_operation_logs(operation)
             end
           end
         end

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

@@ -14,7 +14,7 @@ module Aptible
               app = ensure_app(options)
               operation = app.create_operation(type: 'restart')
               puts 'Restarting app...'
-              poll_for_success(operation)
+              attach_to_operation_logs(operation)
             end
           end
         end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.5.12'
+    VERSION = '0.5.13'
   end
 end

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

@@ -10,21 +10,29 @@ end
 class Operation < OpenStruct
 end
 
+class Account < OpenStruct
+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) }
 
   let(:service) { Service.new(process_type: 'web') }
   let(:op) { Operation.new(status: 'succeeded') }
-  let(:apps) { [App.new(handle: 'hello', services: [service])] }
+  let(:account) { Account.new(bastion_host: 'localhost', dumptruck_port: 1234) }
+  let(:apps) do
+    [App.new(handle: 'hello', services: [service], account: account)]
+  end
 
   describe '#apps:scale' do
     it 'should pass given correct parameters' do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { app: 'hello' } }
-
+      allow(op).to receive(:resource) { apps.first }
       allow(Aptible::Api::App).to receive(:all) { apps }
+
       subject.send('apps:scale', 'web', 3)
     end
 
@@ -40,8 +48,8 @@ describe Aptible::CLI::Agent do
     it 'should fail if number is not a valid number' do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { app: 'hello' } }
-
       allow(Aptible::Api::App).to receive(:all) { apps }
+
       expect do
         subject.send('apps:scale', 'web', 'potato')
       end.to raise_error(ArgumentError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services