esx 0.2.1 → 0.2.3

data/Gemfile

@@ -6,8 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "rspec", ">= 0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "jeweler"
+  gem "simplecov", ">= 0"
 end

data/README.md

@@ -100,6 +100,10 @@ __esx create-vm --user root --password foo --name esx-rubiojr --disk-file /path/
     
     end
 
+# Testing 
+
+Run rspec from the base dir. By default, the tests try to connect to an ESX host named esx-test-host with user root and no password. Edit spec/spec_helper.rb to fit your needs.
+
 # Copyright
 
 Copyright (c) 2011 Sergio Rubio. See LICENSE.txt for

data/bin/esx

@@ -75,6 +75,7 @@ class CreateVMCommand < BaseCommand
 
   parameter "ADDRESS", "ESX host address"
   option "--disk-file", "DISK_FILE", "VMDK file to import", :attribute_name => :disk_file
+  option "--disk-size", "DISK_SIZE", "VM Disk size", :attribute_name => :disk_size, :default => 8192
   option "--guest-id", "GUEST_ID", "GuestID value", :attribute_name => :guest_id, :default => 'otherGuest'
   option "--name", "VM NAME", "Virtual Machine name (required)"
   option "--memory", "MEMORY", "VM Memory size in MB", :default => 512
@@ -93,47 +94,58 @@ class CreateVMCommand < BaseCommand
       end
       exit 1
     end
+    if disk_size and disk_file
+      $stderr.puts "Both --disk-file and --disk-size specified. --disk-size will be ignored."
+    end
     downloaded_file = nil
-    df = disk_file.dup
-    if df.strip.chomp =~ /^http/
+    if disk_file.nil?
+      # if --disk-file nil? create the VM without disk
+      vm = host.create_vm :vm_name => name, 
+                          :datastore => datastore, :disk_type => :flat, :memory => memory,
+                          :disk_size => disk_size,
+                          :guest_id => guest_id, :mac_address => mac_address
+    else
+      df = disk_file.dup
+      if df.strip.chomp =~ /^http/
+        begin
+          downloaded_file = disk_file.dup
+          tmpfile = "#{tmpdir}/#{Time.now.to_i}.esx"
+          puts "Downloading file... (#{tmpfile})"
+          download! downloaded_file, tmpfile
+          puts
+          df = tmpfile
+        rescue Exception => e
+          FileUtils.rm_f(tmpfile) 
+          $stderr.puts "Error downloading file from #{downloaded_file}."
+          $stderr.puts e.message if debug?
+          exit 1
+        end
+      end
+      raise Exception.new("Invalid disk file") if not File.exist?(df)
+      if not name
+        $stderr.puts "Invalid VM name."
+        $stderr.puts "Use --name option to specify the VM name"
+        exit 1
+      end
+      host.remote_command "mkdir /vmfs/volumes/#{datastore}/#{name}"
+
       begin
-        downloaded_file = disk_file.dup
-        tmpfile = "#{tmpdir}/#{Time.now.to_i}.esx"
-        puts "Downloading file... (#{tmpfile})"
-        download! downloaded_file, tmpfile
-        puts
-        df = tmpfile
+        host.import_disk df, "/vmfs/volumes/#{datastore}/#{name}/#{name}.vmdk"
       rescue Exception => e
-        FileUtils.rm_f(tmpfile) 
-        $stderr.puts "Error downloading file from #{downloaded_file}."
+        $stderr.puts "Error uploading file to /vmfs/volumes/#{datastore}/#{name}/#{name}.vmdk"
         $stderr.puts e.message if debug?
         exit 1
       end
-    end
-    raise Exception.new("Invalid disk file") if not File.exist?(df)
-    if not name
-      $stderr.puts "Invalid VM name."
-      $stderr.puts "Use --name option to specify the VM name"
-      exit 1
-    end
-    host.remote_command "mkdir /vmfs/volumes/#{datastore}/#{name}"
 
-    begin
-      host.import_disk df, "/vmfs/volumes/#{datastore}/#{name}/#{name}.vmdk"
-    rescue Exception => e
-      $stderr.puts "Error uploading file to /vmfs/volumes/#{datastore}/#{name}/#{name}.vmdk"
-      $stderr.puts e.message if debug?
-      exit 1
-    end
-
-    if not downloaded_file.nil?
-      puts "Deleting tmp file #{df}" if debug?
-      FileUtils.rm_f(df) 
+      if not downloaded_file.nil?
+        puts "Deleting tmp file #{df}" if debug?
+        FileUtils.rm_f(df) 
+      end
+      vm = host.create_vm :vm_name => name, 
+                          :disk_file => "#{name}/#{name}.vmdk", 
+                          :datastore => datastore, :disk_type => :flat, :memory => memory,
+                          :guest_id => guest_id, :mac_address => mac_address
     end
-    vm = host.create_vm :vm_name => name, 
-                        :disk_file => "#{name}/#{name}.vmdk", 
-                        :datastore => datastore, :disk_type => :flat, :memory => memory,
-                        :guest_id => guest_id, :mac_address => mac_address
     if poweron?
       vm.power_on
     end
@@ -195,4 +207,12 @@ class DefaultCommand < Clamp::Command
   subcommand "create-vm", "Create a VM", CreateVMCommand
 end
 
-DefaultCommand.run
+begin
+  DefaultCommand.run
+rescue Exception => e
+  puts e.message
+  if $DEBUG
+    puts $!
+    puts $@
+  end
+end

data/lib/esx.rb

@@ -6,7 +6,7 @@ require 'net/ssh'
 
 module ESX
 
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 
   class Host
 
@@ -134,10 +134,13 @@ module ESX
           }
         ]
       }
+
+      # VMDK provided, replace the empty vmdk
       vm_cfg[:deviceChange].push(create_disk_spec(:disk_file => spec[:disk_file], 
                                 :disk_type => spec[:disk_type],
                                 :disk_size => spec[:disk_size],
                                 :datastore => spec[:datastore]))
+
       VM.wrap(@_datacenter.vmFolder.CreateVM_Task(:config => vm_cfg, :pool => @_datacenter.hostFolder.children.first.resourcePool).wait_for_completion)
     end
 
@@ -337,6 +340,10 @@ module ESX
       vm_object.Destroy_Task.wait_for_completion
     end
 
+    def reset
+      vm_object.ResetVM_Task.wait_for_completion
+    end
+
     def guest_info
       GuestInfo.wrap(vm_object.guest)
     end

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'rspec/autorun'
+require 'simplecov'
+
+SimpleCov.start do 
+  add_filter '/spec/'
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'esx'
+
+module ESXTestHelpers
+  
+  def esx_host
+    "esx-test-host"
+  end
+
+  def esx_user
+    "root"
+  end
+
+  def esx_password
+    ""
+  end
+
+end

data/spec/unit/host_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "ESX host" do
+  include ESXTestHelpers
+
+  before do
+    @test_host = ESX::Host.connect(esx_host, esx_user, esx_password)
+  end
+
+  it "connects to and ESX with a valid user/pass" do
+    host = nil
+    lambda do
+      host = ESX::Host.connect(esx_host, esx_user, esx_password)
+    end.should_not raise_error
+    
+  end
+
+  it "retrives the host name" do
+    @test_host.name.should_not be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000 Z
+date: 2011-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &16159880 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &15484180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16159880
+  version_requirements: *15484180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16158560 !ruby/object:Gem::Requirement
+  requirement: &15481960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16158560
+  version_requirements: *15481960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16157260 !ruby/object:Gem::Requirement
+  requirement: &15495640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16157260
+  version_requirements: *15495640
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &16155820 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &15492220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16155820
+  version_requirements: *15492220
 - !ruby/object:Gem::Dependency
   name: alchemist
-  requirement: &16154620 !ruby/object:Gem::Requirement
+  requirement: &15503640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16154620
+  version_requirements: *15503640
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &16153360 !ruby/object:Gem::Requirement
+  requirement: &15498460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16153360
+  version_requirements: *15498460
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &16176540 !ruby/object:Gem::Requirement
+  requirement: &15511560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16176540
+  version_requirements: *15511560
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &16175200 !ruby/object:Gem::Requirement
+  requirement: &15510000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16175200
+  version_requirements: *15510000
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &16173960 !ruby/object:Gem::Requirement
+  requirement: &15508740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16173960
+  version_requirements: *15508740
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &16172640 !ruby/object:Gem::Requirement
+  requirement: &15507180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16172640
+  version_requirements: *15507180
 description: Manage VMWare ESX hosts with ease
 email: rubiojr@frameos.org
 executables:
@@ -138,8 +138,8 @@ files:
 - bin/esx
 - examples/basics.rb
 - lib/esx.rb
-- test/helper.rb
-- test/test_esx.rb
+- spec/spec_helper.rb
+- spec/unit/host_spec.rb
 homepage: http://github.com/rubiojr/esx
 licenses:
 - MIT

data/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'esx'
-
-class Test::Unit::TestCase
-end

data/test/test_esx.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestEsx < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end