viaduct-toolkit 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d69e7eacde021a7d6e0d6d22f1c7aa8139303895
-  data.tar.gz: 5a14ab41432ca81b60a27b7c4ce1df7e82ff428d
+  metadata.gz: bbd179f34ce8f31b941d55e67f5dee51188d5d3d
+  data.tar.gz: 38bd556c0c5bb1530e8af2da790bbf317f8bd536
 SHA512:
-  metadata.gz: ee6d8ab691d2f8dbe34ac9e58c07a0c8bc09e79720abd6b1a0535891d11af169448434ed04680fc92878f344ae37be840a488c0cd8a4dc20dc2c4355991ec30c
-  data.tar.gz: 2c63c45a2639c3b15482e9f3690d53c3f3c94bf37516aadba5a41c6a78f13222b758e07959a1621a58d7155aee0118fe2d4255859e9165a5184fc51ca80bcb53
+  metadata.gz: b0bbc588e1acc69dcaf550dd249e2c34c752778571279fda820ea12f0638d99304ce8c3812b5de4b360ab4db3eb5e24b85c97e4dd60fee34f1c16a900e1966c7
+  data.tar.gz: 57c6ef49791f621901be38e44ddf2a39c17c568c4069aa8588441fe51047bf82a94c682c2d2d1cf9a3b1150187c2bf2368c02d558e3551472678310a9570b58b

data/Gemfile

@@ -6,3 +6,4 @@ gem "terminal-table", '~> 1.4', '>= 1.4.5'
 gem "launchy", ">= 2.4.2", "< 3.0"
 gem "eventmachine", ">= 1.0.7", "< 1.1"
 gem 'rake'
+gem 'json', '~> 1.8.3'

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.4.0)
     highline (1.6.21)
-    json (1.8.1)
+    json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     moonrope-client (1.0.1)
@@ -29,10 +29,11 @@ DEPENDENCIES
   colorize (~> 0.7)
   commander (~> 4.2)
   eventmachine (>= 1.0.7, < 1.1)
+  json (~> 1.8.3)
   launchy (>= 2.4.2, < 3.0)
   rake
   terminal-table (~> 1.4, >= 1.4.5)
   viaduct-api (~> 1.0, >= 1.0.7)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/viaduct/toolkit/commands/app_tunnel.rb

@@ -0,0 +1,50 @@
+Viaduct::Toolkit.cli.command "app:tunnel" do |c|
+
+  c.syntax = "app:tunnel"
+  c.description = "Start a new SSH tunnel session so you can securely connect to internal parts of your application"
+  c.option "--ip REMOTE_IP", String, "The remote IP address to tunnel to"
+  c.option "-r REMOTE_PORT", "--remote REMOTE_PORT", String, "The remote port to tunnel to"
+  c.option "-l LOCAL_PORT", "--local LOCAL_PORT", String, "The local port to point to the remote port"
+  c.option "-d DATABASE_NAME", "--db DATABASE_NAME", String, "The name of a database to establish a tunnel to (no need to provide --ip or --remote)"
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if app = find_application
+
+      chech_ssh_key_presence
+      console = get_application_console_port_forward(app)
+
+      remote_ip = opts.ip
+      remote_port = opts.remote
+      local_port = opts.local
+
+      if opts.db
+        database = find_database(app, opts.db)
+        remote_ip = database['database']['env_vars']["VDT_DB_#{opts.db.to_s.upcase}_HOST"]
+        remote_port = database['database']['env_vars']["VDT_DB_#{opts.db.to_s.upcase}_PORT"]
+      end
+
+      if remote_ip.nil?
+        error "Must specify an remote IP using --ip"
+      end
+
+      if remote_port.nil?
+        error "Must specify a remote port using --remote"
+      end
+
+      if local_port.nil?
+        error "Must specify a local port using --local"
+      end
+
+      ssh_opts = [
+        "-p #{console['port']}",
+        "-L #{local_port}:#{remote_ip}:#{remote_port}"
+      ]
+      cmd = "echo -n 'Your tunnel to \e[34m#{remote_ip}:#{remote_port}\e[0m is established on \e[32m127.0.0.1:#{local_port}\e[0m.\nPress CTRL+C to close this connection...'; sleep infinity"
+      exec_console_command(console, "ssh #{ssh_opts.join(' ')} vdt@#{console['ip_address']} \"#{cmd}\"")
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "tunnel", "app:tunnel"

data/lib/viaduct/toolkit/helpers.rb

@@ -142,17 +142,6 @@ module Viaduct
             puts "    $ vdt ssh_key:add".blue
             puts
             exit(1)
-          else
-            stdout, stderr, status = run("ssh-add -l")
-            if status == 0
-              remote_fingerprints = response.data.map { |d| d['fingerprint'] }
-              local_fingerprints = stdout.split(/\n/).map { |l| l.split(/\s+/)[1] }
-              unless remote_fingerprints.any? { |f| local_fingerprints.include?(f) }
-                puts "Warning: it doesn't seem as though your SSH key has been uploaded".yellow
-                puts "to your Viaduct account. This session may not succeed. If it doesn't".yellow
-                puts "ensure that you have uploaded to your SSH key to your Viaduct account.".yellow
-              end
-            end
           end
         else
           error "Couldn't verify remote SSH keys. Please try again."

data/lib/viaduct/toolkit/version.rb

@@ -1,5 +1,5 @@
 module Viaduct
   module Toolkit
-    VERSION = '1.0.11'
+    VERSION = '1.0.12'
   end
 end

data/viaduct-toolkit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eventmachine', '= 1.0.7'
   s.add_dependency 'faye-websocket', '= 0.8.0'
   s.add_dependency 'highline', '= 1.6.21'
-  s.add_dependency 'json', '= 1.8.1'
+  s.add_dependency 'json', '= 1.8.3'
   s.add_dependency 'launchy', '= 2.4.3'
   s.add_dependency 'moonrope-client', '= 1.0.1'
   s.add_dependency 'rake', '= 10.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - lib/viaduct/toolkit/commands/app_open.rb
 - lib/viaduct/toolkit/commands/app_public_key.rb
 - lib/viaduct/toolkit/commands/app_status.rb
+- lib/viaduct/toolkit/commands/app_tunnel.rb
 - lib/viaduct/toolkit/commands/app_upload.rb
 - lib/viaduct/toolkit/commands/app_visit.rb
 - lib/viaduct/toolkit/commands/db_console.rb
@@ -265,7 +266,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: A developer toolkit for working with Viaduct from an CLI