rvc 1.6.0 → 1.7.0

data/lib/rvc/modules/vmrc.rb

@@ -18,40 +18,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rvc/vim'
+
 require 'tmpdir'
 require 'digest/sha2'
 require 'zip'
 require 'rbconfig'
 
-case RbConfig::CONFIG['host_os']
-when /mswin/, /mingw/
-  VMRC_NAME = "vmware-vmrc-win32-x86-3.0.0-309851"
-  VMRC_SHA256 = "8d8f9655121db5987bef1c2fa3a08ef2c4dd7769eb230bbd5b3ba9fd9576db56"
-  VMRC_BIN = "vmware-vmrc.exe"
-when /linux/
-  VMRC_NAME = "vmware-vmrc-linux-x86-3.0.0-309851"
-  VMRC_SHA256 = "c86ecd9d9a1dd909a119c19d28325cb87d6e2853885d3014a7dac65175dd2ae1"
-  VMRC_BIN = "vmware-vmrc"
-else
-  VMRC_NAME = nil
-  VMRC_SHA256 = nil
-  VMRC_BIN = nil
-  $stderr.puts "No VMRC available for OS #{RbConfig::CONFIG['host_os']}"
+VMRC_CHECKSUMS = {
+  "i686-linux" => "b8f11c92853502c3dd208da79514a66d2dd4734b8564aceb9952333037859d04",
+  "x86_64-linux" => "86ec4bc6f23da0c33045d9bf48d9fe66ab2f426b523d8b37531646819891bf54",
+  "i686-mswin" => "f8455f0df038fbc8e817e4381af44fa2141496cb4e2b61f505f75bc447841949",
+}
+
+PACKAGE_VERSION = 'A'
+ARCH = RbConfig::CONFIG['arch']
+ON_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /(mswin|mingw)/) != nil
+
+def vmrc_url arch
+  "http://cloud.github.com/downloads/vmware/rvc/vmware-vmrc-public-#{arch}-#{PACKAGE_VERSION}.zip"
 end
 
-VMRC_BASENAME = "#{VMRC_NAME}.xpi"
-VMRC_URL = "http://cloud.github.com/downloads/vmware/rvc/#{VMRC_BASENAME}"
+def local_vmrc_dir arch
+  File.join(Dir.tmpdir, "vmware-vmrc-#{arch}-#{Process.uid}-#{PACKAGE_VERSION}")
+end
+
+def check_installed
+  File.exists? local_vmrc_dir(ARCH)
+end
 
-def find_local_vmrc
-  return nil if VMRC_NAME.nil?
-  path = File.join(Dir.tmpdir, VMRC_NAME, 'plugins', VMRC_BIN)
+def find_vmrc arch, version
+  path = if version == '3.0.0'
+    basename = ON_WINDOWS ? 'vmware-vmrc.exe' : 'vmware-vmrc'
+    File.join(local_vmrc_dir(arch), version, 'plugins', basename)
+  else
+    fail "VMRC5 not yet supported on win32" if ON_WINDOWS
+    File.join(local_vmrc_dir(arch), version, 'vmware-vmrc-5.0', 'run.sh')
+  end
   File.exists?(path) && path
 end
 
-def find_vmrc
-  find_local_vmrc || search_path('vmrc')
+def choose_vmrc_version vim_version
+  if vim_version >= '5.1.0'
+    '5.0.0'
+  else
+    '3.0.0'
+  end
 end
 
+fail unless choose_vmrc_version('4.1.0') == '3.0.0'
+fail unless choose_vmrc_version('5.0.1') == '3.0.0'
+fail unless choose_vmrc_version('5.1.0') == '5.0.0'
+fail unless choose_vmrc_version('6.0.0') == '5.0.0'
+
 
 opts :view do
   summary "Spawn a VMRC"
@@ -65,10 +84,13 @@ rvc_alias :view, :vmrc
 rvc_alias :view, :v
 
 def view vms, opts
-  unless vmrc = find_vmrc
+  conn = single_connection vms
+  vim_version = conn.serviceContent.about.version
+  vmrc_version = choose_vmrc_version vim_version
+  unless vmrc = find_vmrc(ARCH, vmrc_version)
     if opts[:install]
       install
-      vmrc = find_vmrc
+      vmrc = find_vmrc(ARCH, vmrc_version)
     else
       err "VMRC not found. You may need to run vmrc.install."
     end
@@ -82,8 +104,7 @@ def view vms, opts
   end
 end
 
-case RbConfig::CONFIG['host_os']
-when /mswin/, /mingw/
+if ON_WINDOWS
   def spawn_vmrc vmrc, moref, host, ticket
     err "Ruby 1.9 required" unless Process.respond_to? :spawn
     Process.spawn vmrc, '-h', host, '-p', ticket, '-M', moref,
@@ -109,10 +130,12 @@ opts :install do
 end
 
 def install
-  zip_filename = File.join(Dir.tmpdir, VMRC_BASENAME)
-  download VMRC_URL, zip_filename
-  verify zip_filename, VMRC_SHA256
-  extract zip_filename, File.join(Dir.tmpdir, VMRC_NAME)
+  err "No VMRC available for architecture #{ARCH}" unless VMRC_CHECKSUMS.member? ARCH
+  zip_filename = "#{local_vmrc_dir(ARCH)}.zip"
+  url = vmrc_url ARCH
+  download url, zip_filename
+  verify zip_filename, VMRC_CHECKSUMS[ARCH]
+  extract zip_filename, local_vmrc_dir(ARCH)
   puts "VMRC was installed successfully."
 end
 
@@ -136,6 +159,7 @@ def download url_str, dest
           io.write segment
         end
       end
+      res.value
     end
   rescue Exception
     err "Error downloading VMRC: #{$!.class}: #{$!.message}"
@@ -143,9 +167,13 @@ def download url_str, dest
 end
 
 def verify filename, expected_hash
-  puts "Checking integrity..."
-  hexdigest = Digest::SHA256.file(filename).hexdigest
-  err "Hash mismatch" if hexdigest != VMRC_SHA256
+  if expected_hash == :nocheck
+    puts "WARNING: skipping hash check"
+  else
+    puts "Checking integrity..."
+    hexdigest = Digest::SHA256.file(filename).hexdigest
+    err "Hash mismatch: expected #{expected_hash}, found #{hexdigest}" if hexdigest != expected_hash
+  end
 end
 
 def extract src, dst

data/lib/rvc/modules/vnc.rb

@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rvc/vim'
+
 VNC = ENV['VNC'] || search_path('tightvnc') || search_path('vncviewer') || search_path('vinagre')
 
 opts :view do

data/lib/rvc/namespace.rb

@@ -0,0 +1,114 @@
+# Copyright (c) 2011 VMware, Inc.  All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rvc/command_slate'
+
+module RVC
+
+class Namespace
+  attr_reader :name, :shell, :parent, :slate, :namespaces, :commands, :aliases
+
+  def inspect
+    "#<RVC::Namespace:#{name}>"
+  end
+
+  def initialize name, shell, parent
+    @name = name
+    @shell = shell
+    @parent = parent
+    @slate = CommandSlate.new self
+    @namespaces = {}
+    @commands = {}
+    @aliases = {}
+  end
+
+  def load_code code, filename
+    @slate.instance_eval code, filename
+  end
+
+  def child_namespace name
+    if ns = namespaces[name]
+      return ns
+    else
+      namespaces[name] = Namespace.new(name, shell, self)
+    end
+  end
+
+  def lookup cmdpath, accept=Command
+    if cmdpath.empty?
+      if accept == Command
+        return nil
+      elsif accept == Namespace
+        return self
+      end
+    elsif cmdpath.length == 1 and accept == Command
+      sym = cmdpath[0]
+      if @aliases.member? sym
+        @shell.cmds.lookup @aliases[sym], accept
+      else
+        @commands[sym]
+      end
+    else
+      sym = cmdpath[0]
+      child = @namespaces[sym]
+      return nil if child == nil
+      child.lookup cmdpath[1..-1], accept
+    end
+  end
+
+  def [] sym
+    @namespaces[sym]
+  end
+
+  def method_missing sym, *args
+    if cmd = @commands[sym]
+      cmd.invoke *args
+    elsif args.empty? and x = self[sym]
+      x
+    else
+      super
+    end
+  end
+
+  def load_module_dir dir, verbose
+    puts "loading module directory #{dir}" if verbose
+    Dir.foreach(dir) do |f|
+      path = File.join(dir, f)
+      if f[0..0] == '.'
+        next
+      elsif File.directory? path
+        ns_name = f.to_sym
+        child_namespace(ns_name).load_module_dir(path, verbose)
+      elsif f =~ /\.rb$/
+        ns_name = f[0...-3].to_sym
+        puts "loading #{ns_name} from #{path}" if verbose
+        begin
+          code = File.read path
+          child_namespace(ns_name).load_code(code, path)
+        rescue
+          puts "#{$!.class} while loading #{f}: #{$!.message}"
+          $!.backtrace.each { |x| puts x }
+        end
+      end
+    end
+  end
+end
+
+end

data/lib/rvc/option_parser.rb

@@ -19,21 +19,23 @@
 # THE SOFTWARE.
 
 require 'trollop'
+require 'set'
+
+module RVC
 
 begin
   require 'chronic'
-  RVC::HAVE_CHRONIC = true
+  HAVE_CHRONIC = true
 rescue LoadError
-  RVC::HAVE_CHRONIC = false
+  HAVE_CHRONIC = false
 end
 
-module RVC
-
 class OptionParser < Trollop::Parser
   attr_reader :applicable
 
-  def initialize cmd, &b
+  def initialize cmd, fs, &b
     @cmd = cmd
+    @fs = fs
     @summary = nil
     @args = []
     @has_options = false
@@ -41,8 +43,8 @@ class OptionParser < Trollop::Parser
     @seen_multi = false
     @applicable = Set.new
     super() do
-      opt :help, "Show this message", :short => 'h'
       instance_eval &b
+      opt :help, "Show this message", :short => 'h'
     end
   end
 
@@ -97,7 +99,7 @@ class OptionParser < Trollop::Parser
 
     @specs.each do |name,spec|
       next unless klass = spec[:lookup] and path = opts[name]
-      opts[name] = RVC::Util.lookup_single! path, klass
+      opts[name] = @fs.lookup_single! path, klass
     end
 
     argv = leftovers
@@ -136,10 +138,10 @@ class OptionParser < Trollop::Parser
 
   def postprocess_arg x, spec
     if spec[:lookup]
-      RVC::Util.lookup!(x, spec[:lookup]).
+      @fs.lookup!(x, spec[:lookup]).
         tap { |a| RVC::Util.err "no matches for #{x.inspect}" if a.empty? }
     elsif spec[:lookup_parent]
-      RVC::Util.lookup!(File.dirname(x), spec[:lookup_parent]).
+      @fs.lookup!(File.dirname(x), spec[:lookup_parent]).
         map { |y| [y, File.basename(x)] }.
         tap { |a| RVC::Util.err "no matches for #{File.dirname(x).inspect}" if a.empty? }
     else
@@ -163,16 +165,11 @@ end
 class RawOptionParser
   attr_reader :applicable
 
-  def initialize cmd, summary
+  def initialize cmd
     @cmd = cmd
-    @summary = summary
     @applicable = []
   end
 
-  def summary?
-    @summary
-  end
-
   def parse args
     [args, {}]
   end

data/lib/rvc/readline-ffi.rb

@@ -19,8 +19,10 @@
 # THE SOFTWARE.
 
 require 'ffi'
+require 'readline'
 
-module RVC::ReadlineFFI
+module RVC
+module ReadlineFFI
   extend FFI::Library
   libreadline = ENV['RVC_READLINE'] == nil ? 'readline.so' : ENV['RVC_READLINE']
   ffi_lib libreadline
@@ -28,6 +30,7 @@ module RVC::ReadlineFFI
   attach_variable :rl_char_is_quoted_p, :rl_char_is_quoted_p, :rl_linebuf_func_t
   attach_variable :rl_line_buffer, :rl_line_buffer, :string
 end
+end
 
 unless Readline.respond_to? :line_buffer
   def Readline.line_buffer

data/lib/rvc/ruby_evaluator.rb

@@ -0,0 +1,84 @@
+# Copyright (c) 2011 VMware, Inc.  All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'rvc/util'
+
+module RVC
+
+class RubyEvaluator
+  include RVC::Util
+
+  def initialize shell
+    @binding = toplevel
+    @shell = shell
+  end
+
+  def toplevel
+    binding
+  end
+
+  def do_eval input, file
+    begin
+      eval input, @binding, file
+    rescue Exception => e
+      bt = e.backtrace
+      bt = bt.reverse.drop_while { |x| !(x =~ /toplevel/) }.reverse
+      bt[-1].gsub! ':in `toplevel\'', '' if bt[-1]
+      e.set_backtrace bt
+      raise
+    end
+  end
+
+  def this
+    @shell.fs.cur
+  end
+
+  def dc
+    @shell.fs.lookup("~").first
+  end
+
+  def conn
+    @shell.fs.lookup("~@").first
+  end
+
+  def rvc_exec command
+    @shell.eval_command command
+  end
+
+  def method_missing sym, *a
+    if a.empty?
+      if @shell.cmds.namespaces.member? sym
+        @shell.cmds.namespaces[sym]
+      elsif sym.to_s =~ /_?([\w\d]+)(!?)/ && objs = @shell.fs.marks[$1]
+        if $2 == '!'
+          objs
+        else
+          objs.first
+        end
+      else
+        super
+      end
+    else
+      super
+    end
+  end
+end
+
+end