af 0.3.13.beta.5 → 0.3.16.1

data/lib/cli/usage.rb

@@ -47,7 +47,6 @@ Currently available af commands are:
     stop  <appname>                              Stop the application
     restart <appname> [--debug [MODE]]           Restart the application
     delete <appname>                             Delete the application
-    rename <appname> <newname>                   Rename the application
 
   Application Updates
     update <appname> [--path,--debug [MODE]]     Update the application bits
@@ -78,6 +77,8 @@ Currently available af commands are:
     bind-service <servicename> <appname>         Bind a service to an application
     unbind-service <servicename> <appname>       Unbind service from the application
     clone-services <src-app> <dest-app>          Clone service bindings from <src-app> application to <dest-app>
+    tunnel <servicename> [--port]                Create a local tunnel to a service
+    tunnel <servicename> <clientcmd>             Create a local tunnel to a service and start a local client
 
   Administration
     user                                         Display user account information
@@ -90,6 +91,15 @@ Currently available af commands are:
     runtimes                                     Display the supported runtimes of the target system
     frameworks                                   Display the recognized frameworks of the target system
 
+  Micro Cloud Foundry
+    micro status                                 Display Micro Cloud Foundry VM status
+    micro offline                                Configure Micro Cloud Foundry VM for offline mode
+    micro online                                 Configure Micro Cloud Foundry VM for online mode
+      [--vmx file]                               Path to micro.vmx
+      [--vmrun executable]                       Path to vmrun executable
+      [--password cleartext]                     Cleartext password for guest VM vcap user
+      [--save]                                   Save cleartext password in ~/.af_micro
+
   Misc
     aliases                                      List aliases
     alias <alias[=]command>                      Create an alias for a command

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.13.beta.5'
+    VERSION = '0.3.16.1'
   end
 end

data/lib/vmc/client.rb

@@ -39,7 +39,7 @@ class VMC::Client
   def initialize(target_url=VMC::DEFAULT_TARGET, auth_token=nil)
     target_url = "http://#{target_url}" unless /^https?/ =~ target_url
     target_url = target_url.gsub(/\/+$/, '')
-    @target =  target_url
+    @target = target_url
     @auth_token = auth_token
   end
 
@@ -60,11 +60,11 @@ class VMC::Client
   # Global listing of services that are available on the target system
   def services_info
     check_login_status
-    json_get(VMC::GLOBAL_SERVICES_PATH)
+    json_get(path(VMC::GLOBAL_SERVICES_PATH))
   end
 
   def runtimes_info
-    json_get(VMC::GLOBAL_RUNTIMES_PATH)
+    json_get(path(VMC::GLOBAL_RUNTIMES_PATH))
   end
 
   ######################################################
@@ -86,7 +86,7 @@ class VMC::Client
 
   def update_app(name, manifest)
     check_login_status
-    json_put("#{VMC::APPS_PATH}/#{name}", manifest)
+    json_put(path(VMC::APPS_PATH, name), manifest)
   end
 
   def upload_app(name, zipfile, resource_manifest=nil)
@@ -103,27 +103,29 @@ class VMC::Client
       upload_data[:application] = file
     end
     upload_data[:resources] = resource_manifest.to_json if resource_manifest
-    http_post("#{VMC::APPS_PATH}/#{name}/application", upload_data)
+    http_post(path(VMC::APPS_PATH, name, "application"), upload_data)
+  rescue RestClient::ServerBrokeConnection
+    retry
   end
 
   def delete_app(name)
     check_login_status
-    http_delete("#{VMC::APPS_PATH}/#{name}")
+    http_delete(path(VMC::APPS_PATH, name))
   end
 
   def app_info(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}")
+    json_get(path(VMC::APPS_PATH, name))
   end
 
   def app_update_info(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/update")
+    json_get(path(VMC::APPS_PATH, name, "update"))
   end
 
   def app_stats(name)
     check_login_status
-    stats_raw = json_get("#{VMC::APPS_PATH}/#{name}/stats")
+    stats_raw = json_get(path(VMC::APPS_PATH, name, "stats"))
     stats = []
     stats_raw.each_pair do |k, entry|
       # Skip entries with no stats
@@ -137,20 +139,20 @@ class VMC::Client
 
   def app_instances(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/instances")
+    json_get(path(VMC::APPS_PATH, name, "instances"))
   end
 
   def app_crashes(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/crashes")
+    json_get(path(VMC::APPS_PATH, name, "crashes"))
   end
 
   # List the directory or download the actual file indicated by
   # the path.
-  def app_files(name, path, instance=0)
+  def app_files(name, path, instance='0')
     check_login_status
-    url = "#{VMC::APPS_PATH}/#{name}/instances/#{instance}/files/#{path}"
-    url.gsub!('//', '/')
+    path = path.gsub('//', '/')
+    url = path(VMC::APPS_PATH, name, "instances", instance, "files", path)
     _, body, headers = http_get(url)
     body
   end
@@ -190,7 +192,7 @@ class VMC::Client
 
     raise TargetError, "Service [#{service}] is not a valid service choice" unless service_hash
     service_hash[:name] = name
-    json_post(VMC::SERVICES_PATH, service_hash)
+    json_post(path(VMC::SERVICES_PATH), service_hash)
   end
 
   def delete_service(name)
@@ -198,7 +200,7 @@ class VMC::Client
     svcs = services || []
     names = svcs.collect { |s| s[:name] }
     raise TargetError, "Service [#{name}] not a valid service" unless names.include? name
-    http_delete("#{VMC::SERVICES_PATH}/#{name}")
+    http_delete(path(VMC::SERVICES_PATH, name))
   end
 
   def bind_service(service, appname)
@@ -268,7 +270,7 @@ class VMC::Client
   # Auth token can be retained and used in creating
   # new clients, avoiding login.
   def login(user, password)
-    status, body, headers = json_post("#{VMC::USERS_PATH}/#{user}/tokens", {:password => password})
+    status, body, headers = json_post(path(VMC::USERS_PATH, user, "tokens"), {:password => password})
     response_info = json_parse(body)
     if response_info
       @user = user
@@ -279,10 +281,10 @@ class VMC::Client
   # sets the password for the current logged user
   def change_password(new_password)
     check_login_status
-    user_info = json_get("#{VMC::USERS_PATH}/#{@user}")
+    user_info = json_get(path(VMC::USERS_PATH, @user))
     if user_info
       user_info[:password] = new_password
-      json_put("#{VMC::USERS_PATH}/#{@user}", user_info)
+      json_put(path(VMC::USERS_PATH, @user), user_info)
     end
   end
 
@@ -309,13 +311,23 @@ class VMC::Client
 
   def delete_user(user_email)
     check_login_status
-    http_delete("#{VMC::USERS_PATH}/#{user_email}")
+    http_delete(path(VMC::USERS_PATH, user_email))
   end
 
   ######################################################
 
+  def self.path(*path)
+    path.flatten.collect { |x|
+      URI.encode x.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
+    }.join("/")
+  end
+
   private
 
+  def path(*args, &blk)
+    self.class.path(*args, &blk)
+  end
+
   def json_get(url)
     status, body, headers = http_get(url, 'application/json')
     json_parse(body)
@@ -368,7 +380,7 @@ class VMC::Client
     end
 
     req = {
-      :method => method, :url => "#{@target}#{path}",
+      :method => method, :url => "#{@target}/#{path}",
       :payload => payload, :headers => headers, :multipart => true
     }
     status, body, response_headers = perform_http_request(req)

data/lib/vmc/const.rb

@@ -2,21 +2,21 @@ 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.12.2'
+  VERSION = '0.3.16.1'
 
   # Targets
-  DEFAULT_TARGET = 'https://api.aws.af.cm'
+  DEFAULT_TARGET = 'https://api.appfog.com'
   DEFAULT_LOCAL_TARGET = 'http://api.vcap.me'
 
   # General Paths
-  INFO_PATH            = '/info'
-  GLOBAL_SERVICES_PATH = '/info/services'
-  GLOBAL_RUNTIMES_PATH = '/info/runtimes'
-  RESOURCES_PATH       = '/resources'
+  INFO_PATH            = 'info'
+  GLOBAL_SERVICES_PATH = ['info', 'services']
+  GLOBAL_RUNTIMES_PATH = ['info', 'runtimes']
+  RESOURCES_PATH       = 'resources'
 
   # User specific paths
-  APPS_PATH            = '/apps'
-  SERVICES_PATH        = '/services'
-  USERS_PATH           = '/users'
+  APPS_PATH            = 'apps'
+  SERVICES_PATH        = 'services'
+  USERS_PATH           = 'users'
 
 end

data/lib/vmc/micro.rb

@@ -0,0 +1,56 @@
+require 'find'
+
+module VMC::Micro
+  def config_file(file)
+    File.join(File.dirname(__FILE__), '..', '..', 'config', 'micro', file)
+  end
+
+  def escape_path(path)
+    path = File.expand_path(path)
+    if RUBY_PLATFORM =~ /mingw|mswin32|cygwin/
+      if path.include?(' ')
+        return '"' + path + '"'
+      else
+        return path
+      end
+    else
+      return path.gsub(' ', '\ ')
+    end
+  end
+
+  def locate_file(file, directory, search_paths)
+    search_paths.each do |path|
+      expanded_path = File.expand_path(path)
+      if File.exists?(expanded_path)
+        Find.find(expanded_path) do |current|
+          if File.directory?(current) && current.include?(directory)
+            full_path = File.join(current, file)
+            return self.escape_path(full_path) if File.exists?(full_path)
+          end
+        end
+      end
+    end
+
+    false
+  end
+
+  def run_command(command, args=nil)
+    # TODO switch to using posix-spawn instead
+    result = %x{#{command} #{args} 2>&1}
+    unless $?.exitstatus == 0
+      if block_given?
+        yield
+      else
+        raise "failed to execute #{command} #{args}:\n#{result}"
+      end
+    else
+      result.split(/\n/)
+    end
+  end
+
+  module_function :config_file
+  module_function :escape_path
+  module_function :locate_file
+  module_function :run_command
+
+end

data/lib/vmc/micro/switcher/base.rb

@@ -0,0 +1,97 @@
+require 'interact'
+
+module VMC::Micro::Switcher
+  class Base
+    include Interactive
+
+    def initialize(config)
+      @config = config
+
+      @vmrun = VMC::Micro::VMrun.new(config)
+      unless @vmrun.running?
+        if ask("Micro Cloud Foundry VM is not running. Do you want to start it?", :choices => ['y', 'n']) == 'y'
+          display "Starting Micro Cloud Foundry VM: ", false
+          @vmrun.start
+          say "done".green
+        else
+          err "Micro Cloud Foundry VM needs to be running."
+        end
+      end
+
+      err "Micro Cloud Foundry VM initial setup needs to be completed before using 'vmc micro'" unless @vmrun.ready?
+    end
+
+    def offline
+      unless @vmrun.offline?
+        # save online connection type so we can restore it later
+        @config['online_connection_type'] = @vmrun.connection_type
+
+        if (@config['online_connection_type'] != 'nat')
+          if ask("Reconfigure Micro Cloud Foundry VM network to nat mode and reboot?", :choices => ['y', 'n']) == 'y'
+            display "Rebooting Micro Cloud Foundry VM: ", false
+            @vmrun.connection_type = 'nat'
+            @vmrun.reset
+            say "done".green
+          else
+            err "Aborted"
+          end
+        end
+
+        display "Setting Micro Cloud Foundry VM to offline mode: ", false
+        @vmrun.offline!
+        say "done".green
+        display "Setting host DNS server: ", false
+
+        @config['domain'] = @vmrun.domain
+        @config['ip'] = @vmrun.ip
+        set_nameserver(@config['domain'], @config['ip'])
+        say "done".green
+      else
+        say "Micro Cloud Foundry VM already in offline mode".yellow
+      end
+    end
+
+    def online
+      if @vmrun.offline?
+        current_connection_type = @vmrun.connection_type
+        @config['online_connection_type'] ||= current_connection_type
+
+        if (@config['online_connection_type'] != current_connection_type)
+          # TODO handle missing connection type in saved config
+          question = "Reconfigure Micro Cloud Foundry VM network to #{@config['online_connection_type']} mode and reboot?"
+          if ask(question, :choices => ['y', 'n']) == 'y'
+            display "Rebooting Micro Cloud Foundry VM: ", false
+            @vmrun.connection_type = @config['online_connection_type']
+            @vmrun.reset
+            say "done".green
+          else
+            err "Aborted"
+          end
+        end
+
+        display "Unsetting host DNS server: ", false
+        # TODO handle missing domain and ip in saved config (look at the VM)
+        @config['domain'] ||= @vmrun.domain
+        @config['ip'] ||= @vmrun.ip
+        unset_nameserver(@config['domain'], @config['ip'])
+        say "done".green
+
+        display "Setting Micro Cloud Foundry VM to online mode: ", false
+        @vmrun.online!
+        say "done".green
+      else
+        say "Micro Cloud Foundry already in online mode".yellow
+      end
+    end
+
+    def status
+      mode = @vmrun.offline? ? 'offline' : 'online'
+      say "Micro Cloud Foundry VM currently in #{mode.green} mode"
+      # should the VMX path be unescaped?
+      say "VMX Path: #{@vmrun.vmx}"
+      say "Domain: #{@vmrun.domain.green}"
+      say "IP Address: #{@vmrun.ip.green}"
+    end
+  end
+
+end

data/lib/vmc/micro/switcher/darwin.rb

@@ -0,0 +1,19 @@
+module VMC::Micro::Switcher
+
+  class Darwin < Base
+    def adminrun(command)
+      VMC::Micro.run_command("osascript", "-e 'do shell script \"#{command}\" with administrator privileges'")
+    end
+
+    def set_nameserver(domain, ip)
+      File.open("/tmp/#{domain}", 'w') { |file| file.write("nameserver #{ip}") }
+      adminrun("mkdir -p /etc/resolver;mv /tmp/#{domain} /etc/resolver/")
+    end
+
+    def unset_nameserver(domain, ip)
+      err "domain missing" unless domain
+      adminrun("rm -f /etc/resolver/#{domain}")
+    end
+  end
+
+end

data/lib/vmc/micro/switcher/dummy.rb

@@ -0,0 +1,15 @@
+# only used for testing
+module VMC::Micro::Switcher
+
+  class Dummy < Base
+    def adminrun(command)
+    end
+
+    def set_nameserver(domain, ip)
+    end
+
+    def unset_nameserver(domain, ip)
+    end
+  end
+
+end

data/lib/vmc/micro/switcher/linux.rb

@@ -0,0 +1,16 @@
+module VMC::Micro::Switcher
+
+  class Linux < Base
+    def set_nameserver(domain, ip)
+      VMC::Micro.run_command("sudo", "sed -i'.backup' '1 i nameserver #{ip}' /etc/resolv.conf")
+      # lock resolv.conf so Network Manager doesn't clear out the file when offline
+      VMC::Micro.run_command("sudo", "chattr +i /etc/resolv.conf")
+    end
+
+    def unset_nameserver(domain, ip)
+      VMC::Micro.run_command("sudo", "chattr -i /etc/resolv.conf")
+      VMC::Micro.run_command("sudo", "sed -i'.backup' '/#{ip}/d' /etc/resolv.conf")
+    end
+  end
+
+end

data/lib/vmc/micro/switcher/windows.rb

@@ -0,0 +1,31 @@
+module VMC::Micro::Switcher
+
+  class Windows < Base
+    def version?
+      VMC::Micro.run_command("cmd", "/c ver").to_s.scan(/\d+\.\d+/).first.to_f
+    end
+
+    def adminrun(command, args=nil)
+      if version? > 5.2
+        require 'win32ole'
+        shell = WIN32OLE.new("Shell.Application")
+        shell.ShellExecute(command, args, nil, "runas", 0)
+      else
+        # on older version this will try to run the command, and if you don't have
+        # admin privilges it will tell you so and exit
+        VMC::Micro.run_command(command, args)
+      end
+    end
+
+    # TODO better method to figure out the interface name is to get the NAT ip and find the
+    # interface with the correct subnet
+    def set_nameserver(domain, ip)
+      adminrun("netsh", "interface ip set dns \"VMware Network Adapter VMnet8\" static #{ip}")
+    end
+
+    def unset_nameserver(domain, ip)
+      adminrun("netsh", "interface ip set dns \"VMware Network Adapter VMnet8\" static none")
+    end
+  end
+
+end