viaduct-toolkit 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c66db3a1f9b8d5e872b2f57ee3d9a35cc3245132
-  data.tar.gz: 1f04ed00771efe833b09995d41150d82e9d93b67
+  metadata.gz: e74b426a21bcd09ed6d55df3caeccb100ac0e83b
+  data.tar.gz: 659ef1f517c899b2ebf5f69e80f221aecad3af75
 SHA512:
-  metadata.gz: b08a5b7a585a79629031522a60a81c807c691ba6aaae34347b889c981a64244dc367f6d6940e9eb619e12af2ecf7eef5deae625ad3cbd2bdd960ac82fec15369
-  data.tar.gz: 23006e3fada77da25e3c9ea3c747b73bbd723412d92219f225bff2990122c2663d77edabcf7434040210d1ccd1d5a0c40727bdf57b56b6ed9bbd30513d6ca0eb
+  metadata.gz: 218b9c6b7bba9286de733666a97bde7c0b4f0d10ab65e23ab28534771db1f402284ede76c7c1621061d038730d4e12561c613575c999c9ce6cbbc64b84509539
+  data.tar.gz: c3ba43711e4928386dfe4fd9fa1d7d1af1f43b601259fffb5e3e71c2c84d0a4133d5b66457fe9fd679a7ddfed399d5d89ce2bf115ca50e3bba5e75dc8c69a646

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

@@ -1,56 +1,19 @@
 Viaduct::Toolkit.cli.command "app:console" do |c|
-  
-  c.syntax = "app:console SUBDOMAIN_OF_APP"
-  c.description = "Start a new SSH-based console session"
+
+  c.syntax = "app:console"
+  c.description = "Start a new console session"
   c.option "--disable", "Disable access to the SSH console"
   c.option "--enable", "Enable access to the SSH console"
   c.option "--status", "Display the status of the port forward"
-  
+
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if app = find_application(args[0])
-      
-      # Check the user's SSH keys
-      response = Viaduct::Toolkit.api.ssh_keys.all
-      if response.success?
-        
-        if response.data.empty?
-          puts "You haven't uploaded any SSH keys to your Viaduct user account.".red
-          puts "You cannot use SSH console access without them.".red
-          puts
-          puts "Upload your key using the command below".blue
-          puts
-          puts "    $ vdt ssh_keys: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."
-      end
-      
-      # Get the console port forward for the application
-      response = Viaduct::Toolkit.api.port_forwards.all(:application => app['subdomain'])
-      if response.success?
-        unless console = response.data.select { |c| c['mode'] == 'console'}.first
-          error "Console access is not supported by this application. Please contact support."
-        end
-      else
-        error "Couldn't get port forward information from API for application."
-      end
-      
+    if app = find_application
+
+      chech_ssh_key_presence
+      console = get_application_console_port_forward(app)
+
       if opts.status
         details do
           heading "SSH console access"
@@ -61,13 +24,13 @@ Viaduct::Toolkit.cli.command "app:console" do |c|
             field i == 0 ? 'Allowed IPs' : '', ip
           end
         end
-      
+
       elsif opts.disable
-        
-        # 
+
+        #
         # Just disable console access
         #
-        
+
         if console['enabled']
           response = Viaduct::Toolkit.api.port_forwards.save(:id => console['id'], :enabled => 0)
           if response.success?
@@ -78,13 +41,13 @@ Viaduct::Toolkit.cli.command "app:console" do |c|
         else
           puts "Console access isn't currently enabled.".yellow
         end
-        
+
       elsif opts.enable
-        
+
         #
         # Just enable console access
         #
-        
+
         if console['enabled']
           puts "Console is already enabled.".yellow
         else
@@ -100,37 +63,13 @@ Viaduct::Toolkit.cli.command "app:console" do |c|
             error "We couldn't enable console access at this time. Please try later."
           end
         end
-        
+
       else
-        
-        #
-        # Enable if needed and connect.
-        #
-        unless console['enabled']
-          puts "SSH Console access is not currently enabled for this application.".magenta
-          if enable =  agree("Would you like to enable it now?".blue)
-            disable_after_hour = agree("Would you like to disable this again after an hour?".blue)
-            response = Viaduct::Toolkit.api.port_forwards.save(:id => console['id'], :enabled => 1, :auto_disable_at => (disable_after_hour ? "1 hour from now" : nil))
-            unless response.success?
-              puts response.inspect
-              error "We couldn't enable console access at this time. Please try later."
-            end
-          else
-            puts "Unfortunately, unless enabled you cannot use this command.".red
-            exit(1)
-          end
-        end
-        
-        command = "ssh vdt@#{console['ip_address']} -p #{console['port']}"
-        
-        exec(command)
+        exec_console_command(console, "ssh vdt@#{console['ip_address']} -p #{console['port']}")
       end
-      
-      
     end
   end
-  
-end
 
+end
 
-Viaduct::Toolkit.cli.alias_command "app:ssh", "app:console"
+Viaduct::Toolkit.cli.alias_command "console", "app:console"

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

@@ -1,18 +1,18 @@
 Viaduct::Toolkit.cli.command "app:deployments" do |c|
-  
-  c.syntax = "app:deployments SUBDOMAIN_OF_APP"
+
+  c.syntax = "app:deployments"
   c.description = "List all deployments for an application"
   c.option "--page PAGE", Integer, "The page of deployments to return"
-  
+
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if application = find_application(args[0])
+    if application = find_application
       response = Viaduct::Toolkit.api.applications.deployments(:application => application['subdomain'], :page => opts.page ? opts.page.to_i : 1)
       if response.success?
 
         require 'terminal-table'
-        
+
         colourer = Proc.new do |d, field|
           if d['status'] == 'deployed'
             field.to_s.green
@@ -22,7 +22,7 @@ Viaduct::Toolkit.cli.command "app:deployments" do |c|
             field
           end
         end
-        
+
         rows = response.data.map do |d|
           [
             colourer.call(d, d['number']),

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

@@ -0,0 +1,23 @@
+Viaduct::Toolkit.cli.command "app:download" do |c|
+
+  c.syntax = "app:download [REMOTE_PATH] [LOCAL_PATH]"
+  c.description = "Download files from your application"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if app = find_application
+
+      if args[0].nil?
+        error "must specify path to file to download"
+      end
+
+      chech_ssh_key_presence
+      console = get_application_console_port_forward(app)
+      exec_console_command(console, "scp -r -P #{console['port']} vdt@#{console['ip_address']}:#{args[0]} #{args[1] || './'}")
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "download", "app:download"

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

@@ -1,6 +1,6 @@
 Viaduct::Toolkit.cli.command "app:env" do |c|
-  
-  c.syntax = "app:env SUBDOMAIN_OF_APP"
+
+  c.syntax = "app:env"
   c.description = "Show all environment variables for an application"
   c.option "--simple", "Return environment variables "
   c.option "--yaml", "Return environment variables as YAML file"
@@ -8,7 +8,7 @@ Viaduct::Toolkit.cli.command "app:env" do |c|
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if application = find_application(args[0])
+    if application = find_application
       response = Viaduct::Toolkit.api.applications.environment_variables(:application => application['subdomain'])
       if response.success?
         if opts.simple

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

@@ -1,11 +1,11 @@
 Viaduct::Toolkit.cli.command "app:info" do |c|
-  
-  c.syntax = "app:info SUBDOMAIN_OF_APP"
+
+  c.syntax = "app:info"
   c.description = "Show details of an existing application"
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if application = find_application(args[0])
+    if application = find_application
       details do
         heading "Application Details"
         field "Name", application['name']
@@ -20,16 +20,17 @@ Viaduct::Toolkit.cli.command "app:info" do |c|
           heading "Repository"
           field 'URL', application['repository']['repository']['url']
           field 'Status', application['repository']['repository']['status']
-          field 'Last update', application['repository']['repository']['last_updated_at']
-          field 'Username', application['repository']['repository']['username']
+          field 'Last updated', application['repository']['repository']['last_updated_at']
+          if application['repository']['repository']['username']
+            field 'Username', application['repository']['repository']['username']
+          end
           field 'Branch', application['repository']['branch']
         end
-        
+
         if application['deployment']
           heading "Active Deployment"
           field 'Number', application['deployment']['number']
           field 'Started at', application['deployment']['timing']['created_at']
-          field 'Time', application['deployment']['timing']['time'].round(1).to_s + "s"
           field 'Description', application['deployment']['version']['description']
           field 'Source', application['deployment']['triggered_from']
           if application['deployment']['user']
@@ -41,5 +42,5 @@ Viaduct::Toolkit.cli.command "app:info" do |c|
       end
     end
   end
-  
-end
+
+end

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

@@ -5,7 +5,7 @@ Viaduct::Toolkit.cli.command "app:list" do |c|
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    
+
     pages_seen = 0
     applications = []
     loop do
@@ -31,6 +31,6 @@ Viaduct::Toolkit.cli.command "app:list" do |c|
       end
       table ['Name', 'Subdomain', 'Status', 'Owner'], rows
     end
-    
+
   end
 end

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

@@ -0,0 +1,60 @@
+Viaduct::Toolkit.cli.command "app:logs" do |c|
+  c.syntax = "app:logs"
+  c.description = "Stream logs from the remote server to your screen"
+  c.option "--process PROCESS_NAME", String, "Only show logs for the given process"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if app = find_application
+      response = Viaduct::Toolkit.api.applications.status(:application => app['subdomain'])
+      if response.success?
+
+        processes = response.data['processes'].select do |p|
+          if opts.process
+            p['label'] =~ /\A#{opts.process}/
+          else
+            true
+          end
+        end
+
+        if processes.empty?
+          error "No processes found to stream"
+        end
+
+        process_map = processes.inject({}) do |hash, process|
+          hash[process['id']] = process['label']
+          hash
+        end
+
+        require 'eventmachine'
+
+        begin
+          EM.run do
+            Viaduct::Toolkit.api.push.connected do |event|
+              process_map.keys.each do |process_id|
+                Viaduct::Toolkit.api.push.subscribe :application_process_logs, process_id
+              end
+            end
+
+            Viaduct::Toolkit.api.push.receive do |exchange, process_id, data|
+              if exchange == :application_process_logs
+                tag = "#{process_map[process_id.to_i].rjust(15)}  ".blue
+                puts "#{tag} #{data['line']}"
+              elsif exchange == :global && data['type'] == 'subscribed'
+                puts "Streaming logs for #{process_map[data['routing_key'].to_i]}...".yellow
+              end
+            end
+          end
+        rescue Interrupt
+          puts "Disconnecting..."
+        end
+      else
+        error "Couldn't get application status to determine process list"
+      end
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "logs", "app:logs"

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

@@ -0,0 +1,17 @@
+Viaduct::Toolkit.cli.command "app:open" do |c|
+
+  c.syntax = "app:open"
+  c.description = "Open application in the Viaduct web UI"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if application = find_application
+      require 'launchy'
+      Launchy.open("https://my.viaduct.io/applications/#{application['subdomain']}")
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "open", "app:open"

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

@@ -1,12 +1,11 @@
 Viaduct::Toolkit.cli.command "app:public_key" do |c|
-  c.syntax = "app:public_key NAME_OF_APP"
+  c.syntax = "app:public_key"
   c.description = "Return the public key for a given application"
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if app = find_application(args[0])
+    if app = find_application
       puts app['public_key'] + " Viaduct key for #{app['subdomain']}"
     end
   end
 end
-Viaduct::Toolkit.cli.alias_command "app:pk", "app:public_key"

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

@@ -1,18 +1,17 @@
 Viaduct::Toolkit.cli.command "app:status" do |c|
-  c.syntax = "app:status NAME_OF_APP"
+  c.syntax = "app:status"
   c.description = "Return current status of an application"
   c.option "--process PROCESS_TYPE", String, "A process to show expanded information for"
   c.option "--database DATABASE_ID", String, "The ID of the database to display further information for"
-  
+
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if app = find_application(args[0])
+    if app = find_application
       response = Viaduct::Toolkit.api.applications.status(:application => app['subdomain'])
       if response.success?
-        
         if opts.process
-          
+
           if process = response.data['processes'].select { |p| p['label'] == opts.process.to_s }.first
             details do
               heading "Details"
@@ -26,10 +25,10 @@ Viaduct::Toolkit.cli.command "app:status" do |c|
             puts "No process found matching '#{opts.process}'".red
             exit 1
           end
-          
-          
+
+
         elsif opts.database
-          
+
           if db = response.data['databases'][(opts.database.to_i - 1).abs]
             details do
               heading "Database Details"
@@ -41,9 +40,9 @@ Viaduct::Toolkit.cli.command "app:status" do |c|
             puts "No database found with ID '#{opts.database}'".red
             exit 1
           end
-          
+
         else
-        
+
           puts "Deployment Details".yellow
           details do
             puts "+" + '-' * 78 + '+'
@@ -51,22 +50,22 @@ Viaduct::Toolkit.cli.command "app:status" do |c|
             field 'Version', response.data['deployment']['version']['id']
             field "Description", response.data['deployment']['version']['description']
             field "Source", response.data['deployment']['triggered_from']
-            field "Deployer", response.data['deployment']['user'] ? response.data['deployment']['user']['full_name'] : response.data['deployment']['triggerer']
+            field "Deployer", response.data['deployment']['user'] ? response.data['deployment']['user']['name'] : response.data['deployment']['triggerer']
             field "Started", time(response.data['deployment']['timing']['started_at'])
           end
-        
+
           processes = response.data['processes'].map do |p|
             memory_used = (p['process']['resources']['memory_usage'] / 1024 / 1024).to_s + "MB"
             memory_available = (p['process']['resources']['max_memory'] / 1024 / 1024).to_s + "MB"
             memory = "#{memory_used}/#{memory_available}"
-          
+
             respawns = "#{p['process']['respawning']['current']}/#{p['process']['respawning']['maximum']}"
             [p['label'], p['process']['status'].capitalize, memory, p['container']['command'], respawns]
           end
           puts
           puts "Processes".yellow
           table ['Label', 'Status', 'Memory', 'Command', 'Respawns'], processes
-          
+
           count = 0
           databases = response.data['databases'].map do |d|
             count += 1
@@ -74,7 +73,7 @@ Viaduct::Toolkit.cli.command "app:status" do |c|
             memory_available = (d['process']['resources']['max_memory'] / 1024 / 1024).to_s + "MB"
             memory = "#{memory_used}/#{memory_available}"
             respawns = "#{d['process']['respawning']['current']}/#{d['process']['respawning']['maximum']}"
-          
+
             [count, d['label'], d['process']['status'].capitalize, d['stack']['name'], memory, respawns, d['process']['networking']['ip_address']]
           end
           unless databases.empty?
@@ -83,12 +82,13 @@ Viaduct::Toolkit.cli.command "app:status" do |c|
             table ['#', 'Label', 'Status', 'Type', 'Memory', 'Respawns', 'IP Address'], databases
           end
         end
-        
+
       else
         error "Couldn't get application status"
       end
     end
   end
+
 end
 
 def process_details(p)
@@ -97,23 +97,25 @@ def process_details(p)
     field "Host", p['host']
     field "LXC Name", p['lxc_name']
   end
-  
+
   heading "Networking"
   field "IP Address", p['networking']['ip_address']
   field "MAC Address", p['networking']['mac_address']
   field "Data", "RX: #{p['networking']['rx']}   TX: #{p['networking']['tx']}"
-  
+
   heading "Timing"
   field "Started", time(p['timing']['started'])
   field "Run time", length_of_time(p['timing']['run_time'])
   field "Last seen", time(p['timing']['last_seen_at'])
-  
+
   heading "Resources"
   field "Memory", "#{p['resources']['memory_usage'] /1024/1024}MB of #{p['resources']['max_memory']/1024/1024}MB"
   field "CPU Usage", p['resources']['cpu_usage']
-  
+
   heading "Respawning"
   field "Respawns", "#{p['respawning']['current']} / #{p['respawning']['maximum']}"
   field "Last respawn", time(p['respawning']['last'])
 
 end
+
+Viaduct::Toolkit.cli.alias_command "status", "app:status"

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

@@ -0,0 +1,23 @@
+Viaduct::Toolkit.cli.command "app:upload" do |c|
+
+  c.syntax = "app:upload [LOCAL_PATH] [REMOTE_PATH]"
+  c.description = "Upload files to your application"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if app = find_application
+
+      if args[0].nil?
+        error "must specify path to file to upload"
+      end
+
+      chech_ssh_key_presence
+      console = get_application_console_port_forward(app)
+      exec_console_command(console, "scp -r -P #{console['port']} #{args[0]} vdt@#{console['ip_address']}:#{args[1] || './'}")
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "upload", "app:upload"

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

@@ -0,0 +1,17 @@
+Viaduct::Toolkit.cli.command "app:visit" do |c|
+
+  c.syntax = "app:visit"
+  c.description = "Visit application in a web browser"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if application = find_application
+      require 'launchy'
+      Launchy.open("https://#{application['main_domain'] ? application['main_domain']['name'] : application['viaduct_domain']}")
+    end
+  end
+
+end
+
+Viaduct::Toolkit.cli.alias_command "visit", "app:visit"

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

@@ -0,0 +1,33 @@
+Viaduct::Toolkit.cli.command "db:console" do |c|
+
+  c.syntax = "db:console"
+  c.description = "Open a console session for the given database"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+
+    if args[0].nil?
+      error "You need to specify a database name"
+    end
+    if app = find_application
+      database = Viaduct::Toolkit.api.applications.database(:application => app['subdomain'], :database => args[0])
+      if database.status == 'not-found'
+        puts "No database found named '#{args[0]}'".red
+        exit 1
+      end
+
+      error "Couldn't get database details" unless database.success?
+      if command = database.data['database']['console_command']
+        chech_ssh_key_presence
+        console = get_application_console_port_forward(app)
+        puts command
+        exec_console_command(console, "ssh -t vdt@#{console['ip_address']} -p #{console['port']} '#{command}'")
+      else
+        puts "Console access is not available for this database type.".red
+        exit 1
+      end
+    end
+  end
+
+end

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

@@ -0,0 +1,31 @@
+Viaduct::Toolkit.cli.command "db:list" do |c|
+
+  c.syntax = "db:list"
+  c.description = "List all databases assigned to this application"
+
+  c.action do |args, opts|
+    include Commander::Methods
+    ensure_logged_in!
+    if app = find_application
+
+      shared_databases = Viaduct::Toolkit.api.shared_databases.all(:application => app['subdomain'])
+      error "Couldn't get shared databases" unless shared_databases.success?
+      dedicated_databases = Viaduct::Toolkit.api.dedicated_databases.all(:application => app['subdomain'])
+      error "Couldn't get dedicated databaes" unless dedicated_databases.success?
+
+
+      rows = []
+      shared_databases.data.each do |db|
+        rows << [db['fruit'], db['label'], 'Hobby/Dev', db['type'].split('::').last]
+      end
+
+      dedicated_databases.data.each do |db|
+        rows << [db['fruit'], db['label'], 'Production', db['stack']['name']]
+      end
+
+      table ['ID', 'Label', 'Type', 'Engine'], rows.sort_by { |r| r[0] }
+
+    end
+  end
+
+end

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

@@ -1,10 +1,10 @@
 Viaduct::Toolkit.cli.command "domain:list" do |c|
-  c.syntax = "domain:list NAME_OF_APP"
+  c.syntax = "domain:list"
   c.description = "Return a list of domains for an application"
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    if app = find_application(args[0])
+    if app = find_application
       response = Viaduct::Toolkit.api.domains.all(:application => app['subdomain'])
       if response.success?
         rows = response.data.map do |d|

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

@@ -2,31 +2,21 @@ Viaduct::Toolkit.cli.command "login" do |c|
   c.syntax = "login"
   c.description = "Authenticate this computer with your Viaduct account"
   c.action do |args, options|
-    
-    Viaduct::Toolkit.config['token'] = nil
-    Viaduct::Toolkit.config['secret'] = nil
+
+    Viaduct::Toolkit.env_config['token'] = nil
+    Viaduct::Toolkit.env_config['secret'] = nil
     Viaduct::Toolkit.save_config
-    
+
     response = Viaduct::Toolkit.api.authentication.create_login_token
     if response.success?
-      
-      puts "To log you in we need to open a browser window to allow".magenta
+
+      puts "To log you in we've opened a browser window to allow".magenta
       puts "you to enter your login details. ".magenta
-      puts
-      if agree("Shall we open this for you?".blue)
-        system("open", response.data['url'])
-      else
-        puts
-        puts "That's fine. Just go to the URL below in your browser.".magenta
-        puts "This command will continue to run until you complete this".magenta
-        puts "action.".magenta
-        puts
-        puts response.data['url']
-      end
-      
+      require 'launchy'
+      Launchy.open(response.data['url'])
+
       puts
       puts "Please wait while we verify your login...".magenta
-      puts
       check_response = nil
       100.times do
         sleep 3
@@ -43,14 +33,15 @@ Viaduct::Toolkit.cli.command "login" do |c|
           error "Couldn't successfully exchange login token for an API token. Please try again later."
         end
       end
-      
+
       if @authorised
-        Viaduct::Toolkit.config['token'] = check_response.data['token']['token']
-        Viaduct::Toolkit.config['secret'] = check_response.data['token']['secret']
+        Viaduct::Toolkit.env_config['token'] = check_response.data['token']['token']
+        Viaduct::Toolkit.env_config['secret'] = check_response.data['token']['secret']
 
         user_check = Viaduct::Toolkit.api.user.details
         if user_check.success?
           Viaduct::Toolkit.save_config
+          puts
           puts "Hello #{user_check.data['name']}!".green
           puts "Your user account is now authorised. Your login details are".magenta
           puts "stored in a .viaduct file in your home directory.".magenta
@@ -61,10 +52,10 @@ Viaduct::Toolkit.cli.command "login" do |c|
       else
         error "We didn't receive a login response in a timely manner. Please try again."
       end
-      
+
     else
       error "Couldn't generate a remote login token. Please try again."
     end
-    
+
   end
-end
+end

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

@@ -1,14 +1,14 @@
 Viaduct::Toolkit.cli.command "ssh_key:add" do |c|
-  
+
   c.syntax = "ssh_keys:add PATH_TO_PUBLIC_KEY"
   c.description = "Add a new SSH public key to your user account"
-  
+
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    
+
     key_path = args[0]
-    
+
     default_key_path = File.join(ENV['HOME'], '.ssh', 'id_rsa.pub')
     if key_path.nil? && File.exist?(default_key_path)
       puts "You haven't provided an SSH key to this command.".yellow
@@ -18,7 +18,7 @@ Viaduct::Toolkit.cli.command "ssh_key:add" do |c|
         exit(1)
       end
     end
-    
+
     if File.exist?(key_path)
       response = Viaduct::Toolkit.api.ssh_keys.add(:label => "Added from #{`hostname`}", :key => File.read(key_path))
       if response.success?
@@ -36,5 +36,5 @@ Viaduct::Toolkit.cli.command "ssh_key:add" do |c|
       exit(1)
     end
   end
-  
+
 end

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

@@ -1,12 +1,12 @@
 Viaduct::Toolkit.cli.command "ssh_key:list" do |c|
-  
+
   c.syntax = "ssh_key:list"
   c.description = "List the keys associated with your account"
-  
+
   c.action do |args, opts|
     include Commander::Methods
     ensure_logged_in!
-    
+
     response = Viaduct::Toolkit.api.ssh_keys.all
     if response.success?
       require 'terminal-table'
@@ -15,12 +15,12 @@ Viaduct::Toolkit.cli.command "ssh_key:list" do |c|
       end
       table = Terminal::Table.new :rows => rows, :headings => ['Label', 'Fingerprint']
       puts table
-      
+
     else
       error "Couldn't get the SSH key list."
     end
-    
+
   end
-  
+
 end
 

data/lib/viaduct/toolkit/helpers.rb

@@ -4,7 +4,7 @@ module Viaduct
   module Toolkit
     module Helpers
       def ensure_logged_in!
-        if Viaduct::Toolkit.config['token'].nil? && Viaduct::Toolkit.config['secret'].nil?
+        if Viaduct::Toolkit.env_config['token'].nil? && Viaduct::Toolkit.env_config['secret'].nil?
           puts "You need to login before using this toolkit. Use the command below".yellow
           puts "to login to your Viaduct account.".yellow
           puts
@@ -13,26 +13,26 @@ module Viaduct
           exit 1
         end
       end
-      
+
       def length_of_time(seconds)
         "#{seconds} seconds"
       end
-      
+
       def time(time)
         require 'time'
         time = Time.parse(time) rescue nil
         time ? time.strftime("%d %B %Y at %H:%M:%S UTC") : ''
       end
-      
+
       def boolean(bool)
         bool ? "\u2713".green : "-".red
       end
-      
+
       def table(headings, rows)
         require 'terminal-table'
         puts Terminal::Table.new :rows => rows, :headings => headings.map(&:blue)
       end
-      
+
       def validation_errors(errors)
         errors.each do |field, messages|
           messages.each do |message|
@@ -40,23 +40,23 @@ module Viaduct
           end
         end
       end
-      
+
       def error(message)
         raise Viaduct::Toolkit::Error, message
       end
-      
+
       def run(*commands)
         stdin, stdout, stderr, w = Open3.popen3(*commands)
         [stdout.gets(nil), stderr.gets(nil), w.value]
       end
-      
-      def find_application(subdomain)
-        if subdomain.is_a?(String) && subdomain.length > 0
-          app = Viaduct::Toolkit.api.applications.info(:application => subdomain)
+
+      def find_application
+        if $app.is_a?(String) && $app.length > 0
+          app = Viaduct::Toolkit.api.applications.info(:application => $app)
           if app.success?
             return app.data
           else
-            puts "Couldn't find application with subdomain matching '#{subdomain}'".red
+            puts "Couldn't find application with subdomain matching '#{$app}'".red
             exit(1)
           end
         else
@@ -73,39 +73,95 @@ module Viaduct
                 end
                 exit(1)
               elsif app.data.size == 1
-                return find_application(app.data.first['subdomain'])
+                $app = app.data.first['subdomain']
+                return find_application
               else
                 puts "Multiple applications found matching your repository. Choose an application...".yellow
                 choice = choose('', *app.data.map { |a| "#{a['subdomain']}: #{a['name']}"})
                 choice = choice.split(":", 2).first
-                return find_application(choice)
+                $app = choice
+                return find_application()
               end
             end
           end
         end
-        
+
         puts "Couldn't determine a Viaduct application from command.".red
         exit(1)
       end
-      
+
       def heading(title)
-        puts "+" + ("-" * 78) + "+" 
+        puts "+" + ("-" * 78) + "+"
         puts "| #{title.ljust(76).yellow} |"
-        puts "+" + ("-" * 78) + "+" 
+        puts "+" + ("-" * 78) + "+"
       end
-      
+
       def field(key, value)
         key = key[0,16].ljust(16, ' ')
         value = value.to_s[0,58].ljust(58)
-        
+
         puts "| #{key.blue}| #{value} |"
       end
-      
+
       def details(&block)
         block.call
-        puts "+" + ("-" * 78) + "+" 
+        puts "+" + ("-" * 78) + "+"
+      end
+
+      def chech_ssh_key_presence
+        response = Viaduct::Toolkit.api.ssh_keys.all
+        if response.success?
+
+          if response.data.empty?
+            puts "You haven't uploaded any SSH keys to your Viaduct user account.".red
+            puts "You cannot use SSH console access without them.".red
+            puts
+            puts "Upload your key using the command below".blue
+            puts
+            puts "    $ vdt ssh_keys: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."
+        end
       end
-      
+
+      def get_application_console_port_forward(app)
+        response = Viaduct::Toolkit.api.port_forwards.all(:application => app['subdomain'])
+        if response.success?
+          if console = response.data.select { |c| c['mode'] == 'console'}.first
+            console
+          else
+            error "Console access is not supported by this application. Please contact support."
+          end
+        else
+          error "Couldn't get port forward information from API for application."
+        end
+      end
+
+      def exec_console_command(console, command)
+        unless console['enabled']
+          response = Viaduct::Toolkit.api.port_forwards.save(:id => console['id'], :enabled => 1, :auto_disable_at => '5 minutes from now')
+          unless response.success?
+            error "We couldn't enable console access at this time. Please try later."
+          end
+        end
+        puts "Connecting...".magenta
+        exec(command)
+      end
+
     end
   end
 end

data/lib/viaduct/toolkit/version.rb

@@ -1,5 +1,5 @@
 module Viaduct
   module Toolkit
-    VERSION = '0.0.3'
+    VERSION = '0.1.0'
   end
 end

data/lib/viaduct/toolkit.rb

@@ -13,16 +13,16 @@ Commander::Methods.send :include, Viaduct::Toolkit::Helpers
 
 module Viaduct
   module Toolkit
-    
+
     class Error < StandardError
     end
-    
+
     class << self
-      
+
       def binary
         File.expand_path(File.join('..', '..', '..', 'bin', 'viaduct'), __FILE__)
       end
-      
+
       def cli
         @cli ||= begin
           c = Commander::Runner.instance
@@ -30,47 +30,59 @@ module Viaduct
           c.program :version, Viaduct::Toolkit::VERSION
           c.program :description, "A CLI toolkit for Viaduct developers"
           c.global_option('-c', '--config FILE', 'The config file to store local credentials within') { |file| $config_file_path = file }
+          c.global_option('--app NAME', 'The application to work on') { |name| $app = name }
+          c.global_option('--dev', 'Connect to local development installation of Viaduct (dev only)') { $dev = true }
           c.default_command :help
           c
         end
       end
-    
+
       def add_commands
         Dir[File.expand_path(File.join('..', 'toolkit', 'commands', '*.rb'), __FILE__)].each do |file|
           require file
         end
       end
-    
+
       def api
         @api ||= begin
-          Viaduct::API::Client.new(config['token'], config['secret'])
+          if $dev
+            Viaduct::API.host = 'localhost'
+            Viaduct::API.port = 5000
+            Viaduct::API.ssl = false
+            Viaduct::API.application_token = 'example'
+          end
+          Viaduct::API::Client.new(env_config['token'], env_config['secret'])
         end
       end
-      
+
       def reset_api
         @api = nil
       end
-    
+
       def config_file_path
         $config_file_path || File.join(ENV['HOME'], '.viaduct')
       end
-    
+
+      def env_config
+        config[$dev ? 'dev' : 'live'] ||= {}
+      end
+
       def config
         @config ||= begin
           if File.exist?(config_file_path)
-            YAML.load_file(config_file_path)
+            YAML.load_file(config_file_path) || {}
           else
             {}
           end
         end
       end
-    
+
       def save_config
         File.open(config_file_path, 'w') do |f|
           f.write self.config.to_yaml
         end
       end
-      
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A set of useful tools to help developers use & manage their Viaduct applications.
 email:
 - adam@viaduct.io
@@ -84,11 +104,18 @@ files:
 - lib/viaduct/toolkit.rb
 - lib/viaduct/toolkit/commands/app_console.rb
 - lib/viaduct/toolkit/commands/app_deployments.rb
+- lib/viaduct/toolkit/commands/app_download.rb
 - lib/viaduct/toolkit/commands/app_env.rb
 - lib/viaduct/toolkit/commands/app_info.rb
 - lib/viaduct/toolkit/commands/app_list.rb
+- lib/viaduct/toolkit/commands/app_logs.rb
+- 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_upload.rb
+- lib/viaduct/toolkit/commands/app_visit.rb
+- lib/viaduct/toolkit/commands/db_console.rb
+- lib/viaduct/toolkit/commands/db_list.rb
 - lib/viaduct/toolkit/commands/domain_list.rb
 - lib/viaduct/toolkit/commands/login.rb
 - lib/viaduct/toolkit/commands/ssh_key_add.rb