aptible-cli 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed6d33fb4df228f78616e5a2a612584c1595fbce
-  data.tar.gz: 4795a89a24e7108ed2ee2c8eb590d331fbd4ecc6
+  metadata.gz: 02557871e371cd47bdc211ea7a52d11587c9c30c
+  data.tar.gz: 3f110a5037e15116cd05b55e591e72decd52b677
 SHA512:
-  metadata.gz: 7d3e19769ee760b39e9d0fe388fdfa2a8c2dac97b78678758ecaacc467989982a34c993f9d606d09388053a8c7a3c1552b693896945ac596cc668896fc93325c
-  data.tar.gz: 77b04483d2f82409cbc2c03ba05e0fa66b7041bfaf72646335064a305ebaa2ed3f65c9128d7345f8e76c6a726a3313e1ad690721bef5f804ffffd6a77dbd7529
+  metadata.gz: 235225b2aa1c1935f077efd0f23dd5e1af98d46a1a045ef7d1d4a1da6fb9537de0b347cfb6ce58b90605394c94bcbb78dd8fb4777fb4b36b05050c1615b156a3
+  data.tar.gz: cd51663f95904b23814bfa8d4c1db99357905ca7f4301cb60c5721e70cd8c4568b4a96407cd44e0e805e0e89478412d785949193b97892408f224cc7d4e98403

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

@@ -47,7 +47,7 @@ module Aptible
 
         def clone_database(source, dest_handle)
           op = source.create_operation!(type: 'clone', handle: dest_handle)
-          poll_for_success(op)
+          attach_to_operation_logs(op)
 
           databases_from_handle(dest_handle, source.account).first
         end
@@ -72,7 +72,7 @@ module Aptible
 
           with_local_tunnel(database) do |tunnel_helper|
             auth = "aptible:#{database.passphrase}"
-            host = "localhost:#{tunnel_helper.port}"
+            host = "localhost.aptible.in:#{tunnel_helper.port}"
             yield "postgresql://#{auth}@#{host}/db"
           end
         end
@@ -82,7 +82,7 @@ module Aptible
           uri = URI.parse(remote_url)
 
           "#{uri.scheme}://#{uri.user}:#{uri.password}@" \
-          "127.0.0.1:#{local_port}#{uri.path}"
+          "localhost.aptible.in:#{local_port}#{uri.path}"
         end
 
         def ssh_env(database)

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

@@ -24,7 +24,9 @@ module Aptible
             '-o', 'TCPKeepAlive=yes',
             '-o', 'KeepAlive=yes',
             '-o', 'ServerAliveInterval=60',
-            '-o', "LogLevel=#{log_level}"
+            '-o', "LogLevel=#{log_level}",
+            '-o', 'ControlMaster=no',
+            '-o', 'ControlPath=none'
           ]
         end
       end

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

@@ -58,12 +58,18 @@ module Aptible
 
         def stop
           fail 'You must call #start before calling #stop' if @pid.nil?
-          Process.kill('HUP', @pid)
+          begin
+            Process.kill('HUP', @pid)
+          rescue Errno::ESRCH
+            nil # Dear Rubocop: I know what I'm doing.
+          end
           wait
         end
 
         def wait
           Process.wait @pid
+        rescue Errno::ECHILD
+          nil
         end
 
         def port

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.7.3'.freeze
+    VERSION = '0.7.4'.freeze
   end
 end

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

@@ -22,7 +22,7 @@ describe Aptible::CLI::Agent do
 
     it 'should print a message about how to connect' do
       allow(Aptible::Api::Database).to receive(:all) { [database] }
-      local_url = 'postgresql://aptible:password@127.0.0.1:4242/db'
+      local_url = 'postgresql://aptible:password@localhost.aptible.in:4242/db'
 
       expect(subject).to receive(:with_local_tunnel).with(database, 0)
         .and_yield(socat_helper)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api