aptible-cli 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf860a7c589c2689289068a00ea10b4a2bb8cd10
-  data.tar.gz: 30a8504c9fdeddd33c67a23e775e08eae455cae9
+  metadata.gz: 9eee8bccf78fd7a0814d5fb48e92c9c31aaef356
+  data.tar.gz: 80d7cf361bba1d14c1c50ab1f832de3c46533e72
 SHA512:
-  metadata.gz: 709bfbf15f9a1988a3bdbd7d6c04d88a7ac748c0f15d4550afdcdf80bdd11536cd1735ed7437c8188d3272e9890a265880b010f546367135d85bb1d956df6a81
-  data.tar.gz: 96ac24c260b42100c57639dcd8ee10e57ccbef49dcbf070ce3509f255b98835df0c2a10d9a99cbfe729c7a195adfac21b6070d622017f8cc55a5f40bf0980718
+  metadata.gz: 6c51adcf6c82f63b5129674a82070235d6ab079c7ed91fc8b02771ba81f8e243a459d39cf80135687797a6576320942a7ec767a5bec78bfc5155bfacdfca5caf
+  data.tar.gz: 2c5ccc49276560307c75d5dff6b6504d87b6f77a4bf9b820910c37900b65059e341ef2676e888870ffca0dbc9ae503ad82d328be7d93f16866b45605330cf78a

data/.rubocop.yml

@@ -28,6 +28,9 @@ PerceivedComplexity:
 AbcSize:
   Enabled: false
 
+SignalException:
+  Enabled: false
+
 AllCops:
   Include:
     - !ruby/regexp /\.rb$/

data/.travis.yml

@@ -1,3 +1,7 @@
+sudo: false
+
 rvm:
   - 2.0.0
+  - 2.1.0
+  - 2.2.0
   - 2.3.0

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
+gem 'activesupport', '~> 4.0'
 
 group :test do
   gem 'webmock'

data/README.md

@@ -10,13 +10,17 @@ Command-line interface for Aptible services.
 
 ## Installation
 
+**NOTE: To install the `aptible` tool as a system-level binary, Aptible
+recommends you install the
+[Aptible Toolbelt](https://support.aptible.com/toolbelt/)**, which is faster
+and more robust.
+
 Add the following line to your application's Gemfile.
 
     gem 'aptible-cli'
 
 And then run `bundle install`.
 
-*NOTE: To install the `aptible` tool as a system-level binary, consider using the [aptible-toolbelt gem](https://github.com/aptible/aptible-toolbelt), which is performance-optimized through dependency pinning.*
 
 ## Usage
 

data/lib/aptible/cli/agent.rb

@@ -3,12 +3,12 @@ require 'thor'
 require 'json'
 require 'chronic_duration'
 
+require_relative 'helpers/ssh'
 require_relative 'helpers/token'
 require_relative 'helpers/operation'
 require_relative 'helpers/environment'
 require_relative 'helpers/app'
 require_relative 'helpers/database'
-require_relative 'helpers/env'
 require_relative 'helpers/tunnel'
 
 require_relative 'subcommands/apps'

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

@@ -1,5 +1,9 @@
 require 'aptible/api'
-require 'git'
+
+# Avoid requiring the git gem upfront, since it'll fail to load if git isn't
+# available, whereas we're able to gracefully handle that by requiring the
+# --app and / or --environment flags.
+autoload :Git, 'git'
 
 module Aptible
   module CLI

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

@@ -6,6 +6,7 @@ module Aptible
       module Database
         include Helpers::Token
         include Helpers::Environment
+        include Helpers::Ssh
 
         def ensure_database(options = {})
           db_handle = options[:db]
@@ -54,16 +55,12 @@ module Aptible
         # Creates a local tunnel and yields the helper
 
         def with_local_tunnel(database, port = 0)
-          env = {
-            'ACCESS_TOKEN' => fetch_token,
-            'APTIBLE_DATABASE' => database.href
-          }
-          command = ['ssh', '-q'] + ssh_args(database)
-          Helpers::Tunnel.new(env, command).tap do |tunnel_helper|
-            tunnel_helper.start(port)
-            yield tunnel_helper
-            tunnel_helper.stop
-          end
+          tunnel_helper = Helpers::Tunnel.new(ssh_env(database),
+                                              ssh_args(database))
+
+          tunnel_helper.start(port)
+          yield tunnel_helper if block_given?
+          tunnel_helper.stop
         end
 
         # Creates a local PG tunnel and yields the url to it
@@ -88,15 +85,18 @@ module Aptible
           "127.0.0.1:#{local_port}#{uri.path}"
         end
 
+        def ssh_env(database)
+          {
+            'ACCESS_TOKEN' => fetch_token,
+            'APTIBLE_DATABASE' => database.href
+          }
+        end
+
         def ssh_args(database)
-          host = database.account.bastion_host
-          port = database.account.bastion_port
-
-          ['-o', 'SendEnv=APTIBLE_DATABASE',
-           '-o', 'SendEnv=ACCESS_TOKEN',
-           '-o', 'StrictHostKeyChecking=no',
-           '-o', 'UserKnownHostsFile=/dev/null',
-           '-p', port.to_s, "root@#{host}"]
+          broadwayjoe_ssh_command(database.account) + [
+            '-o', 'SendEnv=ACCESS_TOKEN',
+            '-o', 'SendEnv=APTIBLE_DATABASE'
+          ]
         end
       end
     end

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

@@ -1,5 +1,4 @@
 require 'aptible/api'
-require 'git'
 
 module Aptible
   module CLI

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

@@ -4,6 +4,8 @@ module Aptible
   module CLI
     module Helpers
       module Operation
+        include Helpers::Ssh
+
         POLL_INTERVAL = 1
 
         def poll_for_success(operation)
@@ -21,20 +23,22 @@ module Aptible
         end
 
         def attach_to_operation_logs(operation)
-          host = operation.resource.account.bastion_host
-          port = operation.resource.account.dumptruck_port
+          ENV['ACCESS_TOKEN'] = fetch_token
+          ENV['APTIBLE_OPERATION'] = operation.id.to_s
+          ENV['APTIBLE_CLI_COMMAND'] = 'oplog'
+
+          cmd = dumptruck_ssh_command(operation.resource.account) + [
+            '-o', 'SendEnv=ACCESS_TOKEN',
+            '-o', 'SendEnv=APTIBLE_OPERATION',
+            '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
+          ]
 
-          set_env('ACCESS_TOKEN', fetch_token)
-          set_env('APTIBLE_OPERATION', operation.id.to_s)
-          set_env('APTIBLE_CLI_COMMAND', 'oplog')
+          success = Kernel.system(*cmd)
 
-          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
+          poll_for_success(operation) unless success
         end
       end
     end

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

@@ -0,0 +1,33 @@
+module Aptible
+  module CLI
+    module Helpers
+      module Ssh
+        def dumptruck_ssh_command(account)
+          base_ssh_command(account, :dumptruck_port)
+        end
+
+        def broadwayjoe_ssh_command(account)
+          base_ssh_command(account, :bastion_port)
+        end
+
+        private
+
+        def base_ssh_command(account, port_method)
+          log_level = ENV['APTIBLE_SSH_VERBOSE'] ? 'VERBOSE' : 'ERROR'
+
+          [
+            'ssh',
+            "root@#{account.bastion_host}",
+            '-p', account.public_send(port_method).to_s,
+            '-o', 'StrictHostKeyChecking=no',
+            '-o', 'UserKnownHostsFile=/dev/null',
+            '-o', 'TCPKeepAlive=yes',
+            '-o', 'KeepAlive=yes',
+            '-o', 'ServerAliveInterval=60',
+            '-o', "LogLevel=#{log_level}"
+          ]
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Aptible
   module CLI
     module Helpers
       module Token
-        TOKEN_ENV_VAR = 'APTIBLE_ACCESS_TOKEN'
+        TOKEN_ENV_VAR = 'APTIBLE_ACCESS_TOKEN'.freeze
 
         def fetch_token
           @token ||= ENV[TOKEN_ENV_VAR] ||

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

@@ -5,44 +5,54 @@ module Aptible
   module CLI
     module Helpers
       class Tunnel
-        def initialize(env, cmd)
+        def initialize(env, ssh_cmd)
           @env = env
-          @cmd = cmd
+          @ssh_cmd = ssh_cmd
         end
 
-        def start(desired_port = 0, err_fd = $stderr)
+        def start(desired_port = 0)
           @local_port = desired_port
-          @local_port = random_local_port if @local_port == 0
+          @local_port = random_local_port if @local_port.zero?
 
           # First, grab a remote port
-          out, err, status = Open3.capture3(@env, *@cmd)
+          out, err, status = Open3.capture3(@env, *@ssh_cmd)
           fail "Failed to request remote port: #{err}" unless status.success?
           remote_port = out.chomp
 
-          # Then, spin up a SSH session using that port and port forwarding
+          # Then, spin up a SSH session using that port and port forwarding.
+          # Pass ExitOnForwardFailure to ensure nothing else can be listening
+          # on this port (thanks to Diego Argueta for reporting this issue).
           tunnel_env = @env.merge(
             'TUNNEL_PORT' => remote_port, # Request a specific port
             'TUNNEL_SIGNAL_OPEN' => '1'   # Request signal when tunnel is up
           )
 
-          tunnel_cmd = @cmd + [
+          # TODO: Dynamically compose SendEnv from tunnel_env
+          tunnel_cmd = @ssh_cmd + [
             '-L', "#{@local_port}:localhost:#{remote_port}",
             '-o', 'SendEnv=TUNNEL_PORT',
-            '-o', 'SendEnv=TUNNEL_SIGNAL_OPEN'
+            '-o', 'SendEnv=TUNNEL_SIGNAL_OPEN',
+            '-o', 'ExitOnForwardFailure=yes'
           ]
 
-          r_pipe, w_pipe = IO.pipe
+          out_read, out_write = IO.pipe
+          err_read, err_write = IO.pipe
           @pid = Process.spawn(tunnel_env, *tunnel_cmd, in: :close,
-                                                        out: w_pipe,
-                                                        err: err_fd)
+                                                        out: out_write,
+                                                        err: err_write)
 
           # Wait for the tunnel to come up before returning. The other end
           # will send a message on stdout to indicate that the tunnel is ready.
-          w_pipe.close
+          [out_write, err_write].map(&:close)
           begin
-            r_pipe.readline
+            out_read.readline
           rescue EOFError
-            raise 'Server closed the tunnel'
+            stop
+            e = 'Tunnel did not come up, is something else listening on port ' \
+                "#{@local_port}?\n#{err_read.read}"
+            raise e
+          ensure
+            [out_read, err_read].map(&:close)
           end
         end
 

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

@@ -18,16 +18,17 @@ module Aptible
                                   "Have you deployed #{app.handle} yet?"
               end
 
-              host = app.account.bastion_host
-              port = app.account.dumptruck_port
-
               ENV['ACCESS_TOKEN'] = fetch_token
               ENV['APTIBLE_APP'] = app.href
               ENV['APTIBLE_CLI_COMMAND'] = 'logs'
 
-              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
-                     '-o UserKnownHostsFile=/dev/null'
-              Kernel.exec "ssh #{opts} -p #{port} root@#{host}"
+              cmd = dumptruck_ssh_command(app.account) + [
+                '-o', 'SendEnv=ACCESS_TOKEN',
+                '-o', 'SendEnv=APTIBLE_APP',
+                '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
+              ]
+
+              Kernel.exec(*cmd)
             end
           end
         end

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

@@ -8,7 +8,6 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
-            include Helpers::Env
 
             desc 'ps', 'Display running processes for an app - DEPRECATED'
             app_options
@@ -16,16 +15,17 @@ module Aptible
               app = ensure_app(options)
               deprecated('This command is deprecated on Aptible v2 stacks.')
 
-              host = app.account.bastion_host
-              port = app.account.dumptruck_port
+              ENV['ACCESS_TOKEN'] = fetch_token
+              ENV['APTIBLE_APP'] = app.href
+              ENV['APTIBLE_CLI_COMMAND'] = 'ps'
 
-              set_env('ACCESS_TOKEN', fetch_token)
-              set_env('APTIBLE_APP', app.href)
-              set_env('APTIBLE_CLI_COMMAND', 'ps')
+              cmd = dumptruck_ssh_command(app.account) + [
+                '-o', 'SendEnv=ACCESS_TOKEN',
+                '-o', 'SendEnv=APTIBLE_APP',
+                '-o', 'SendEnv=APTIBLE_CLI_COMMAND'
+              ]
 
-              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
-                     '-o UserKnownHostsFile=/dev/null'
-              Kernel.exec "ssh #{opts} -p #{port} root@#{host}"
+              Kernel.exec(*cmd)
             end
           end
         end

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

@@ -8,6 +8,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::App
+            include Helpers::Ssh
 
             desc 'ssh [COMMAND]', 'Run a command against an app'
             long_desc <<-LONGDESC
@@ -19,17 +20,19 @@ module Aptible
             option :force_tty, type: :boolean
             def ssh(*args)
               app = ensure_app(options)
-              host = app.account.bastion_host
-              port = app.account.bastion_port
 
               ENV['ACCESS_TOKEN'] = fetch_token
-              ENV['APTIBLE_COMMAND'] = command_from_args(*args)
               ENV['APTIBLE_APP'] = app.href
+              ENV['APTIBLE_COMMAND'] = command_from_args(*args)
+
+              cmd = broadwayjoe_ssh_command(app.account) + [
+                '-o', 'SendEnv=ACCESS_TOKEN',
+                '-o', 'SendEnv=APTIBLE_APP',
+                '-o', 'SendEnv=APTIBLE_COMMAND'
+              ]
+              cmd << '-tt' if options[:force_tty]
 
-              opts = options[:force_tty] ? '-t -t' : ''
-              opts << " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
-                      '-o UserKnownHostsFile=/dev/null'
-              Kernel.exec "ssh #{opts} -p #{port} root@#{host}"
+              Kernel.exec(*cmd)
             end
 
             private

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'.freeze
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -157,4 +157,15 @@ describe Aptible::CLI::Agent do
       end
     end
   end
+
+  context 'load' do
+    it 'loads without git' do
+      mocks = File.expand_path('../../../mock', __FILE__)
+      bins =  File.expand_path('../../../../bin', __FILE__)
+      ClimateControl.modify PATH: [mocks, bins, ENV['PATH']].join(':') do
+        _, _, status = Open3.capture3('aptible version')
+        expect(status).to eq(0)
+      end
+    end
+  end
 end

data/spec/aptible/cli/helpers/tunnel_spec.rb

@@ -1,61 +1,49 @@
 require 'spec_helper'
 
 describe Aptible::CLI::Helpers::Tunnel do
-  around do |example|
-    mocks_path = File.expand_path('../../../../mock', __FILE__)
-    path = "#{mocks_path}:#{ENV['PATH']}"
-    ClimateControl.modify PATH: path do
-      example.run
-    end
-  end
+  include_context 'mock ssh'
 
-  it 'reuses the port it was given' do
+  it 'forwards traffic to the remote port given by the server (1234)' do
     helper = described_class.new({}, ['ssh_mock.rb'])
 
-    r, w = IO.pipe
-    helper.start(0, w)
+    helper.start(0)
     helper.stop
 
-    expect(r.readline.chomp).to eq('6')
-    expect(r.readline.chomp).to eq('-L')
-    expect(r.readline.chomp).to match(/\d+:localhost:1234$/)
-    expect(r.readline.chomp).to eq('-o')
-    expect(r.readline.chomp).to eq('SendEnv=TUNNEL_PORT')
-    expect(r.readline.chomp).to eq('-o')
-    expect(r.readline.chomp).to eq('SendEnv=TUNNEL_SIGNAL_OPEN')
-
-    r.close
-    w.close
+    mock_argv = read_mock_argv
+    expect(mock_argv.size).to eq(8)
+
+    expect(mock_argv.shift).to eq('-L')
+    expect(mock_argv.shift).to match(/\d+:localhost:1234$/)
+    expect(mock_argv.shift).to eq('-o')
+    expect(mock_argv.shift).to eq('SendEnv=TUNNEL_PORT')
+    expect(mock_argv.shift).to eq('-o')
+    expect(mock_argv.shift).to eq('SendEnv=TUNNEL_SIGNAL_OPEN')
+    expect(mock_argv.shift).to eq('-o')
+    expect(mock_argv.shift).to eq('ExitOnForwardFailure=yes')
   end
 
-  it 'accepts a desired port' do
+  it 'accepts a desired local port' do
     helper = described_class.new({}, ['ssh_mock.rb'])
-    r, w = IO.pipe
-    helper.start(5678, w)
+    helper.start(5678)
     helper.stop
 
-    expect(r.readline.chomp).to eq('6')
-    expect(r.readline.chomp).to eq('-L')
-    expect(r.readline.chomp).to eq('5678:localhost:1234')
-    expect(r.readline.chomp).to eq('-o')
-    expect(r.readline.chomp).to eq('SendEnv=TUNNEL_PORT')
-    expect(r.readline.chomp).to eq('-o')
-    expect(r.readline.chomp).to eq('SendEnv=TUNNEL_SIGNAL_OPEN')
+    mock_argv = read_mock_argv
+    expect(mock_argv.size).to eq(8)
 
-    r.close
-    w.close
+    expect(mock_argv.shift).to eq('-L')
+    expect(mock_argv.shift).to eq('5678:localhost:1234')
   end
 
   it 'captures and displays port discovery errors' do
     helper = described_class.new({ 'FAIL_PORT' => '1' }, ['ssh_mock.rb'])
-    expect { helper.start }.to raise_error(/Something went wrong/)
+    expect { helper.start }
+      .to raise_error(/Failed to request.*Something went wrong/m)
   end
 
   it 'captures and displays tunnel errors' do
     helper = described_class.new({ 'FAIL_TUNNEL' => '1' }, ['ssh_mock.rb'])
-    expect do
-      helper.start(0, File.open(File::NULL, 'w'))
-    end.to raise_error(/Server closed the tunnel/)
+    expect { helper.start(0) }
+      .to raise_error(/Tunnel did not come up.*Something went wrong/m)
   end
 
   it 'should fail if #port is called before #start' do

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

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Aptible::CLI::Agent do
+  include_context 'mock ssh'
+
   let(:account) do
     Fabricate(:account, bastion_host: 'bastion.com', dumptruck_port: 45022)
   end
@@ -10,21 +12,25 @@ describe Aptible::CLI::Agent do
   before { subject.stub(:save_token) }
   before { subject.stub(:fetch_token) { double 'token' } }
   before { subject.stub(:ensure_app) { app } }
-  before { subject.stub(:set_env) }
-  before { Kernel.stub(:exec) }
+
+  before do
+    allow(Kernel).to receive(:exec) do |*args|
+      Kernel.system(*args)
+    end
+  end
 
   describe '#ps' do
     it 'should set ENV["APTIBLE_CLI_COMMAND"]' do
-      expect(subject).to receive(:set_env).with('APTIBLE_CLI_COMMAND', 'ps')
       subject.send('ps')
+      expect(read_mock_env['APTIBLE_CLI_COMMAND']).to eq('ps')
     end
 
     it 'should construct a proper SSH call' do
-      expect(Kernel).to receive(:exec) do |*args|
-        cmd = args.first
-        expect(cmd).to match(/ssh.*-p 45022 root@bastion.com/)
-      end
       subject.send('ps')
+
+      mock_argv = read_mock_argv
+      expect(mock_argv).to include('root@bastion.com')
+      expect(mock_argv).to include('45022')
     end
   end
 end

data/spec/mock/git

@@ -0,0 +1,2 @@
+#!/bin/sh
+exit 1

data/spec/mock/ssh

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+# Emulate server behavior
+
+if ENV['TUNNEL_PORT']
+  fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
+  puts 'TUNNEL READY'
+else
+  fail 'Something went wrong!' if ENV['FAIL_PORT']
+  puts 1234
+end
+
+# Log to SSH_MOCK_OUTFILE
+require 'json'
+
+File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
+  f.write({
+    'argc' => ARGV.size,
+    'argv' => ARGV,
+    'env' => ENV.to_hash
+  }.to_json)
+end

data/spec/mock/ssh_mock.rb

@@ -10,9 +10,13 @@ else
   puts 1234
 end
 
-# Log to stderr so we can collect in test
+# Log to SSH_MOCK_OUTFILE
+require 'json'
 
-$stderr.puts ARGV.size
-ARGV.each do |a|
-  $stderr.puts a
+File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
+  f.write({
+    'argc' => ARGV.size,
+    'argv' => ARGV,
+    'env' => ENV.to_hash
+  }.to_json)
 end

data/spec/shared/mock_ssh_context.rb

@@ -0,0 +1,30 @@
+shared_context 'mock ssh' do
+  let(:ssh_mock_outfile) { Tempfile.new('tunnel_spec') }
+
+  after do
+    ssh_mock_outfile.close
+    ssh_mock_outfile.unlink
+  end
+
+  around do |example|
+    mocks_path = File.expand_path('../../mock', __FILE__)
+    env = {
+      PATH: "#{mocks_path}:#{ENV['PATH']}",
+      SSH_MOCK_OUTFILE: ssh_mock_outfile.path
+    }
+
+    ClimateControl.modify(env) { example.run }
+  end
+
+  def read_mock_argv
+    File.open(ssh_mock_outfile) do |f|
+      return JSON.load(f.read).fetch('argv')
+    end
+  end
+
+  def read_mock_env
+    File.open(ssh_mock_outfile) do |f|
+      return JSON.load(f.read).fetch('env')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -229,9 +229,9 @@ files:
 - lib/aptible/cli/agent.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/database.rb
-- lib/aptible/cli/helpers/env.rb
 - lib/aptible/cli/helpers/environment.rb
 - lib/aptible/cli/helpers/operation.rb
+- lib/aptible/cli/helpers/ssh.rb
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/helpers/tunnel.rb
 - lib/aptible/cli/subcommands/apps.rb
@@ -263,7 +263,10 @@ files:
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/vhost_fabricator.rb
+- spec/mock/git
+- spec/mock/ssh
 - spec/mock/ssh_mock.rb
+- spec/shared/mock_ssh_context.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/aptible-cli
 licenses:
@@ -285,7 +288,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
@@ -308,5 +311,8 @@ test_files:
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/vhost_fabricator.rb
+- spec/mock/git
+- spec/mock/ssh
 - spec/mock/ssh_mock.rb
+- spec/shared/mock_ssh_context.rb
 - spec/spec_helper.rb

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

@@ -1,11 +0,0 @@
-module Aptible
-  module CLI
-    module Helpers
-      module Env
-        def set_env(key, value)
-          ENV[key] = value
-        end
-      end
-    end
-  end
-end