veewee 0.2.3 → 0.3.0.alpha1

data/veewee.gemspec

@@ -14,21 +14,26 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "veewee"
 
-  s.add_dependency "vagrant",  ">= 0.9.0"
-  s.add_dependency "virtualbox",  ">= 0.9.2"
-  s.add_dependency "net-ssh",  ">= 2.1.0"
-  s.add_dependency "popen4",   "~> 0.1.2"
-  s.add_dependency "thor",     "~> 0.14.6"
+  s.add_dependency "vagrant", "~> 0.8.2"
+  s.add_dependency "net-ssh", "~> 2.1.0"
+  s.add_dependency "popen4", "~> 0.1.2"
+  s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "highline", "~> 1.6.1"
   s.add_dependency "progressbar"
-  s.add_dependency "cucumber", ">= 1.0.0"
-  s.add_dependency "rspec",    "~> 2.5"
-  #s.add_dependency "simon", "~> 0.1.1"
+  s.add_dependency "i18n"
+  s.add_dependency "cucumber", "~> 1.0.2"
+  s.add_dependency "rspec", "~> 2.5.0"
+  s.add_dependency "ansi", "~> 1.3.0"
+  s.add_dependency "ruby-vnc", "~> 1.0.0"
+  s.add_dependency "fog", "~> 1.0.0"
+  s.add_dependency "CFPropertyList", "~> 2.0.17"
+#  s.add_dependency "libvirt"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
+  #s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{ |f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'
 end
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: -3702664338
+  prerelease: 6
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  - alpha
+  - 1
+  version: 0.3.0.alpha1
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,46 +18,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 +01:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: vagrant
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 59
         segments: 
         - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :runtime
-  requirement: *id001
-  name: vagrant
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
+        - 8
         - 2
-        version: 0.9.2
+        version: 0.8.2
   type: :runtime
-  requirement: *id002
-  name: virtualbox
   prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: net-ssh
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -64,11 +51,11 @@ dependencies:
         - 0
         version: 2.1.0
   type: :runtime
-  requirement: *id003
-  name: net-ssh
   prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: popen4
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +67,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :runtime
-  requirement: *id004
-  name: popen4
   prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: thor
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +83,11 @@ dependencies:
         - 6
         version: 0.14.6
   type: :runtime
-  requirement: *id005
-  name: thor
   prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: highline
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,10 +99,24 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  requirement: *id006
-  name: highline
   prerelease: false
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: progressbar
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: i18n
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,42 +127,107 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  requirement: *id007
-  name: progressbar
   prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: cucumber
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :runtime
-  requirement: *id008
-  name: cucumber
   prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 27
         segments: 
         - 2
         - 5
-        version: "2.5"
+        - 0
+        version: 2.5.0
   type: :runtime
-  requirement: *id009
-  name: rspec
   prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
+  name: ansi
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-vnc
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  name: fog
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  name: CFPropertyList
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 0
+        - 17
+        version: 2.0.17
+  type: :runtime
+  prerelease: false
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,15 +239,17 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  requirement: *id010
-  name: bundler
   prerelease: false
+  requirement: *id014
 description: Expand the 'vagrant box' command to support the creation of base boxes from scratch
 email: 
 - patrick.debois@jedi.be
 - ringo.desmet@gmail.com
 executables: 
 - veewee
+- veewee-kvm-old
+- veewee-vagrant
+- veewee-vmfusion
 extensions: []
 
 extra_rdoc_files: []
@@ -191,35 +259,100 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- License
+- README-LIB.md
 - README.md
 - Rakefile
 - bin/veewee
+- bin/veewee-kvm-old
+- bin/veewee-vagrant
+- bin/veewee-vmfusion
+- lib/fission.rb
+- lib/fission/cli.rb
+- lib/fission/command.rb
+- lib/fission/command/clone.rb
+- lib/fission/command/delete.rb
+- lib/fission/command/snapshot_create.rb
+- lib/fission/command/snapshot_list.rb
+- lib/fission/command/snapshot_revert.rb
+- lib/fission/command/start.rb
+- lib/fission/command/status.rb
+- lib/fission/command/stop.rb
+- lib/fission/command/suspend.rb
+- lib/fission/config.rb
+- lib/fission/core_ext/class.rb
+- lib/fission/core_ext/file.rb
+- lib/fission/core_ext/object.rb
+- lib/fission/error.rb
+- lib/fission/fusion.rb
+- lib/fission/leasesfile.rb
+- lib/fission/metadata.rb
+- lib/fission/response.rb
+- lib/fission/ui.rb
+- lib/fission/version.rb
+- lib/fission/vm.rb
 - lib/java/README.txt
 - lib/java/dir2floppy.jar
 - lib/java/dir2floppy.java
+- lib/net/vnc/vnc.rb
 - lib/vagrant_init.rb
 - lib/veewee.rb
+- lib/veewee/builder/core/box.rb
+- lib/veewee/builder/core/box/vnc.rb
+- lib/veewee/builder/core/builder.rb
+- lib/veewee/builder/core/builder/build.rb
+- lib/veewee/builder/core/builder/iso.rb
+- lib/veewee/builder/core/builder/transaction.rb
+- lib/veewee/builder/core/builder/tunnel.rb
+- lib/veewee/builder/kvm/box.rb
+- lib/veewee/builder/kvm/builder.rb
+- lib/veewee/builder/virtualbox/box.rb
+- lib/veewee/builder/virtualbox/builder.rb
+- lib/veewee/builder/virtualbox/helper/_snapshots.rb
+- lib/veewee/builder/virtualbox/helper/_transaction.rb
+- lib/veewee/builder/virtualbox/helper/console_type.rb
+- lib/veewee/builder/virtualbox/helper/create.rb
+- lib/veewee/builder/virtualbox/helper/destroy.rb
+- lib/veewee/builder/virtualbox/helper/export_vagrant.rb
+- lib/veewee/builder/virtualbox/helper/validate_vagrant.rb
+- lib/veewee/builder/vmfusion/box.rb
+- lib/veewee/builder/vmfusion/builder.rb
+- lib/veewee/builder/vmfusion/helper/create.rb
+- lib/veewee/builder/vmfusion/helper/export_ova.rb
+- lib/veewee/builder/vmfusion/helper/template.rb
+- lib/veewee/builder/vmfusion/helper/template.vmx.erb
+- lib/veewee/builder/vmfusion/helper/validate_vmfusion.rb
+- lib/veewee/builder/vmfusion/info/export_ovf.info
+- lib/veewee/cli.rb
 - lib/veewee/command.rb
-- lib/veewee/command/basebox.rb
-- lib/veewee/command/basebox_build.rb
-- lib/veewee/command/basebox_define.rb
-- lib/veewee/command/basebox_destroy.rb
-- lib/veewee/command/basebox_export.rb
-- lib/veewee/command/basebox_list.rb
-- lib/veewee/command/basebox_ostypes.rb
-- lib/veewee/command/basebox_templates.rb
-- lib/veewee/command/basebox_undefine.rb
-- lib/veewee/command/basebox_validate.rb
+- lib/veewee/command/base.rb
+- lib/veewee/command/group_base.rb
+- lib/veewee/command/helpers.rb
+- lib/veewee/command/kvm.rb
+- lib/veewee/command/named_base.rb
+- lib/veewee/command/vagrant.rb
+- lib/veewee/command/version.rb
+- lib/veewee/command/virtualbox.rb
+- lib/veewee/command/vmfusion.rb
 - lib/veewee/config.rb
-- lib/veewee/export.rb
-- lib/veewee/scancode.rb
-- lib/veewee/session.rb
-- lib/veewee/shell.rb
-- lib/veewee/ssh.rb
-- lib/veewee/transaction.rb
-- lib/veewee/utils.rb
+- lib/veewee/config/builders.rb
+- lib/veewee/config/collection.rb
+- lib/veewee/config/component.rb
+- lib/veewee/config/definition.rb
+- lib/veewee/config/ostypes.yml
+- lib/veewee/config/veewee.rb
+- lib/veewee/definition.rb
+- lib/veewee/environment.rb
+- lib/veewee/error.rb
+- lib/veewee/templates/locales/en.yml
+- lib/veewee/ui.rb
+- lib/veewee/util/scancode.rb
+- lib/veewee/util/shell.rb
+- lib/veewee/util/ssh.rb
+- lib/veewee/util/tcp.rb
+- lib/veewee/util/web.rb
+- lib/veewee/vagrant/config.rb
 - lib/veewee/version.rb
-- lib/veewee/web.rb
 - templates/CentOS-4.8-i386/definition.rb
 - templates/CentOS-4.8-i386/ks.cfg
 - templates/CentOS-4.8-i386/postinstall.sh
@@ -256,24 +389,18 @@ files:
 - templates/CentOS-6.0-x86_64/definition.rb
 - templates/CentOS-6.0-x86_64/ks.cfg
 - templates/CentOS-6.0-x86_64/postinstall.sh
-- templates/CentOS-6.1-x86_64-minimal/definition.rb
-- templates/CentOS-6.1-x86_64-minimal/ks.cfg
-- templates/CentOS-6.1-x86_64-minimal/postinstall.sh
-- templates/CentOS-6.2-x86_64-minimal/definition.rb
-- templates/CentOS-6.2-x86_64-minimal/ks.cfg
-- templates/CentOS-6.2-x86_64-minimal/postinstall.sh
 - templates/Debian-5.0.8-amd64-netboot/definition.rb
 - templates/Debian-5.0.8-amd64-netboot/postinstall.sh
 - templates/Debian-5.0.8-amd64-netboot/preseed.cfg
 - templates/Debian-5.0.8-i386-netboot/definition.rb
 - templates/Debian-5.0.8-i386-netboot/postinstall.sh
 - templates/Debian-5.0.8-i386-netboot/preseed.cfg
-- templates/Debian-6.0.3-amd64-netboot/definition.rb
-- templates/Debian-6.0.3-amd64-netboot/postinstall.sh
-- templates/Debian-6.0.3-amd64-netboot/preseed.cfg
-- templates/Debian-6.0.3-i386-netboot/definition.rb
-- templates/Debian-6.0.3-i386-netboot/postinstall.sh
-- templates/Debian-6.0.3-i386-netboot/preseed.cfg
+- templates/Debian-6.0.2-amd64-netboot/definition.rb
+- templates/Debian-6.0.2-amd64-netboot/postinstall.sh
+- templates/Debian-6.0.2-amd64-netboot/preseed.cfg
+- templates/Debian-6.0.2-i386-netboot/definition.rb
+- templates/Debian-6.0.2-i386-netboot/postinstall.sh
+- templates/Debian-6.0.2-i386-netboot/preseed.cfg
 - templates/Fedora-14-amd64-netboot/definition.rb
 - templates/Fedora-14-amd64-netboot/ks.cfg
 - templates/Fedora-14-amd64-netboot/postinstall.sh
@@ -292,26 +419,9 @@ files:
 - templates/Fedora-15-i386/definition.rb
 - templates/Fedora-15-i386/ks.cfg
 - templates/Fedora-15-i386/postinstall.sh
-- templates/Fedora-15-x86_64-netboot/definition.rb
-- templates/Fedora-15-x86_64-netboot/ks.cfg
-- templates/Fedora-15-x86_64-netboot/postinstall.sh
 - templates/Fedora-15-x86_64/definition.rb
 - templates/Fedora-15-x86_64/ks.cfg
 - templates/Fedora-15-x86_64/postinstall.sh
-- templates/Fedora-16-i386/definition.rb
-- templates/Fedora-16-i386/ks.cfg
-- templates/Fedora-16-i386/postinstall.sh
-- templates/Fedora-16-x86_64/definition.rb
-- templates/Fedora-16-x86_64/ks.cfg
-- templates/Fedora-16-x86_64/postinstall.sh
-- templates/SLES-11-SP1-DVD-i586-GM/autoinst_de.xml
-- templates/SLES-11-SP1-DVD-i586-GM/autoinst_en.xml
-- templates/SLES-11-SP1-DVD-i586-GM/definition.rb
-- templates/SLES-11-SP1-DVD-i586-GM/postinstall.sh
-- templates/SLES-11-SP1-DVD-x86_64-GM/autoinst_de.xml
-- templates/SLES-11-SP1-DVD-x86_64-GM/autoinst_en.xml
-- templates/SLES-11-SP1-DVD-x86_64-GM/definition.rb
-- templates/SLES-11-SP1-DVD-x86_64-GM/postinstall.sh
 - templates/Sysrescuecd-2.0.0-experimental/autorun0
 - templates/Sysrescuecd-2.0.0-experimental/definition.rb
 - templates/archlinux-i386-netboot/aif.cfg
@@ -337,13 +447,8 @@ files:
 - templates/freebsd-8.2-pcbsd-i386/definition.rb
 - templates/freebsd-8.2-pcbsd-i386/pcinstall.fbg.cfg
 - templates/freebsd-8.2-pcbsd-i386/postinstall.sh
-- templates/funtoo-latest-generic_64-stable/definition.rb
-- templates/funtoo-latest-generic_64-stable/postinstall.sh
-- templates/funtoo-latest-generic_64-stable/postinstall2.sh
 - templates/gentoo-latest-i386-experimental/definition.rb
 - templates/gentoo-latest-i386-experimental/postinstall.sh
-- templates/gentoo-latest-x86_64-experimental/definition.rb
-- templates/gentoo-latest-x86_64-experimental/postinstall.sh
 - templates/openSUSE-11.4-DVD-i586/autoinst_de.xml
 - templates/openSUSE-11.4-DVD-i586/autoinst_en.xml
 - templates/openSUSE-11.4-DVD-i586/definition.rb
@@ -360,21 +465,6 @@ files:
 - templates/openSUSE-11.4-NET-x86_64/autoinst_en.xml
 - templates/openSUSE-11.4-NET-x86_64/definition.rb
 - templates/openSUSE-11.4-NET-x86_64/postinstall.sh
-- templates/openSUSE-12.1-DVD+NET-i586/autoinst_de.xml
-- templates/openSUSE-12.1-DVD+NET-i586/autoinst_en.xml
-- templates/openSUSE-12.1-DVD+NET-i586/definition.rb
-- templates/openSUSE-12.1-DVD+NET-i586/postinstall.sh
-- templates/openSUSE-12.1-DVD+NET-x86_64/autoinst_de.xml
-- templates/openSUSE-12.1-DVD+NET-x86_64/autoinst_en.xml
-- templates/openSUSE-12.1-DVD+NET-x86_64/definition.rb
-- templates/openSUSE-12.1-DVD+NET-x86_64/postinstall.sh
-- templates/openbsd50_amd64/README
-- templates/openbsd50_amd64/definition.rb
-- templates/openbsd50_amd64/postinstall.sh
-- templates/openbsd50_i386/.definition.rb.swp
-- templates/openbsd50_i386/README
-- templates/openbsd50_i386/definition.rb
-- templates/openbsd50_i386/postinstall.sh
 - templates/openindiana-148-ai-x86/auto_install/ai.dtd
 - templates/openindiana-148-ai-x86/auto_install/ai_manifest.xml
 - templates/openindiana-148-ai-x86/auto_install/configuration.dtd
@@ -392,12 +482,6 @@ files:
 - templates/opensuse-11.4-i386-experimental/autoinst.xml.tweaked
 - templates/opensuse-11.4-i386-experimental/definition.rb
 - templates/opensuse-11.4-i386-experimental/postinstall.sh
-- templates/scientificlinux-6.1-i386-netboot/definition.rb
-- templates/scientificlinux-6.1-i386-netboot/ks.cfg
-- templates/scientificlinux-6.1-i386-netboot/postinstall.sh
-- templates/scientificlinux-6.1-x86_64-netboot/definition.rb
-- templates/scientificlinux-6.1-x86_64-netboot/ks.cfg
-- templates/scientificlinux-6.1-x86_64-netboot/postinstall.sh
 - templates/solaris-11-express-i386/auto_install/ai.dtd
 - templates/solaris-11-express-i386/auto_install/ai_manifest.xml
 - templates/solaris-11-express-i386/auto_install/configuration.dtd
@@ -418,59 +502,60 @@ files:
 - templates/ubuntu-10.04.3-server-amd64-alt/definition.rb
 - templates/ubuntu-10.04.3-server-amd64-alt/postinstall.sh
 - templates/ubuntu-10.04.3-server-amd64-alt/preseed.cfg
+- templates/ubuntu-10.04.3-server-amd64/base.sh
+- templates/ubuntu-10.04.3-server-amd64/chef.sh
+- templates/ubuntu-10.04.3-server-amd64/cleanup.sh
 - templates/ubuntu-10.04.3-server-amd64/definition.rb
-- templates/ubuntu-10.04.3-server-amd64/postinstall.sh
 - templates/ubuntu-10.04.3-server-amd64/preseed.cfg
+- templates/ubuntu-10.04.3-server-amd64/puppet.sh
+- templates/ubuntu-10.04.3-server-amd64/ruby.sh
+- templates/ubuntu-10.04.3-server-amd64/vagrant.sh
+- templates/ubuntu-10.04.3-server-amd64/virtualbox.sh
 - templates/ubuntu-10.04.3-server-i386/definition.rb
 - templates/ubuntu-10.04.3-server-i386/postinstall.sh
 - templates/ubuntu-10.04.3-server-i386/preseed.cfg
 - templates/ubuntu-10.10-server-amd64-netboot/definition.rb
 - templates/ubuntu-10.10-server-amd64-netboot/postinstall.sh
 - templates/ubuntu-10.10-server-amd64-netboot/preseed.cfg
+- templates/ubuntu-10.10-server-amd64/base.sh
+- templates/ubuntu-10.10-server-amd64/chef.sh
+- templates/ubuntu-10.10-server-amd64/cleanup.sh
 - templates/ubuntu-10.10-server-amd64/definition.rb
 - templates/ubuntu-10.10-server-amd64/postinstall.sh
 - templates/ubuntu-10.10-server-amd64/preseed.cfg
+- templates/ubuntu-10.10-server-amd64/puppet.sh
+- templates/ubuntu-10.10-server-amd64/ruby.sh
+- templates/ubuntu-10.10-server-amd64/vagrant.sh
+- templates/ubuntu-10.10-server-amd64/virtualbox.sh
 - templates/ubuntu-10.10-server-i386-netboot/definition.rb
 - templates/ubuntu-10.10-server-i386-netboot/postinstall.sh
 - templates/ubuntu-10.10-server-i386-netboot/preseed.cfg
 - templates/ubuntu-10.10-server-i386/definition.rb
 - templates/ubuntu-10.10-server-i386/postinstall.sh
 - templates/ubuntu-10.10-server-i386/preseed.cfg
+- templates/ubuntu-11.04-server-amd64/apt-upgrade.sh
+- templates/ubuntu-11.04-server-amd64/chef.sh
 - templates/ubuntu-11.04-server-amd64/definition.rb
-- templates/ubuntu-11.04-server-amd64/postinstall.sh
+- templates/ubuntu-11.04-server-amd64/network-cleanup.sh
+- templates/ubuntu-11.04-server-amd64/nfs-client.sh
 - templates/ubuntu-11.04-server-amd64/preseed.cfg
+- templates/ubuntu-11.04-server-amd64/puppet.sh
+- templates/ubuntu-11.04-server-amd64/remove-build-essentials.sh
+- templates/ubuntu-11.04-server-amd64/ruby.sh
+- templates/ubuntu-11.04-server-amd64/ssh-keys.sh
+- templates/ubuntu-11.04-server-amd64/sudo.sh
+- templates/ubuntu-11.04-server-amd64/timestamp.sh
+- templates/ubuntu-11.04-server-amd64/vbox_additions.sh
+- templates/ubuntu-11.04-server-amd64/zero-disk.sh
 - templates/ubuntu-11.04-server-i386/definition.rb
 - templates/ubuntu-11.04-server-i386/postinstall.sh
 - templates/ubuntu-11.04-server-i386/preseed.cfg
-- templates/ubuntu-11.10-server-amd64-ishaya/definition.rb
-- templates/ubuntu-11.10-server-amd64-ishaya/postinstall.sh
-- templates/ubuntu-11.10-server-amd64-ishaya/preseed.cfg
-- templates/ubuntu-11.10-server-amd64-ruby192/definition.rb
-- templates/ubuntu-11.10-server-amd64-ruby192/postinstall.sh
-- templates/ubuntu-11.10-server-amd64-ruby192/preseed.cfg
-- templates/ubuntu-11.10-server-amd64/definition.rb
-- templates/ubuntu-11.10-server-amd64/postinstall.sh
-- templates/ubuntu-11.10-server-amd64/preseed.cfg
-- templates/ubuntu-11.10-server-i386/definition.rb
-- templates/ubuntu-11.10-server-i386/postinstall.sh
-- templates/ubuntu-11.10-server-i386/preseed.cfg
 - templates/ubuntu-8.04.4-server-amd64/definition.rb
 - templates/ubuntu-8.04.4-server-amd64/postinstall.sh
 - templates/ubuntu-8.04.4-server-amd64/preseed.cfg
 - templates/ubuntu-8.04.4-server-i386/definition.rb
 - templates/ubuntu-8.04.4-server-i386/postinstall.sh
 - templates/ubuntu-8.04.4-server-i386/preseed.cfg
-- templates/windows-2008R1-serverstandard-amd64/Autounattend.xml
-- templates/windows-2008R1-serverstandard-amd64/README.md
-- templates/windows-2008R1-serverstandard-amd64/cygwin-setup.exe
-- templates/windows-2008R1-serverstandard-amd64/definition.rb
-- templates/windows-2008R1-serverstandard-amd64/install-cygwin-sshd.bat
-- templates/windows-2008R1-serverstandard-amd64/install-guest-additions.bat
-- templates/windows-2008R1-serverstandard-amd64/install-winrm.bat
-- templates/windows-2008R1-serverstandard-amd64/oracle-cert.cer
-- templates/windows-2008R1-serverstandard-amd64/postinstall.sh
-- templates/windows-2008R1-serverstandard-amd64/sudo
-- templates/windows-2008R1-serverstandard-amd64/winrm.rb
 - templates/windows-2008R2-amd64/Autounattend.xml
 - templates/windows-2008R2-amd64/README.md
 - templates/windows-2008R2-amd64/cygwin-setup.exe
@@ -479,69 +564,14 @@ files:
 - templates/windows-2008R2-amd64/install-winrm.bat
 - templates/windows-2008R2-amd64/oracle-cert.cer
 - templates/windows-2008R2-amd64/postinstall.sh
+- templates/windows-2008R2-amd64/win7/Autounattend.xml
 - templates/windows-2008R2-amd64/winrm.rb
-- templates/windows-2008R2-serverstandard-amd64/Autounattend.xml
-- templates/windows-2008R2-serverstandard-amd64/README.md
-- templates/windows-2008R2-serverstandard-amd64/definition.rb
-- templates/windows-2008R2-serverstandard-amd64/install-cygwin-sshd.bat
-- templates/windows-2008R2-serverstandard-amd64/install-winrm.bat
-- templates/windows-2008R2-serverstandard-amd64/oracle-cert.cer
-- templates/windows-2008R2-serverstandard-amd64/postinstall.sh
-- templates/windows-7-enterprise-amd64/Autounattend.xml
-- templates/windows-7-enterprise-amd64/README.md
-- templates/windows-7-enterprise-amd64/definition.rb
-- templates/windows-7-enterprise-amd64/install-cygwin-sshd.bat
-- templates/windows-7-enterprise-amd64/install-winrm.bat
-- templates/windows-7-enterprise-amd64/oracle-cert.cer
-- templates/windows-7-enterprise-amd64/postinstall.sh
-- templates/windows-7-enterprise-i386/Autounattend.xml
-- templates/windows-7-enterprise-i386/README.md
-- templates/windows-7-enterprise-i386/definition.rb
-- templates/windows-7-enterprise-i386/install-cygwin-sshd.bat
-- templates/windows-7-enterprise-i386/install-winrm.bat
-- templates/windows-7-enterprise-i386/oracle-cert.cer
-- templates/windows-7-enterprise-i386/postinstall.sh
-- templates/windows-7-premium-amd64/Autounattend.xml
-- templates/windows-7-premium-amd64/README.md
-- templates/windows-7-premium-amd64/definition.rb
-- templates/windows-7-premium-amd64/install-chefclient.bat
-- templates/windows-7-premium-amd64/install-winrm.bat
-- templates/windows-7-premium-amd64/oracle-cert.cer
-- templates/windows-7-premium-amd64/postinstall.sh
-- templates/windows-7-premium-amd64/winrm.rb
-- templates/windows-7-professional-amd64/Autounattend.xml
-- templates/windows-7-professional-amd64/README.md
-- templates/windows-7-professional-amd64/definition.rb
-- templates/windows-7-professional-amd64/install-cygwin-sshd.bat
-- templates/windows-7-professional-amd64/install-winrm.bat
-- templates/windows-7-professional-amd64/oracle-cert.cer
-- templates/windows-7-professional-amd64/postinstall.sh
-- templates/windows-7-ultimate-amd64/Autounattend.xml
-- templates/windows-7-ultimate-amd64/README.md
-- templates/windows-7-ultimate-amd64/definition.rb
-- templates/windows-7-ultimate-amd64/install-cygwin-sshd.bat
-- templates/windows-7-ultimate-amd64/install-winrm.bat
-- templates/windows-7-ultimate-amd64/oracle-cert.cer
-- templates/windows-7-ultimate-amd64/postinstall.sh
-- templates/windows-7sp1-ultimate-amd64/Autounattend.xml
-- templates/windows-7sp1-ultimate-amd64/README.md
-- templates/windows-7sp1-ultimate-amd64/definition.rb
-- templates/windows-7sp1-ultimate-amd64/install-cygwin-sshd.bat
-- templates/windows-7sp1-ultimate-amd64/install-winrm.bat
-- templates/windows-7sp1-ultimate-amd64/oracle-cert.cer
-- templates/windows-7sp1-ultimate-amd64/postinstall.sh
-- templates/windows-8-preview-dev-amd64/Autounattend.xml
-- templates/windows-8-preview-dev-amd64/README.md
-- templates/windows-8-preview-dev-amd64/cygwin-setup.exe
-- templates/windows-8-preview-dev-amd64/definition.rb
-- templates/windows-8-preview-dev-amd64/install-cygwin-sshd.bat
-- templates/windows-8-preview-dev-amd64/install-winrm.bat
-- templates/windows-8-preview-dev-amd64/oracle-cert.cer
-- templates/windows-8-preview-dev-amd64/postinstall.sh
-- templates/windows-8-preview-dev-amd64/winrm.rb
-- trials/docu-vbox.txt
-- trials/f.rb
-- trials/t.rb
+- test/build_test.rb
+- test/definition_test.rb
+- test/definitions/test_definition/_test_me.sh
+- test/definitions/test_definition/autorun0
+- test/definitions/test_definition/definition.rb
+- test/environment_test.rb
 - validation/features/steps/ssh_steps.rb
 - validation/support/env.rb
 - validation/vagrant-private.key