veewee 0.2.3 → 0.3.0.alpha1

data/.gitignore

@@ -1,9 +1,11 @@
 .DS_Store
+.bundle
 gems/*
 iso/*
 tmp/*
 definitions/*
 Vagrantfile
+Vagrantfile.*
 cookbooks/*
 manifests/*
 boxes/*
@@ -11,3 +13,4 @@ pkg/*
 *.box
 .vagrant
 virtualfloppy.vfd
+*.swp

data/Gemfile

@@ -1,9 +1,8 @@
 source "http://rubygems.org"
 
-#gem "veewee", :path => "."
+gem "veewee", :path => "."
 
 group :test do
   gem "rake"
 end
-
 gemspec

data/Gemfile.lock

@@ -1,68 +1,91 @@
 PATH
   remote: .
   specs:
-    veewee (0.2.3)
-      cucumber (>= 1.0.0)
+    veewee (0.3.0.alpha1)
+      CFPropertyList (~> 2.0.17)
+      ansi (~> 1.3.0)
+      cucumber (~> 1.0.2)
+      fog (~> 1.0.0)
       highline (~> 1.6.1)
-      net-ssh (>= 2.1.0)
+      i18n
+      net-ssh (~> 2.1.0)
       popen4 (~> 0.1.2)
       progressbar
-      rspec (~> 2.5)
+      rspec (~> 2.5.0)
+      ruby-vnc (~> 1.0.0)
       thor (~> 0.14.6)
-      vagrant (>= 0.9.0)
-      virtualbox (>= 0.9.2)
+      vagrant (~> 0.8.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    CFPropertyList (2.0.17)
+      libxml-ruby (>= 1.1.0)
+      rake (>= 0.7.0)
     Platform (0.4.0)
+    ansi (1.3.0)
     archive-tar-minitar (0.5.2)
     builder (3.0.0)
-    childprocess (0.3.1)
-      ffi (~> 1.0.6)
-    cucumber (1.1.4)
+    cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.11)
-    gherkin (2.7.6)
+    excon (0.7.3)
+    ffi (1.0.9)
+    fog (1.0.0)
+      builder
+      excon (~> 0.7.3)
+      formatador (~> 0.2.0)
+      mime-types
+      multi_json (~> 1.0.3)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.1.4)
+      nokogiri (~> 1.5.0)
+      ruby-hmac
+    formatador (0.2.1)
+    gherkin (2.4.21)
       json (>= 1.4.6)
-    highline (1.6.11)
+    highline (1.6.2)
     i18n (0.6.0)
     json (1.5.4)
-    log4r (1.1.10)
+    libxml-ruby (2.2.2)
+    mime-types (1.16)
+    multi_json (1.0.3)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    open4 (1.3.0)
+    net-ssh (2.1.4)
+    nokogiri (1.5.0)
+    open4 (1.1.0)
     popen4 (0.1.2)
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
-    progressbar (0.10.0)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
+    progressbar (0.9.1)
+    rake (0.9.2)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    term-ansicolor (1.0.7)
+    rspec-mocks (2.5.0)
+    ruby-hmac (0.4.0)
+    ruby-vnc (1.0.1)
+    term-ansicolor (1.0.6)
     thor (0.14.6)
-    vagrant (0.9.5)
+    vagrant (0.8.7)
       archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
       json (~> 1.5.1)
-      log4r (~> 1.1.9)
       net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
+      net-ssh (~> 2.1.4)
+      thor (~> 0.14.6)
+      virtualbox (~> 0.9.1)
     virtualbox (0.9.2)
       ffi (~> 1.0.9)
 

data/License

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010-2011 Patrick Debois
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README-LIB.md

@@ -0,0 +1,2 @@
+this version includes patches for both fission and ruby-vnc
+As the gems are not yet released, they are currently included in the veewee gem

data/README.md

@@ -32,66 +32,39 @@ If you don't use rvm, be sure to execute vagrant through bundle exec
 
     $ vagrant basebox templates
     The following templates are available:
-    vagrant basebox define '<boxname>' 'CentOS-4.8-i386'
-    vagrant basebox define '<boxname>' 'CentOS-5.5-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-5.6-i386'
-    vagrant basebox define '<boxname>' 'CentOS-5.6-i386-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-5.6-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-5.7-i386-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-5.7-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-6.0-i386'
-    vagrant basebox define '<boxname>' 'CentOS-6.0-i386-netboot'
-    vagrant basebox define '<boxname>' 'CentOS-6.0-x86_64'
-    vagrant basebox define '<boxname>' 'CentOS-6.0-x86_64-minimal'
-    vagrant basebox define '<boxname>' 'CentOS-6.0-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'Debian-5.0.8-amd64-netboot'
-    vagrant basebox define '<boxname>' 'Debian-5.0.8-i386-netboot'
-    vagrant basebox define '<boxname>' 'Debian-6.0.3-amd64-netboot'
-    vagrant basebox define '<boxname>' 'Debian-6.0.3-i386-netboot'
-    vagrant basebox define '<boxname>' 'Fedora-14-amd64'
-    vagrant basebox define '<boxname>' 'Fedora-14-amd64-netboot'
-    vagrant basebox define '<boxname>' 'Fedora-14-i386'
-    vagrant basebox define '<boxname>' 'Fedora-14-i386-netboot'
-    vagrant basebox define '<boxname>' 'Fedora-15-i386'
-    vagrant basebox define '<boxname>' 'Fedora-15-i386-netboot'
-    vagrant basebox define '<boxname>' 'Fedora-15-x86_64'
-    vagrant basebox define '<boxname>' 'Fedora-15-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'Sysrescuecd-2.0.0-experimental'
-    vagrant basebox define '<boxname>' 'archlinux-i386'
-    vagrant basebox define '<boxname>' 'archlinux-i386-netboot'
-    vagrant basebox define '<boxname>' 'archlinux-x86_64'
-    vagrant basebox define '<boxname>' 'archlinux-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'freebsd-8.2-experimental'
-    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386'
-    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386-netboot'
-    vagrant basebox define '<boxname>' 'gentoo-latest-i386-experimental'
-    vagrant basebox define '<boxname>' 'openSUSE-11.4-DVD-i586'
-    vagrant basebox define '<boxname>' 'openSUSE-11.4-DVD-x86_64'
-    vagrant basebox define '<boxname>' 'openSUSE-11.4-NET-i586'
-    vagrant basebox define '<boxname>' 'openSUSE-11.4-NET-x86_64'
-    vagrant basebox define '<boxname>' 'openindiana-148-ai-x86'
-    vagrant basebox define '<boxname>' 'opensuse-11.4-i386-experimental'
-    vagrant basebox define '<boxname>' 'scientificlinux-6.1-i386-netboot'
-    vagrant basebox define '<boxname>' 'scientificlinux-6.1-x86_64-netboot'
-    vagrant basebox define '<boxname>' 'solaris-11-express-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-amd64-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.3-server-amd64'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.3-server-amd64-alt'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.3-server-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-i386-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-11.04-server-amd64'
-    vagrant basebox define '<boxname>' 'ubuntu-11.04-server-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-11.10-server-amd64'
-    vagrant basebox define '<boxname>' 'ubuntu-11.10-server-amd64-ishaya'
-    vagrant basebox define '<boxname>' 'ubuntu-11.10-server-amd64-ruby192'
-    vagrant basebox define '<boxname>' 'ubuntu-11.10-server-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-8.04.4-server-amd64'
-    vagrant basebox define '<boxname>' 'ubuntu-8.04.4-server-i386'
-    vagrant basebox define '<boxname>' 'windows-2008R2-amd64'
+    vagrant basebox define '<box_name>' 'ubuntu-10.10-server-i386-netboot'
+    vagrant basebox define '<box_name>' 'ubuntu-10.10-server-amd64-netboot'
+    vagrant basebox define '<box_name>' 'solaris-11-express-i386'
+    vagrant basebox define '<box_name>' 'freebsd-8.2-pcbsd-i386-netboot'
+    vagrant basebox define '<box_name>' 'Fedora-14-amd64-netboot'
+    vagrant basebox define '<box_name>' 'ubuntu-11.04-server-amd64'
+    vagrant basebox define '<box_name>' 'freebsd-8.2-experimental'
+    vagrant basebox define '<box_name>' 'archlinux-i686'
+    vagrant basebox define '<box_name>' 'CentOS-5.6-i386-netboot'
+    vagrant basebox define '<box_name>' 'openindiana-148-ai-x86'
+    vagrant basebox define '<box_name>' 'ubuntu-10.10-server-i386'
+    vagrant basebox define '<box_name>' 'ubuntu-10.04.2-server-i386'
+    vagrant basebox define '<box_name>' 'ubuntu-10.04.2-amd64-netboot'
+    vagrant basebox define '<box_name>' 'Sysrescuecd-2.0.0-experimental'
+    vagrant basebox define '<box_name>' 'Debian-6.0.1a-amd64-netboot'
+    vagrant basebox define '<box_name>' 'freebsd-8.2-pcbsd-i386'
+    vagrant basebox define '<box_name>' 'Fedora-14-i386'
+    vagrant basebox define '<box_name>' 'Fedora-14-amd64'
+    vagrant basebox define '<box_name>' 'ubuntu-10.04.2-server-i386-netboot'
+    vagrant basebox define '<box_name>' 'opensuse-11.4-i386-experimental'
+    vagrant basebox define '<box_name>' 'CentOS-4.8-i386'
+    vagrant basebox define '<box_name>' 'ubuntu-10.04.2-server-amd64'
+    vagrant basebox define '<box_name>' 'ubuntu-8.04.4-server-amd64'
+    vagrant basebox define '<box_name>' 'gentoo-latest-i386-experimental'
+    vagrant basebox define '<box_name>' 'ubuntu-8.04.4-server-i386'
+    vagrant basebox define '<box_name>' 'windows-2008R2-amd64'
+    vagrant basebox define '<box_name>' 'Fedora-14-i386-netboot'
+    vagrant basebox define '<box_name>' 'archlinux-64-experimental'
+    vagrant basebox define '<box_name>' 'Debian-6.0.1a-i386-netboot'
+    vagrant basebox define '<box_name>' 'ubuntu-10.10-server-amd64'
+    vagrant basebox define '<box_name>' 'archlinux-64-aif-experimental'
+    vagrant basebox define '<box_name>' 'ubuntu-11.04-server-i386'
+    vagrant basebox define '<box_name>' 'CentOS-5.6-i386'
 
 
 ## Define a new box
@@ -111,7 +84,7 @@ this is essentially making a copy based on the  templates provided above.
 
 ## Optionally modify the definition.rb , postinstall.sh or preseed.cfg
 
-    Veewee::Session.declare( {
+    Veewee::Definition.declare( {
     :cpu_count => '1', :memory_size=> '256', 
     :disk_size => '10140', :disk_format => 'VDI',
     :os_type_id => 'Ubuntu',
@@ -158,7 +131,7 @@ Put your isofile inside the 'currentdir'/iso directory or if you don't run
 - Mount the ISO File :iso_file
 - Boot up the machine and wait for :boot_time
 - Send the keystrokes in :boot_cmd_sequence
-- Startup a webserver on :kickstart_port to wait for a request for the :kickstart_file (don't navigate to the file in your browser or the server will stop and the installer will not be able to find your preseed)
+- Startup a webserver on :kickstart_port to wait for a request for the :kickstart_file
 - Wait for ssh login to work with :ssh_user , :ssh_password
 - Sudo execute the :postinstall_files
 

data/Rakefile

@@ -1,97 +1,63 @@
 require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
+require 'veewee'
 Bundler::GemHelper.install_tasks
 
-#Setup some base variables to use
-veewee_dir = "."
-lib_dir  = File.expand_path(File.join(veewee_dir, "lib"))
-box_dir  = File.expand_path(File.join(veewee_dir, "boxes"))
-vbox_dir = File.expand_path(File.join(veewee_dir, "tmp"))
-tmp_dir  = File.expand_path(File.join(veewee_dir, "tmp"))
-iso_dir  = File.expand_path(File.join(veewee_dir, "iso"))
-definition_dir = File.expand_path(File.join(veewee_dir, "definitions"))
-template_dir   = File.expand_path(File.join(veewee_dir, "templates"))
+desc 'Default: run tests'
+task :default => :test
 
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks
 
-#Load Veewee::Session libraries
-Dir.glob(File.join(lib_dir, '**','*.rb')).each { |f| require f }
-
-#Initialize
-Veewee::Session.setenv({
-  :veewee_dir => veewee_dir,
-  :definition_dir => definition_dir,
-  :template_dir => template_dir,
-  :iso_dir => iso_dir,
-  :box_dir => box_dir,
-  :tmp_dir => tmp_dir
-})
-
-desc 'Default: list templates'
-task :default => [:templates]
-
-desc 'List templates'
-task :templates do
-  Veewee::Session.list_templates
-end
-
-desc 'Define box'
-task :define, [:boxname,:template_name] do |t,args|
-  if args.to_hash.size!=2
-    puts "needs two arguments: rake define['boxname','template_name']"
-    exit
-  end
-  Veewee::Session.define(args.boxname,args.template_name)
-end
-
-desc 'Undefine box'
-task :undefine, [:boxname] do |t,args|
-  if args.to_hash.size!=1
-    puts "needs one arguments: rake undefine[\"yourname\"]"
-    exit
-  end
-  Veewee::Session.undefine(args.boxname)
-end
-
-desc 'List Definitions'
-task :definitions do
-  Veewee::Session.list_definitions
-end
-
-desc 'Build box'
-task :build, [:boxname] do |t,args|
-  if args.to_hash.size!=1
-    puts "needs one arguments: rake build['boxname']"
-    exit
-  end
-  Veewee::Session.build(args.boxname)
-end
-
-desc 'List boxes'
-task :boxes do
-  Veewee::Session.list_boxes
-end
-
-desc 'Export box'
-task :export, [:boxname] do |t,args|
-  if args.to_hash.size!=1
-    puts "needs one arguments: rake export['boxname']"
-    exit
+desc 'Tests not requiring an real box'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/*_test.rb'
+end
+
+desc 'Tests requiring an real box'
+Rake::TestTask.new do |t|
+  t.name="realtest"
+  t.libs << "test"
+  t.pattern = 'test/**/*_realtest.rb'
+end
+
+desc 'Verify ISO'
+task :iso, [:box_name] do |t,args|
+  require 'net/http'
+  #if args.to_hash.size!=1
+  #puts "needs one arguments: rake iso [\"yourname\"]"
+  #exit
+  #end
+  Dir.glob("templates/*").each do |name|
+    definition_name=File.basename(name)
+    definition=Veewee::Environment.new(:cwd => ".",:definition_dir => "templates",:definition_path => "templates").get_definition(definition_name)
+    next if definition.iso_src.nil? || definition.iso_src==""
+    begin
+      url=definition.iso_src
+      found=false
+      response = nil
+      while found==false
+        uri=URI.parse(url)
+        Net::HTTP.start(uri.host,uri.port) {|http|
+          response = http.head(uri.path)
+        }
+        unless response['location'].nil?
+          #puts "Redirecting to "+response['location']
+          url=response['location']
+        else
+          found=true
+        end
+      end
+      length=response['content-length']
+      if length.to_i < 10000
+        puts definition.iso_src
+        p response['content-type']
+        puts uri.host,uri.port, uri.path,response.code
+      end
+    rescue Exception => ex
+      puts "Error"+ex.to_s+definition.iso_src
+    end
   end
-  Veewee::Session.export_box(args.boxname)
-end
-
-desc 'Remove box'
-task :remove_box, [:boxname] do |t,args|
-  Veewee::Session.remove_box(args.boxname)
-end
-
-desc 'List ostypes available'
-task :list_ostypes do |t,args|
-  Veewee::Session.list_ostypes
-end
-
-desc 'Clean all unfinished builds'
-task :clean do
-  Veewee::Session.clean
 end

data/bin/veewee

@@ -1,79 +1,22 @@
 #!/usr/bin/env ruby
-
-require 'rubygems'
-require 'thor'
-require 'bundler'
-require 'virtualbox'
 require 'veewee'
 
+env = Veewee::Environment.new
 
-#Setup some base variables to use
-veewee_dir= File.expand_path(File.join(File.dirname(__FILE__),".."))
-definition_dir= File.expand_path(File.join(".", "definitions"))
-lib_dir= File.expand_path(File.join(veewee_dir, "lib"))
-box_dir= File.expand_path(File.join(veewee_dir, "boxes"))
-template_dir=File.expand_path(File.join(veewee_dir, "templates"))
-
-#vbox_dir=File.expand_path(File.join(veewee_dir, "tmp"))
-tmp_dir=File.expand_path(File.join(veewee_dir, "tmp"))
-
-iso_dir=File.expand_path(File.join(veewee_dir, "iso"))
-
-#needs to be moved to the config files to be allowed override
-#ENV['VBOX_USER_HOME']=vbox_dir
-
-#Load Veewee::Session libraries
-Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f|
-  require f  }
+begin
+  # Begin logging
+  env.ui.info("veewee") { "`veewee` invoked: #{ARGV.inspect}" }
 
-#Initialize
-Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition_dir,
-   :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir})
-
-
-   
-class VeeweeCLI < Thor 
-  
-  desc "init [NAME] [TEMPLATE]", "initializes a box from a template" 
-  method_options :force => :boolean
-  def init(boxname=nil, template=nil)
-    if (boxname.nil?)  
-      puts "please provide a boxname"
-      exit
-    end
-    
-    puts "Init a new box #{boxname}, starting from template #{template}"
-  	Veewee::Session.define(boxname,template)
-  	
-  end
-
-  desc "templates", "list the template available" 
-  def templates 
-    Veewee::Session.list_templates
-  end
-  
-  desc "build [NAME]", "build the box defined" 
-  method_options :force => :boolean
-  def build(boxname)
-    puts "Building box #{boxname}"
-	  Veewee::Session.build(boxname)
-  end
-
-  desc "export [NAME]", "export the box" 
-  method_options :force => :boolean  
-  def export(boxname)
-      if (!boxname.nil?)
-        Veewee::Session.export_box(boxname)
-      end
-  end
-  
-end
+  # Disable color if the proper argument was passed
+  shell = ARGV.include?("--no-color") ? Thor::Shell::Basic.new : Thor::Base.shell.new
 
+  # Attach the UI
+  env.ui = ::Veewee::UI::Shell.new(env, shell)
+  env.load!
 
+  # Start the CLI
+  ::Veewee::CLI.start(ARGV,:env => env)
 
-version=VirtualBox.version
-if (version.match(/^4./))
-   	VeeweeCLI.start
-else
-   	puts "veewee only supports VirtualBox 4.x"
+rescue Veewee::Error => e
+  puts "#{e}"
 end