vmc 0.2.4 → 0.2.6

data/Rakefile

@@ -14,3 +14,4 @@ desc "Synonym for spec"
 task :test => :spec
 desc "Synonym for spec"
 task :tests => :spec
+task :default => :spec

data/lib/cli/commands/admin.rb

@@ -17,7 +17,7 @@ module VMC::Cli::Command
       client.add_user(email, password)
       display 'OK'.green
 
-      # if we are not logged in, log in as the new user
+      # if we are not logged in for the current target, log in as the new user
       return unless VMC::Cli::Config.auth_token.nil?
       @options[:password] = password
       cmd = User.new(@options)

data/lib/cli/commands/apps.rb

@@ -160,10 +160,17 @@ module VMC::Cli::Command
 
     end
 
-    def delete(appname=nil, force=false)
+    def delete(appname=nil)
+      force = @options[:force]
       if @options[:all]
-        apps = client.apps
-        apps.each { |app| delete_app(app[:name], force) }
+        should_delete = force && no_prompt ? 'Y' : 'N'
+        unless no_prompt || force
+          should_delete = ask 'Delete ALL Applications and Services? (y/N)? '
+        end
+        if should_delete.upcase == 'Y'
+          apps = client.apps
+          apps.each { |app| delete_app(app[:name], force) }
+        end
       else
         err 'No valid appname given' unless appname
         delete_app(appname, force)
@@ -175,8 +182,7 @@ module VMC::Cli::Command
       services_to_delete = []
       app_services = app[:services]
       app_services.each { |service|
-        del_service = 'Y' if force
-        del_service = 'N' if no_prompt
+        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]: ")
         end
@@ -301,13 +307,13 @@ module VMC::Cli::Command
     end
 
     def update(appname)
+      app = client.app_info(appname)
       path = @options[:path] || '.'
       upload_app_bits(appname, path)
       display "Successfully updated Application: '#{appname}'".green
       if @options[:canary]
         display "[--canary] is deprecated and will be removed in a future version".yellow
       end
-      app = client.app_info(appname)
       restart appname if app[:state] == 'STARTED'
     end
 
@@ -334,7 +340,7 @@ module VMC::Cli::Command
       check_app_limit
 
       # check memsize here for capacity
-      check_has_capacity_for(mem_choice_to_quota(memswitch)) if memswitch
+      check_has_capacity_for(mem_choice_to_quota(memswitch)) if memswitch && !no_start
 
       unless no_prompt || @options[:path]
         proceed = ask('Would you like to deploy from the current directory? [Yn]: ')
@@ -399,7 +405,7 @@ module VMC::Cli::Command
       mem_quota = mem_choice_to_quota(mem)
 
       # check memsize here for capacity
-      check_has_capacity_for(mem_quota)
+      check_has_capacity_for(mem_quota) unless no_start
 
       display 'Creating Application: ', false
 
@@ -476,11 +482,12 @@ module VMC::Cli::Command
           total_size = 0
           resource_files = Dir.glob("#{explode_dir}/**/*", File::FNM_DOTMATCH)
           resource_files.each do |filename|
+            next if (File.directory?(filename) || !File.exists?(filename))
             fingerprints << {
               :size => File.size(filename),
               :sha1 => Digest::SHA1.file(filename).hexdigest,
               :fn => filename
-            } unless (File.directory?(filename) || !File.exists?(filename))
+            }
             total_size += File.size(filename)
           end
 
@@ -504,6 +511,15 @@ 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)
@@ -768,7 +784,7 @@ module VMC::Cli::Command
       map = VMC::Cli::Config.instances
       instance = map[instance] if map[instance]
 
-      ['/logs/err.log', 'logs/stderr.log', 'logs/stdout.log', 'logs/startup.log'].each do |path|
+      ['/logs/err.log', '/logs/staging.log', 'logs/stderr.log', 'logs/stdout.log', 'logs/startup.log'].each do |path|
         begin
           content = client.app_files(appname, path, instance)
         rescue
@@ -803,7 +819,7 @@ module VMC::Cli::Command
       @read ||= 0
       @read += rsize
       p = (@read * 100 / FileWithPercentOutput.upload_size).to_i
-      unless VMC::Cli::Config.output.nil?
+      unless VMC::Cli::Config.output.nil? || !STDOUT.tty?
         clear(FileWithPercentOutput.display_str.size + 5)
         VMC::Cli::Config.output.print("#{FileWithPercentOutput.display_str} #{p}%")
         VMC::Cli::Config.output.flush
@@ -815,7 +831,7 @@ module VMC::Cli::Command
       if result && result.size > 0
         update_display(result.size)
       else
-        unless VMC::Cli::Config.output.nil?
+        unless VMC::Cli::Config.output.nil? || !STDOUT.tty?
           clear(FileWithPercentOutput.display_str.size + 5)
           VMC::Cli::Config.output.print(FileWithPercentOutput.display_str)
           display('OK'.green)

data/lib/cli/commands/user.rb

@@ -21,7 +21,7 @@ module VMC::Cli::Command
       say "Successfully logged into [#{target_url}]".green
     rescue VMC::Client::TargetError
       display "Problem with login, invalid account or password.".red
-      retry if (tries += 1) < 3 && prompt_ok
+      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

data/lib/cli/frameworks.rb

@@ -6,13 +6,13 @@ 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'}],
+      '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 => 'NodeJS Application'}],
+      'Node'     => ['nodejs/1.0',      { :mem => '64M',  :description => 'Node.js Application'}],
     }
 
     class << self
@@ -38,7 +38,7 @@ module VMC::Cli
             contents = ZipUtil.entry_lines(war_file)
 
             # Spring Variations
-            if contents =~ /WEB-INF\/grails-app/
+            if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
               return Framework.lookup('Grails')
             elsif contents =~ /WEB-INF\/classes\/org\/springframework/
               return Framework.lookup('Spring')
@@ -58,13 +58,13 @@ module VMC::Cli
                 matched_file = fname if (str && str.match(/^\s*require\s*'sinatra'/))
               end
             end
-            if matched_file && !File.exist?('config.ru')
+            if matched_file
               f = Framework.lookup('Sinatra')
               f.exec = "ruby #{matched_file}"
               return f
             end
 
-          # Node.JS
+          # Node.js
           elsif !Dir.glob('*.js').empty?
             # Fixme, make other files work too..
             if File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')

data/lib/cli/runner.rb

@@ -81,11 +81,20 @@ class VMC::Cli::Runner
 
       opts.on_tail('--options')    {          puts "#{opts}\n"; exit }
     end
+    instances_delta_arg = check_instances_delta!
     @args = opts_parser.parse!(@args)
+    @args.concat instances_delta_arg
     convert_options!
     self
   end
 
+  def check_instances_delta!
+    return unless @args
+    instance_args = @args.select { |arg| /[-]\d+/ =~ arg } || []
+    @args.delete_if { |arg| instance_args.include? arg}
+    instance_args
+  end
+
   def display_help
     puts command_usage
     exit
@@ -349,9 +358,12 @@ class VMC::Cli::Runner
   def process_aliases!
     return if @args.empty?
     aliases = VMC::Cli::Config.aliases
-    if key = aliases.values.grep(@args[0]).first
-      display "[#{@args[0]} aliased to #{aliases.invert[key]}]" if @options[:verbose]
-      @args[0] = aliases.invert[key]
+    aliases.each_pair do |k,v|
+      if @args[0] == k
+        display "[#{@args[0]} aliased to #{aliases.invert[key]}]" if @options[:verbose]
+        @args[0] = v
+        break;
+      end
     end
   end
 
@@ -366,8 +378,9 @@ class VMC::Cli::Runner
   end
 
   def run
+
     trap('TERM') { print "\nInterupted\n"; exit(false)}
-    trap("INT")  { print "\nInterupted\n"; exit(false)}
+    trap('INT')  { print "\nInterupted\n"; exit(false)}
 
     parse_options!
 
@@ -406,6 +419,9 @@ class VMC::Cli::Runner
   rescue VMC::Client::TargetError, VMC::Client::NotFound, VMC::Client::BadTarget  => e
     puts e.message.red
     @exit_status = false
+  rescue VMC::Client::HTTPException => e
+    puts e.message.red
+    @exit_status = false
   rescue VMC::Cli::GracefulExit => e
     # Redirected commands end up generating this exception (kind of goto)
   rescue VMC::Cli::CliExit => e

data/lib/cli/usage.rb

@@ -17,7 +17,7 @@ class VMC::Cli::Runner
     say command_usage
   end
 
-    def command_usage
+  def command_usage
     <<-USAGE
 
 #{basic_usage}

data/lib/cli/version.rb

@@ -1,5 +1,7 @@
 module VMC
   module Cli
-    VERSION = '0.2.4'
+    # This version number is used as the RubyGem release version.
+    # The internal VMC version number is VMC::VERSION.
+    VERSION = '0.2.6'
   end
 end

data/lib/cli/zip_util.rb

@@ -5,6 +5,8 @@ module VMC::Cli
 
   class ZipUtil
 
+    PACK_EXCLUSION_GLOBS = ['..', '.', '*~', '#*#', '*.log']
+
     class << self
       def entry_lines(file)
         contents = nil
@@ -36,22 +38,27 @@ module VMC::Cli
         end
       end
 
+      def get_files_to_pack(dir)
+        Dir.glob("#{dir}/**/*", File::FNM_DOTMATCH).select do |f|
+          process = true
+          PACK_EXCLUSION_GLOBS.each { |e| process = false if File.fnmatch(e, File.basename(f)) }
+          process && File.exists?(f)
+        end
+      end
+
       def pack(dir, zipfile)
-        exclude = ['..', '.', '*~', '#*#', '*.log']
         unless VMC::Cli::Config.nozip
-          excludes = exclude.map { |e| "\\#{e}" }
+          excludes = PACK_EXCLUSION_GLOBS.map { |e| "\\#{e}" }
           excludes = excludes.join(' ')
           Dir.chdir(dir) do
-            `zip -q -r -x #{excludes} #{zipfile} . 2> /dev/null`
+            `zip -q -r #{zipfile} . -x #{excludes} 2> /dev/null`
             return unless $? != 0
           end
         end
         # Do Ruby version if told to or native version failed
         Zip::ZipFile::open(zipfile, true) do |zf|
-          Dir.glob("#{dir}/**/*", File::FNM_DOTMATCH).each do |f|
-            process = true
-            exclude.each { |e| process = false if File.fnmatch(e, File.basename(f)) }
-            zf.add(f.sub("#{dir}/",''), f) if (process && File.exists?(f))
+          get_files_to_pack(dir).each do |f|
+            zf.add(f.sub("#{dir}/",''), f)
           end
         end
       end

data/lib/vmc/client.rb

@@ -12,7 +12,7 @@
 require 'rubygems'
 require 'json/pure'
 
-require File.dirname(__FILE__) + '/const'
+require File.expand_path('../const', __FILE__)
 
 class VMC::Client
 
@@ -378,8 +378,8 @@ class VMC::Client
     result
   rescue Net::HTTPBadResponse => e
     raise BadTarget "Received bad HTTP response from target: #{e}"
-  rescue RestClient::Exception => e
-    raise HTTPException, "HTTP exception: #{e}"
+  rescue SystemCallError, RestClient::Exception => e
+    raise HTTPException, "HTTP exception: #{e.class}:#{e}"
   end
 
   def truncate(str, limit = 30)

data/lib/vmc/const.rb

@@ -1,6 +1,8 @@
 module VMC
 
-  VERSION = '0.2.4'
+  # This is the internal VMC version number, and is not necessarily
+  # the same as the RubyGem version (VMC::Cli::VERSION).
+  VERSION = '0.2.6'
 
   # Targets
   DEFAULT_TARGET = 'http://api.cloudfoundry.com'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-19 00:00:00 -05:00
+date: 2011-04-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
         version: 2.0.1
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id003
@@ -74,19 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
         version: 1.7.0
   type: :runtime
   version_requirements: *id004
@@ -98,11 +68,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id005
@@ -114,9 +79,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -128,11 +90,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   version_requirements: *id007
@@ -144,11 +101,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :development
   version_requirements: *id008
@@ -219,23 +171,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Client library and CLI that provides access to the VMware Cloud Application Platform.