veewee 0.1.12 → 0.1.13

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.12)
-      cucumber
+    veewee (0.1.13)
+      cucumber (= 0.8.5)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
       progressbar
-      rspec
       thor (~> 0.14.6)
       vagrant (~> 0.7.0)
 
@@ -38,21 +37,13 @@ GEM
     mario (0.0.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.1.0)
+    net-ssh (2.1.2)
     open4 (1.0.1)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     progressbar (0.9.0)
     rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     trollop (1.16.2)

data/lib/vagrant_init.rb

@@ -1 +1,6 @@
-require 'veewee'
+begin
+  require 'veewee'
+rescue LoadError
+  require 'rubygems'
+  require 'veewee'
+end

data/lib/veewee/session.rb

@@ -492,6 +492,11 @@ module Veewee
 
         #Exec and system stop the execution here
         Veewee::Shell.execute("#{command}")
+
+        #Set a shared folder for validation
+        command="#{@vboxcmd} sharedfolder add  '#{boxname}' --name 'veewee-validation' --hostpath '#{File.expand_path(@veewee_dir)}/validation' --automount"    
+
+        Veewee::Shell.execute("#{command}")
         
       end
 
@@ -818,7 +823,7 @@ module Veewee
  
           #Need to look it up again because if it was an initial load
           vm=VirtualBox::VM.find(boxname) 
-          puts "Step [#{current_step_nr}] was succesfull - saving state"
+          puts "Step [#{current_step_nr}] was succesfully - saving state"
           vm.save_state
           sleep 2 #waiting for it to be ok
           #puts "about to snapshot #{vm}"

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

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

@@ -12,7 +12,6 @@ Veewee::Session.declare( {
   :boot_wait => "10",:boot_cmd_sequence => [
      '<Esc>',
      'install ',
-     'acpi=off noapic nolapic ',
      'preseed/url=http://%IP%:%PORT%/preseed.cfg ',
      'debian-installer=en_US ',
      'auto ',
@@ -36,7 +35,7 @@ Veewee::Session.declare( {
   :ssh_host_port => "7222",
   :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
-  :shutdown_cmd => "shutdown -H",
+  :shutdown_cmd => "halt -p",
   :postinstall_files => [ "postinstall.sh" ],
   :postinstall_timeout => "10000"
  }

data/templates/Debian-6.0-amd64-netboot/postinstall.sh

@@ -8,7 +8,7 @@ apt-get clean
 
 #Setting up sudo
 cp /etc/sudoers /etc/sudoers.orig
-sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
+sed -i -e 's/%sudo ALL=(ALL) ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers
 
 #Installing ruby
 wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz

data/templates/{freebsd-8.1-experimental → freebsd-8.2-experimental}/definition.rb

@@ -2,9 +2,9 @@ Veewee::Session.declare( {
   :cpu_count => '1', :memory_size=> '256', 
   :disk_size => '10140', :disk_format => 'VDI',:disk_size => '10240' ,
   :os_type_id => 'FreeBSD_64',
-  :iso_file => "mfsbsd-8.1-amd64.iso",
-  :iso_src => "http://mfsbsd.vx.sk/iso/mfsbsd-8.1-amd64.iso",
-  :iso_md5 => "alala",
+  :iso_file => "mfsbsd-8.2-amd64.iso",
+  :iso_src => "http://mfsbsd.vx.sk/iso/mfsbsd-8.2-amd64.iso",
+  :iso_md5 => "3296cf0e5844",
   :iso_download_timeout => "1000",
   :boot_wait => "10",:boot_cmd_sequence => [ 
 	 '<Enter>' 

data/templates/{freebsd-8.1-experimental → freebsd-8.2-experimental}/postinstall.sh

@@ -1,9 +1,30 @@
 #http://www.freebsd.org/doc/en_US.ISO8859-1/articles/remote-install/installation.html
 dd if=/dev/zero of=/dev/ad4 count=2
-#bsdlabel -wB /dev/ad4
+#bsdlabel -w -B /dev/ad4
 
 sysctl kern.geom.debugflags=16
 
+#http://forum.nginx.org/read.php?23,146311,146451
+# Init the disk with an MBR
+gpart create -s mbr ad4 
+# Create a BSD container
+gpart add -t freebsd ad4 
+# Init with a BSD scheme
+gpart create -s bsd ad4s1 
+
+# 1GB for /
+gpart add -t freebsd-ufs -s 1G ad4s1 
+
+gpart add -t freebsd-swap -s 2G ad4s1 
+# 2GB for swap
+gpart add -t freebsd-ufs -s 2G ad4s1 
+# 2GB for /var
+gpart add -t freebsd-ufs ad4s1 
+# all rest for /usr
+
+#install bootcode
+gpart bootcode -p /boot/boot -i 1 ad4s1
+gpart set -a active -i 	ad4
 
 cat <<EOF >/install.cfg
 # This is the installation configuration file for our rackmounted FreeBSD 
@@ -28,9 +49,14 @@ tryDHCP=NO
 
 ################################
 # Which installation device to use 
-_ftpPath=ftp://ftp.freebsd.org/pub/FreeBSD/
+# ftp://ftp.smr.ru/pub/0/FreeBSD/current/src/release/sysinstall/sysinstall.h
+_ftpPath=ftp://ftp2.freebsd.org/pub/FreeBSD/
+#_httpPath=ftp://ftp2.freebsd.org/pub/FreeBSD/
+#httpProxy=192.168.2.10:800
 netDev=em0
 mediaSetFTP
+#mediaSetHTTP
+
 ################################
 
 ################################
@@ -47,7 +73,7 @@ partition=all
 #http://www.mail-archive.com/freebsd-questions@freebsd.org/msg212036.html
 bootManager=standard
 diskPartitionEditor
-diskPartitionWrite
+#diskPartitionWrite
 
 ################################
 
@@ -92,5 +118,72 @@ installCommit
 
 EOF
 
-exit
 sysinstall configFile=/install.cfg loadConfig
+
+
+#http://www.daemonforums.org/showthread.php?t=4389
+
+cd /mnt/boot
+cp -Rp GENERIC/* kernel/
+
+#For some reason this is the disk layout the sysinstall creates
+
+cat <<EOF > /mnt/etc/fstab
+/dev/ad4s1b  none            swap    sw              0       0
+/dev/ad4s1d / ufs rw 0 0
+/dev/ad4s1f /usr ufs rw 0 0
+/dev/ad4s1e /var ufs rw 0 0
+EOF
+
+
+# boot0cfg -B ad4
+#make the menu appear
+
+# Booting mentions an error
+# Invalid partition
+# FAILS WITH: 0:ad(0,a)/boot/kernel/kernel
+# WORKS WITH: 0:ad(4,d)/boot/loader
+
+#http://www.mail-archive.com/freebsd-questions@freebsd.org/msg72530.html
+cat  <<EOF > /mnt/boot/loader.conf 
+#geom_label_load="YES"
+#root_disk_unit="4"
+#currdev="disk4s1d"
+#rootdev="disk4s1d"
+#vfs.root.mountfrom="ufs:/dev/ad4s1d"
+EOF
+
+#activate dhcp
+cat <<EOF > /mnt/etc/rc.conf
+ifconfig_DEFAULT="DHCP"
+EOF
+
+
+#The vi edit program needs a /var/tmp/vi.recover file.
+
+mkdir -p /mnt/usr/local/etc/rc.d/
+cd /mnt/usr/local/etc/rc.d/
+cat  <<EOF > mkvirecover
+#!/bin/sh
+# PROVIDE: mkvirecover
+# REQUIRE: mountcritremote
+# BEFORE: DAEMON virecover
+ 
+
+. /etc/rc.subr
+ 
+name="mkvirecover"
+stop_cmd=":"
+start_cmd="mkvirecover_start"
+ 
+mkvirecover_start()
+{
+[ -d /var/tmp/vi.recover ] || mkdir -m 1777 /var/tmp/vi.recover
+echo '.'
+}
+ 
+load_rc_config "\$name"
+run_rc_command "\$1"
+EOF
+ 
+chmod 555 /mnt/usr/local/etc/rc.d/mkvirecover

data/validation/vagrant.feature

@@ -44,9 +44,9 @@ Scenario: Checking puppet
 	And I run ". /etc/profile ; puppet --version 2> /dev/null 1>/dev/null; echo $?"
 	Then I should see "0" in the output
 
-Scenario: Checking puppet
+Scenario: Checking shared folders
 	When I ssh to "127.0.0.1" with the following credentials: 
 	| username| password |keyfile  | port |
 	| vagrant | vagrant  | vagrant-private.key | 7222 |
-	And I run "whoami"
-	Then I should see "vagrant" in the output
+	And I run "mount|grep veewee-validation"
+	Then I should see "veewee-validation" in the output

data/veewee.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "highline", "~> 1.6.1"
   s.add_dependency "progressbar"
-  s.add_dependency "cucumber"
-  s.add_dependency "rspec"
+  s.add_dependency "cucumber", "0.8.5"
+  #s.add_dependency "rspec"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 +01:00
+date: 2011-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,32 +117,20 @@ dependencies:
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 53
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 5
+        version: 0.8.5
   type: :runtime
   requirement: *id007
   name: cucumber
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  requirement: *id008
-  name: rspec
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,7 +142,7 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  requirement: *id009
+  requirement: *id008
   name: bundler
   prerelease: false
 description: Expand the 'vagrant box' command to support the creation of base boxes from scratch
@@ -205,8 +193,8 @@ files:
 - templates/Debian-6.0-amd64-netboot/preseed.cfg
 - templates/Sysrescuecd-2.0.0-experimental/autorun0
 - templates/Sysrescuecd-2.0.0-experimental/definition.rb
-- templates/freebsd-8.1-experimental/definition.rb
-- templates/freebsd-8.1-experimental/postinstall.sh
+- templates/freebsd-8.2-experimental/definition.rb
+- templates/freebsd-8.2-experimental/postinstall.sh
 - templates/ubuntu-10.04.1-server-amd64/definition.rb
 - templates/ubuntu-10.04.1-server-amd64/postinstall.sh
 - templates/ubuntu-10.04.1-server-amd64/preseed.cfg