vmc 0.0.7 → 0.0.8

data/Rakefile

@@ -6,15 +6,15 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name = "vmc"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
   s.author = "Ezra Zygmuntowicz"
   s.email = "ez@vmware.com"
   s.homepage = "http://vmware.com"
-  s.description = s.summary = "A gem that provides command line access to the VMWare Cloud Application Platform"
+  s.description = s.summary = "A gem that provides command line access to the VMware Cloud Application Platform"
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE"]
-  s.executables           = %w(vmc vmc.bat)
+  s.executables           = %w(vmc)
   # Uncomment this to add a dependency
   s.add_dependency "main", "~> 4.3.0"
   s.add_dependency "arrayfields", "~> 4.7.4"

data/lib/vmc.rb

@@ -67,7 +67,7 @@ module VMC
         response = HTTPClient.get try_host
         if response.status != 200
           display "New Target host is not valid: '#{target_host_display}'"
-          show_response = ask "Would you like to use one of these (y/n)? "
+          show_response = ask "Would you like see the response [yN]? "
           display response.content if show_response.upcase == 'Y'
           exit(1)
         end
@@ -637,7 +637,7 @@ module VMC
       if !service_names.empty? && !service_name
         list_services(get_user_service_names, "The following services have been provisioned for you:")
         display ''
-        use_existing = ask "Would you like to use one of these (y/n)? "
+        use_existing = ask "Would you like to use one of these [yN]? "
         if use_existing.upcase == 'Y'
           begin
             service_name = ask "Which service (name)? "
@@ -1019,10 +1019,10 @@ module VMC
       failed = false
       display "Trying to start Application: '#{appname}'."
       loop do
-        display ".", false unless count > 9
-        sleep 1
+        display ".", false unless count > 19
+        sleep 0.5
         begin
-          if app_started_properly(appname)
+          if app_started_properly(appname, count > 6)
             display ''
             break;
           elsif !crashes(appname, false).empty?
@@ -1036,14 +1036,14 @@ module VMC
             end
             failed = true
             break
-          elsif count > 9
+          elsif count > 19
             log_lines_displayed = grab_startup_tail(appname, log_lines_displayed)
           end
         rescue => e
           display e.message, false
         end
         count += 1
-        if count > 300 # 5 minutes
+        if count > 600 # 5 minutes
           error "\n\nApplication is taking too long to start, check your logs"
           break
         end
@@ -1382,11 +1382,11 @@ module VMC
       since + new_lines
     end
 
-    def app_started_properly(appname)
+    def app_started_properly(appname, error_on_health)
       check_for_token
       response = get_app_internal @droplets_uri, appname, auth_hdr
       if response.status != 200
-        error "Application '#{appname}'s state is undetermined,  not enough information available at this time."
+        error "\nApplication '#{appname}'s state is undetermined,  not enough information available at this time."
         return
       end
 
@@ -1395,7 +1395,8 @@ module VMC
       case health(droplet)
         when 'N/A'
           # Health manager not running.
-          error "Application '#{appname}'s state is undetermined,  not enough information available at this time."
+          error "\nApplication '#{appname}'s state is undetermined,  not enough information available at this time." if error_on_health
+          return false
         when 'RUNNING'
           return true
         else
@@ -1528,7 +1529,7 @@ module VMC
       info_json = JSON.parse(@check.content)
       usage = info_json['usage']
       limits = info_json['limits']
-      return unless limits['apps']
+      return unless usage and limits and limits['apps']
       if limits['apps'] == usage['apps']
         display "Not enough capacity for operation."
         tapps = limits['apps'] || 0
@@ -1541,6 +1542,7 @@ module VMC
       info_json = JSON.parse(@check.content)
       usage = info_json['usage']
       limits = info_json['limits']
+      return unless usage and limits
       available_for_use = limits['memory'].to_i - usage['memory'].to_i
       if mem_wanted > available_for_use
         info_json = JSON.parse(@check.content)
@@ -1556,8 +1558,8 @@ module VMC
       default = ['64M', '128M', '256M', '512M', '1G', '2G']
       info_json = JSON.parse(@check.content)
 
-      default unless info_json
-      default unless (usage = info_json['usage'] and limits = info_json['limits'])
+      return default unless info_json
+      return default unless (usage = info_json['usage'] and limits = info_json['limits'])
 
       available_for_use = limits['memory'].to_i - usage['memory'].to_i
       check_has_capacity_for(64) if available_for_use < 64

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,11 +129,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id007
-description: A gem that provides command line access to the VMWare Cloud Application Platform
+description: A gem that provides command line access to the VMware Cloud Application Platform
 email: ez@vmware.com
 executables: 
 - vmc
-- vmc.bat
 extensions: []
 
 extra_rdoc_files: 
@@ -163,7 +162,6 @@ files:
 - vendor/gems/httpclient/lib/tags
 - vendor/gems/httpclient/VERSION
 - bin/vmc
-- bin/vmc.bat
 has_rdoc: true
 homepage: http://vmware.com
 licenses: []
@@ -197,6 +195,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A gem that provides command line access to the VMWare Cloud Application Platform
+summary: A gem that provides command line access to the VMware Cloud Application Platform
 test_files: []
 

data/bin/vmc.bat

@@ -1 +0,0 @@
-@ ruby "%~dp0vmc" %1 %2 %3 %4 %5 %6