vmc 0.3.7 → 0.3.8

data/lib/cli/commands/apps.rb

@@ -27,31 +27,48 @@ module VMC::Cli::Command
 
     alias :apps :list
 
-    SLEEP_TIME  = 0.5
+    SLEEP_TIME  = 1
     LINE_LENGTH = 80
 
     # Numerators are in secs
-    TICKER_TICKS  = 15/SLEEP_TIME
+    TICKER_TICKS  = 25/SLEEP_TIME
     HEALTH_TICKS  = 5/SLEEP_TIME
-    TAIL_TICKS    = 25/SLEEP_TIME
+    TAIL_TICKS    = 45/SLEEP_TIME
     GIVEUP_TICKS  = 120/SLEEP_TIME
     YES_SET = Set.new(["y", "Y", "yes", "YES"])
 
-
     def start(appname, push = false)
       app = client.app_info(appname)
+
       return display "Application '#{appname}' could not be found".red if app.nil?
       return display "Application '#{appname}' already started".yellow if app[:state] == 'STARTED'
+
+      banner = 'Staging Application: '
+      display banner, false
+
+      t = Thread.new do
+        count = 0
+        while count < TAIL_TICKS do
+          display '.', false
+          sleep SLEEP_TIME
+          count += 1
+        end
+      end
+
       app[:state] = 'STARTED'
       client.update_app(appname, app)
 
-      count = log_lines_displayed = 0
-      failed = false
-      start_time = Time.now.to_i
+      Thread.kill(t)
+      clear(LINE_LENGTH)
+      display "#{banner}#{'OK'.green}"
 
       banner = 'Starting Application: '
       display banner, false
 
+      count = log_lines_displayed = 0
+      failed = false
+      start_time = Time.now.to_i
+
       loop do
         display '.', false unless count > TICKER_TICKS
         sleep SLEEP_TIME
@@ -187,9 +204,9 @@ module VMC::Cli::Command
       app_services.each { |service|
         del_service = force && no_prompt ? 'Y' : 'N'
         unless no_prompt || force
-          del_service = ask("Provisioned service [#{service}] detected, would you like to delete it? [Yn]: ")
+          del_service = ask("Provisioned service [#{service}] detected, would you like to delete it? [yN]: ")
         end
-        services_to_delete << service unless del_service.upcase == 'N'
+        services_to_delete << service if del_service.upcase == 'Y'
       }
       display "Deleting application [#{appname}]: ", false
       client.delete_app(appname)
@@ -386,6 +403,7 @@ module VMC::Cli::Command
         framework_correct ||= 'y'
         if prompt_ok && (framework.nil? || framework_correct.upcase == 'N')
           display "#{"[WARNING]".yellow} Can't determine the Application Type." unless framework
+          framework = nil if framework_correct.upcase == 'N'
           choose do |menu|
             menu.layout = :one_line
             menu.prompt = "Select Application Type: "
@@ -642,15 +660,20 @@ module VMC::Cli::Command
         menu.header = "The following system services are available:"
         menu.prompt = 'Please select one you wish to provision: '
         menu.select_by = :index_or_name
+        service_choices = []
         services.each do |service_type, value|
           value.each do |vendor, version|
-            menu.choice(vendor) do
-              default_name = random_service_name(vendor)
-              service_name = ask("Specify the name of the service [#{default_name}]: ")
-              service_name = default_name if service_name.empty?
-              create_service_banner(vendor, service_name)
-              bind_service_banner(service_name, appname)
-            end
+            service_choices << vendor
+          end
+        end
+        service_choices.sort!
+        service_choices.each do |vendor|
+          menu.choice(vendor) do
+            default_name = random_service_name(vendor)
+            service_name = ask("Specify the name of the service [#{default_name}]: ")
+            service_name = default_name if service_name.empty?
+            create_service_banner(vendor, service_name)
+            bind_service_banner(service_name, appname)
           end
         end
       end

data/lib/cli/frameworks.rb

@@ -6,14 +6,6 @@ module VMC::Cli
     DEFAULT_MEM = '256M'
 
     FRAMEWORKS = {
-#      'Rails'    => ['rails/1.0',       { :mem => '256M', :description => 'Rails Application'}],
-#      'Spring'   => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
-#      'Grails'   => ['grails/1.0',      { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
-#      'Roo'      => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Roo Application'}],
-#      'JavaWeb'  => ['spring_web/1.0',  { :mem => '512M', :description => 'Java Web Application'}],
-#      'Sinatra'  => [DEFAULT_FRAMEWORK, { :mem => '128M', :description => 'Sinatra Application'}],
-#      'Node'     => ['nodejs/1.0',      { :mem => '64M',  :description => 'Node.js Application'}],
-
       'Rails'    => ['rails3',  { :mem => '256M', :description => 'Rails Application'}],
       'Spring'   => ['spring',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
       'Grails'   => ['grails',  { :mem => '512M', :description => 'Java SpringSource Grails Application'}],

data/lib/cli/runner.rb

@@ -407,8 +407,8 @@ class VMC::Cli::Runner
 
   def run
 
-    trap('TERM') { print "\nInterupted\n"; exit(false)}
-    trap('INT')  { print "\nInterupted\n"; exit(false)}
+    trap('TERM') { print "\nInterrupted\n"; exit(false)}
+    trap('INT')  { print "\nInterrupted\n"; exit(false)}
 
     parse_options!
 

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

data/lib/vmc/client.rb

@@ -111,6 +111,11 @@ class VMC::Client
     json_get("#{VMC::APPS_PATH}/#{name}")
   end
 
+  def app_update_info(name)
+    check_login_status
+    json_get("#{VMC::APPS_PATH}/#{name}/update")
+  end
+
   def app_stats(name)
     check_login_status
     stats_raw = json_get("#{VMC::APPS_PATH}/#{name}/stats")
@@ -345,7 +350,11 @@ class VMC::Client
     headers = headers.dup
     headers['AUTHORIZATION'] = @auth_token if @auth_token
     headers['PROXY-USER'] = @proxy if @proxy
-    headers['Content-Type'] = content_type if content_type
+
+    if content_type
+      headers['Content-Type'] = content_type
+      headers['Accept'] = content_type
+    end
 
     req = {
       :method => method, :url => "#{@target}#{path}",
@@ -414,7 +423,8 @@ class VMC::Client
     if body.nil? || body.empty?
       "Error (#{status}): No Response Received"
     else
-      "Error (JSON #{status}): #{truncate(body)}"
+      body_out = trace ? body : truncate(body)
+      "Error (JSON #{status}): #{body_out}"
     end
   end
 

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.0'
+  VERSION = '0.3.2'
 
   # Targets
   DEFAULT_TARGET = 'http://api.cloudfoundry.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -07:00
+date: 2011-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,45 +165,45 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/cli/config.rb
-- lib/cli/services_helper.rb
 - lib/cli/commands/admin.rb
-- lib/cli/commands/services.rb
-- lib/cli/commands/misc.rb
 - lib/cli/commands/apps.rb
-- lib/cli/commands/user.rb
 - lib/cli/commands/base.rb
-- lib/cli/usage.rb
-- lib/cli/frameworks.rb
+- lib/cli/commands/misc.rb
+- lib/cli/commands/services.rb
+- lib/cli/commands/user.rb
+- lib/cli/config.rb
+- lib/cli/core_ext.rb
 - lib/cli/errors.rb
+- lib/cli/frameworks.rb
+- lib/cli/runner.rb
+- lib/cli/services_helper.rb
+- lib/cli/usage.rb
 - lib/cli/version.rb
 - lib/cli/zip_util.rb
-- lib/cli/core_ext.rb
-- lib/cli/runner.rb
+- lib/cli.rb
 - lib/vmc/client.rb
 - lib/vmc/const.rb
-- lib/cli.rb
 - lib/vmc.rb
-- spec/unit/client_spec.rb
-- spec/unit/cli_opts_spec.rb
-- spec/spec_helper.rb
-- spec/assets/info_return_bad.txt
-- spec/assets/info_return.txt
-- spec/assets/service_listings.txt
+- spec/assets/app_info.txt
+- spec/assets/app_listings.txt
+- spec/assets/bad_create_app.txt
 - spec/assets/delete_app.txt
-- spec/assets/user_info.txt
+- spec/assets/global_service_listings.txt
 - spec/assets/good_create_app.txt
-- spec/assets/service_already_exists.txt
+- spec/assets/good_create_service.txt
+- spec/assets/info_authenticated.txt
+- spec/assets/info_return.txt
+- spec/assets/info_return_bad.txt
 - spec/assets/login_fail.txt
-- spec/assets/app_info.txt
 - spec/assets/login_success.txt
-- spec/assets/app_listings.txt
-- spec/assets/global_service_listings.txt
-- spec/assets/bad_create_app.txt
 - spec/assets/sample_token.txt
+- spec/assets/service_already_exists.txt
+- spec/assets/service_listings.txt
 - spec/assets/service_not_found.txt
-- spec/assets/info_authenticated.txt
-- spec/assets/good_create_service.txt
+- spec/assets/user_info.txt
+- spec/spec_helper.rb
+- spec/unit/cli_opts_spec.rb
+- spec/unit/client_spec.rb
 - bin/vmc
 has_rdoc: true
 homepage: http://vmware.com
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Client library and CLI that provides access to the VMware Cloud Application Platform.