vmc 0.3.21 → 0.3.22

data/lib/cli/commands/user.rb

@@ -26,7 +26,7 @@ module VMC::Cli::Command
       err "Need a password" unless password
       login_and_save_token(email, password)
       say "Successfully logged into [#{target_url}]".green
-    rescue VMC::Client::TargetError
+    rescue CFoundry::Denied
       display "Problem with login, invalid account or password when attempting to login to '#{target_url}'".red
       retry if (tries += 1) < 3 && prompt_ok && !@options[:password]
       exit 1
@@ -59,6 +59,7 @@ module VMC::Cli::Command
 
     def login_and_save_token(email, password)
       cfoundry = CFoundry::Client.new(client.target)
+      cfoundry.trace = @client.trace
       token = cfoundry.login(:username => email, :password => password)
       VMC::Cli::Config.store_token(token, @options[:token_file])
     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.21'
+    VERSION = '0.3.22'
   end
 end

data/lib/vmc/micro/vmrun.rb

@@ -76,12 +76,16 @@ module VMC::Micro
       path = VMC::Micro.escape_path(VMC::Micro.config_file('offline.conf'))
       run('CopyFileFromHostToGuest', "#{path} /etc/dnsmasq.d/offline.conf")
       run('runProgramInGuest', '/usr/bin/touch /var/vcap/micro/offline')
+      run('runProgramInGuest',
+        "/bin/sed -i -e 's/^[^#]/# &/g' /etc/dnsmasq.d/server || true")
       restart_dnsmasq
     end
 
     def online!
       run('runProgramInGuest', '/bin/rm -f /etc/dnsmasq.d/offline.conf')
       run('runProgramInGuest', '/bin/rm -f /var/vcap/micro/offline')
+      run('runProgramInGuest',
+        "/bin/sed -i -e 's/^# //g' /etc/dnsmasq.d/server || true")
       restart_dnsmasq
     end
 
@@ -133,7 +137,13 @@ module VMC::Micro
         vms.map! { |x| x.downcase }
         vms.include?(@vmx.downcase)
       else
-        vms.include?(@vmx)
+        # Handle vmx being in a symlinked dir.
+        real_path = nil
+        begin
+          real_path = File.realpath(@vmx)
+        rescue
+        end
+        vms.include?(@vmx) || (real_path && vms.include?(real_path))
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 3
-  - 21
-  version: 0.3.21
+  - 22
+  version: 0.3.22
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-07 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure