rvc 1.3.4 → 1.3.5

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.add_dependency 'trollop', '>= 1.16.2'
     gem.add_dependency 'backports', '>= 1.18.2'
     gem.add_dependency 'highline', '>= 1.6.1'
+    gem.add_dependency 'zip', '>= 2.0.2'
     #gem.add_dependency 'ffi', '>= 1.0.7'
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/lib/rvc/modules/vim.rb

@@ -122,7 +122,7 @@ def connect uri, opts
   Thread.new do
     while true
       sleep 600
-      vim.serviceInstance.RetrieveServiceContent
+      vim.serviceInstance.CurrentTime
     end
   end
 

data/lib/rvc/modules/vmrc.rb

@@ -19,17 +19,28 @@
 # THE SOFTWARE.
 
 require 'tmpdir'
+require 'digest/sha2'
+require 'zip'
+require 'rbconfig'
 
-VMRC_NAME = "vmware-vmrc-linux-x86-3.0.0"
-VMRC_PKGVER = 1
-VMRC_BASENAME = "#{VMRC_NAME}.#{VMRC_PKGVER}.tar.bz2"
-VMRC_URL = "http://cloud.github.com/downloads/vmware/rvc/#{VMRC_BASENAME}"
-VMRC_SHA256 = "cda9ba0b0078aee9a7b9704d720ef4c7d74ae2028efb71815d0eb91a5de75921"
+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
+  $stderr.puts "No VMRC available for OS #{RbConfig::CONFIG['host_os']}"
+end
 
-CURL = ENV['CURL'] || 'curl'
+VMRC_BASENAME = "#{VMRC_NAME}.xpi"
+VMRC_URL = "http://cloud.github.com/downloads/vmware/rvc/#{VMRC_BASENAME}"
 
 def find_local_vmrc
-  path = File.join(Dir.tmpdir, VMRC_NAME, 'plugins', 'vmware-vmrc')
+  path = File.join(Dir.tmpdir, VMRC_NAME, 'plugins', VMRC_BIN)
   File.exists?(path) && path
 end
 
@@ -54,6 +65,19 @@ def view vms
     moref = vm._ref
     ticket = vm._connection.serviceInstance.content.sessionManager.AcquireCloneTicket
     host = vm._connection._host
+    spawn_vmrc vmrc, moref, host, ticket
+  end
+end
+
+case RbConfig::CONFIG['host_os']
+when /mswin/, /mingw/
+  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,
+                  :err => "#{ENV['HOME']||'.'}/.rvc-vmrc.log"
+  end
+else
+  def spawn_vmrc vmrc, moref, host, ticket
     fork do
       ENV['https_proxy'] = ENV['HTTPS_PROXY'] = ''
       $stderr.reopen("#{ENV['HOME']||'.'}/.rvc-vmrc.log", "a")
@@ -61,30 +85,71 @@ def view vms
       $stderr.puts "Using VMRC #{vmrc}"
       $stderr.flush
       Process.setpgrp
-      exec vmrc, '-M', moref,
-                 '-h', host,
-                 '-p', ticket
+      exec vmrc, '-M', moref, '-h', host, '-p', ticket
     end
   end
 end
 
+
 opts :install do
   summary "Install VMRC"
 end
 
 def install
-  system "which #{CURL} > /dev/null" or err "curl not found"
-  system "which sha256sum > /dev/null" or err "sha256sum not found"
+  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)
+  puts "VMRC was installed successfully."
+end
+
+def download url_str, dest
   puts "Downloading VMRC..."
-  dir = Dir.mktmpdir
-  vmrc_file = "#{dir}/#{VMRC_BASENAME}"
-  checksum_file = "#{dir}/sha256sums"
-  system "#{CURL} -L #{VMRC_URL} -o #{vmrc_file}" or err "download failed"
+
+  url = URI.parse(url_str)
+
+  http = if ENV['http_proxy']
+    proxy_uri = URI.parse(ENV['http_proxy'])
+    proxy_user, proxy_pass = proxy_uri.userinfo.split(/:/) if proxy_uri.userinfo
+    Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_user, proxy_pass)
+  else
+    Net::HTTP
+  end
+
+  begin
+    File.open(dest, 'wb') do |io|
+      res = http.start(url.host, url.port) do |http|
+        http.get(url.path) do |segment|
+          io.write segment
+        end
+      end
+    end
+  rescue Exception
+    err "Error downloading VMRC: #{$!.class}: #{$!.message}"
+  end
+end
+
+def verify filename, expected_hash
   puts "Checking integrity..."
-  File.open(checksum_file, 'w') { |io| io.puts "#{VMRC_SHA256} *#{vmrc_file}" }
-  system "sha256sum -c #{checksum_file}" or err "integrity check failed"
+  hexdigest = Digest::SHA256.file(filename).hexdigest
+  err "Hash mismatch" if hexdigest != VMRC_SHA256
+end
+
+def extract src, dst
   puts "Installing VMRC..."
-  system "tar -xj -f #{vmrc_file} -C #{Dir.tmpdir}" or err("VMRC installation failed")
-  puts "VMRC was installed successfully."
-  FileUtils.rm_r dir
+  FileUtils.mkdir_p dst
+  Zip::ZipFile.open(src) do |zf|
+    zf.each do |e|
+      dst_filename = File.join(dst, e.name)
+      case e.ftype
+      when :file
+        zf.extract e.name, dst_filename
+        File.chmod(e.unix_perms, dst_filename) if e.unix_perms
+      when :directory
+        FileUtils.mkdir_p dst_filename
+      else
+        $stderr.puts "unknown file type #{e.ftype}"
+      end
+    end
+  end
 end

data/test/_test_completion.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'rvc'
+require 'inventory_fixtures'
+
+class CompletionTest < Test::Unit::TestCase
+  NodeBaz = FixtureNode.new
+  NodeBar = FixtureNode.new
+  NodeFoo = FixtureNode.new('bar' => NodeBar, 'baz' => NodeBaz)
+  Root = FixtureNode.new('foo' => NodeFoo)
+
+  def check word, expected
+    got = RVC::Completion::Completor[word]
+    assert_equal expected, got
+  end
+
+  def setup
+    @context = RVC::Context.new Root
+  end
+
+  def teardown
+    @context = nil
+  end
+
+  def test_simple
+    check 
+  end
+end

data/test/_test_option_parser.rb

@@ -0,0 +1,6 @@
+require 'test/unit'
+require 'rvc'
+require 'inventory_fixtures'
+
+class OptionParserTest < Test::Unit::TestCase
+end

metadata

@@ -2,7 +2,7 @@
 name: rvc
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Rich Lane
@@ -57,6 +57,17 @@ dependencies:
         version: 1.6.1
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: zip
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+  type: :runtime
+  version_requirements: *id005
 description: 
 email: rlane@vmware.com
 executables: 
@@ -112,6 +123,8 @@ files:
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb
+- test/_test_completion.rb
+- test/_test_option_parser.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -136,11 +149,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: vSphere console UI
 test_files: 
+- test/_test_completion.rb
+- test/_test_option_parser.rb
 - test/inventory_fixtures.rb
 - test/test_fs.rb
 - test/test_parse_path.rb