vmc 0.3.14.beta.3 → 0.3.14.beta.4

data/config/clients.yml

@@ -8,4 +8,7 @@ mongodb:
   mongo: mongo --host ${host} --port ${port} -u ${user} -p ${password} ${name}
 
 postgresql:
-  psql: PGPASSWORD='${password}' psql -h ${host} -p ${port} -d ${name} -U ${user} -w
+  psql:
+    command: psql -h ${host} -p ${port} -d ${name} -U ${user} -w
+    environment:
+      - PGPASSWORD='${password}'

data/lib/cli/commands/services.rb

@@ -151,21 +151,24 @@ module VMC::Cli::Command
       start_tunnel(service, port, conn_info, auth)
 
       clients = get_clients_for(info[:vendor])
+
       if clients.empty?
-        which = "none"
+        client_name ||= "none"
       else
-        which = client_name || ask(
+        client_name ||= ask(
           "Which client would you like to start?",
           :choices => ["none"] + clients.keys,
           :indexed => true
         )
       end
 
-      if which == "none"
+      if client_name == "none"
         wait_for_tunnel_end
       else
         wait_for_tunnel_start(port)
-        start_local_prog(which, local_prog_cmdline(clients[which], port, conn_info))
+        unless start_local_prog(clients[client_name], conn_info, port)
+          err "'#{client_name}' executation failed; is it in your $PATH?"
+        end
       end
     end
 

data/lib/cli/tunnel_helper.rb

@@ -231,9 +231,8 @@ module VMC::Cli
       @local_tunnel_thread.join
     end
 
-    def local_prog_cmdline(command, local_port, tunnel_info)
-      cmd = command.dup
-      cmd.gsub!(/\$\{\s*([^\}]+)\s*\}/) do
+    def resolve_symbols(str, info, local_port)
+      str.gsub(/\$\{\s*([^\}]+)\s*\}/) do
         case $1
         when "host"
           # TODO: determine proper host
@@ -241,20 +240,31 @@ module VMC::Cli
         when "port"
           local_port
         when "user", "username"
-          tunnel_info["username"]
+          info["username"]
         else
-          tunnel_info[$1] || err("Unknown symbol '#{$1}'")
+          info[$1] || err("Unknown symbol '#{$1}'")
         end
       end
-      cmd
     end
 
-    def start_local_prog(which, cmdline)
+    def start_local_prog(client, info, port)
+      case client
+      when Hash
+        cmdline = resolve_symbols(client["command"], info, port)
+        client["environment"].each do |e|
+          e =~ /([^=]+)=(["']?)([^"']*)\2/
+          ENV[$1] = resolve_symbols($3, info, port)
+        end
+      when String
+        cmdline = resolve_symbols(client, info, port)
+      else
+        err "Unknown client info: #{client.inspect}."
+      end
+
       display "Launching '#{cmdline}'"
       display ''
-      unless system(cmdline)
-        err "Failed to start '#{which}' client; is it in your $PATH?"
-      end
+
+      system(cmdline)
     end
 
     def push_caldecott(token)

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.14.beta.3'
+    VERSION = '0.3.14.beta.4'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: vmc
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.3.14.beta.3
+  version: 0.3.14.beta.4
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 -08:00
+date: 2011-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency