veewee 0.3.7 → 0.3.9

data/lib/veewee/command/parallels.rb

@@ -1,125 +1,35 @@
 module Veewee
   module Command
-    class Parallels< Veewee::Command::GroupBase
+    class Parallels < Veewee::Command::GroupBase
+
+      register :command => "parallels",
+               :description => "Subcommand for Parallels",
+               :provider => "parallels"
 
-      register "parallels", "Subcommand for Parallels"
       desc "build [BOX_NAME]", "Build box"
+      # TODO move common build options into array
       method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the build"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
       method_option :auto,:type => :boolean , :default => false, :aliases => "-a", :desc => "auto answers"
+      method_option :checksum , :type => :boolean , :default => false, :desc => "verify checksum"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
       def build(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).build(options)
-      end
-
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the destroy" 
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      desc "destroy [BOXNAME]", "Destroys the virtualmachine that was built"
-      def destroy(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).destroy(options)
-      end
-
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the shutdown" 
-      desc "halt [BOXNAME]", "Activates a shutdown the virtualmachine"
-      def halt(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).halt(options)
-      end
-
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
-      desc "up [BOXNAME]", "Starts a Box"
-      def up(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).up(options)
-      end
-
-      desc "ssh [BOXNAME] [COMMAND]", "SSH to box"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def ssh(box_name,command=nil)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).issh(command)
-      end
-
-      desc "define [BOXNAME] [TEMPLATE]", "Define a new basebox starting from a template"
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def define(definition_name, template_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.definitions.define(definition_name,template_name,options)
-        env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
-        env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
-        env.ui.info "veewee parallels build '#{definition_name}'"
+        env.get_box(box_name).build(options)
       end
 
-      desc "undefine [BOXNAME]", "Removes the definition of a basebox "
+      desc "export [BOX_NAME]", "Exports the basebox to the vagrant-parallels format"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def undefine(definition_name)
-        env.ui.info "Removing definition #{definition_name}" , :prefix => false
-        begin
-          venv=Veewee::Environment.new(options)
-          venv.ui=env.ui
-          venv.definitions.undefine(definition_name,options)
-          env.ui.info "Definition #{definition_name} successfully removed",:prefix => false
-        rescue Error => ex
-          env.ui.error "#{ex}" , :prefix => false
-          exit -1
-        end
+      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite existing file"
+      method_option :vagrantfile,:type => :string , :default => "", :desc => "specify Vagrantfile"
+      def export(box_name)
+        env.get_box(box_name).export_vagrant(options)
       end
 
-      desc "validate [NAME]", "Validates a box against parallels compliancy rules"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      desc "validate [BOX_NAME]", "Validates a box against parallels compliancy rules"
       method_option :tags,:type => :array, :default => %w{parallels puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["parallels"].get_box(box_name).validate_parallels(options)
-      end
-
-      desc "ostypes", "List the available Operating System types"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def ostypes
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.ostypes.each do |name|
-           env.ui.info "- #{name}"
-        end
+        env.get_box(box_name).validate_parallels(options)
       end
-
-      desc "templates", "List the currently available templates"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def templates
-        env.ui.info "The following templates are available:",:prefix => false
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.templates.each do |name,template|
-          env.ui.info "veewee parallels define '<box_name>' '#{name}'",:prefix => false
-        end
-      end
-
-      desc "list", "Lists all defined boxes"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def list
-        env.ui.info "The following local definitions are available:",:prefix => false
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.definitions.each do |name,definition|
-          env.ui.info "- #{name}"
-        end
-      end
-
-
     end
-
   end
 end

data/lib/veewee/command/vagrant/build.rb

@@ -40,8 +40,8 @@ module Veewee
               options['postinstall_list'] = e
             end
 
-            opts.on("--[no-]md5","force to check iso file md5 sum") do |v|
-              options['md5check'] = v
+            opts.on("--[no-]checksum","force to check iso file check sum") do |v|
+              options['checksum'] = v
             end
 
           end

data/lib/veewee/command/vagrant/export.rb

@@ -6,8 +6,6 @@ module Veewee
       class Export < ::Vagrant::Command::Base
         def execute
           options = {}
-          options['include'] = []
-          options['vagrantfile'] = []
 
           opts = OptionParser.new do |opts|
             opts.banner = "Exports basebox to the vagrant box format"

data/lib/veewee/command/vbox.rb

@@ -1,170 +1,57 @@
 module Veewee
   module Command
-    class Vbox< Veewee::Command::GroupBase
+    class Vbox < Veewee::Command::GroupBase
+
+      register :command => "vbox",
+               :description => "Subcommand for VirtualBox",
+               :provider => "virtualbox"
 
-      register "vbox", "Subcommand for VirtualBox"
       desc "build [BOX_NAME]", "Build box"
+      # TODO move common build options into array
       method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the build"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
       method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
       method_option :auto,:type => :boolean , :default => false, :aliases => "-a", :desc => "auto answers"
+      method_option :checksum , :type => :boolean , :default => false, :desc => "verify checksum"
       method_option :redirectconsole,:type => :boolean , :default => false, :aliases => "-r", :desc => "redirects console output"
       method_option :postinstall_include, :type => :array, :default => [], :aliases => "-i", :desc => "ruby regexp of postinstall filenames to additionally include"
       method_option :postinstall_exclude, :type => :array, :default => [], :aliases => "-e", :desc => "ruby regexp of postinstall filenames to exclude"
       def build(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).build(options)
-      end
-
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the destroy" 
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
-      desc "destroy [BOXNAME]", "Destroys the basebox that was built"
-      def destroy(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).destroy(options)
-      end
-
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "force the shutdown" 
-      desc "halt [BOXNAME]", "Activates a shutdown on the basebox"
-      def halt(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).halt(options)
+        env.get_box(box_name).build(options)
       end
 
+      desc "export [BOX_NAME]", "Exports the basebox to the vagrant format"
       method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
-      desc "up [BOXNAME]", "Starts a Box"
-      def up(box_name)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).up(options)
-      end
-
-      desc "ssh [BOXNAME] [COMMAND]", "Interactive ssh login"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def ssh(box_name,command=nil)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).issh(command)
-      end
-
-
-      desc "winrm [BOXNAME] [COMMAND]", "Execute command via winrm"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def winrm(box_name,command=nil)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).winrm(command,{:exitcode => "*"})
-      end
-
-      desc "copy [BOXNAME] [SRC] [DST]", "Copy a file to the VM"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def copy(box_name,src,dst)
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.providers["virtualbox"].get_box(box_name).copy_to_box(src,dst)
-      end
-
-
-      desc "define [BOXNAME] [TEMPLATE]", "Define a new basebox starting from a template"
-      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def define(definition_name, template_name)
-        begin
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.definitions.define(definition_name,template_name,options)
-        env.ui.info "The basebox '#{definition_name}' has been successfully created from the template '#{template_name}'"
-        env.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
-        env.ui.info "veewee vbox build '#{definition_name}'"
-        rescue Error => ex
-          env.ui.error("#{ex}",:prefix => false)
-          exit -1
-        end
+      method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite existing file"
+      method_option :vagrantfile,:type => :string , :default => "", :desc => "specify Vagrantfile"
+      def export(box_name)
+       env.get_box(box_name).export_vagrant(options)
       end
 
-      desc "undefine [BOXNAME]", "Removes the definition of a basebox "
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def undefine(definition_name)
-        env.ui.info  "Removing definition #{definition_name}", :prefix => false
-        begin
-          venv=Veewee::Environment.new(options)
-          venv.ui=env.ui
-          venv.definitions.undefine(definition_name,options)
-          env.ui.info "Definition #{definition_name} successfully removed" , :prefix => false
-        rescue Error => ex
-          env.ui.error("#{ex}",:prefix => false)
-          exit -1
-        end
-      end
-
-      desc "ostypes", "List the available Operating System types"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def ostypes
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.ostypes.each do |name|
-           env.ui.info "- #{name}"
-        end
-      end
-
-      desc "templates", "List the currently available templates"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def templates
-        env.ui.info "The following templates are available:",:prefix => false
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.templates.each do |name,template|
-          env.ui.info "veewee vbox define '<box_name>' '#{name}'",:prefix => false
-        end
-      end
-
-      desc "list", "Lists all defined boxes"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
-      def list
-        env.ui.info "The following local definitions are available:",:prefix => false
-        venv=Veewee::Environment.new(options)
-        venv.ui=env.ui
-        venv.definitions.each do |name,definition|
-          env.ui.info "- #{name}",:prefix => false
-        end
-      end
-
-      desc "validate [NAME]", "Validates a box against vagrant compliancy rules"
-      method_option :debug,:type => :boolean , :default => false, :aliases => "-d", :desc => "enable debugging"
+      desc "validate [BOX_NAME]", "Validates a box against vagrant compliancy rules"
       method_option :tags, :type => :array , :default => %w{vagrant virtualbox puppet chef}, :aliases => "-t", :desc => "tags to validate"
       def validate(box_name)
         begin
-        venv=Veewee::Environment.new(options)
-        venv.ui = ::Veewee::UI::Shell.new(venv, shell)
-
-        venv.providers["virtualbox"].get_box(box_name).validate_vagrant(options)
+          venv=Veewee::Environment.new(options)
+          venv.ui = ::Veewee::UI::Shell.new(venv, shell)
+          venv.providers[@provider].get_box(box_name).validate_vagrant(options)
         rescue Veewee::Error => ex
           venv.ui.error(ex, :prefix => false)
           exit -1
         end
       end
 
-      desc "screenshot [NAME] [PNGFILENAME]", "Takes a screenshot of the box"
+      desc "screenshot [BOX_NAME] [PNGFILENAME]", "Takes a screenshot of the box"
       def screenshot(box_name,pngfilename)
         begin
-        venv=Veewee::Environment.new(options)
-        venv.ui = ::Veewee::UI::Shell.new(venv, shell)
+          venv=Veewee::Environment.new(options)
+          venv.ui = ::Veewee::UI::Shell.new(venv, shell)
 
-        venv.providers["virtualbox"].get_box(box_name).screenshot(pngfilename,options)
+          venv.providers[@provider].get_box(box_name).screenshot(pngfilename,options)
         rescue Veewee::Error => ex
           venv.ui.error(ex, :prefix => false)
           exit -1
         end
       end
-
-
     end
-
   end
 end

data/lib/veewee/config.rb

@@ -11,10 +11,8 @@ module Veewee
 
     def initialize(options)
       @env = options[:env]
-
       # Initialize with defaults
       @veewee = ::Veewee::Config::Veewee.new(self)
-
     end
 
     def define()
@@ -32,8 +30,9 @@ module Veewee
     def load_veewee_config()
       veewee_configurator = self
       begin
-        filename = File.join(Dir.pwd, "Veeweefile")
+        filename = @env.config_filepath
         if File.exists?(filename)
+          env.logger.info("Loading config file: #{filename}")
           veeweefile = File.read(filename)
           veeweefile["Veewee::Config.run"] = "veewee_configurator.define"
           #        http://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation

data/lib/veewee/config/ostypes.yml

@@ -110,7 +110,7 @@ FreeBSD:
   :vbox: FreeBSD
   :parallels: freebsd
 FreeBSD_64:
-  :fusion: FreeBSD_64
+  :fusion: freebsd-64
   :kvm:
   :vbox: FreeBSD_64
   :parallels: freebsd
@@ -333,3 +333,23 @@ NetBSD_64:
   :kvm:
   :vbox: NetBSD_64
   :parallels: other
+ESXi5:
+  :fusion: vmkernel5 
+  :kvm:
+  :vbox: 
+  :parallels: 
+Darwin_10_7:
+  :fusion: darwin11
+  :kvm:
+  :vbox:
+  :parallels:
+Darwin_10_7_64:
+  :fusion: darwin11-64
+  :kvm:
+  :vbox:
+  :parallels:
+Darwin_10_8_64:
+  :fusion: darwin12-64
+  :kvm:
+  :vbox:
+  :parallels:

data/lib/veewee/definition.rb

@@ -9,9 +9,12 @@ module Veewee
     attr_accessor :name
     attr_accessor :env
     attr_accessor :path
+    attr_accessor :params
 
-    attr_accessor :cpu_count, :memory_size, :video_memory_size, :iso_file
-    attr_accessor :disk_size, :disk_format, :disk_variant
+    attr_writer   :cpu_count, :memory_size
+
+    attr_accessor :video_memory_size, :iso_file
+    attr_accessor :disk_size, :disk_format, :disk_variant, :disk_count
 
     attr_accessor :os_type_id
 
@@ -34,7 +37,7 @@ module Veewee
 
     attr_accessor :use_hw_virt_ext, :use_pae, :hostiocache, :use_sata
 
-    attr_accessor :iso_dowload_timeout, :iso_src, :iso_md5, :iso_download_instructions
+    attr_accessor :iso_dowload_timeout, :iso_src, :iso_md5, :iso_sha1 , :iso_download_instructions
 
     attr_accessor :virtualbox
     attr_accessor :vmfusion
@@ -42,6 +45,11 @@ module Veewee
     attr_accessor :add_shares
     attr_accessor :vmdk_file
 
+    attr_accessor :skip_iso_transfer
+    attr_accessor :skip_nat_mapping
+
+    attr_accessor :force_ssh_port
+
     def ui
       return @_ui if defined?(@_ui)
       @_ui = @env.ui.dup
@@ -60,11 +68,11 @@ module Veewee
         @path = path
       end
 
-      # Default is 1 CPU + 256 Mem of memory + 8 Mem of video memory
-      @cpu_count = '1' ; @memory_size = '256'; @video_memory_size = '8'
+      # Default is 1 CPU + 256 MB of memory + 10 MB of video memory
+      @cpu_count = '1' ; @memory_size = '256'; @video_memory_size = '10'
 
       # Default there is no ISO file mounted
-      @iso_file = nil, @iso_src = nil ; @iso_md5 = nil ; @iso_download_timeout = 1000 ; @iso_download_instructions = nil
+      @iso_file = nil, @iso_src = nil ; @iso_md5 = nil ; @iso_sha1;  @iso_download_timeout = 1000 ; @iso_download_instructions = nil
 
       # Shares to add
       @add_shares = []
@@ -77,7 +85,7 @@ module Veewee
       @postinstall_files = [] ; @postinstall_timeout = 10000 ;
 
       @iso_file = ""
-      @disk_size = '10240' ; @disk_format = 'VDI' ; @disk_variant = 'Standard'
+      @disk_size = '10240' ; @disk_format = 'VDI' ; @disk_variant = 'Standard' ; @disk_count = 1
       @use_sata = true
 
       #        :hostiocache => 'off' ,
@@ -97,6 +105,13 @@ module Veewee
       @vmfusion = { :vm_options => {} }
       @kvm = { :vm_options => {} }
 
+      @skip_iso_transfer = false
+
+      @skip_nat_mapping = false
+
+      @force_ssh_port = false
+
+      @params = {}
     end
 
 
@@ -188,6 +203,26 @@ module Veewee
       return true
     end
 
+    def memory_size
+      if ENV['VEEWEE_MEMORY_SIZE'].nil?
+        return @memory_size
+      else
+        return ENV['VEEWEE_MEMORY_SIZE'].to_i
+      end
+    end
+
+    def cpu_count
+      if ENV['VEEWEE_CPU_COUNT'].nil?
+        return @cpu_count
+      else
+        return ENV['VEEWEE_CPU_COUNT'].to_i
+      end
+    end
+
+    def box
+      env.get_box(name)
+    end
+
     private
 
     def ostype_valid?
@@ -199,9 +234,5 @@ module Veewee
       end
     end
 
-    def method_missing(m, *args, &block)
-      env.logger.info "There's no attribute #{m} defined for definition #{@name}-- ignoring it"
-    end
-
   end #End Class
 end #End Module