veewee 0.3.0.alpha7 → 0.3.0.alpha8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (22) hide show
  1. data/lib/veewee/command/vagrant/ssh.rb +1 -1
  2. data/lib/veewee/version.rb +1 -1
  3. data/templates/CentOS-5.7-x86_64-netboot/definition.rb +1 -1
  4. data/templates/CentOS-6.0-i386-netboot/definition.rb +1 -1
  5. data/templates/CentOS-6.0-i386/definition.rb +3 -1
  6. data/templates/CentOS-6.0-x86_64-netboot/definition.rb +1 -1
  7. data/templates/CentOS-6.0-x86_64/definition.rb +1 -1
  8. data/templates/CentOS-6.1-x86_64-minimal/definition.rb +1 -1
  9. data/templates/CentOS-6.1-x86_64-netboot/definition.rb +1 -1
  10. data/templates/Fedora-14-amd64-netboot/definition.rb +1 -1
  11. data/templates/Fedora-14-amd64/definition.rb +1 -1
  12. data/templates/Fedora-14-i386-netboot/definition.rb +1 -1
  13. data/templates/Fedora-14-i386/definition.rb +1 -1
  14. data/templates/ubuntu-10.04.3-server-amd64-alt/definition.rb +1 -1
  15. data/templates/ubuntu-10.04.3-server-i386/definition.rb +1 -1
  16. data/templates/ubuntu-12.04-server-amd64-packages/definition.rb +1 -1
  17. data/templates/ubuntu-12.04-server-amd64-packages/postinstall.sh +9 -9
  18. data/templates/ubuntu-12.04-server-amd64/definition.rb +1 -1
  19. data/templates/ubuntu-12.04-server-amd64/postinstall.sh +10 -9
  20. data/test/build_realtest.rb +5 -5
  21. data/test/definitions/test_definition/definition.rb +1 -1
  22. metadata +3 -3
data/lib/veewee/command/vagrant/ssh.rb CHANGED
@@ -25,7 +25,7 @@ module Veewee
25
25
  begin
26
26
  venv=Veewee::Environment.new(options)
27
27
  venv.ui=@env.ui
28
- venv.providers["virtualbox"].get_box(argv[0]).issh(arg[1])
28
+ venv.providers["virtualbox"].get_box(argv[0]).issh(argv[1])
29
29
  rescue Veewee::Error => ex
30
30
  venv.ui.error(ex,:prefix => false)
31
31
  exit -1
data/lib/veewee/version.rb CHANGED
@@ -4,5 +4,5 @@ end
4
4
 
5
5
  # Only set the version constant if it wasn't set before
6
6
  unless defined?(Veewee::VERSION)
7
- ::Veewee::VERSION="0.3.0.alpha7"
7
+ ::Veewee::VERSION="0.3.0.alpha8"
8
8
  end
data/templates/CentOS-5.7-x86_64-netboot/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Session.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
4
4
  :os_type_id => 'RedHat_64',
5
5
  :iso_file => "CentOS-5.7-x86_64-netinstall.iso",
6
- :iso_src => "http://mirror.atlanticmetro.net/centos/5.7/isos/x86_64/CentOS-5.7-x86_64-netinstall.iso",
6
+ :iso_src => "http://vault.centos.org/5.7/isos/x86_64/CentOS-5.7-x86_64-netinstall.iso",
7
7
  :iso_md5 => "5db3d49ba7a2c56810822914fadc1edf",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "10", :boot_cmd_sequence => [ 'linux text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
data/templates/CentOS-6.0-i386-netboot/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
4
4
  :os_type_id => 'RedHat',
5
5
  :iso_file => "CentOS-6.0-i386-netinstall.iso",
6
- :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/i386/CentOS-6.0-i386-netinstall.iso",
6
+ :iso_src => "http://vault.centos.org/6.0/isos/i386/CentOS-6.0-i386-netinstall.iso",
7
7
  :iso_md5 => "65731c29c49630dea6cde103d02ccffb",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
data/templates/CentOS-6.0-i386/definition.rb CHANGED
@@ -2,7 +2,9 @@ Veewee::Definition.declare({
2
2
  :cpu_count => '1', :memory_size=> '384',
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
4
4
  :os_type_id => 'RedHat',
5
- :iso_file => "CentOS-6.0-i386-bin-DVD.iso", :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/i386/CentOS-6.0-i386-bin-DVD.iso", :iso_md5 => "d7e57d6edaca1556d5bad2fa88602309", :iso_download_timeout => 1000,
5
+ :iso_file => "CentOS-6.0-i386-bin-DVD.iso",
6
+ :iso_src => "http://vault.centos.org/6.0/isos/i386/CentOS-6.0-i386-bin-DVD.iso",
7
+ :iso_md5 => "d7e57d6edaca1556d5bad2fa88602309", :iso_download_timeout => 1000,
6
8
  :iso_download_instructions => "We can not download the ISO , you need to download it yourself and put it in the iso directory\n"+
7
9
  "- URL: http://isoredirect.centos.org/centos/6/isos/i386/",
8
10
  :boot_wait => "10", :boot_cmd_sequence => [
data/templates/CentOS-6.0-x86_64-netboot/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
4
4
  :os_type_id => 'RedHat_64',
5
5
  :iso_file => "CentOS-6.0-x86_64-netinstall.iso",
6
- :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/x86_64/CentOS-6.0-x86_64-netinstall.iso",
6
+ :iso_src => "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-netinstall.iso",
7
7
  :iso_md5 => "d13da95c29e585ee15cf403b89468243",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
data/templates/CentOS-6.0-x86_64/definition.rb CHANGED
@@ -6,7 +6,7 @@ Veewee::Definition.declare({
6
6
  :hostiocache => 'off',
7
7
  :os_type_id => 'RedHat_64',
8
8
  :iso_file => "CentOS-6.0-x86_64-bin-DVD1.iso",
9
- :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso",
9
+ :iso_src => "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-bin-DVD1.iso",
10
10
  :iso_md5 => "7c148e0a1b330186adef66ee3e2d433d",
11
11
  :iso_download_timeout => 1000,
12
12
  :iso_download_instructions => "We can not download the ISO , you need to download it yourself and put it in the iso directory\n"+
data/templates/CentOS-6.1-x86_64-minimal/definition.rb CHANGED
@@ -6,7 +6,7 @@ Veewee::Session.declare({
6
6
  :hostiocache => 'off',
7
7
  :os_type_id => 'RedHat_64',
8
8
  :iso_file => "CentOS-6.1-x86_64-minimal.iso",
9
- :iso_src => "http://centos.weepeetelecom.be/6.1/isos/x86_64/CentOS-6.1-x86_64-minimal.iso",
9
+ :iso_src => "http://vault.centos.org/6.1/isos/x86_64/CentOS-6.1-x86_64-minimal.iso",
10
10
  :iso_md5 => "03177dfefb4ebfeb03f457c29f00b0a1",
11
11
  :iso_download_timeout => 1000,
12
12
  :boot_wait => "10",
data/templates/CentOS-6.1-x86_64-netboot/definition.rb CHANGED
@@ -8,7 +8,7 @@ Veewee::Definition.declare({
8
8
  :pae => 'on',
9
9
  :os_type_id => 'RedHat_64',
10
10
  :iso_file => "CentOS-6.1-x86_64-netinstall.iso",
11
- :iso_src => "http://be.mirror.eurid.eu/centos/6.1/isos/x86_64/CentOS-6.1-x86_64-netinstall.iso",
11
+ :iso_src => "http://vault.centos.org/6.1/isos/x86_64/CentOS-6.1-x86_64-netinstall.iso",
12
12
  :iso_md5 => "d13da95c29e585ee15cf403b89468243",
13
13
  :iso_download_timeout => 1000,
14
14
  :boot_wait => "15",
data/templates/Fedora-14-amd64-netboot/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
4
4
  :os_type_id => 'Fedora_64',
5
5
  :iso_file => "Fedora-14-x86_64-netinst.iso",
6
- :iso_src => "http://mirror.uoregon.edu/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-netinst.iso",
6
+ :iso_src => "http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-netinst.iso",
7
7
  :iso_md5 => "acd25fc1470f2497cf2a2a245adbfe1e",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
data/templates/Fedora-14-amd64/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
4
4
  :os_type_id => 'Fedora_64',
5
5
  :iso_file => "Fedora-14-x86_64-DVD.iso",
6
- :iso_src => "http://mirror.uoregon.edu/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso",
6
+ :iso_src => "http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/iso/Fedora-14-x86_64-DVD.iso",
7
7
  :iso_md5 => "381d7336c6d1685cbb4eae49cdef2247",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
data/templates/Fedora-14-i386-netboot/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
4
4
  :os_type_id => 'Fedora',
5
5
  :iso_file => "Fedora-14-i386-netinst.iso",
6
- :iso_src => "http://www.gtlib.gatech.edu/pub/fedora.redhat/linux//releases/14/Fedora/i386/iso/Fedora-14-i386-netinst.iso",
6
+ :iso_src => "http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-netinst.iso",
7
7
  :iso_md5 => "59d2490d7bf73a6c8a80d9a790f17184",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
data/templates/Fedora-14-i386/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :hwvirtext => 'on',
4
4
  :os_type_id => 'Fedora',
5
5
  :iso_file => "Fedora-14-i386-DVD.iso",
6
- :iso_src => "http://mirror.uoregon.edu/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso",
6
+ :iso_src => "http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/iso/Fedora-14-i386-DVD.iso",
7
7
  :iso_md5 => "1cc67641506d2f931d669b8d3528dded",
8
8
  :iso_download_timeout => 1000,
9
9
  :boot_wait => "10", :boot_cmd_sequence => [ '<Tab> linux text ks=http://%IP%:%PORT%/ks.cfg<Enter><Enter>' ],
data/templates/ubuntu-10.04.3-server-amd64-alt/definition.rb CHANGED
@@ -35,7 +35,7 @@ Veewee::Definition.declare( {
35
35
  :hostiocache => 'on',
36
36
  :iso_download_timeout => "60",
37
37
  :iso_file => "ubuntu-10.04.3-alternate-amd64.iso",
38
- :iso_src => "http://releases.ubuntu.com/10.04.3/ubuntu-10.04.3-alternate-amd64.iso",
38
+ :iso_src => "http://old-releases.ubuntu.com/releases/10.04.3/ubuntu-10.04.3-alternate-amd64.iso",
39
39
  :iso_md5 => "e38e5cf4cc02c9a3fa4ecd88832d120c",
40
40
  :kickstart_file => "preseed.cfg",
41
41
  :kickstart_port => "7122",
data/templates/ubuntu-10.04.3-server-i386/definition.rb CHANGED
@@ -3,7 +3,7 @@ Veewee::Session.declare({
3
3
  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
4
4
  :os_type_id => 'Ubuntu',
5
5
  :iso_file => "ubuntu-10.04.3-server-i386.iso",
6
- :iso_src => "http://releases.ubuntu.com/10.04.3/ubuntu-10.04.3-server-i386.iso",
6
+ :iso_src => "http://old-releases.ubuntu.com/releases/10.04.3/ubuntu-10.04.3-server-i386.iso",
7
7
  :iso_md5 => "388104f6225ae676ceab0ba4bd7b5784",
8
8
  :iso_download_timeout => "1000",
9
9
  :boot_wait => "10", :boot_cmd_sequence => [
data/templates/ubuntu-12.04-server-amd64-packages/definition.rb CHANGED
@@ -9,7 +9,7 @@ Veewee::Session.declare({
9
9
  :os_type_id => 'Ubuntu_64',
10
10
  :iso_file => "precise-alternate-amd64.iso",
11
11
  :iso_src => "http://cdimage.ubuntu.com/daily/current/precise-alternate-amd64.iso",
12
- :iso_md5 => `curl -s http://cdimage.ubuntu.com/daily/current/MD5SUMS -o - | awk '{if ( $2 == \"*precise-alternate-amd64.iso\") print $1 }'`,
12
+ :iso_md5 => `curl -s http://cdimage.ubuntu.com/daily/current/MD5SUMS -o - | awk '{if ( $2 == \"*precise-alternate-amd64.iso\") print $1 }'`.strip,
13
13
  :iso_download_timeout => "1000",
14
14
  :boot_wait => "4",
15
15
  :boot_cmd_sequence => [
data/templates/ubuntu-12.04-server-amd64-packages/postinstall.sh CHANGED
@@ -2,6 +2,15 @@
2
2
 
3
3
  date > /etc/vagrant_box_build_time
4
4
 
5
+ # Apt-install various things necessary for Ruby, guest additions,
6
+ # etc., and remove optional things to trim down the machine.
7
+ apt-get -y update
8
+ apt-get -y upgrade
9
+ apt-get -y install linux-headers-$(uname -r) build-essential
10
+ apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
11
+ apt-get -y install vim
12
+ apt-get clean
13
+
5
14
  # Installing the virtualbox guest additions
6
15
  apt-get -y install dkms
7
16
  VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
@@ -13,15 +22,6 @@ umount /mnt
13
22
 
14
23
  rm VBoxGuestAdditions_$VBOX_VERSION.iso
15
24
 
16
- # Apt-install various things necessary for Ruby, guest additions,
17
- # etc., and remove optional things to trim down the machine.
18
- apt-get -y update
19
- apt-get -y upgrade
20
- apt-get -y install linux-headers-$(uname -r) build-essential
21
- apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
22
- apt-get -y install vim
23
- apt-get clean
24
-
25
25
  # Setup sudo to allow no-password sudo for "admin"
26
26
  groupadd -r admin
27
27
  usermod -a -G admin vagrant
data/templates/ubuntu-12.04-server-amd64/definition.rb CHANGED
@@ -9,7 +9,7 @@ Veewee::Session.declare({
9
9
  :os_type_id => 'Ubuntu_64',
10
10
  :iso_file => "precise-alternate-amd64.iso",
11
11
  :iso_src => "http://cdimage.ubuntu.com/daily/current/precise-alternate-amd64.iso",
12
- :iso_md5 => `curl -s http://cdimage.ubuntu.com/daily/current/MD5SUMS -o - | awk '{if ( $2 == \"*precise-alternate-amd64.iso\") print $1 }'`,
12
+ :iso_md5 => `curl -s http://cdimage.ubuntu.com/daily/current/MD5SUMS -o - | awk '{if ( $2 == \"*precise-alternate-amd64.iso\") print $1 }'`.strip,
13
13
  :iso_download_timeout => "1000",
14
14
  :boot_wait => "4",
15
15
  :boot_cmd_sequence => [
data/templates/ubuntu-12.04-server-amd64/postinstall.sh CHANGED
@@ -2,6 +2,16 @@
2
2
 
3
3
  date > /etc/vagrant_box_build_time
4
4
 
5
+
6
+ # Apt-install various things necessary for Ruby, guest additions,
7
+ # etc., and remove optional things to trim down the machine.
8
+ apt-get -y update
9
+ apt-get -y upgrade
10
+ apt-get -y install linux-headers-$(uname -r) build-essential
11
+ apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
12
+ apt-get -y install vim
13
+ apt-get clean
14
+
5
15
  # Installing the virtualbox guest additions
6
16
  apt-get -y install dkms
7
17
  VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
@@ -13,15 +23,6 @@ umount /mnt
13
23
 
14
24
  rm VBoxGuestAdditions_$VBOX_VERSION.iso
15
25
 
16
- # Apt-install various things necessary for Ruby, guest additions,
17
- # etc., and remove optional things to trim down the machine.
18
- apt-get -y update
19
- apt-get -y upgrade
20
- apt-get -y install linux-headers-$(uname -r) build-essential
21
- apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
22
- apt-get -y install vim
23
- apt-get clean
24
-
25
26
  # Setup sudo to allow no-password sudo for "admin"
26
27
  groupadd -r admin
27
28
  usermod -a -G admin vagrant
data/test/build_realtest.rb CHANGED
@@ -10,7 +10,7 @@ class TestVeeweeBuild < Test::Unit::TestCase
10
10
  @vd=@ve.definitions[@definition_name]
11
11
  @box_name=@definition_name
12
12
  @vd.postinstall_files=["_test_me.sh"]
13
- @box=@ve.providers["vmfusion"].get_box(@box_name)
13
+ @box=@ve.providers["virtualbox"].get_box(@box_name)
14
14
  end
15
15
 
16
16
  # First build of box
@@ -20,7 +20,7 @@ class TestVeeweeBuild < Test::Unit::TestCase
20
20
  def test_box_1_build
21
21
  assert_nothing_raised {
22
22
  #@box.build({"auto" => true,:force => true, #:nogui => true })
23
- @box.build({"auto" => true,:force => true })
23
+ @box.build({"auto" => true,"force" => true })
24
24
  }
25
25
  end
26
26
 
@@ -57,9 +57,9 @@ class TestVeeweeBuild < Test::Unit::TestCase
57
57
  end
58
58
 
59
59
  def test_box_6_destroy
60
- # assert_nothing_raised {
61
- #@box.destroy
62
- #}
60
+ assert_nothing_raised {
61
+ @box.destroy
62
+ }
63
63
  end
64
64
 
65
65
  #
data/test/definitions/test_definition/definition.rb CHANGED
@@ -9,7 +9,7 @@ Veewee::Definition.declare({
9
9
  #:iso_src => "http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/2.0.0/systemrescuecd-x86-2.0.0.iso",
10
10
  #:iso_md5 => "51012e0bb943cff6367e5cea3a61cdbe",
11
11
  :iso_download_timeout => "1000",
12
- :boot_wait => "3", :boot_cmd_sequence => [
12
+ :boot_wait => "10", :boot_cmd_sequence => [
13
13
  '<Tab> raid=noautodetect setkmap=us dodhcp=eth0 fastboot dhcphostname=%NAME% rootpass=vagrant ar_source=http://%IP%:%PORT%/ autoruns=0 ar_nowait dns=127.0.0.1 nomodeset nodetect nodmraid nomadm edd=off quiet nosata nosound nosmp nohotplug acpi=off noresume load=eth1000 nonet noload=ipv6,floppy,md,raid10,raid456,raid1,raid0,multipath,linear,i2c_piix4,i2c_core,udev scandelay=0 nousb<Enter>'
14
14
  ],
15
15
  :kickstart_port => "7122", :kickstart_timeout => "10000",
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: veewee
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 0.3.0.alpha7
5
+ version: 0.3.0.alpha8
6
6
  platform: ruby
7
7
  authors:
8
8
  - Patrick Debois
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-04-16 00:00:00 Z
13
+ date: 2012-04-17 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: vagrant
@@ -917,7 +917,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
917
917
  requirements:
918
918
  - - ">="
919
919
  - !ruby/object:Gem::Version
920
- hash: 71648237759924019
920
+ hash: -3989224323634617638
921
921
  segments:
922
922
  - 0
923
923
  version: "0"