veewee 0.3.0.alpha5 → 0.3.0.alpha6

data/README.md

@@ -1,24 +1,3 @@
-# Note: due to a miss manipulation on my side, the veewee03 branch got merged with master
-# Therefore the current state of the masterbranch on github is highly unstable
-
-To refer to the old master, I've put up the state before the error at
-<https://github.com/jedi4ever/veewee-old>
-
--------
-
-Maintaining two branches with complete different structures isn't fun. So..... I want to merge the two.
-
-Veewee03 will bring many new features:
-
-- kvm and vmware fusion support -
-- veewee as a standalone tool tool if you don't use virtualbox,vagrant 
-- postinstall scripts can now be toggle with --include and --exclude
-
-Caveat: it's alpha-functional but not as polished as the previous version. But I'm sure with your help this won't take long.
-
-My apologies for all the pull-requests to the previous version that will not be merged automatically. I'm focusing more on get this version stable and will incorporate the ideas later (some already are)
-
----
 **VeeWee:** the tool to easily build vagrant base boxes or kvm,virtualbox and fusion images
 
 Vagrant is a great tool to test new things or changes in a virtual machine(Virtualbox) using either chef or puppet.
@@ -52,3 +31,7 @@ People have reported good experiences, why don't you give it a try?
 IDEAS:
 
 - Now you integrate this with your CI build to create a daily basebox
+
+[whren - 2012/04/12]
+
+See [use of pre_postinstall_file in defition.rb](https://github.com/whren/veewee/wiki/Use-of-pre_postinstall_file-in-definition.rb)

data/doc/README-changes.txt

@@ -1,5 +1,6 @@
 Changelog
   now has include-postinstall, exclude-postinstall
+  now has pre_postinstall_file allowing pre postinstall execution (ie to export http_proxy, https_proxy)
   ostypes are now synchronized accross kvm
   require libvirt 0.8+ version 
   user veewee instead of vagrant
@@ -13,7 +14,7 @@ Todo:
   validate vms - + features selection
   check libvirt version
   windows test
-  validation of checks (also - inclide/exclude)
+  validation of checks (also - include/exclude)
   check execs with exit code
   multinetwork card 
   dkms for kernel installs

data/doc/TODO

@@ -54,7 +54,7 @@ Todo:
   validate vms - + features selection
   check libvirt version
   windows test
-  validation of checks (also - inclide/exclude)
+  validation of checks (also - include/exclude)
   check execs with exit code
   multinetwork card 
   dkms for kernel installs

data/lib/fission/vm.rb

@@ -327,7 +327,9 @@ module Fission
 
         unless File.binary?(file)
           text = (File.read file).gsub from, to
-          File.open(file, 'w'){ |f| f.print text }
+          # Force binary mode to prevent windows from putting CR-LF end line style
+          # http://www.ruby-forum.com/topic/60697#58748
+          File.open(file, 'wb'){ |f| f.print text }
         end
 
       end
@@ -349,7 +351,9 @@ module Fission
       content=content+"uuid.action = \"create\"\n"
 
       # Now rewrite the vmx file
-      File.open(new_vmx_file,'w'){ |f| f.print content}
+      # Force binary mode to prevent windows from putting CR-LF end line style
+      # http://www.ruby-forum.com/topic/60697#58748
+      File.open(new_vmx_file,'wb'){ |f| f.print content}
 
     end
 

data/lib/veewee/definition.rb

@@ -24,6 +24,8 @@ module Veewee
     attr_accessor :sudo_cmd
     attr_accessor :shutdown_cmd
 
+    attr_accessor :pre_postinstall_file
+
     attr_accessor :postinstall_files, :postinstall_timeout
 
     attr_accessor :floppy_files
@@ -58,6 +60,7 @@ module Veewee
       @floppy_files = nil
 
       # Default there are no post install files
+      @pre_postinstall_file = nil
       @postinstall_files=[]; @postinstall_timeout = 10000;
 
       @iso_file=""

data/lib/veewee/provider/core/box/build.rb

@@ -38,7 +38,7 @@ module Veewee
           self.create(options)
 
           # Check the GUI mode required
-          env.logger.info "Provider asks the box to start: GUI enabled? #{!options[:nogui]}"
+          env.logger.info "Provider asks the box to start: GUI enabled? #{!options['nogui']}"
           self.up(options)
 
           # Waiting for it to boot
@@ -77,6 +77,7 @@ module Veewee
           self.transfer_buildinfo(options)
           self.handle_postinstall(options)
 
+
           env.ui.success "The box #{name} was built succesfully!"
           env.ui.info "You can now login to the box with:"
           env.ui.info ssh_command_string
@@ -157,7 +158,7 @@ module Veewee
         # It requires a definition to find all the necessary information
         def handle_kickstart(options)
 
-          # Filtering post install files based upon --postinstall-include and --postinstall--exclude
+            # Filtering post install files based upon --postinstall-include and --postinstall--exclude
           definition.postinstall_files=filter_postinstall_files(options)
           # Handling the kickstart by web
           kickstartfiles=definition.kickstart_file
@@ -190,13 +191,32 @@ module Veewee
         # This function handles all the post-install scripts
         # It requires a box(to login to) and a definition(listing the postinstall files)
         def handle_postinstall(options)
+          is_pre_postinstall_file = !definition.pre_postinstall_file.nil? && !definition.pre_postinstall_file.length != 0
+          transfered = false
           definition.postinstall_files.each do |postinstall_file|
             # Filenames of postinstall_files are relative to their definition
             filename=File.join(definition.path,postinstall_file)
             unless File.basename(postinstall_file)=~/^_/
               self.scp(filename,File.basename(filename))
               self.exec("chmod +x \"#{File.basename(filename)}\"")
-              self.exec(sudo("./"+File.basename(filename)))
+              if is_pre_postinstall_file
+                # Filename of pre_postinstall_file are relative to their definition
+                pre_filename=File.join(definition.path, definition.pre_postinstall_file)
+                # Upload the pre postinstall script if not already transfered
+                if !transfered
+                  self.scp(pre_filename,File.basename(pre_filename))
+                  transfered = true
+                  self.exec("chmod +x \"#{File.basename(pre_filename)}\"")
+                  # Inject the call to the real script by executing the first argument (it will be the postinstall script file name to be executed)
+                  self.exec("execute=\"\\n# We must execute the script passed as the first argument\\n\\$1\" && printf \"%b\\n\" \"$execute\" >> #{File.basename(pre_filename)}")
+                end
+                command = "./" + File.basename(pre_filename)
+                command = sudo(command) + " ./"+File.basename(filename)
+              else
+                command = "./"+File.basename(filename)
+                command = sudo(command)
+              end
+              self.exec(command)
             else
               env.logger.info "Skipping postinstallfile #{postinstall_file}"
             end
@@ -210,6 +230,9 @@ module Veewee
           build_info.each do |info|
             begin
               infofile=Tempfile.open("#{info[:filename]}")
+              # Force binary mode to prevent windows from putting CR-LF end line style
+              # http://www.ruby-forum.com/topic/127453#568546
+              infofile.binmode
               infofile.puts "#{info[:content]}"
               infofile.rewind
               infofile.close

data/lib/veewee/provider/core/helper/iso.rb

@@ -40,6 +40,9 @@ module Veewee
               # We assume large 10K files, so this is tempfile object 
               env.logger.info "#{src.class}"
                 env.ui.info "Moving #{src.path} to #{localfile}"
+                # Force the close of the src stream to release handle before moving
+                # Not forcing the close may cause an issue on windows (Permission Denied)
+                src.close
                 FileUtils.mv(src.path,localfile)
                 #open(localfile,"wb") { |dst|
                   #dst.write(src.read)
@@ -51,7 +54,7 @@ module Veewee
           def hashsum(filename)
             checksum=Digest::MD5.new
             buflen=1024
-            open(filename, "r") do |io|
+            open(filename, "rb") do |io|
               counter = 0
               while (!io.eof)
                 readBuf = io.readpartial(buflen)

data/lib/veewee/provider/virtualbox/box/destroy.rb

@@ -19,7 +19,7 @@ module Veewee
             sleep 2
           end
 
-          command="#{@vboxcmd} unregistervm  '#{name}' --delete"
+          command="#{@vboxcmd} unregistervm  \"#{name}\" --delete"
           env.ui.info command
           env.ui.info "Deleting vm #{name}"
 
@@ -39,9 +39,9 @@ module Veewee
             if location.match(/#{pattern}/)
 
               if File.exists?(location)
-                command="#{@vboxcmd} closemedium disk '#{location}' --delete"
+                command="#{@vboxcmd} closemedium disk \"#{location}\" --delete"
               else
-                command="#{@vboxcmd} closemedium disk '#{location}'"
+                command="#{@vboxcmd} closemedium disk \"#{location}\""
               end
 
               env.ui.info "Deleting disk #{location}"

data/lib/veewee/provider/virtualbox/box/helper/console_type.rb

@@ -44,7 +44,7 @@ module Veewee
         end
 
         def send_keycode(keycode)
-          command= "#{@vboxcmd} controlvm '#{name}' keyboardputscancode #{keycode}"
+          command= "#{@vboxcmd} controlvm \"#{name}\" keyboardputscancode #{keycode}"
           env.logger.info "#{command}"
           sshresult=shell_exec("#{command}",{:mute => true})
           unless sshresult.stdout.index("E_ACCESSDENIED").nil?

data/lib/veewee/provider/virtualbox/box/helper/create.rb

@@ -4,21 +4,21 @@ module Veewee
       module BoxCommand
 
         def add_ide_controller
-          #unless => "${vboxcmd} showvminfo '${vname}' | grep 'IDE Controller' "
-          command ="#{@vboxcmd} storagectl '#{name}' --name 'IDE Controller' --add ide"
+          #unless => "${vboxcmd} showvminfo \"${vname}\" | grep \"IDE Controller\" "
+          command ="#{@vboxcmd} storagectl \"#{name}\" --name \"IDE Controller\" --add ide"
           shell_exec("#{command}")
         end
 
         def add_sata_controller
-          #unless => "${vboxcmd} showvminfo '${vname}' | grep 'SATA Controller' ";
-          command ="#{@vboxcmd} storagectl '#{name}' --name 'SATA Controller' --add sata --hostiocache #{definition.hostiocache} --sataportcount 1"
+          #unless => "${vboxcmd} showvminfo \"${vname}\" | grep \"SATA Controller\" ";
+          command ="#{@vboxcmd} storagectl \"#{name}\" --name \"SATA Controller\" --add sata --hostiocache #{definition.hostiocache} --sataportcount 1"
           shell_exec("#{command}")
         end
 
         def attach_serial_console
-          command ="#{@vboxcmd} modifyvm '#{name}' --uart1 0x3F8 4"
+          command ="#{@vboxcmd} modifyvm \"#{name}\" --uart1 0x3F8 4"
           shell_exec("#{command}")
-          command ="#{@vboxcmd} modifyvm '#{name}' --uartmode1 file '#{File.join(FileUtils.pwd,name+"-serial-console"+'.log')}'"
+          command ="#{@vboxcmd} modifyvm \"#{name}\" --uartmode1 file \"#{File.join(FileUtils.pwd,name+"-serial-console"+".log")}\""
           shell_exec("#{command}")
         end
 
@@ -26,20 +26,23 @@ module Veewee
 
           unless definition.nil?
             #Map SSH Ports
-            command="#{@vboxcmd} modifyvm '#{name}' --natpf#{self.natinterface} 'guestssh,tcp,,#{definition.ssh_host_port},,#{definition.ssh_guest_port}'"
+            command="#{@vboxcmd} modifyvm \"#{name}\" --natpf#{self.natinterface} \"guestssh,tcp,,#{definition.ssh_host_port},,#{definition.ssh_guest_port}\""
             shell_exec("#{command}")
           end
         end
 
         def add_shared_folder
-          command="#{@vboxcmd} sharedfolder add  '#{name}' --name 'veewee-validation' --hostpath '#{File.expand_path(env.validation_dir)}' --automount"
+          command="#{@vboxcmd} sharedfolder add  \"#{name}\" --name \"veewee-validation\" --hostpath \"#{File.expand_path(env.validation_dir)}\" --automount"
           shell_exec("#{command}")
         end
 
         def get_vbox_home
           command="#{@vboxcmd}  list  systemproperties"
           shell_results=shell_exec("#{command}")
-          location=shell_results.stdout.split(/\n/).grep(/Default machine/)[0].split(":")[1].strip
+          # On windows Default machine path would include a drive letter, then ':'.
+          # So here we tell to split no more than 2 elements to keep the full path
+          # This should work for all OS as we just need to separate the parameter name with first ':' from the value
+          location=shell_results.stdout.split(/\n/).grep(/Default machine/)[0].split(":", 2)[1].strip
           return location
         end
 
@@ -55,7 +58,7 @@ module Veewee
             ["GUI/UpdateCheckCount","60"]
           ]
           extraData.each do |data|
-            command="#{@vboxcmd} setextradata global '#{data[0]}' '#{data[1]}'"
+            command="#{@vboxcmd} setextradata global \"#{data[0]}\" \"#{data[1]}\""
             shell_results=shell_exec("#{command}")
           end
 
@@ -67,7 +70,7 @@ module Veewee
 
 
             place=get_vbox_home
-            command ="#{@vboxcmd} createhd --filename '#{File.join(place,name,name+"."+definition.disk_format.downcase)}' --size '#{definition.disk_size.to_i}' --format #{definition.disk_format.downcase}"
+            command ="#{@vboxcmd} createhd --filename \"#{File.join(place,name,name+"."+definition.disk_format.downcase)}\" --size \"#{definition.disk_size.to_i}\" --format #{definition.disk_format.downcase}"
             shell_exec("#{command}")
 
         end
@@ -80,8 +83,8 @@ module Veewee
           location="#{File.join(place,name,location)}"
           env.ui.info "Attaching disk: #{location}"
 
-          #command => "${vboxcmd} storageattach '${vname}' --storagectl 'SATA Controller' --port 0 --device 0 --type hdd --medium '${vname}.vdi'",
-          command ="#{@vboxcmd} storageattach '#{name}' --storagectl 'SATA Controller' --port 0 --device 0 --type hdd --medium '#{location}'"
+          #command => "${vboxcmd} storageattach \"${vname}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"${vname}.vdi\"",
+          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"SATA Controller\" --port 0 --device 0 --type hdd --medium \"#{location}\""
           shell_exec("#{command}")
 
         end
@@ -90,14 +93,14 @@ module Veewee
         def attach_isofile
           full_iso_file=File.join(env.config.veewee.iso_dir,definition.iso_file)
           env.ui.info "Mounting cdrom: #{full_iso_file}"
-          command ="#{@vboxcmd} storageattach '#{name}' --storagectl 'IDE Controller' --type dvddrive --port 0 --device 0 --medium '#{full_iso_file}'"
+          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"IDE Controller\" --type dvddrive --port 0 --device 0 --medium \"#{full_iso_file}\""
           shell_exec("#{command}")
         end
 
         def attach_guest_additions
           full_iso_file=File.join(env.config.veewee.iso_dir,"VBoxGuestAdditions_#{self.vbox_version}.iso")
           env.ui.info "Mounting guest additions: #{full_iso_file}"
-          command ="#{@vboxcmd} storageattach '#{name}' --storagectl 'IDE Controller' --type dvddrive --port 1 --device 0 --medium '#{full_iso_file}'"
+          command ="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"IDE Controller\" --type dvddrive --port 1 --device 0 --medium \"#{full_iso_file}\""
           shell_exec("#{command}")
         end
 
@@ -106,7 +109,7 @@ module Veewee
           # Create floppy controller
           unless definition.floppy_files.nil?
 
-            command="#{@vboxcmd} storagectl '#{name}' --name 'Floppy Controller' --add floppy"
+            command="#{@vboxcmd} storagectl \"#{name}\" --name \"Floppy Controller\" --add floppy"
             shell_exec("#{command}")
           end
         end
@@ -117,7 +120,7 @@ module Veewee
 
             # Attach floppy to machine (the vfd extension is crucial to detect msdos type floppy)
             floppy_file=File.join(definition.path,"virtualfloppy.vfd")
-            command="#{@vboxcmd} storageattach '#{name}' --storagectl 'Floppy Controller' --port 0 --device 0 --type fdd --medium '#{floppy_file}'"
+            command="#{@vboxcmd} storageattach \"#{name}\" --storagectl \"Floppy Controller\" --port 0 --device 0 --type fdd --medium \"#{floppy_file}\""
             shell_exec("#{command}")
           end
         end
@@ -129,7 +132,7 @@ module Veewee
         end
 
         def create_vm
-          command="#{@vboxcmd} createvm --name '#{name}' --ostype '#{vbox_os_type_id(definition.os_type_id)}' --register"
+          command="#{@vboxcmd} createvm --name \"#{name}\" --ostype \"#{vbox_os_type_id(definition.os_type_id)}\" --register"
 
           #Exec and system stop the execution here
           shell_exec("#{command}")
@@ -137,15 +140,15 @@ module Veewee
           env.ui.info "Creating vm #{name} : #{definition.memory_size}M - #{definition.cpu_count} CPU - #{vbox_os_type_id(definition.os_type_id)}"
 
           #setting cpu's
-          command="#{@vboxcmd} modifyvm '#{name}' --cpus #{definition.cpu_count}"
+          command="#{@vboxcmd} modifyvm \"#{name}\" --cpus #{definition.cpu_count}"
           shell_exec("#{command}")
 
           #setting memory size
-          command="#{@vboxcmd} modifyvm '#{name}' --memory #{definition.memory_size}"
+          command="#{@vboxcmd} modifyvm \"#{name}\" --memory #{definition.memory_size}"
           shell_exec("#{command}")
 
           #setting bootorder
-          command="#{@vboxcmd} modifyvm '#{name}' --boot1 disk --boot2 dvd --boot3 none --boot4 none"
+          command="#{@vboxcmd} modifyvm \"#{name}\" --boot1 disk --boot2 dvd --boot3 none --boot4 none"
           shell_exec("#{command}")
 
           # Modify the vm to enable or disable hw virtualization extensions

data/lib/veewee/provider/virtualbox/box/helper/forwarding.rb

@@ -4,7 +4,7 @@ module Veewee
       module BoxCommand
 
         def forwarding(name)
-          command="#{@vboxcmd} showvminfo --details --machinereadable '#{self.name}'"
+          command="#{@vboxcmd} showvminfo --details --machinereadable \"#{self.name}\""
           shell_results=shell_exec("#{command}")
           rules=shell_results.stdout.split(/\n/).grep(/^Forward/)
           result=nil
@@ -28,7 +28,7 @@ module Veewee
 
         def delete_forwarding(name)
           forward=self.forwarding(name)
-          command="#{@vboxcmd} controlvm '#{self.name}' natpf#{self.natinterface} delete #{name}"
+          command="#{@vboxcmd} controlvm \"#{self.name}\" natpf#{self.natinterface} delete #{name}"
           shell_results=shell_exec("#{command}")
         end
 

data/lib/veewee/provider/virtualbox/box/poweroff.rb

@@ -8,7 +8,7 @@ module Veewee
           if (self.exists? && self.running?)
             env.ui.info "Shutting down vm #{name}"
             #We force it here, maybe vm.shutdown is cleaner
-            command="#{@vboxcmd} controlvm '#{name}' poweroff"
+            command="#{@vboxcmd} controlvm \"#{name}\" poweroff"
             shell_exec("#{command}")
           end
         end

data/lib/veewee/provider/virtualbox/box/up.rb

@@ -10,7 +10,7 @@ module Veewee
             exit -1
           end
 
-          gui_enabled=options[:nogui]==true ? false : true
+          gui_enabled=options['nogui']==true ? false : true
 
           raise Veewee::Error,"Box is already running" if self.running?
 
@@ -35,9 +35,9 @@ module Veewee
           # Once assembled we start the machine
           env.logger.info "Started the VM with GUI Enabled? #{gui_enabled}"
 
-          command="#{@vboxcmd} startvm --type gui '#{name}'"
+          command="#{@vboxcmd} startvm --type gui \"#{name}\""
           unless (gui_enabled)
-            command="#{@vboxcmd} startvm --type headless '#{name}'"
+            command="#{@vboxcmd} startvm --type headless \"#{name}\""
           end
           shell_results=shell_exec("#{command}",{:mute => true})
         end

data/lib/veewee/version.rb

@@ -4,5 +4,5 @@ end
 
 # Only set the version constant if it wasn't set before
 unless defined?(Veewee::VERSION)
-  ::Veewee::VERSION="0.3.0.alpha5"
+  ::Veewee::VERSION="0.3.0.alpha6"
 end

data/veewee.gemspec

@@ -32,7 +32,10 @@ Gem::Specification.new do |s|
   s.add_dependency "fog", "~> 1.1.2"
   s.add_dependency "childprocess"
 
-  s.add_dependency "CFPropertyList", "~> 2.0.17"
+  # Modified dependency version, as libxml-ruby dependency has been removed in version 2.1.1
+  # See : https://github.com/ckruse/CFPropertyList/issues/14
+  # See : https://github.com/jedi4ever/veewee/issues/6
+  s.add_dependency "CFPropertyList", ">= 2.1.1"
 #  s.add_dependency "libvirt"
   s.add_dependency "rspec",    "~> 2.5"
 

metadata

@@ -2,7 +2,7 @@
 name: veewee
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.3.0.alpha5
+  version: 0.3.0.alpha6
 platform: ruby
 authors: 
 - Patrick Debois
@@ -149,9 +149,9 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.17
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: *id013
@@ -916,7 +916,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2945739560758709107
+      hash: -1280042332517595849
       segments: 
       - 0
       version: "0"