af 0.3.16.5 → 0.3.18.1

data/README.md

@@ -4,7 +4,7 @@ The AppFog CLI. This is the command line interface to AppFog.com
 
 af is based on vmc but will have features specific to the AppFog service as well as having the default target set to AppFog's service
 
-_Copyright 2010-2011, VMware, Inc. Licensed under the
+_Copyright 2010-2012, VMware, Inc. Licensed under the
 MIT license, please see the LICENSE file.  All rights reserved._
 
     Usage: af [options] command [<args>] [command_options]

data/lib/cli.rb

@@ -1,6 +1,7 @@
-ROOT = File.expand_path(File.dirname(__FILE__))
-WINDOWS = !!(RUBY_PLATFORM =~ /mingw|mswin32|cygwin/)
+require "rbconfig"
 
+ROOT = File.expand_path(File.dirname(__FILE__))
+WINDOWS = !!(RbConfig::CONFIG['host_os'] =~ /mingw|mswin32|cygwin/)
 
 module VMC
   autoload :Client,           "#{ROOT}/vmc/client"
@@ -26,6 +27,7 @@ module VMC
     autoload :TunnelHelper,   "#{ROOT}/cli/tunnel_helper"
     autoload :ManifestHelper, "#{ROOT}/cli/manifest_helper"
     autoload :ConsoleHelper,  "#{ROOT}/cli/console_helper"
+    autoload :InfraHelper,    "#{ROOT}/cli/infra_helper"
 
     module Command
       autoload :Base,         "#{ROOT}/cli/commands/base"

data/lib/cli/commands/apps.rb

@@ -22,11 +22,18 @@ module VMC::Cli::Command
 
       display "\n"
       return display "No Applications" if apps.nil? || apps.empty?
+      
+      infra_supported = !apps.detect { |a| a[:infra] }.nil?
 
       apps_table = table do |t|
         t.headings = 'Application', '# ', 'Health', 'URLS', 'Services'
+        t.headings << 'In' if infra_supported
         apps.each do |app|
-          t << [app[:name], app[:instances], health(app), app[:uris].join(', '), app[:services].join(', ')]
+          a = [app[:name], app[:instances], health(app), app[:uris].join(', '), app[:services].join(', ')]
+          if infra_supported
+            a << ( app[:infra] ? app[:infra][:provider] : "   " )
+          end
+          t << a  
         end
       end
       display apps_table
@@ -48,6 +55,10 @@ module VMC::Cli::Command
     end
 
     def console(appname, interactive=true)
+
+      app = client.app_info(appname)
+      infra_name = app[:infra] ? app[:infra][:name] : 'aws' # FIXME 
+
       unless defined? Caldecott
         display "To use `vmc rails-console', you must first install Caldecott:"
         display ""
@@ -68,26 +79,27 @@ module VMC::Cli::Command
 
       raise VMC::Client::AuthError unless client.logged_in?
 
-      if not tunnel_pushed?
-        display "Deploying tunnel application '#{tunnel_appname}'."
+      if not tunnel_pushed?(infra_name)
+        display "Deploying tunnel application '#{tunnel_appname(infra_name)}'."
         auth = UUIDTools::UUID.random_create.to_s
-        push_caldecott(auth)
-        start_caldecott
+        push_caldecott(auth,infra_name)
+        start_caldecott(infra_name)
       else
-        auth = tunnel_auth
+        auth = tunnel_auth(infra_name)
       end
 
-      if not tunnel_healthy?(auth)
-        display "Redeploying tunnel application '#{tunnel_appname}'."
+
+      if not tunnel_healthy?(auth,infra_name)
+        display "Redeploying tunnel application '#{tunnel_appname(infra_name)}'."
         # We don't expect caldecott not to be running, so take the
         # most aggressive restart method.. delete/re-push
-        client.delete_app(tunnel_appname)
-        invalidate_tunnel_app_info
-        push_caldecott(auth)
-        start_caldecott
+        client.delete_app(tunnel_appname(infra_name))
+        invalidate_tunnel_app_info(infra_name)
+        push_caldecott(auth,infra_name)
+        start_caldecott(infra_name)
       end
 
-      start_tunnel(port, conn_info, auth)
+      start_tunnel(port, conn_info, auth, infra_name)
       wait_for_tunnel_start(port)
       start_local_console(port, appname) if interactive
       port
@@ -894,6 +906,7 @@ module VMC::Cli::Command
     end
 
     def do_push(appname=nil)
+
       unless @app_info || no_prompt
         @manifest = { "applications" => { @path => { "name" => appname } } }
 
@@ -920,6 +933,11 @@ module VMC::Cli::Command
       memswitch = normalize_mem(memswitch) if memswitch
       command = info(:command)
       runtime = info(:runtime)
+      infra = info(:infra)
+
+      if infra
+        err "Infra '#{infra}' is not valid" unless VMC::Cli::InfraHelper.valid?(infra)
+      end
 
       # Check app existing upfront if we have appname
       app_checked = false
@@ -968,7 +986,6 @@ module VMC::Cli::Command
       default_url = "None"
       default_url = "#{appname}.#{VMC::Cli::Config.suggest_url}" if framework.require_url?
 
-
       unless no_prompt || url || !framework.require_url?
         url = ask(
           "Application Deployed URL",
@@ -1015,18 +1032,19 @@ module VMC::Cli::Command
         }
       }
       manifest[:staging][:command] = command if command
-
+      manifest[:infra] = { :provider => infra } if infra
+      
       # Send the manifest to the cloud controller
       client.create_app(appname, manifest)
       display 'OK'.green
 
-
+      
       existing = Set.new(client.services.collect { |s| s[:name] })
 
       if @app_info && services = @app_info["services"]
         services.each do |name, info|
           unless existing.include? name
-            create_service_banner(info["type"], name, true)
+            create_service_banner(info["type"], name, true, infra)
           end
 
           bind_service_banner(name, appname)

data/lib/cli/commands/base.rb

@@ -27,7 +27,7 @@ module VMC::Cli
 
         load_manifest manifest_file if manifest_file
       end
-
+      
       def manifest_file
         return @options[:manifest] if @options[:manifest]
         return @manifest_file if @manifest_file
@@ -221,6 +221,11 @@ module VMC::Cli
         end
         @frameworks
       end
+
+      def default_infra
+        "aws"
+      end
+
     end
   end
 end

data/lib/cli/commands/services.rb

@@ -38,7 +38,7 @@ module VMC::Cli::Command
         name = random_service_name(service)
         picked_name = true
       end
-      create_service_banner(service, name, picked_name)
+      create_service_banner(service, name, picked_name, @options[:infra])
       appname = @options[:bind] unless appname
       bind_service_banner(name, appname) if appname
     end
@@ -118,37 +118,44 @@ module VMC::Cli::Command
 
       raise VMC::Client::AuthError unless client.logged_in?
 
-      if not tunnel_pushed?
-        display "Deploying tunnel application '#{tunnel_appname}'."
+      infra_name = info[:infra] ? info[:infra][:name] : default_infra
+      
+      if infra_name
+        err "Infra '#{infra_name}' is not valid" unless VMC::Cli::InfraHelper.valid?(infra_name)
+      end
+
+      
+      if not tunnel_pushed?(infra_name)
+        display "Deploying tunnel application '#{tunnel_appname(infra_name)}'."
         auth = UUIDTools::UUID.random_create.to_s
-        push_caldecott(auth)
-        bind_service_banner(service, tunnel_appname, false)
-        start_caldecott
+        push_caldecott(auth,infra_name)
+        bind_service_banner(service, tunnel_appname(infra_name), false)
+        start_caldecott(infra_name)
       else
-        auth = tunnel_auth
+        auth = tunnel_auth(infra_name)
       end
 
-      if not tunnel_healthy?(auth)
-        display "Redeploying tunnel application '#{tunnel_appname}'."
+      if not tunnel_healthy?(auth,infra_name)
+        display "Redeploying tunnel application '#{tunnel_appname(infra_name)}'."
 
         # We don't expect caldecott not to be running, so take the
         # most aggressive restart method.. delete/re-push
-        client.delete_app(tunnel_appname)
-        invalidate_tunnel_app_info
+        client.delete_app(tunnel_appname(infra_name))
+        invalidate_tunnel_app_info(infra_name)
 
-        push_caldecott(auth)
-        bind_service_banner(service, tunnel_appname, false)
-        start_caldecott
+        push_caldecott(auth,infra_name)
+        bind_service_banner(service, tunnel_appname(infra_name), false)
+        start_caldecott(infra_name)
       end
 
-      if not tunnel_bound?(service)
-        bind_service_banner(service, tunnel_appname)
+      if not tunnel_bound?(service,infra_name)
+        bind_service_banner(service, tunnel_appname(infra_name))
       end
 
-      conn_info = tunnel_connection_info info[:vendor], service, auth
+      conn_info = tunnel_connection_info info[:vendor], service, auth, infra_name
       display_tunnel_connection_info(conn_info)
       display "Starting tunnel to #{service.bold} on port #{port.to_s.bold}."
-      start_tunnel(port, conn_info, auth)
+      start_tunnel(port, conn_info, auth, infra_name)
 
       clients = get_clients_for(info[:vendor])
 
@@ -167,7 +174,7 @@ module VMC::Cli::Command
       else
         wait_for_tunnel_start(port)
         unless start_local_prog(clients, client_name, conn_info, port)
-          err "'#{client_name}' executation failed; is it in your $PATH?"
+          err "'#{client_name}' execution failed; is it in your $PATH?"
         end
       end
     end

data/lib/cli/config.rb

@@ -23,6 +23,7 @@ module VMC::Cli
       attr_accessor :output
       attr_accessor :trace
       attr_accessor :nozip
+      attr_accessor :infra
 
       def target_url
         return @target_url if @target_url
@@ -42,7 +43,7 @@ module VMC::Cli
       end
 
       def suggest_url
-        @suggest_url ||= "aws.af.cm"
+        @suggest_url ||= VMC::Cli::InfraHelper.base_for_infra(@infra)
       end
 
       def store_target(target_host)

data/lib/cli/console_helper.rb

@@ -27,7 +27,10 @@ module VMC::Cli
             "Please redeploy your app to enable support."
         end
       end
-      conn_info = {'hostname' => entry[:console_ip], 'port' => entry[:console_port]}
+      conn_info = {
+        'hostname' => entry[:console_ip],
+        'port' => entry[:console_port]
+        }
     end
 
     def start_local_console(port, appname)
@@ -50,13 +53,14 @@ module VMC::Cli
       5.times do
         begin
           results = @telnet_client.login("Name"=>auth_info["username"],
-            "Password"=>auth_info["password"]) {|line|
-            if line =~ /[$%#>] \z/n
-              prompt = line
-            elsif line =~ /Login failed/
-              err_msg = line
-            end
-          }
+            "Password"=>auth_info["password"])
+          lines = results.sub("Login: Password: ", "").split("\n")
+          last_line = lines.pop
+          if last_line =~ /[$%#>] \z/n
+            prompt = last_line
+          elsif last_line =~ /Login failed/
+            err_msg = last_line
+          end
           break
         rescue TimeoutError
           sleep 1
@@ -104,29 +108,31 @@ module VMC::Cli
     end
 
     def readline_with_history(prompt)
-      line = Readline.readline(prompt, true)
-      return '' if line.nil?
-      #Don't keep blank or repeat commands in history
-      if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
-        Readline::HISTORY.pop
-      end
+      line = Readline::readline(prompt)
+      return nil if line == nil || line == 'quit' || line == 'exit'
+      Readline::HISTORY.push(line) if not line =~ /^\s*$/ and Readline::HISTORY.to_a[-1] != line
       line
     end
 
     def run_console(prompt)
-      while(cmd = readline_with_history(prompt))
-        if(cmd == "exit" || cmd == "quit")
-          #TimeoutError expected, as exit doesn't return anything
-          @telnet_client.cmd("String"=>cmd,"Timeout"=>1) rescue TimeoutError
-          close_console
+      prev = trap("INT")  { |x| exit_console; prev.call(x); exit }
+      prev = trap("TERM") { |x| exit_console; prev.call(x); exit }
+      loop do
+        cmd = readline_with_history(prompt)
+        if(cmd == nil)
+          exit_console
           break
         end
-        if !cmd.empty?
-          prompt = send_console_command_display_results(cmd, prompt)
-        end
+        prompt = send_console_command_display_results(cmd, prompt)
       end
     end
 
+    def exit_console
+      #TimeoutError expected, as exit doesn't return anything
+      @telnet_client.cmd("String"=>"exit","Timeout"=>1) rescue TimeoutError
+      close_console
+    end
+
     def send_console_command_display_results(cmd, prompt)
       begin
         lines = send_console_command cmd
@@ -154,4 +160,4 @@ module VMC::Cli
       }
     end
   end
-end
+end

data/lib/cli/frameworks.rb

@@ -18,13 +18,19 @@ module VMC::Cli
       'Erlang/OTP Rebar' => ['otp_rebar',  { :mem => '64M',  :description => 'Erlang/OTP Rebar Application'}],
       'WSGI'     => ['wsgi',    { :mem => '64M',  :description => 'Python WSGI Application'}],
       'Django'   => ['django',  { :mem => '128M', :description => 'Python Django Application'}],
-      'Rack'     => ['rack', { :mem => '128M', :description => 'Rack Application'}]
+      'dotNet'   => ['dotNet',  { :mem => '128M', :description => '.Net Web Application'}],
+      'Rack'     => ['rack', { :mem => '128M', :description => 'Rack Application'}],
+      'Play'     => ['play',  { :mem => '256M', :description => 'Play Framework Application'}]
     }
 
     class << self
 
-      def known_frameworks
-        FRAMEWORKS.keys
+      def known_frameworks(available_frameworks)
+        frameworks = []
+        FRAMEWORKS.each do |key,fw|
+          frameworks << key if available_frameworks.include? [fw[0]]
+        end
+        frameworks
       end
 
       def lookup(name)
@@ -49,6 +55,8 @@ module VMC::Cli
         if !File.directory? path
           if path.end_with?('.war')
             return detect_framework_from_war path
+          elsif path.end_with?('.zip')
+            return detect_framework_from_zip path, available_frameworks
           elsif available_frameworks.include?(["standalone"])
             return Framework.lookup('Standalone')
           else
@@ -78,7 +86,7 @@ module VMC::Cli
               next if matched_file
               File.open(fname, 'r') do |f|
                 str = f.read # This might want to be limited
-                matched_file = fname if (str && str.match(/^\s*require[\s\(]*['"]sinatra['"]/))
+                matched_file = fname if (str && str.match(/^\s*\#?\s*require\s*\(?\s*['"]sinatra['"]/))
               end
             end
             if matched_file
@@ -87,11 +95,7 @@ module VMC::Cli
               f.exec = "ruby #{matched_file}"
               return f
             end
-          # Node.js
-          elsif !Dir.glob('*.js').empty?
-            if File.exist?('server.js') || File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
-              return Framework.lookup('Node')
-            end
+
           # PHP
           elsif !Dir.glob('*.php').empty?
             return Framework.lookup('PHP')
@@ -108,6 +112,21 @@ module VMC::Cli
           # Python
           elsif !Dir.glob('wsgi.py').empty?
             return Framework.lookup('WSGI')
+
+          # .Net
+          elsif !Dir.glob('web.config').empty?
+            return Framework.lookup('dotNet')
+
+          # Node.js
+          elsif !Dir.glob('*.js').empty?
+            if File.exist?('server.js') || File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
+              return Framework.lookup('Node')
+            end
+
+          # Play or Standalone Apps
+          elsif Dir.glob('*.zip').first
+            zip_file = Dir.glob('*.zip').first
+            return detect_framework_from_zip zip_file, available_frameworks
           end
 
           # Default to Standalone if no other match was made
@@ -115,7 +134,6 @@ module VMC::Cli
         end
       end
 
-      private
       def detect_framework_from_war(war_file=nil)
         if war_file
           contents = ZipUtil.entry_lines(war_file)
@@ -139,6 +157,19 @@ module VMC::Cli
           return Framework.lookup('JavaWeb')
         end
       end
+
+      def detect_framework_from_zip(zip_file, available_frameworks)
+        contents = ZipUtil.entry_lines(zip_file)
+        detect_framework_from_zip_contents(contents, available_frameworks)
+      end
+
+      def detect_framework_from_zip_contents(contents, available_frameworks)
+        if available_frameworks.include?(["play"]) && contents =~ /lib\/play\..*\.jar/
+          return Framework.lookup('Play')
+        elsif available_frameworks.include?(["standalone"])
+          return Framework.lookup('Standalone')
+        end
+      end
     end
 
     attr_reader   :name, :description, :console
@@ -218,7 +249,7 @@ module VMC::Cli
     def memory(runtime=nil)
       default_mem = @memory
       default_mem = '128M' if runtime =~ /\Aruby/ || runtime == "php"
-      default_mem = '512M' if runtime == "java"
+      default_mem = '512M' if runtime == "java" || runtime == "java7"
       default_mem
     end
 

data/lib/cli/infra_helper.rb

@@ -0,0 +1,29 @@
+
+
+module VMC::Cli
+  module InfraHelper
+
+    class << self 
+
+      def base_for_infra(infra)
+        infras.has_key?(infra) ?  infras[infra][:base] : "aws.af.cm"
+      end
+
+      def valid?(infra) 
+        infra && infras.has_key?(infra)
+      end
+
+      private
+      def infras
+        { 
+          "ap-aws" => { :base => "ap01.aws.af.cm" },
+          "eu-aws" => { :base => "eu01.aws.af.cm" },
+          "rs"     => { :base => "rs.af.cm" },
+          "aws"    => { :base => "aws.af.cm" }
+        }
+      end
+
+    end
+
+  end
+end

data/lib/cli/manifest_helper.rb

@@ -197,7 +197,7 @@ module VMC::Cli::ManifestHelper
           "Select Application Type",
           :indexed => true,
           :default => framework,
-          :choices => VMC::Cli::Framework.known_frameworks
+          :choices => VMC::Cli::Framework.known_frameworks(frameworks_info)
         )
       )
       display "Selected #{framework}"

data/lib/cli/runner.rb

@@ -98,6 +98,9 @@ class VMC::Cli::Runner
 
       # Proxying for another user, requires admin privileges
       opts.on('-u PROXY')          { |proxy| @options[:proxy] = proxy }
+      
+      # Select infrastructure
+      opts.on('--infra INFRA')     { |infra| @options[:infra] = infra }
 
       opts.on_tail('--options')    {          puts "#{opts}\n"; exit }
     end
@@ -301,7 +304,7 @@ class VMC::Cli::Runner
       set_cmd(:apps, :crashlogs, 1)
 
     when 'push'
-      usage('af push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--runtime RUNTIME] [--no-start]')
+      usage('af push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--runtime RUNTIME] [--no-start] [--infra infraname]')
       if @args.size == 1
         set_cmd(:apps, :push, 1)
       else
@@ -333,7 +336,7 @@ class VMC::Cli::Runner
       set_cmd(:apps, :environment_del, 2)
 
     when 'create-service', 'create_service'
-      usage('af create-service [service] [servicename] [appname] [--name servicename] [--bind appname]')
+      usage('af create-service [service] [servicename] [appname] [--name servicename] [--bind appname] [--infra infraname]')
       set_cmd(:services, :create_service) if @args.size == 0
       set_cmd(:services, :create_service, 1) if @args.size == 1
       set_cmd(:services, :create_service, 2) if @args.size == 2
@@ -456,6 +459,7 @@ class VMC::Cli::Runner
     VMC::Cli::Config.nozip      = @options.delete(:nozip)
     VMC::Cli::Config.trace      = @options.delete(:trace)
     VMC::Cli::Config.output   ||= STDOUT unless @options[:quiet]
+    VMC::Cli::Config.infra      = @options[:infra]
 
     process_aliases!
     parse_command!

data/lib/cli/services_helper.rb

@@ -33,19 +33,26 @@ module VMC::Cli
 
     def display_provisioned_services_table(services)
       return unless services && !services.empty?
+      
+      infra_supported = !services.detect { |a| a[:infra] }.nil?
       services_table = table do |t|
         t.headings = 'Name', 'Service'
+        t.headings << 'In' if infra_supported
         services.each do |service|
-          t << [ service[:name], service[:vendor] ]
+          s =  [ service[:name], service[:vendor] ]
+          if infra_supported
+            s << ( service[:infra] ? service[:infra][:provider] : "   " )
+          end
+          t << s
         end
       end
       display services_table
     end
 
-    def create_service_banner(service, name, display_name=false)
+    def create_service_banner(service, name, display_name=false, infra=nil)
       sn = " [#{name}]" if display_name
       display "Creating Service#{sn}: ", false
-      client.create_service(service, name)
+      client.create_service(infra,service, name)
       display 'OK'.green
     end
 

data/lib/cli/tunnel_helper.rb

@@ -17,35 +17,33 @@ module VMC::Cli
     # this is to keep the helper in sync with any updates here
     HELPER_VERSION = '0.0.4'
 
-    def tunnel_uniquename
-      random_service_name(tunnel_appname)
+    def tunnel_uniquename(infra)
+      random_service_name(tunnel_appname(infra))
     end
 
-    def tunnel_appname
-      "caldecott"
+    def tunnel_appname(infra)
+      infra ? "caldecott-#{infra}" : "caldecott"
     end
 
-    def tunnel_app_info
-      return @tun_app_info if @tunnel_app_info
+    def tunnel_app_info(infra)
       begin
-        @tun_app_info = client.app_info(tunnel_appname)
+        client.app_info(tunnel_appname(infra))
       rescue => e
-        @tun_app_info = nil
+        nil
       end
     end
 
-    def tunnel_auth
-      tunnel_app_info[:env].each do |e|
+    def tunnel_auth(infra)
+      tunnel_app_info(infra)[:env].each do |e|
         name, val = e.split("=", 2)
         return val if name == "CALDECOTT_AUTH"
       end
       nil
     end
 
-    def tunnel_url
-      return @tunnel_url if @tunnel_url
+    def tunnel_url(infra)
 
-      tun_url = tunnel_app_info[:uris][0]
+      tun_url = tunnel_app_info(infra)[:uris][0]
 
       ["https", "http"].each do |scheme|
         url = "#{scheme}://#{tun_url}"
@@ -57,54 +55,51 @@ module VMC::Cli
 
         # we expect a 404 since this request isn't auth'd
         rescue RestClient::ResourceNotFound
-          return @tunnel_url = url
+          return url
         end
       end
 
       err "Cannot determine URL for #{tun_url}"
     end
 
-    def invalidate_tunnel_app_info
-      @tunnel_url = nil
-      @tunnel_app_info = nil
+    def invalidate_tunnel_app_info(infra)
     end
 
-    def tunnel_pushed?
-      not tunnel_app_info.nil?
+    def tunnel_pushed?(infra)
+      not tunnel_app_info(infra).nil?
     end
 
-    def tunnel_healthy?(token)
-      return false unless tunnel_app_info[:state] == 'STARTED'
+    def tunnel_healthy?(token,infra)
+      return false unless tunnel_app_info(infra)[:state] == 'STARTED'
 
       begin
         response = RestClient.get(
-          "#{tunnel_url}/info",
+          "#{tunnel_url(infra)}/info",
           "Auth-Token" => token
         )
-
         info = JSON.parse(response)
         if info["version"] == HELPER_VERSION
           true
         else
-          stop_caldecott
+          stop_caldecott(infra)
           false
         end
       rescue RestClient::Exception
-        stop_caldecott
+        stop_caldecott(infra)
         false
       end
     end
 
-    def tunnel_bound?(service)
-      tunnel_app_info[:services].include?(service)
+    def tunnel_bound?(service,infra)
+      tunnel_app_info(infra)[:services].include?(service)
     end
 
-    def tunnel_connection_info(type, service, token)
+    def tunnel_connection_info(type, service, token, infra)
       display "Getting tunnel connection info: ", false
       response = nil
       10.times do
         begin
-          response = RestClient.get(tunnel_url + "/" + VMC::Client.path("services", service), "Auth-Token" => token)
+          response = RestClient.get(tunnel_url(infra) + "/" + VMC::Client.path("services", service), "Auth-Token" => token)
           break
         rescue RestClient::Exception
           sleep 1
@@ -120,6 +115,7 @@ module VMC::Cli
       display "OK".green
 
       info = JSON.parse(response)
+      info["infra"] = infra
       case type
       when "rabbitmq"
         uri = Addressable::URI.parse info["url"]
@@ -183,11 +179,11 @@ module VMC::Cli
       display ''
     end
 
-    def start_tunnel(local_port, conn_info, auth)
+    def start_tunnel(local_port, conn_info, auth, infra)
       @local_tunnel_thread = Thread.new do
         Caldecott::Client.start({
           :local_port => local_port,
-          :tun_url => tunnel_url,
+          :tun_url => tunnel_url(infra),
           :dst_host => conn_info['hostname'],
           :dst_port => conn_info['port'],
           :log_file => STDOUT,
@@ -292,33 +288,37 @@ module VMC::Cli
       system(cmdline)
     end
 
-    def push_caldecott(token)
-      client.create_app(
-        tunnel_appname,
-        { :name => tunnel_appname,
-          :staging => {:framework => "sinatra"},
-          :uris => ["#{tunnel_uniquename}.#{target_base}"],
+    def push_caldecott(token,infra)
+      manifest = {
+          :name => tunnel_appname(infra),
+          :staging => {:framework => "sinatra", :runtime => "ruby18" },
+          :uris => ["#{tunnel_uniquename(infra)}.#{VMC::Cli::InfraHelper.base_for_infra(infra)}"],
           :instances => 1,
           :resources => {:memory => 64},
           :env => ["CALDECOTT_AUTH=#{token}"]
         }
+      manifest[:infra] = { :provider => infra } if infra 
+
+      client.create_app(
+        tunnel_appname(infra),
+        manifest
       )
 
-      apps_cmd.send(:upload_app_bits, tunnel_appname, HELPER_APP)
+      apps_cmd.send(:upload_app_bits, tunnel_appname(infra), HELPER_APP)
 
-      invalidate_tunnel_app_info
+      invalidate_tunnel_app_info(infra)
     end
 
-    def stop_caldecott
-      apps_cmd.stop(tunnel_appname)
+    def stop_caldecott(infra)
+      apps_cmd.stop(tunnel_appname(infra))
 
-      invalidate_tunnel_app_info
+      invalidate_tunnel_app_info(infra)
     end
 
-    def start_caldecott
-      apps_cmd.start(tunnel_appname)
+    def start_caldecott(infra)
+      apps_cmd.start(tunnel_appname(infra))
 
-      invalidate_tunnel_app_info
+      invalidate_tunnel_app_info(infra)
     end
 
     private
@@ -328,5 +328,6 @@ module VMC::Cli
       a.client client
       a
     end
+    
   end
 end

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.16.5'
+    VERSION = '0.3.18.1'
   end
 end

data/lib/cli/zip_util.rb

@@ -10,7 +10,7 @@ module VMC::Cli
     class << self
 
       def to_dev_null
-        if !!RUBY_PLATFORM['mingw'] || !!RUBY_PLATFORM['mswin32'] || !!RUBY_PLATFORM['cygwin']
+        if WINDOWS
           'nul'
         else
           '/dev/null'

data/lib/vmc/client.rb

@@ -6,7 +6,7 @@
 #   client = VMC::Client.new('api.vcap.me')
 #   client.login(:user, :pass)
 #   client.create('myapplication', manifest)
-#   client.create_service('redis', 'my_redis_service', opts);
+#   client.create_service('aws', 'redis', 'my_redis_service', opts);
 #
 
 require 'rubygems'
@@ -27,6 +27,9 @@ class VMC::Client
   # Error codes
   VMC_HTTP_ERROR_CODES = [ 400, 500 ]
 
+  HTTP_TIMEOUT = ENV['TIMEOUT'].to_i if ENV['TIMEOUT']
+  HTTP_TIMEOUT ||= 10*60
+  
   # Errors
   class BadTarget <  RuntimeError; end
   class AuthError <  RuntimeError; end
@@ -167,7 +170,7 @@ class VMC::Client
     json_get(VMC::SERVICES_PATH)
   end
 
-  def create_service(service, name)
+  def create_service(infra,service, name)
     check_login_status
     services = services_info
     services ||= []
@@ -184,6 +187,7 @@ class VMC::Client
               :type => service_descr[:type], :tier => 'free',
               :vendor => service, :version => version_str
             }
+            service_hash[:infra] = { :provider => infra } if infra
             break
           end
         end
@@ -382,7 +386,7 @@ class VMC::Client
     req = {
       :method => method, :url => "#{@target}/#{path}",
       :payload => payload, :headers => headers, :multipart => true,
-      :timeout => 120, :open_timeout => 120
+      :timeout => HTTP_TIMEOUT, :open_timeout => HTTP_TIMEOUT
     }
     status, body, response_headers = perform_http_request(req)
 

data/lib/vmc/const.rb

@@ -2,7 +2,7 @@ module VMC
 
   # This is the internal VMC version number, and is not necessarily
   # the same as the RubyGem version (VMC::Cli::VERSION).
-  VERSION = '0.3.16.5'
+  VERSION = '0.3.18.1'
 
   # Targets
   DEFAULT_TARGET = 'https://api.appfog.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.3.16.5
+  version: 0.3.18.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-08-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2153510720 !ruby/object:Gem::Requirement
+  requirement: &70266170534240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +24,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153510720
+  version_requirements: *70266170534240
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2153509940 !ruby/object:Gem::Requirement
+  requirement: &70266170533480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +35,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153509940
+  version_requirements: *70266170533480
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153509420 !ruby/object:Gem::Requirement
+  requirement: &70266170533000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -50,10 +49,10 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153509420
+  version_requirements: *70266170533000
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &2153508660 !ruby/object:Gem::Requirement
+  requirement: &70266170532280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -61,10 +60,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153508660
+  version_requirements: *70266170532280
 - !ruby/object:Gem::Dependency
   name: interact
-  requirement: &2153508160 !ruby/object:Gem::Requirement
+  requirement: &70266170531820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -72,10 +71,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153508160
+  version_requirements: *70266170531820
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2153507580 !ruby/object:Gem::Requirement
+  requirement: &70266170531360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -83,10 +82,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153507580
+  version_requirements: *70266170531360
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2153507040 !ruby/object:Gem::Requirement
+  requirement: &70266170530900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +93,21 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153507040
+  version_requirements: *70266170530900
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: &70266170530440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70266170530440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153506640 !ruby/object:Gem::Requirement
+  requirement: &70266170550520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -105,10 +115,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153506640
+  version_requirements: *70266170550520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153506080 !ruby/object:Gem::Requirement
+  requirement: &70266170549980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -116,10 +126,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153506080
+  version_requirements: *70266170549980
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153505580 !ruby/object:Gem::Requirement
+  requirement: &70266170549480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -127,7 +137,7 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153505580
+  version_requirements: *70266170549480
 description: AppFog.com CLI
 email: support@appfog.com
 executables:
@@ -157,6 +167,7 @@ files:
 - lib/cli/core_ext.rb
 - lib/cli/errors.rb
 - lib/cli/frameworks.rb
+- lib/cli/infra_helper.rb
 - lib/cli/manifest_helper.rb
 - lib/cli/runner.rb
 - lib/cli/services_helper.rb
@@ -179,7 +190,6 @@ files:
 - caldecott_helper/Gemfile.lock
 - caldecott_helper/server.rb
 - bin/af
-has_rdoc: true
 homepage: http://appfog.com
 licenses: []
 post_install_message: 
@@ -200,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: AppFog.com CLI