veewee 0.3.0.alpha6 → 0.3.0.alpha7

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

@@ -12,13 +12,13 @@ module Veewee
 
         def send_virtualbox_sequence(sequence)
 
-          env.ui.info ""
+          ui.info ""
 
           counter=0
           sequence.each { |s|
             counter=counter+1
 
-            env.ui.info "Typing:[#{counter}]: "+s
+            ui.info "Typing:[#{counter}]: "+s
 
             keycodes=Veewee::Provider::Core::Helper::Scancode.string_to_keycode(s)
 
@@ -38,8 +38,8 @@ module Veewee
             sleep 0.5
           }
 
-          env.ui.info "Done typing."
-          env.ui.info ""
+          ui.info "Done typing."
+          ui.info ""
 
         end
 
@@ -48,10 +48,10 @@ module Veewee
           env.logger.info "#{command}"
           sshresult=shell_exec("#{command}",{:mute => true})
           unless sshresult.stdout.index("E_ACCESSDENIED").nil?
-            env.ui.error "There was an error typing the commands on the console"
-            env.ui.error "Probably the VM did not get started."
-            env.ui.error ""
-            env.ui.error "#{sshresult.stdout}"
+            ui.error "There was an error typing the commands on the console"
+            ui.error "Probably the VM did not get started."
+            ui.error ""
+            ui.error "#{sshresult.stdout}"
             exit -1
           end
         end

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

@@ -66,7 +66,7 @@ module Veewee
 
 
         def create_disk
-            env.ui.info "Creating new harddrive of size #{definition.disk_size.to_i} "
+            ui.info "Creating new harddrive of size #{definition.disk_size.to_i} "
 
 
             place=get_vbox_home
@@ -81,7 +81,7 @@ module Veewee
           location=name+"."+definition.disk_format.downcase
 
           location="#{File.join(place,name,location)}"
-          env.ui.info "Attaching disk: #{location}"
+          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}\""
@@ -92,14 +92,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}"
+          ui.info "Mounting cdrom: #{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}"
+          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}\""
           shell_exec("#{command}")
         end
@@ -137,7 +137,7 @@ module Veewee
           #Exec and system stop the execution here
           shell_exec("#{command}")
 
-          env.ui.info "Creating vm #{name} : #{definition.memory_size}M - #{definition.cpu_count} CPU - #{vbox_os_type_id(definition.os_type_id)}"
+          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}"
@@ -157,8 +157,8 @@ module Veewee
           vm_flags.each do |vm_flag|
             if definition.instance_variable_defined?("@#{vm_flag}")
               vm_flag_value=definition.instance_variable_get("@#{vm_flag}")
-              env.ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
-              env.ui.warn "Used of #{vm_flag} is deprecated - specify your options in :virtualbox => { : vm_options => [\"#{vm_flag}\" => \"#{vm_flag_value}\"]}"
+              ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
+              ui.warn "Used of #{vm_flag} is deprecated - specify your options in :virtualbox => { : vm_options => [\"#{vm_flag}\" => \"#{vm_flag_value}\"]}"
               command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"
               shell_exec("#{command}")
             end
@@ -166,7 +166,7 @@ module Veewee
 
           unless definition.virtualbox[:vm_options][0].nil?
             definition.virtualbox[:vm_options][0].each do |vm_flag,vm_flag_value|
-              env.ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
+              ui.info "Setting VM Flag #{vm_flag} to #{vm_flag_value}"
               command="#{@vboxcmd} modifyvm #{name} --#{vm_flag.to_s} #{vm_flag_value}"
               shell_exec("#{command}")
             end

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

@@ -7,7 +7,7 @@ module Veewee
           version=self.vbox_version
           isofile="VBoxGuestAdditions_#{version}.iso"
           url="http://download.virtualbox.org/virtualbox/#{version}/#{isofile}"
-          env.ui.info "Downloading vbox guest additions iso v #{version} - #{url}"
+          ui.info "Downloading vbox guest additions iso v #{version} - #{url}"
           download_iso(url,isofile)
         end
 

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

@@ -6,7 +6,7 @@ module Veewee
         def poweroff(options={})
           # If the vm is not powered off, perform a shutdown
           if (self.exists? && self.running?)
-            env.ui.info "Shutting down vm #{name}"
+            ui.info "Shutting down vm #{name}"
             #We force it here, maybe vm.shutdown is cleaner
             command="#{@vboxcmd} controlvm \"#{name}\" poweroff"
             shell_exec("#{command}")

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

@@ -6,7 +6,7 @@ module Veewee
         def up(options={})
 
           unless self.exists?
-            env.ui.error "Error:: You tried to up a non-existing box '#{name}'"
+            ui.error "Error:: You tried to up a non-existing box '#{name}'"
             exit -1
           end
 
@@ -23,7 +23,7 @@ module Veewee
             if guessed_port!=forward[:guest_port]
               # Remove the existing one
               self.delete_forwarding("guestssh")
-              env.ui.warn "Changing ssh port from #{forward[:guest_port]} to #{guessed_port}"
+              ui.warn "Changing ssh port from #{forward[:guest_port]} to #{guessed_port}"
               self.add_ssh_nat_mapping
             end
           else

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

@@ -6,7 +6,7 @@ module Veewee
         def validate_vagrant(options)
 
           unless self.running?
-            env.ui.error "Error:: You tried to validate box '#{name}' but it is not running"
+            ui.error "Error:: You tried to validate box '#{name}' but it is not running"
             exit -1
           end
 
@@ -40,8 +40,8 @@ module Veewee
           rescue SystemExit => e
             Kernel.exit(e.status)
           rescue Exception => e
-            env.ui.error("#{e.message} (#{e.class})")
-            env.ui.error(e.backtrace.join("\n"))
+            ui.error("#{e.message} (#{e.class})")
+            ui.error(e.backtrace.join("\n"))
             Kernel.exit(1)
           end
 

data/lib/veewee/providers.rb

@@ -19,7 +19,7 @@ module Veewee
              rescue ::Veewee::Error => e
                 raise
              rescue Error => e
-               env.ui.error "Error loading provider with #{name},#{$!}"
+               env.ui.error "Error loading provider with #{name},#{$!}",:prefix => false
              end
       end
 

data/lib/veewee/ui.rb

@@ -5,6 +5,7 @@ module Veewee
   # of `warn`, `error`, `info`, and `success`.
   class UI
     attr_accessor :env
+    attr_accessor :resource
 
     def initialize(env)
       @env = env
@@ -71,6 +72,7 @@ module Veewee
       def format_message(message, opts=nil)
         opts = { :prefix => true }.merge(opts || {})
         opts[:prefix]=false if env.resource=="veewee"
+        opts[:prefix]=false if env.resource=="vagrant"
         message = "[#{env.resource}] #{message}" if opts[:prefix]
         message
       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.alpha6"
+  ::Veewee::VERSION="0.3.0.alpha7"
 end

data/templates/CentOS-5.7-i386-netboot/definition.rb

@@ -3,7 +3,7 @@ Veewee::Session.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
   :iso_file => "CentOS-5.7-i386-netinstall.iso",
-  :iso_src => "http://mirror.atlanticmetro.net/centos/5.7/isos/i386/CentOS-5.7-i386-netinstall.iso",
+  :iso_src => "http://vault.centos.org/5.7/isos/i386/CentOS-5.7-i386-netinstall.iso",
   :iso_md5 => "11222d9134cdfc101f6f91fe544254c9",
   :iso_download_timeout => 1000,
   :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],

data/templates/CentOS-5.7-i386-netboot/ks.cfg

@@ -1,7 +1,7 @@
 # Kickstart file automatically generated by anaconda.
 
 install
-url --url=http://mirror.atlanticmetro.net/centos/5.7/os/i386
+url --url=http://vault.centos.org/5.7/os/i386
 lang en_US.UTF-8
 langsupport --default=en_US.UTF-8 en_US.UTF-8
 keyboard us

data/templates/Debian-6.0.3-amd64-netboot/definition.rb

@@ -4,7 +4,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
   :iso_file => "debian-6.0.3-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.3/amd64/iso-cd/debian-6.0.3-amd64-netinst.iso",
+  :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.3/amd64/iso-cd/debian-6.0.3-amd64-netinst.iso",
   :iso_md5 => "b663727d7f5b572c329cea8e2ff5e29c",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/Debian-6.0.3-i386-netboot/definition.rb

@@ -6,7 +6,7 @@ Veewee::Definition.declare({
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
   :iso_file => "debian-6.0.3-i386-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/6.0.3/i386/iso-cd/debian-6.0.3-i386-netinst.iso",
+  :iso_src => "http://cdimage.debian.org/cdimage/archive/6.0.3/i386/iso-cd/debian-6.0.3-i386-netinst.iso",
   :iso_md5 => "bf10748a0b867912727b248d2e21e8ba",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [

metadata

@@ -2,7 +2,7 @@
 name: veewee
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.3.0.alpha6
+  version: 0.3.0.alpha7
 platform: ruby
 authors: 
 - Patrick Debois
@@ -260,6 +260,7 @@ files:
 - lib/veewee/command/vagrant/templates.rb
 - lib/veewee/command/vagrant/undefine.rb
 - lib/veewee/command/vagrant/up.rb
+- lib/veewee/command/vagrant/validate.rb
 - lib/veewee/command/version.rb
 - lib/veewee/command/virtualbox.rb
 - lib/veewee/command/vmfusion.rb
@@ -916,7 +917,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1280042332517595849
+      hash: 71648237759924019
       segments: 
       - 0
       version: "0"