veewee 0.3.0.alpha6 → 0.3.0.alpha7

data/lib/veewee/command/kvm.rb

@@ -74,7 +74,7 @@ module Veewee
           venv.undefine(definition_name,options)
           venv.definitions.undefine(definition_name,options)
         rescue Error => ex
-          env.ui.error "#{ex}"
+          env.ui.error("#{ex}", :prefix=> false)
           exit -1
         end
       end

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

@@ -10,6 +10,7 @@ require 'veewee/command/vagrant/halt'
 require 'veewee/command/vagrant/ssh'
 require 'veewee/command/vagrant/define'
 require 'veewee/command/vagrant/undefine'
+require 'veewee/command/vagrant/validate'
 require 'veewee/command/vagrant/export'
 
 
@@ -34,6 +35,7 @@ module Veewee
           @subcommands.register(:define)    { Veewee::Command::Vagrant::Define }
           @subcommands.register(:undefine)    { Veewee::Command::Vagrant::Undefine }
           @subcommands.register(:export)    { Veewee::Command::Vagrant::Export }
+          @subcommands.register(:validate)    { Veewee::Command::Vagrant::Validate }
 
         end
 

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

@@ -53,7 +53,7 @@ module Veewee
             venv.ui=@env.ui
             venv.providers["virtualbox"].get_box(argv[0]).build(options)
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex, :prefix => false)
             exit -1
           end
 

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

@@ -37,7 +37,7 @@ module Veewee
             venv.ui.info "You can now edit the definition files stored in definitions/#{definition_name} or build the box with:"
             venv.ui.info "vagrant basebox build '#{definition_name}'"
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -36,7 +36,7 @@ module Veewee
             venv.ui=@env.ui
             venv.providers["virtualbox"].get_box(argv[0]).destroy(options)
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -33,7 +33,7 @@ module Veewee
             box_name=argv[0]
             venv.providers["virtualbox"].get_box(box_name).export_vagrant(options)
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -32,7 +32,7 @@ module Veewee
             venv.ui=@env.ui
             venv.providers["virtualbox"].get_box(argv[0]).halt(options)
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -25,10 +25,10 @@ module Veewee
             venv=Veewee::Environment.new(options)
             venv.ui = @env.ui
             venv.definitions.each do |name,definition|
-              venv.ui.info "- #{name}"
+              venv.ui.info("- #{name}", :prefix => false)
             end
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
         end

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

@@ -25,10 +25,10 @@ module Veewee
             venv=Veewee::Environment.new(options)
             venv.ui = @env.ui
             venv.ostypes.each do |name|
-              venv.ui.info "- #{name}"
+              venv.ui.info("- #{name}", :prefix => false)
             end
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
         end

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

@@ -21,14 +21,13 @@ module Veewee
           # Parse the options
           argv = parse_options(opts)
           return if !argv
-          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 2
 
           begin
             venv=Veewee::Environment.new(options)
             venv.ui=@env.ui
             venv.providers["virtualbox"].get_box(argv[0]).issh(arg[1])
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -24,12 +24,12 @@ module Veewee
           begin
             venv=Veewee::Environment.new(options)
             venv.ui = @env.ui
-            venv.ui.info "The following templates are available:"
+            venv.ui.info("The following templates are available:",:prefix => false)
             venv.templates.each do |name,template|
-              venv.ui.info "vagrant basebox define '<boxname>' '#{name}'",:prefix => false
+              venv.ui.info("vagrant basebox define '<boxname>' '#{name}'",:prefix => false)
             end
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
         end

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

@@ -28,9 +28,9 @@ module Veewee
             venv.ui=@env.ui
             definition_name=argv[0]
             venv.definitions.undefine(definition_name,options)
-            venv.ui.info "Definitio '#{definition_name}' succesfully removed"
+            venv.ui.info("Definition '#{definition_name}' succesfully removed",:prefix => false)
           rescue Veewee::Error => ex
-            venv.ui.error ex
+            venv.ui.error(ex,:prefix => false)
             exit -1
           end
 

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

@@ -31,7 +31,7 @@ module Veewee
           begin
             venv=Veewee::Environment.new(options)
             venv.ui=@env.ui
-            venv.providers["virtualbox"].get_box(argv[0]).start(options)
+            venv.providers["virtualbox"].get_box(argv[0]).up(options)
           rescue Veewee::Error => ex
             venv.ui.error ex
             exit -1

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

@@ -0,0 +1,44 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    module Vagrant
+      class Validate < ::Vagrant::Command::Base
+        def execute
+          options = {}
+
+          opts = OptionParser.new do |opts|
+            opts.banner = "Validates a box against vagrant compliancy rules"
+            opts.separator ""
+            opts.separator "Usage: vagrant basebox validate <boxname>"
+
+            opts.on("-d", "--debug", "enable debugging") do |d|
+              options['debug'] = d
+            end
+
+            opts.on("-f", "--force", "force overwrite") do |f|
+              options['force'] = f
+            end
+
+          end
+
+          # Parse the options
+          argv = parse_options(opts)
+          return if !argv
+          raise ::Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+          begin
+            venv=Veewee::Environment.new(options)
+            venv.ui=@env.ui
+            box_name=argv[0]
+            venv.providers["virtualbox"].get_box(box_name).validate_vagrant(options)
+          rescue Veewee::Error => ex
+            venv.ui.error(ex,:prefix => false)
+            exit -1
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/veewee/command/virtualbox.rb

@@ -75,7 +75,7 @@ module Veewee
           venv.definitions.undefine(definition_name,options)
           env.ui.info "Definition #{definition_name} succesfully removed" , :prefix => false
         rescue Error => ex
-          env.ui.error "#{ex}",:prefix => false
+          env.ui.error("#{ex}",:prefix => false)
           exit -1
         end
       end
@@ -108,7 +108,7 @@ module Veewee
         venv=Veewee::Environment.new(options)
         venv.ui=env.ui
         venv.definitions.each do |name,definition|
-          env.ui.info "- #{name}"
+          env.ui.info "- #{name}",:prefix => false
         end
       end
 
@@ -121,7 +121,7 @@ module Veewee
 
         venv.providers["virtualbox"].get_box(box_name).validate_vagrant(options)
         rescue Veewee::Error => ex
-          venv.ui.error ex
+          venv.ui.error(ex, :prefix => false)
           exit -1
         end
       end

data/lib/veewee/config/definition.rb

@@ -14,20 +14,20 @@ module Veewee
         @env=config.env
         @components=Hash.new
       end
-      
+
       # Currently not used, this is in case we will specify the a definition in the Veeweefile
       # This is for future needs
       def define(name)
         # Depending on type, we create a variable of that type
         definition_stub=OpenStruct.new
 
-        begin        
+        begin
         # Get a real definition object
         real_definition=::Veewee::Definition.new(name,env)
         rescue Error => e
-          env.ui.error "Error loading provider with #{name},#{$!}"
+          env.ui.error("Error loading provider with #{name},#{$!}",:prefix => false)
         end
-        
+
         definition_stub.definition=real_definition
 
         env.logger.debug("config definition"){ "Start defining definition"}

data/lib/veewee/definition.rb

@@ -39,6 +39,14 @@ module Veewee
     attr_accessor :vmfusion
     attr_accessor :kvm
 
+
+    def ui
+      return @_ui if defined?(@_ui)
+      @_ui = @env.ui.dup
+      @_ui.resource = @name
+      @_ui
+    end
+
     def initialize(name,path,env)
 
       @name=name

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

@@ -30,6 +30,13 @@ module Veewee
 
         include ::Veewee::Provider::Core::BoxCommand
 
+        def ui
+          return @_ui if defined?(@_ui)
+          @_ui = @env.ui.dup
+          @_ui.resource = @name
+          @_ui
+        end
+
         def initialize(name,env)
           @env=env
           @name=name

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

@@ -7,9 +7,9 @@ module Veewee
 
           # Requires valid definition
 
-          env.ui.info "Building Box #{name} with Definition #{definition.name}:"
+          ui.info "Building Box #{name} with Definition #{definition.name}:"
           options.each do |name,value|
-            env.ui.info "- #{name} : #{value}"
+            ui.info "- #{name} : #{value}"
           end
 
           # Checking regexp of postinstall include/excludes
@@ -24,14 +24,14 @@ module Veewee
               self.destroy
               self.reload
             else
-              env.ui.error "you need to provide --force because the box #{name} already exists"
+              ui.error("you need to provide --force because the box #{name} already exists",:prefix => false)
               raise Veewee::Error,"you need to provide --force because the box #{name} already exists"
             end
           end
 
           # By now the box should have been gone, just checking again
           if self.exists?
-            env.ui.error "The box should have been deleted by now. Something went terribly wrong. Sorry"
+            ui.error("The box should have been deleted by now. Something went terribly wrong. Sorry",:prefix => false)
             raise Veewee::Error, "The box should have been deleted by now. Something went terribly wrong. Sorry"
           end
 
@@ -42,14 +42,14 @@ module Veewee
           self.up(options)
 
           # Waiting for it to boot
-          env.ui.info "Waiting #{definition.boot_wait.to_i} seconds for the machine to boot"
+          ui.info "Waiting #{definition.boot_wait.to_i} seconds for the machine to boot"
           sleep definition.boot_wait.to_i
 
           # Calculate an available kickstart port
           unless definition.kickstart_port.nil?
             guessed_port=guess_free_port(definition.kickstart_port.to_i,7199).to_s
             if guessed_port.to_s!=definition.kickstart_port
-              env.ui.warn "Changing kickstart port from #{definition.kickstart_port} to #{guessed_port}"
+              ui.warn "Changing kickstart port from #{definition.kickstart_port} to #{guessed_port}"
               definition.kickstart_port=guessed_port.to_s
             end
           end
@@ -78,9 +78,9 @@ module Veewee
           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
+          ui.success "The box #{name} was built succesfully!"
+          ui.info "You can now login to the box with:"
+          ui.info ssh_command_string
 
           return self
         end
@@ -164,10 +164,10 @@ module Veewee
           kickstartfiles=definition.kickstart_file
 
           if kickstartfiles.nil? || kickstartfiles.length == 0
-            env.ui.info "Skipping webserver as no kickstartfile was specified"
+            ui.info "Skipping webserver as no kickstartfile was specified"
           end
 
-          env.ui.info "Starting a webserver #{definition.kickstart_ip}:#{definition.kickstart_port}\n"
+          ui.info "Starting a webserver #{definition.kickstart_ip}:#{definition.kickstart_port}\n"
 
           # Check if the kickstart is an array or a single string
           if kickstartfiles.is_a?(String)
@@ -239,7 +239,7 @@ module Veewee
               self.scp(infofile.path,info[:filename])
               infofile.delete
             rescue RuntimeError => ex
-              env.ui.error "Error transfering file #{info[:filename]} failed, possible not enough permissions to write? #{ex}"
+              ui.error("Error transfering file #{info[:filename]} failed, possible not enough permissions to write? #{ex}",:prefix => false)
               raise Veewee::Error,"Error transfering file #{info[:filename]} failed, possible not enough permissions to write? #{ex}"
             end
           end

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

@@ -18,12 +18,12 @@ module Veewee
                 result=self.ssh_execute(self.ip_address,command,new_options)
                 return result
               rescue RuntimeError => ex
-                env.ui.error "Error executing command #{command} : #{ex}"
+                ui.error("Error executing command #{command} : #{ex}",:prefix => false)
                 raise Veewee::SshError, ex
               end
             end
           rescue Net::SSH::AuthenticationFailed => ex
-            env.ui.error "Authentication failure"
+            ui.error("Authentication failure",:prefix => false)
             raise Veewee::SshError, ex
           end
 

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

@@ -13,12 +13,12 @@ module Veewee
                 env.logger.info "About to transfer #{localfile} to #{remotefile} to the box #{name} - #{self.ip_address} - #{new_options}"
                 self.ssh_transfer_file(self.ip_address,localfile,remotefile,new_options)
               rescue RuntimeError => ex
-                env.ui.error "Error transfering file #{localfile} failed, possible not enough permissions to write? #{ex}"
+                ui.error("Error transfering file #{localfile} failed, possible not enough permissions to write? #{ex}",:prefix => false)
                 raise Veewee::SshError,ex
               end
             end
           rescue Net::SSH::AuthenticationFailed => ex
-            env.ui.error "Authentication failure"
+            ui.error("Authentication failure",:prefix => false)
             raise Veewee::SshError,ex
           end
 

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

@@ -20,7 +20,7 @@ module Veewee
               fg_exec(ssh_command,options)
 
             else
-              env.ui.error "Can't ssh into '#{@name} as we couldn't figure out it's ip-address"
+              ui.error("Can't ssh into '#{@name} as we couldn't figure out it's ip-address",:prefix => false)
             end
           else
             ssh_options={:user => definition.ssh_user,:password => definition.ssh_password, :port => definition.ssh_host_port}

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

@@ -16,7 +16,7 @@ module Veewee
         sequence.each { |s|
           counter=counter+1
 
-          env.ui.info "Typing:[#{counter}]: "+s
+          ui.info "Typing:[#{counter}]: "+s
 
           keycodes=string_to_vnccode(s)
 
@@ -29,8 +29,8 @@ module Veewee
             end
         }
         vnc.close
-        env.ui.info "Done typing."
-        env.ui.info ""
+        ui.info "Done typing."
+        ui.info ""
 
       end
 

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

@@ -11,15 +11,15 @@ module Veewee
 
           def download_iso(url,filename)
             if !File.exists?(env.config.veewee.iso_dir)
-              env.ui.info "Creating an iso directory"
+              ui.info "Creating an iso directory"
               FileUtils.mkdir(env.config.veewee.iso_dir)
             end
-            env.ui.info "Checking if isofile #{filename} already exists."
+            ui.info "Checking if isofile #{filename} already exists."
             full_path=File.join(env.config.veewee.iso_dir,filename)
-            env.ui.info "Full path: #{full_path}"
+            ui.info "Full path: #{full_path}"
             if File.exists?(full_path)
-              env.ui.info ""
-              env.ui.info "The isofile #{filename} already exists."
+              ui.info ""
+              ui.info "The isofile #{filename} already exists."
             else
               download_progress(url,full_path)
             end
@@ -39,7 +39,7 @@ module Veewee
             }) { |src|
               # We assume large 10K files, so this is tempfile object 
               env.logger.info "#{src.class}"
-                env.ui.info "Moving #{src.path} to #{localfile}"
+                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
@@ -58,7 +58,7 @@ module Veewee
               counter = 0
               while (!io.eof)
                 readBuf = io.readpartial(buflen)
-                env.ui.info('.',{:new_line => false}) if ((counter+=1) % 20000 == 0)
+                env.ui.info('.',{:new_line => false,:prefix => false }) if ((counter+=1) % 20000 == 0)
                 checksum.update(readBuf)
               end
             end
@@ -71,51 +71,51 @@ module Veewee
             full_path=File.join(env.config.veewee.iso_dir,filename)
 
             if File.exists?(full_path)
-              env.ui.info ""
-              env.ui.info "The isofile #{filename} already exists."
+              ui.info ""
+              ui.info "The isofile #{filename} already exists."
             else
 
               path1=Pathname.new(full_path)
               path2=Pathname.new(Dir.pwd)
               rel_path=path1.relative_path_from(path2).to_s
 
-              env.ui.info ""
-              env.ui.info "We did not find an isofile in <currentdir>/iso. \n\nThe definition provided the following download information:"
+              ui.info ""
+              ui.info "We did not find an isofile in <currentdir>/iso. \n\nThe definition provided the following download information:"
               unless "#{self.iso_src}"==""
-                env.ui.info "- Download url: #{self.iso_src}"
+                ui.info "- Download url: #{self.iso_src}"
               end
-              env.ui.info "- Md5 Checksum: #{self.iso_md5}"
-              env.ui.info "#{self.iso_download_instructions}"
-              env.ui.info ""
+              ui.info "- Md5 Checksum: #{self.iso_md5}"
+              ui.info "#{self.iso_download_instructions}"
+              ui.info ""
 
               if self.iso_src == ""
-                env.ui.info "Please follow the instructions above:"
-                env.ui.info "- to get the ISO"
-                env.ui.info" - put it in <currentdir>/iso"
-                env.ui.info "- then re-run the command"
-                env.ui.info ""
+                ui.info "Please follow the instructions above:"
+                ui.info "- to get the ISO"
+                ui.info" - put it in <currentdir>/iso"
+                ui.info "- then re-run the command"
+                ui.info ""
                 raise Veewee::Error, "No ISO src is available, can't download it automatically"
               else
                 answer=nil
                 answer="yes" if options["auto"]==true
                 env.logger.info "Auto download enabled?#{answer} #{!options['auto'].nil?}"
                 if answer.nil?
-                  answer=env.ui.ask("Download? (Yes/No)") {|q| q.default="No"}
+                  answer=ui.ask("Download? (Yes/No)") {|q| q.default="No"}
                 end
 
                 if answer.downcase == "yes"
                   begin
                     download_iso(self.iso_src,filename)
                   rescue OpenURI::HTTPError => ex
-                    env.ui.error "There was an error downloading #{self.iso_src}:"
-                    env.ui.error "#{ex}"
+                    ui.error "There was an error downloading #{self.iso_src}:"
+                    ui.error "#{ex}"
                     raise Veewee::Error, "There was an error downloading #{self.iso_src}:\n#{ex}"
                   end
                 else
-                  env.ui.info "You have selected manual download: "
-                  env.ui.info "curl -C - -L '#{self.iso_src}' -o '#{rel_path}'"
-                  env.ui.info "md5 '#{rel_path}' "
-                  env.ui.info ""
+                  ui.info "You have selected manual download: "
+                  ui.info "curl -C - -L '#{self.iso_src}' -o '#{rel_path}'"
+                  ui.info "md5 '#{rel_path}' "
+                  ui.info ""
                   exit
                 end
 
@@ -123,12 +123,12 @@ module Veewee
                   raise Veewee::Error, "The provided iso #{full_path} is not readable"
                 end
 
-                env.ui.info "Verifying md5 checksum : #{self.iso_md5}"
+                ui.info "Verifying md5 checksum : #{self.iso_md5}"
                 file_md5=hashsum(full_path)
 
                 unless file_md5==self.iso_md5
-                  env.ui.error "The MD5 checksums for file #{filename } do not match: "
-                  env.ui.error "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
+                  ui.error "The MD5 checksums for file #{filename } do not match: "
+                  ui.error "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
                   raise Veewee::Error, "The MD5 checksums for file #{filename } do not match: \n"+ "- #{file_md5} (current) vs #{self.iso_md5} (specified)"
                 end