vmc 0.3.13.beta.5 → 0.3.13

data/lib/cli/commands/apps.rb

@@ -388,7 +388,6 @@ module VMC::Cli::Command
 
       # check if we have hit our app limit
       check_app_limit
-
       # check memsize here for capacity
       if memswitch && !no_start
         check_has_capacity_for(mem_choice_to_quota(memswitch) * instances)
@@ -572,6 +571,17 @@ module VMC::Cli::Command
       err "Can't deploy applications from staging directory: [#{Dir.tmpdir}]"
     end
 
+    def check_unreachable_links
+      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
+      } if files
+      if unreachable_paths.length > 0
+        err "Can't deploy application containing links '#{unreachable_paths}' that reach outside its root '#{path}'"
+      end
+    end
+
     def upload_app_bits(appname, path)
       display 'Uploading Application:'
 
@@ -586,6 +596,7 @@ module VMC::Cli::Command
         if war_file = Dir.glob('*.war').first
           VMC::Cli::ZipUtil.unpack(war_file, explode_dir)
         else
+          check_unreachable_links
           FileUtils.mkdir(explode_dir)
           files = Dir.glob('{*,.[^\.]*}')
           # Do not process .git files

data/lib/cli/commands/base.rb

@@ -1,5 +1,5 @@
-
 require 'rubygems'
+require 'interact'
 require 'terminal-table/import'
 
 module VMC::Cli
@@ -7,6 +7,9 @@ module VMC::Cli
   module Command
 
     class Base
+      include Interactive
+      disable_rewind
+
       attr_reader :no_prompt, :prompt_ok
 
       def initialize(options={})
@@ -20,7 +23,9 @@ module VMC::Cli
         end
       end
 
-      def client
+      # Inject a client to help in testing.
+      def client(cli=nil)
+        @client ||= cli
         return @client if @client
         @client = VMC::Client.new(target_url, auth_token)
         @client.trace = VMC::Cli::Config.trace if VMC::Cli::Config.trace

data/lib/cli/core_ext.rb

@@ -68,334 +68,6 @@ module VMCExtensions
     return sprintf("%.#{prec}fM", size/(1024.0*1024.0)) if size < (1024*1024*1024)
     return sprintf("%.#{prec}fG", size/(1024.0*1024.0*1024.0))
   end
-
-  # general-purpose interaction
-  #
-  # `question' is the prompt (without ": " at the end)
-  # `options' is a hash containing:
-  #   :input - the input source (defaults to STDIN)
-  #   :default - the default value, also used to attempt type conversion
-  #              of the answer (e.g. numeric/boolean)
-  #   :choices - a list of strings to choose from
-  #   :indexed - whether to allow choosing from `:choices' by their index,
-  #              best for when there are many choices
-  #   :echo - a string to echo when showing the input;
-  #           used for things like censoring password inpt
-  #   :callback - a block used to override certain actions
-  #
-  #               takes 4 arguments:
-  #                 action: the event, e.g. :up or [:key, X] where X is a
-  #                         string containing a single character
-  #                 answer: the current answer to the question; you'll
-  #                         probably mutate this
-  #                 position: the current offset from the start of the
-  #                           answer string, e.g. when typing in the middle
-  #                           of the input, this will be where you insert
-  #                           characters
-  #                 echo: the :echo option above, may be nil
-  #
-  #               the block should return the updated `position', or nil if
-  #               it didn't handle the event
-  def ask(question, options = {})
-    default = options[:default]
-    choices = options[:choices]
-    indexed = options[:indexed]
-    callback = options[:callback]
-    input = options[:input] || STDIN
-    echo = options[:echo]
-
-    if choices
-      VMCExtensions.ask_choices(input, question, default, choices, indexed, echo, &callback)
-    else
-      VMCExtensions.ask_default(input, question, default, echo, &callback)
-    end
-  end
-
-  ESCAPES = {
-    "[A" => :up, "H" => :up,
-    "[B" => :down, "P" => :down,
-    "[C" => :right, "M" => :right,
-    "[D" => :left, "K" => :left,
-    "[3~" => :delete, "S" => :delete,
-    "[H" => :home, "G" => :home,
-    "[F" => :end, "O" => :end
-  }
-
-  def handle_action(which, ans, pos, echo = nil)
-    if block_given?
-      res = yield which, ans, pos, echo
-      return res unless res.nil?
-    end
-
-    case which
-    when :up
-      # nothing
-
-    when :down
-      # nothing
-
-    when :tab
-      # nothing
-
-    when :right
-      unless pos == ans.size
-        display censor(ans[pos .. pos], echo), false
-        return pos + 1
-      end
-
-    when :left
-      unless pos == 0
-        display "\b", false
-        return pos - 1
-      end
-
-    when :delete
-      unless pos == ans.size
-        ans.slice!(pos, 1)
-        if WINDOWS
-          rest = ans[pos .. -1]
-          display(censor(rest, echo) + " \b" + ("\b" * rest.size), false)
-        else
-          display("\e[P", false)
-        end
-      end
-
-    when :home
-      display("\b" * pos, false)
-      return 0
-
-    when :end
-      display(censor(ans[pos .. -1], echo), false)
-      return ans.size
-
-    when :backspace
-      if pos > 0
-        ans.slice!(pos - 1, 1)
-
-        if WINDOWS
-          rest = ans[pos - 1 .. -1]
-          display("\b" + censor(rest, echo) + " \b" + ("\b" * rest.size), false)
-        else
-          display("\b\e[P", false)
-        end
-
-        return pos - 1
-      end
-
-    when :interrupt
-      raise Interrupt.new
-
-    when :eof
-      return false if ans.empty?
-
-    when :kill_word
-      if pos > 0
-        start = /[^\s]*\s*$/ =~ ans[0 .. pos]
-        length = pos - start
-        ans.slice!(start, length)
-        display("\b" * length + " " * length + "\b" * length, false)
-        return start
-      end
-
-    when Array
-      case which[0]
-      when :key
-        c = which[1]
-        rest = ans[pos .. -1]
-
-        ans.insert(pos, c)
-
-        display(censor(c + rest, echo) + ("\b" * rest.size), false)
-
-        return pos + 1
-      end
-    end
-
-    pos
-  end
-
-  def censor(str, with)
-    return str unless with
-    with * str.size
-  end
-
-  # ask a simple question, maybe with a default answer
-  #
-  # reads character-by-character, handling backspaces, and sending each
-  # character to a block if provided
-  def self.ask_default(input, question, default = nil, echo = nil, &callback)
-    while true
-      prompt(question, default)
-
-      ans = ""
-      pos = 0
-      escaped = false
-      escape_seq = ""
-
-      with_char_io(input) do
-        until pos == false or (c = get_character(input)) =~ /[\r\n]/
-          if c == "\e" || c == "\xE0"
-            escaped = true
-          elsif escaped
-            escape_seq << c
-
-            if cmd = ESCAPES[escape_seq]
-              pos = handle_action(cmd, ans, pos, echo, &callback)
-              escaped, escape_seq = false, ""
-            elsif ESCAPES.select { |k, v| k.start_with? escape_seq }.empty?
-              escaped, escape_seq = false, ""
-            end
-          elsif c == "\177" or c == "\b" # backspace
-            pos = handle_action(:backspace, ans, pos, echo, &callback)
-          elsif c == "\x01"
-            pos = handle_action(:home, ans, pos, echo, &callback)
-          elsif c == "\x03"
-            pos = handle_action(:interrupt, ans, pos, echo, &callback)
-          elsif c == "\x04"
-            pos = handle_action(:eof, ans, pos, echo, &callback)
-          elsif c == "\x05"
-            pos = handle_action(:end, ans, pos, echo, &callback)
-          elsif c == "\x17"
-            pos = handle_action(:kill_word, ans, pos, echo, &callback)
-          elsif c == "\t"
-            pos = handle_action(:tab, ans, pos, echo, &callback)
-          elsif c < " "
-            # ignore
-          else
-            pos = handle_action([:key, c], ans, pos, echo, &callback)
-          end
-        end
-      end
-
-      display "\n", false
-
-      if ans.empty?
-        return default unless default.nil?
-      else
-        return match_type(ans, default)
-      end
-    end
-  end
-
-  def self.ask_choices(input, question, default, choices, indexed = false, echo = nil, &callback)
-    msg = question.dup
-
-    if indexed
-      choices.each.with_index do |o, i|
-        say "#{i + 1}: #{o}"
-      end
-    else
-      msg << " (#{choices.collect(&:inspect).join ", "})"
-    end
-
-    while true
-      ans = ask_default(input, msg, default, echo, &callback)
-
-      matches = choices.select { |x| x.start_with? ans }
-
-      if matches.size == 1
-        return matches.first
-      elsif indexed and ans =~ /^\d+$/ and res = choices.to_a[ans.to_i - 1]
-        return res
-      elsif matches.size > 1
-        warn "Please disambiguate: #{matches.join " or "}?"
-      else
-        warn "Unknown answer, please try again!"
-      end
-    end
-  end
-
-  # display a question and show the default value
-  def self.prompt(question, default = nil)
-    msg = question.dup
-
-    case default
-    when true
-      msg << " [Yn]"
-    when false
-      msg << " [yN]"
-    else
-      msg << " [#{default.inspect}]" if default
-    end
-
-    display "#{msg}: ", false
-  end
-
-  # try to make `str' be the same class as `x'
-  def self.match_type(str, x)
-    case x
-    when Integer
-      str.to_i
-    when true, false
-      str.upcase.start_with? "Y"
-    else
-      str
-    end
-  end
-
-  # definitions for reading character-by-character
-  begin
-    require "Win32API"
-
-    def self.with_char_io(input)
-      yield
-    end
-
-    def self.get_character(input)
-      if input == STDIN
-        begin
-          Win32API.new("msvcrt", "_getch", [], "L").call.chr
-        rescue
-          Win32API.new("crtdll", "_getch", [], "L").call.chr
-        end
-      else
-        input.getc.chr
-      end
-    end
-  rescue LoadError
-    begin
-      require "termios"
-
-      def self.with_char_io(input)
-        return yield unless input.tty?
-
-        before = Termios.getattr(input)
-
-        new = before.dup
-        new.c_lflag &= ~(Termios::ECHO | Termios::ICANON)
-        new.c_cc[Termios::VMIN] = 1
-
-        begin
-          Termios.setattr(input, Termios::TCSANOW, new)
-          yield
-        ensure
-          Termios.setattr(input, Termios::TCSANOW, before)
-        end
-      end
-
-      def self.get_character(input)
-        input.getc.chr
-      end
-    rescue LoadError
-      # set tty modes for the duration of a block, restoring them afterward
-      def self.with_char_io(input)
-        return yield unless input.tty?
-
-        begin
-          before = `stty -g`
-          system("stty raw -echo -icanon isig")
-          yield
-        ensure
-          system("stty #{before}")
-        end
-      end
-
-      # this assumes we're wrapped in #with_stty
-      def self.get_character(input)
-        input.getc.chr
-      end
-    end
-  end
 end
 
 module VMCStringExtensions

data/lib/cli/runner.rb

@@ -438,6 +438,10 @@ class VMC::Cli::Runner
     end
 
   rescue OptionParser::InvalidOption => e
+    puts(e.message.red)
+    puts("\n")
+    puts(basic_usage)
+    @exit_status = false
   rescue OptionParser::AmbiguousOption => e
     puts(e.message.red)
     puts("\n")
@@ -473,7 +477,7 @@ class VMC::Cli::Runner
   rescue Interrupt => e
     say("\nInterrupted".red)
     @exit_status = false
-  rescue => e
+  rescue Exception => e
     puts e.message.red
     puts e.backtrace
     @exit_status = false

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.13.beta.5'
+    VERSION = '0.3.13'
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  prerelease: 7
-  version: 0.3.13.beta.5
+  prerelease: 
+  version: 0.3.13
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 -07:00
+date: 2011-11-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,38 +61,49 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: interact
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.5.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Client library and CLI that provides access to the VMware Cloud Application Platform.
 email: support@vmware.com
 executables: 
@@ -144,9 +155,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: