vmc 0.2.6 → 0.2.10

data/lib/cli/commands/apps.rb

@@ -35,7 +35,7 @@ module VMC::Cli::Command
     TAIL_TICKS    = 25/SLEEP_TIME
     GIVEUP_TICKS  = 120/SLEEP_TIME
 
-    def start(appname)
+    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'
@@ -58,7 +58,7 @@ module VMC::Cli::Command
             # Check for the existance of crashes
             display "\nError: Application [#{appname}] failed to start, logs information below.\n".red
             grab_crash_logs(appname, '0', true)
-            if @push
+            if push
               display "\n"
               should_delete = ask 'Should I delete the application? (Y/n)? ' unless no_prompt
               delete_app(appname, false) unless no_prompt || should_delete.upcase == 'N'
@@ -334,6 +334,8 @@ module VMC::Cli::Command
       if appname
         err "Application '#{appname}' already exists, use update" if app_exists?(appname)
         app_checked = true
+      else
+        raise VMC::Client::AuthError unless client.logged_in?
       end
 
       # check if we have hit our app limit
@@ -427,17 +429,18 @@ module VMC::Cli::Command
       display 'OK'.green
 
       # Services check
-      services = client.services_info
-      unless no_prompt || @options[:noservices] || services.empty?
-        proceed = ask("Would you like to bind any services to '#{appname}'? [yN]: ")
-        bind_services(appname, services) if proceed.upcase == 'Y'
+      unless no_prompt || @options[:noservices]
+        services = client.services_info
+        unless services.empty?
+          proceed = ask("Would you like to bind any services to '#{appname}'? [yN]: ")
+          bind_services(appname, services) if proceed.upcase == 'Y'
+        end
       end
 
       # Stage and upload the app bits.
       upload_app_bits(appname, path)
 
-      @push = true
-      start(appname) unless no_start
+      start(appname, true) unless no_start
     end
 
     private
@@ -445,7 +448,7 @@ module VMC::Cli::Command
     def app_exists?(appname)
       app_info = client.app_info(appname)
       app_info != nil
-    rescue
+    rescue VMC::Client::NotFound
       false
     end
 
@@ -511,32 +514,34 @@ module VMC::Cli::Command
 
         end
 
-        # It's possible the CC tells us that we don't need to pack anything.
-        # If so, exit early.
-        if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
-          display '  No resources need to be uploaded'
-          display 'Push Status: ', false
-          display 'OK'.green
-          return
-        end
-
         # Perform Packing of the upload bits here.
-        display '  Packing application: ', false
-        VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
-        display 'OK'.green
+        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+          display '  Packing application: ', false
+          VMC::Cli::ZipUtil.pack(explode_dir, upload_file)
+          display 'OK'.green
 
-        upload_size = File.size(upload_file);
-        if upload_size > 1024*1024
-          upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
-        elsif upload_size > 0
-          upload_size  = (upload_size/1024.0).round.to_s + 'K'
+          upload_size = File.size(upload_file);
+          if upload_size > 1024*1024
+            upload_size  = (upload_size/(1024.0*1024.0)).round.to_s + 'M'
+          elsif upload_size > 0
+            upload_size  = (upload_size/1024.0).round.to_s + 'K'
+          end
+        else
+          upload_size = '0K'
         end
+
         upload_str = "  Uploading (#{upload_size}): "
         display upload_str, false
-        FileWithPercentOutput.display_str = upload_str
-        FileWithPercentOutput.upload_size = File.size(upload_file);
-        file = FileWithPercentOutput.open(upload_file, 'rb')
+
+        unless VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+          FileWithPercentOutput.display_str = upload_str
+          FileWithPercentOutput.upload_size = File.size(upload_file);
+          file = FileWithPercentOutput.open(upload_file, 'rb')
+        end
+
         client.upload_app(appname, file, appcloud_resources)
+        display 'OK'.green if VMC::Cli::ZipUtil.get_files_to_pack(explode_dir).empty?
+
         display 'Push Status: ', false
         display 'OK'.green
       end

data/lib/cli/runner.rb

@@ -90,7 +90,7 @@ class VMC::Cli::Runner
 
   def check_instances_delta!
     return unless @args
-    instance_args = @args.select { |arg| /[-]\d+/ =~ arg } || []
+    instance_args = @args.select { |arg| /^[-]\d+$/ =~ arg } || []
     @args.delete_if { |arg| instance_args.include? arg}
     instance_args
   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.2.6'
+    VERSION = '0.2.10'
   end
 end

data/lib/vmc/client.rb

@@ -87,12 +87,15 @@ class VMC::Client
     #FIXME, manifest should be allowed to be null, here for compatability with old cc's
     resource_manifest ||= []
     check_login_status
-    if zipfile.is_a? File
-      file = zipfile
-    else
-      file = File.new(zipfile, 'rb')
+    upload_data = {:_method => 'put'}
+    if zipfile
+      if zipfile.is_a? File
+        file = zipfile
+      else
+        file = File.new(zipfile, 'rb')
+      end
+      upload_data[:application] = file
     end
-    upload_data = {:application => file, :_method => 'put'}
     upload_data[:resources] = resource_manifest.to_json if resource_manifest
     http_post("#{VMC::APPS_PATH}/#{name}/application", upload_data)
   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.2.6'
+  VERSION = '0.2.8'
 
   # Targets
   DEFAULT_TARGET = 'http://api.cloudfoundry.com'

metadata

@@ -2,7 +2,7 @@
 name: vmc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.6
+  version: 0.2.10
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 -05:00
+date: 2011-04-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency