aptible-cli 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca32684c92760fd049ba703618258b837950590
-  data.tar.gz: b251f6a123c54002638a7ef0c5567de892f6cb62
+  metadata.gz: 710c981d4ee3393bbe00fb09cabb6a45e964aeb7
+  data.tar.gz: 2705459f3698db56a010edce891f49f832dc584c
 SHA512:
-  metadata.gz: 28e54b39f91cb892b9ce5443321b9049290a302b9e38de9cd3b7162b3567499fa5c00abc5d860d31d8661190fdbc692b24ce0186af410b98a4922a0b62cdd70d
-  data.tar.gz: 772bb6f34a8a07baee41f1682189dbfa6a31c422802649d74721f028c89cd060ae7cfe4c77f3bfd150c9cb90c04b3ddc52acb6bc52be31f71cf83eafb8b05acf
+  metadata.gz: 67a7478f09bdfcf92839064523ee231e8b84d8b7455a8e0826ab47a5fa1a09dcb7eaea968a7981694921738bf9733b23b90518a7697427a067b4db921e6440d7
+  data.tar.gz: dc845bf331a6644e89352af644eacd95b871b12fdc443feb49ca543594fd2868fb735b4be358ece0753ffe125b546ec08991b7ced562b72d8c1bc2e5dc860703

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

@@ -26,7 +26,37 @@ module Aptible
 
               ENV['ACCESS_TOKEN'] = fetch_token
               opts = ['-o', 'SendEnv=ACCESS_TOKEN']
-              opts << '-tt' if options[:force_tty]
+
+              # SSH's default behavior is as follows:
+              #
+              # - If a TTY is forced, one is allocated.
+              # - If there is no command, then a TTY is allocated.
+              # - If no-TTY is forced, then none is allocated.
+              # - No TTY is allocated if stdin isn't a TTY.
+              #
+              # Unfortunately, in our case, this breaks, because we use a
+              # forced-command, so we don't *ever* send a command, which causes
+              # SSH to *always* allocate TTY, which causes a variety of
+              # problems, not least of which is that stdout and stderr end up
+              # merged.
+              #
+              # Now, it's pretty common for Aptible users to run commands in
+              # their container with the intention of using a TTY (by e.g.
+              # running `aptible ssh bash`), so we use a slightly different
+              # heuristic from SSH: we allocate TTY iif there's no input or
+              # output redirection going on.
+              #
+              # 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
+
               connect_to_ssh_portal(op, *opts)
             end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.8.5'.freeze
+    VERSION = '0.8.6'.freeze
   end
 end

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

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  describe '#ssh' do
+    let(:app) { Fabricate(:app) }
+    let(:operation) { double('operation') }
+
+    context 'TTY control' do
+      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(subject).to receive(:connect_to_ssh_portal).with(
+          operation, '-o', 'SendEnv=ACCESS_TOKEN', '-t'
+        )
+        subject.ssh
+      end
+
+      it 'allocates a TTY even if STDERR is redirected ' do
+        allow(STDIN).to receive(:tty?).and_return(true)
+        allow(STDOUT).to receive(:tty?).and_return(true)
+        allow(STDERR).to receive(:tty?).and_return(false)
+
+        expect(subject).to receive(:connect_to_ssh_portal).with(
+          operation, '-o', 'SendEnv=ACCESS_TOKEN', '-t'
+        )
+        subject.ssh
+      end
+
+      it 'does not allocate TTY if STDIN is redirected' do
+        allow(STDIN).to receive(:tty?).and_return(false)
+        allow(STDOUT).to receive(:tty?).and_return(true)
+
+        expect(subject).to receive(:connect_to_ssh_portal).with(
+          operation, '-o', 'SendEnv=ACCESS_TOKEN', '-T'
+        )
+        subject.ssh
+      end
+
+      it 'does not allocate TTY if STDOUT is redirected' do
+        allow(STDIN).to receive(:tty?).and_return(true)
+        allow(STDOUT).to receive(:tty?).and_return(false)
+
+        expect(subject).to receive(:connect_to_ssh_portal).with(
+          operation, '-o', 'SendEnv=ACCESS_TOKEN', '-T'
+        )
+        subject.ssh
+      end
+
+      it 'allocates a TTY if forced' do
+        subject.options = { force_tty: true }
+
+        allow(STDIN).to receive(:tty?).and_return(false)
+        allow(STDOUT).to receive(:tty?).and_return(false)
+
+        expect(subject).to receive(:connect_to_ssh_portal).with(
+          operation, '-o', 'SendEnv=ACCESS_TOKEN', '-tt'
+        )
+        subject.ssh
+      end
+    end
+  end
+end

data/spec/mock/ssh

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'json'
+
+raise 'Something went wrong!' if ENV['SSH_MOCK_FAIL_TUNNEL']
+
+# Log arguments to SSH_MOCK_OUTFILE
+File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
+  f.write({
+    'pid' => $PID,
+    'argc' => ARGV.size,
+    'argv' => ARGV,
+    'env' => ENV.to_hash
+  }.to_json)
+end
+
+puts 'TUNNEL READY'
+
+exit Integer(ENV.fetch('SSH_MOCK_EXITCODE', 0))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -260,6 +260,7 @@ files:
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
+- spec/aptible/cli/subcommands/ssh_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
@@ -295,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
@@ -314,6 +315,7 @@ test_files:
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
+- spec/aptible/cli/subcommands/ssh_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb

data/spec/mock/ssh

@@ -1 +0,0 @@
-ssh_mock.rb