viaduct-toolkit 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b42c0089908706f994489f0605d4db622c133ea4
-  data.tar.gz: 7b7210759489af94bb3631d043962c051e4de9d9
+  metadata.gz: 54397867692088f4b304e2646a73db4ddf1d1353
+  data.tar.gz: bee8a5c74ad804d4adb10d515bd859aaa37898ef
 SHA512:
-  metadata.gz: 590dd2c1bbf38111fd6f2aa517dada71d57addfec204a261de94dcaac57c2f07aeb24acd14cfd527787c9e04f8495a805eafd1eae2e359fa19842ee22ea0b86e
-  data.tar.gz: b8862753e232b2bb94a01f87943b78590d33bbac044c931846aead5099246e065a438bc2e50fed3323fd99880805bb29d0def18e9d55cc8d394cd5b045138d96
+  metadata.gz: c6fcddf16110648b224be3aabea36bbeedb0fc8182444f1eb31ddc03a7710a29a4b5f0398f51c11fab7563fd6f2ce4c61047d3ed1214722127c2b3ceb087a270
+  data.tar.gz: 98c74f7e7622382bc38b57efc10f2ab02bd5dbbb773b621ea825011cda5859f87a748318f5b22066f9068d9e222cb5dd4c02cf41250dafeb38a5f79ef53399d7

data/Gemfile

@@ -4,6 +4,7 @@ gem "viaduct-api", '~> 1.0', '>= 1.0.7'
 gem "colorize", "~> 0.7"
 gem "terminal-table", '~> 1.4', '>= 1.4.5'
 gem "launchy", ">= 2.4.2", "< 3.0"
+gem "eventmachine", ">= 1.0.7", "< 1.1"
 
 group :development do
   gem 'rake'

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     colorize (0.7.3)
     commander (4.2.1)
       highline (~> 1.6.11)
-    eventmachine (1.0.3)
+    eventmachine (1.0.7)
     faye-websocket (0.8.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.4.0)
@@ -28,6 +28,7 @@ PLATFORMS
 DEPENDENCIES
   colorize (~> 0.7)
   commander (~> 4.2)
+  eventmachine (>= 1.0.7, < 1.1)
   launchy (>= 2.4.2, < 3.0)
   rake
   terminal-table (~> 1.4, >= 1.4.5)

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

@@ -5,6 +5,7 @@ Viaduct::Toolkit.cli.command "app:console" do |c|
   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.option "-A", "--forward-agent", "Forward agent to this SSH session"
 
   c.action do |args, opts|
     include Commander::Methods
@@ -65,7 +66,9 @@ Viaduct::Toolkit.cli.command "app:console" do |c|
         end
 
       else
-        exec_console_command(console, "ssh vdt@#{console['ip_address']} -p #{console['port']}")
+        ssh_opts = ["-p #{console['port']}"]
+        ssh_opts << "-A" if opts.forward_agent
+        exec_console_command(console, "ssh #{ssh_opts.join(' ')} vdt@#{console['ip_address']}")
       end
     end
   end

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

@@ -12,7 +12,7 @@ Viaduct::Toolkit.cli.command "app:info" do |c|
         field "Viaduct Domain", application['viaduct_domain']
         field "Status", application['status']
         field "Maintenance", application['maintenance?'] ? 'Yes' : 'No'
-        field 'Owner', "#{application['user']['name']} (#{application['user']['username']})"
+        field 'Owner', "#{application['owner']['owner']['name']} (#{application['owner']['owner']['username']})"
         field "Zone", application['zone']['name']
         field "Platform", "#{application['platform']['name']} (on #{application['platform']['stack']['name']} stack)"
         field "Subnet(s)", application['subnets'].map { |s| s['description'] }.join(', ')

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

@@ -27,7 +27,7 @@ Viaduct::Toolkit.cli.command "app:list" do |c|
       end
     else
       rows = applications.map do |app|
-        [app['name'], app['subdomain'], app['status'], app['user']['name']]
+        [app['name'], app['subdomain'], app['status'], app['owner'] && app['owner']['owner'] ? app['owner']['owner']['name'] : '']
       end
       table ['Name', 'Subdomain', 'Status', 'Owner'], rows
     end

data/lib/viaduct/toolkit/version.rb

@@ -1,5 +1,5 @@
 module Viaduct
   module Toolkit
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
   end
 end

data/viaduct-toolkit.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '= 2.3.6'
   s.add_dependency 'colorize', '= 0.7.3'
   s.add_dependency 'commander', '= 4.2.1'
-  s.add_dependency 'eventmachine', '= 1.0.3'
+  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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -251,9 +251,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A developer toolkit for working with Viaduct from an CLI
 test_files: []
-has_rdoc: