aptible-cli 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f92695aa1c51fb3389734be932a19b0a74db4cb
-  data.tar.gz: f0dae0641048bcf9467e0a701b10e4fd48046a4e
+  metadata.gz: 8340614d1cc3d2fb53ba6b4ae68dc03b6b19625e
+  data.tar.gz: 53687908023aceedb3e77846aedde82e6192211c
 SHA512:
-  metadata.gz: caa9156eea7ab665a935a9377d25089a2824bb29e0c62667c095c5d77e7e44bc725d5c30c9e643f734bf31f4a82b7bd4241bc75c86b5b49e6ccb218d2eb26c1d
-  data.tar.gz: 38b3ac64486f0b2384c79b0f4a90b0afecce98806cd6c5e20e55ced3e6071d0e64fedee6f259fd1369c1ea490676916cab3c30d19c31835c1c82cb41edf2e5d0
+  metadata.gz: f28df71687301e46511dd5c0fd1f523e2d98b96f19768cc6a171fe4e1e96547a4591098e9d3ef1abd76ed8e000a01c9d155b16d2c328d08b7a02b83f70badbfb
+  data.tar.gz: bf28470cb7db548572226eaab4a7be3da12ae7dc7e0707b2fe721955148e0e3c06069cf7cca69f69c497576d1206ec96847919ca2d7e10d9a724f94f01edf503

data/.rubocop.yml

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

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

@@ -51,7 +51,7 @@ module Aptible
                   fail Thor::Error, 'db:dump only works for PostgreSQL'
                 end
 
-                local_port = random_port
+                local_port = random_local_port
                 pid = fork { establish_connection(database, local_port) }
 
                 # TODO: Better test for connection readiness
@@ -74,7 +74,7 @@ module Aptible
                 fail Thor::Error, "Could not find database #{handle}"
               end
 
-              local_port = options[:port] || random_port
+              local_port = options[:port] || random_local_port
               puts "Creating tunnel at localhost:#{local_port}..."
               establish_connection(database, local_port)
             end
@@ -82,16 +82,14 @@ module Aptible
             private
 
             def establish_connection(database, local_port)
-              host = database.account.bastion_host
-              port = database.account.bastion_port
-
               ENV['ACCESS_TOKEN'] = fetch_token
               ENV['APTIBLE_DATABASE'] = database.handle
+
+              remote_port = claim_remote_port(database)
+              ENV['TUNNEL_PORT'] = remote_port
+
               tunnel_args = "-L #{local_port}:localhost:#{remote_port}"
-              connection_args = "-o 'SendEnv=*' -p #{port} root@#{host}"
-              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
-                     '-o UserKnownHostsFile=/dev/null'
-              command = "ssh #{opts} #{tunnel_args} #{connection_args}"
+              command = "ssh #{tunnel_args} #{common_ssh_args(database)}"
               Kernel.exec(command)
             end
 
@@ -101,7 +99,7 @@ module Aptible
               end
             end
 
-            def random_port
+            def random_local_port
               # Allocate a dummy server to discover an available port
               dummy = TCPServer.new('127.0.0.1', 0)
               port = dummy.addr[1]
@@ -109,8 +107,20 @@ module Aptible
               port
             end
 
-            def remote_port
-              8080
+            def claim_remote_port(database)
+              ENV['ACCESS_TOKEN'] = fetch_token
+
+              `ssh #{common_ssh_args(database)} 2>/dev/null`.chomp
+            end
+
+            def common_ssh_args(database)
+              host = database.account.bastion_host
+              port = database.account.bastion_port
+
+              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
+                     '-o UserKnownHostsFile=/dev/null'
+              connection_args = "-p #{port} root@#{host}"
+              "#{opts} #{connection_args}"
             end
           end
         end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.4.4'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Aptible CLI
@@ -130,10 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -166,12 +166,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []