vmc 0.3.14 → 0.3.15.beta.1

data/config/clients.yml

@@ -3,6 +3,7 @@ redis:
 
 mysql:
   mysql: mysql --protocol=TCP --host=${host} --port=${port} --user=${user} --password=${password} ${name}
+  mysqldump: mysqldump --protocol=TCP --host=${host} --port=${port} --user=${user} --password=${password} ${name} > ${Output file}
 
 mongodb:
   mongo: mongo --host ${host} --port ${port} -u ${user} -p ${password} ${name}

data/lib/cli/commands/apps.rb

@@ -1,5 +1,6 @@
 require 'digest/sha1'
 require 'fileutils'
+require 'pathname'
 require 'tempfile'
 require 'tmpdir'
 require 'set'
@@ -577,7 +578,7 @@ module VMC::Cli::Command
       path = Dir.pwd
       files = Dir.glob("#{path}/**/*", File::FNM_DOTMATCH)
       unreachable_paths = files.select { |f|
-        File.symlink? f and !File.expand_path(File.readlink(f)).include? path
+        File.symlink? f and !Pathname.new(f).realpath.to_s.include? path
       } if files
       if unreachable_paths.length > 0
         err "Can't deploy application containing links '#{unreachable_paths}' that reach outside its root '#{path}'"

data/lib/cli/commands/user.rb

@@ -25,11 +25,11 @@ module VMC::Cli::Command
       login_and_save_token(email, password)
       say "Successfully logged into [#{target_url}]".green
     rescue VMC::Client::TargetError
-      display "Problem with login, invalid account or password.".red
+      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
     rescue => e
-      display "Problem with login, #{e}, try again or register for an account.".red
+      display "Problem with login to '#{target_url}', #{e}, try again or register for an account.".red
       exit 1
     end
 

data/lib/cli/config.rb

@@ -28,14 +28,9 @@ module VMC::Cli
         return @target_url if @target_url
         target_file = File.expand_path(TARGET_FILE)
         if File.exists? target_file
-          @target_url = lock_and_read(target_file).strip!
-          ha = @target_url.split('.')
-          ha.shift
-          @suggest_url = ha.join('.')
-          @suggest_url = DEFAULT_SUGGEST if @suggest_url.empty?
+          @target_url = lock_and_read(target_file).strip
         else
           @target_url  = DEFAULT_TARGET
-          @suggest_url = DEFAULT_SUGGEST
         end
         @target_url = "http://#{@target_url}" unless /^https?/ =~ @target_url
         @target_url = @target_url.gsub(/\/+$/, '')
@@ -43,7 +38,11 @@ module VMC::Cli
       end
 
       def suggest_url
-        target_url
+        return @suggest_url if @suggest_url
+        ha = target_url.split('.')
+        ha.shift
+        @suggest_url = ha.join('.')
+        @suggest_url = DEFAULT_SUGGEST if @suggest_url.empty?
         @suggest_url
       end
 

data/lib/cli/tunnel_helper.rb

@@ -242,7 +242,7 @@ module VMC::Cli
         when "user", "username"
           info["username"]
         else
-          info[$1] || err("Unknown symbol '#{$1}'")
+          info[$1] || ask($1)
         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.14'
+    VERSION = '0.3.15.beta.1'
   end
 end

data/lib/vmc/client.rb

@@ -104,6 +104,8 @@ class VMC::Client
     end
     upload_data[:resources] = resource_manifest.to_json if resource_manifest
     http_post("#{VMC::APPS_PATH}/#{name}/application", upload_data)
+  rescue RestClient::ServerBrokeConnection
+    retry
   end
 
   def delete_app(name)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.14
+  prerelease: 7
+  version: 0.3.15.beta.1
 platform: ruby
 authors: 
 - VMware
@@ -171,9 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: