veewee 0.3.7 → 0.3.9

data/templates/windows-2012R2-serverdatacenter-amd64/definition.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+Veewee::Session.declare({
+    :os_type_id => 'Windows8_64',
+    :iso_download_instructions => "Download and install full featured software for 180-day trial at http://technet.microsoft.com/en-US/evalcenter/hh670538.aspx",
+    :iso_file => "9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+    :iso_md5 => "458ff91f8abc21b75cb544744bf92e6a",
+    :iso_src => "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+    :iso_download_timeout => "1000",
+    :cpu_count => '1',
+    :memory_size=> '512', 
+    :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+
+    :floppy_files => [
+      "Autounattend.xml", 
+      "oracle-cert.cer"],
+
+    :boot_wait => "1",
+    :boot_cmd_sequence => [''],
+
+    :kickstart_port => "7122",
+    :winrm_user => "vagrant",
+    :winrm_password => "vagrant",
+    # And run postinstall.sh for up to 10000 seconds
+    :postinstall_timeout => "10000",
+    :postinstall_files => ["install-chef.bat", "install-puppet.bat", "install-vbox.bat"],
+    # No sudo on windows
+    :sudo_cmd => "%f",
+    :shutdown_cmd => "shutdown /s /t 10 /f /d p:4:1 /c \"Vagrant Shutdown\"",
+
+    :virtualbox => {
+      :extradata => 'VBoxInternal/CPUM/CMPXCHG16B 1',
+    }
+})

data/templates/windows-2012R2-serverdatacenter-amd64/install-chef.bat

@@ -0,0 +1,37 @@
+@REM Loop ten times to make sure outbound networking is up
+@FOR /L %%n IN (1,1,10) DO (
+  @PING -n 1 www.opscode.com
+  @IF %ERRORLEVEL% == 0 CALL :wget
+  @TIMEOUT 10
+)
+
+:err
+@ECHO "Couldn't reach Opscode even after 10 retries"
+@GOTO :done
+
+:wget
+@REM Install Chef using chef-client MSI installer
+@setlocal
+
+@set REMOTE_SOURCE_MSI_URL=https://www.opscode.com/chef/install.msi
+@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\chef-client-latest.msi
+@set QUERY_STRING=?DownloadContext=PowerShell
+
+@set DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%')
+
+@if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+powershell -noprofile -noninteractive -command "%DOWNLOAD_COMMAND%"
+@IF NOT ERRORLEVEL 1 (
+  @ECHO Download succeeded
+    ) else (
+  @ECHO Failed to download %REMOTE_SOURCE_MSI_URL%
+  @ECHO Subsequent attempt to install the downloaded MSI is likely to fail
+)
+
+msiexec /qn /i "%LOCAL_DESTINATION_MSI_PATH%"
+
+@endlocal
+EXIT
+
+:done
+EXIT

data/templates/windows-2012R2-serverdatacenter-amd64/install-puppet.bat

@@ -0,0 +1,37 @@
+@REM Loop ten times to make sure outbound networking is up
+@FOR /L %%n IN (1,1,10) DO (
+  @PING -n 1 downloads.puppetlabs.com
+  @IF %ERRORLEVEL% == 0 CALL :wget
+  @TIMEOUT 10
+)
+
+:err
+@ECHO "Couldn't reach PuppetLabs even after 10 retries"
+@GOTO :done
+
+:wget
+@REM Install Puppet using MSI installer
+@setlocal
+
+@set REMOTE_SOURCE_MSI_URL=https://downloads.puppetlabs.com/windows/puppet-3.2.1.msi
+@set LOCAL_DESTINATION_MSI_PATH=%TEMP%\puppet-latest.msi
+@set QUERY_STRING=?DownloadContext=PowerShell
+
+@set DOWNLOAD_COMMAND=$webClient=new-object System.Net.WebClient; $webClient.DownloadFile('%REMOTE_SOURCE_MSI_URL%%QUERY_STRING%', '%LOCAL_DESTINATION_MSI_PATH%')
+
+@if EXIST "%LOCAL_DESTINATION_MSI_PATH%" del /f /q "%LOCAL_DESTINATION_MSI_PATH%"
+powershell -noprofile -noninteractive -command "%DOWNLOAD_COMMAND%"
+@IF NOT ERRORLEVEL 1 (
+  @ECHO Download succeeded
+    ) else (
+  @ECHO Failed to download %REMOTE_SOURCE_MSI_URL%
+  @ECHO Subsequent attempt to install the downloaded MSI is likely to fail
+)
+
+msiexec /qn /i "%LOCAL_DESTINATION_MSI_PATH%" PUPPET_MASTER_SERVER=dummy_server
+
+@endlocal
+EXIT
+
+:done
+EXIT

data/templates/windows-2012R2-serverdatacenter-amd64/install-vbox.bat

@@ -0,0 +1,4 @@
+cmd /c certutil -addstore -f "TrustedPublisher" a:oracle-cert.cer
+cmd /c e:\VBoxWindowsAdditions-amd64.exe /S
+cmd /c shutdown.exe /r /t 5 /d p:2:4 /c "Vagrant reboot for VBoxWindowsAdditions"
+

data/templates/windows-7-enterprise-amd64-winrm/Autounattend.xml

@@ -28,12 +28,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant Fullname</FullName>
                 <Organization>Vagrant Inc</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>
@@ -146,46 +147,52 @@
                     <Order>6</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>cmd.exe /c winrm set winrm/config/client/auth @{Basic="true"}</CommandLine>
+                    <Description>Win RM client auth Basic</Description>
+                    <Order>7</Order>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>                 
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"} </CommandLine>
                     <Description>Win RM listener Address/Port</Description>
-                    <Order>7</Order>
+                    <Order>8</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c netsh advfirewall firewall set rule group="remote administration" new enable=yes </CommandLine>
                     <Description>Win RM adv firewall enable</Description>
-                    <Order>8</Order>
+                    <Order>9</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c netsh firewall add portopening TCP 5985 "Port 5985" </CommandLine>
                     <Description>Win RM port open</Description>
-                    <Order>9</Order>
+                    <Order>10</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c net stop winrm </CommandLine>
                     <Description>Stop Win RM Service </Description>
-                    <Order>10</Order>
+                    <Order>11</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c sc config winrm start= auto</CommandLine>
                     <Description>Win RM Autostart</Description>
-                    <Order>11</Order>
+                    <Order>12</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>cmd.exe /c net start winrm </CommandLine>
                     <Description>Start Win RM Service</Description>
-                    <Order>12</Order>
+                    <Order>13</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <CommandLine>powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
                     <Description>Start Win RM Service</Description>
-                    <Order>13</Order>
+                    <Order>14</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
             </FirstLogonCommands>

data/templates/windows-7-enterprise-amd64/Autounattend.xml

@@ -28,12 +28,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant Fullname</FullName>
                 <Organization>Vagrant Inc</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7-enterprise-amd64/install-cygwin-sshd.bat

@@ -3,7 +3,7 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
 
-cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup-x86.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp

data/templates/windows-7-enterprise-i386/Autounattend.xml

@@ -82,12 +82,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant User</FullName>
                 <Organization>Vagrant Inc.</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7-enterprise-i386/install-cygwin-sshd.bat

@@ -3,7 +3,7 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
 
-cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup-x86.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp

data/templates/windows-7-premium-amd64/Autounattend.xml

@@ -82,13 +82,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-              <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant User</FullName>
                 <Organization>Vagrant Inc.</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7-professional-amd64/Autounattend.xml

@@ -82,13 +82,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-              <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant User</FullName>
                 <Organization>Vagrant Inc.</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7-professional-amd64/install-cygwin-sshd.bat

@@ -3,7 +3,7 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
 
-cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup-x86.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp

data/templates/windows-7-professional-amd64/postinstall.sh

@@ -54,7 +54,7 @@ alias ruby="ruby.exe"
 alias puppet="puppet.bat"
 alias ohai="ohai.bat"
 alias irb="irb.bat"
-alias facter="facter.bat" 
+alias facter="facter.bat"
 EOF
 
 
@@ -70,5 +70,5 @@ net.exe use  '\\vboxsvr\veewee-validation'
 
 # Reboot
 # http://www.techrepublic.com/blog/datacenter/restart-windows-server-2003-from-the-command-line/245
-shutdown.exe /s /t 0 /d p:2:4 /c "Vagrant initial reboot"
+shutdown.exe /r /t 0 /d p:2:4 /c "Vagrant initial reboot"
 

data/templates/windows-7-ultimate-amd64/Autounattend.xml

@@ -82,13 +82,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-              <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant User</FullName>
                 <Organization>Vagrant Inc.</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7-ultimate-amd64/install-cygwin-sshd.bat

@@ -3,7 +3,7 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
 
-cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup-x86.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp

data/templates/windows-7sp1-ultimate-amd64/Autounattend.xml

@@ -28,12 +28,13 @@
                 <WillShowUI>OnError</WillShowUI>
             </DiskConfiguration>
             <UserData>
-                <ProductKey>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <FullName>Vagrant Fullname</FullName>
                 <Organization>Vagrant Inc</Organization>
+                <!-- Product Key from http://technet.microsoft.com/en-us/library/ff793406.aspx -->
+                <ProductKey>
+                    <WillShowUI>Never</WillShowUI>
+                </ProductKey>
             </UserData>
             <ImageInstall>
                 <OSImage>

data/templates/windows-7sp1-ultimate-amd64/install-cygwin-sshd.bat

@@ -3,7 +3,7 @@ REM http://webcache.googleusercontent.com/search?q=cache:SjoPPpuQxuoJ:www.tcm.ph
 REM create the cygwin directory
 cmd /c mkdir %SystemDrive%\cygwin
 
-cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup.exe %SystemDrive%\cygwin\cygwin-setup.exe
+cmd /c bitsadmin /transfer CygwinSetupExe /download /priority normal http://www.cygwin.com/setup-x86.exe %SystemDrive%\cygwin\cygwin-setup.exe
 
 REM goto a temp directory
 cd %SystemDrive%\windows\temp
@@ -22,7 +22,7 @@ cmd /c %SystemDrive%\cygwin\bin\bash -c 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/
 
 %SystemDrive%\cygwin\usr\bin\sleep 1
 
-%SystemDrive%\cygwin\bin\bash -c 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin /usr/bin/ssh-host-config -y -c "ntsecbinmode tty" -w "abc&&123!!" '
+%SystemDrive%\cygwin\bin\bash -c 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin /usr/bin/ssh-host-config -y -c "ntsecbinmode" -w "abc&&123!!" '
 
 %SystemDrive%\cygwin\usr\bin\sleep 2 
 

data/test/build_realtest.rb

@@ -19,7 +19,7 @@ class TestVeeweeBuild < Test::Unit::TestCase
   # - postinstall execution
   def test_box_1_build
     assert_nothing_raised {
-      @box.build({'auto' => true,'force' => true, 'nogui' => true })
+      @box.build({'auto' => true,'force' => true, 'nogui' => true , 'disk_count' => 2})
       #@box.build({"auto" => true,"force" => true })
     }
   end
@@ -40,23 +40,33 @@ class TestVeeweeBuild < Test::Unit::TestCase
       assert_match(/bla/,result.stdout)
     }
   end
+  
+  # Are there as many disks as in disk_count?
+  def test_box_4_check_disk_count
+    assert_nothing_raised { 
+      result=@box.exec("lsblk -lo MODEL|grep -i harddisk|wc -l")
+      assert_match(/#{@box.definition.disk_count}/,result.stdout)
+    }
+  end
+  
 
   # Try shutdown
-  def test_box_4_shutdown
+  def test_box_5_shutdown
     assert_nothing_raised {
       @box.halt
     }
   end
 
   # Now try build again (with no force flag)
-  def test_box_5_build
-    assert_raise(Veewee::Error) {
+  def test_box_6_build
+    #assert_raise(Veewee::Error) {
+    assert_nothing_raised {
       #@box.build({"auto" => true})
       @box.build({"auto" => true,'force' => true, 'nogui' => true })
     }
   end
 
-  def test_box_6_destroy
+  def test_box_7_destroy
     assert_nothing_raised {
       @box.destroy
     }

data/test/environment_test.rb

@@ -4,7 +4,8 @@ require 'tempfile'
 
 class TestVeeweeEnvironment < Test::Unit::TestCase
   def test_environment_default_to_currentdir
-
+    # unset the VEEWEE_DIR environment which overwrites cwd
+    ENV['VEEWEE_DIR'] = nil
     tempdir = Dir.mktmpdir
     Dir.chdir(tempdir)
     tempdir=Dir.pwd

data/veewee.gemspec

@@ -14,32 +14,34 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "veewee"
 
-  s.add_dependency "vagrant", ">= 0.9"
 
   # Currently locked to 2.2.0
   # if specifying to >= 2.2.0 it would use 2.3 and bundler would go in a resolver loop
   # DEBUG_RESOLVER=1 bundle install
-  s.add_dependency "net-ssh", "~> 2.2.0"
+  s.add_dependency "net-ssh", ">= 2.2.0"
 
   s.add_dependency "popen4", "~> 0.1.2"
   s.add_dependency "thor", "~> 0.15"
   s.add_dependency "highline"
+  s.add_dependency "json"
+  #s.add_dependency "json", ">= 1.5.1", "< 1.8.0"
   s.add_dependency "progressbar"
   s.add_dependency "i18n"
-  s.add_dependency "cucumber", ">=1.0.0"
+  #s.add_dependency "cucumber", ">=1.0.0"
   s.add_dependency "ansi", "~> 1.3.0"
   s.add_dependency "ruby-vnc", "~> 1.0.0"
   s.add_dependency "fog", "~> 1.8"
   s.add_dependency "childprocess"
   s.add_dependency "grit"
   s.add_dependency "fission", "0.4.0"
+  s.add_dependency "whichr"
 
   # 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"
+  s.add_development_dependency "rspec", "~> 2.5"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   #s.add_development_dependency('ruby-libvirt','~>0.4.0')