HeSYINUvSBZfxqA-veewee 0.2.0.2 → 0.203.1

data/README.md

@@ -32,39 +32,66 @@ 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>' 'ubuntu-10.10-server-i386-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64-netboot'
-    vagrant basebox define '<boxname>' 'solaris-11-express-i386'
-    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386-netboot'
+    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>' 'ubuntu-11.04-server-amd64'
+    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>' 'archlinux-i686'
-    vagrant basebox define '<boxname>' 'CentOS-5.6-i386-netboot'
+    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>' 'ubuntu-10.10-server-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386'
+    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>' 'Sysrescuecd-2.0.0-experimental'
-    vagrant basebox define '<boxname>' 'Debian-6.0.1a-amd64-netboot'
-    vagrant basebox define '<boxname>' 'freebsd-8.2-pcbsd-i386'
-    vagrant basebox define '<boxname>' 'Fedora-14-i386'
-    vagrant basebox define '<boxname>' 'Fedora-14-amd64'
     vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-i386-netboot'
-    vagrant basebox define '<boxname>' 'opensuse-11.4-i386-experimental'
-    vagrant basebox define '<boxname>' 'CentOS-4.8-i386'
-    vagrant basebox define '<boxname>' 'ubuntu-10.04.2-server-amd64'
+    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>' 'gentoo-latest-i386-experimental'
     vagrant basebox define '<boxname>' 'ubuntu-8.04.4-server-i386'
     vagrant basebox define '<boxname>' 'windows-2008R2-amd64'
-    vagrant basebox define '<boxname>' 'Fedora-14-i386-netboot'
-    vagrant basebox define '<boxname>' 'archlinux-64-experimental'
-    vagrant basebox define '<boxname>' 'Debian-6.0.1a-i386-netboot'
-    vagrant basebox define '<boxname>' 'ubuntu-10.10-server-amd64'
-    vagrant basebox define '<boxname>' 'archlinux-64-aif-experimental'
-    vagrant basebox define '<boxname>' 'ubuntu-11.04-server-i386'
-    vagrant basebox define '<boxname>' 'CentOS-5.6-i386'
 
 
 ## Define a new box
@@ -131,7 +158,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
+- 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)
 - Wait for ssh login to work with :ssh_user , :ssh_password
 - Sudo execute the :postinstall_files
 

data/Rakefile

@@ -4,67 +4,72 @@ require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
 #Setup some base variables to use
-veewee_dir= "."
-definition_dir= File.expand_path(File.join(veewee_dir, "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"))
+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"))
 
 
 #Load Veewee::Session libraries
-Dir.glob(File.join(lib_dir, '**','*.rb')).each {|f| 
-  require f  }
+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})
+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
+  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)
+  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)
+  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
+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)
+  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
+  Veewee::Session.list_boxes
 end
 
 desc 'Export box'
@@ -73,20 +78,20 @@ task :export, [:boxname] do |t,args|
     puts "needs one arguments: rake export['boxname']"
     exit
   end
-    Veewee::Session.export_box(args.boxname)
+  Veewee::Session.export_box(args.boxname)
 end
 
 desc 'Remove box'
 task :remove_box, [:boxname] do |t,args|
-    Veewee::Session.remove_box(args.boxname)
+  Veewee::Session.remove_box(args.boxname)
 end
 
 desc 'List ostypes available'
 task :list_ostypes do |t,args|
-    Veewee::Session.list_ostypes
+  Veewee::Session.list_ostypes
 end
 
 desc 'Clean all unfinished builds'
-task :clean do 
-    Veewee::Session.clean
+task :clean do
+  Veewee::Session.clean
 end

data/lib/veewee.rb

@@ -1,2 +1,4 @@
 require 'vagrant'
 require 'veewee/command'
+
+Vagrant.commands.register(:basebox)      { Veewee::Command::Basebox }

data/lib/veewee/command.rb

@@ -19,64 +19,6 @@ Veewee::Session.setenv({:veewee_dir => veewee_dir, :definition_dir => definition
    :template_dir => template_dir, :iso_dir => iso_dir, :box_dir => box_dir, :tmp_dir => tmp_dir, :validation_dir => validation_dir})
 
 module Veewee
-class Command < Vagrant::Command::GroupBase
-  register "basebox","Commands to manage baseboxes"  
-
-  desc "templates", "List the currently available basebox templates"
-  def templates
-    Veewee::Session.list_templates
-  end
-
-  desc "define BOXNAME TEMPLATE", "Define a new basebox starting from a template"
-  method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the definition"
-  def define(boxname, template)    
-    Veewee::Session.define(boxname,template,options)
-  end
-
-  desc "undefine BOXNAME", "Removes the definition of a basebox "
-  def undefine(boxname)    
-      Veewee::Session.undefine(boxname)
-  end
-
-  desc "build BOXNAME", "Build the box BOXNAME"
-  method_option :force,:type => :boolean , :default => false, :aliases => "-f", :desc => "overwrite the basebox"
-  method_option :nogui,:type => :boolean , :default => false, :aliases => "-n", :desc => "no gui"
-
-  def build(boxname)
-    Veewee::Session.build(boxname,options)
+  module Command
   end
-
-  desc "ostypes", "List the available Operating System types"
-  def ostypes
-    Veewee::Session.list_ostypes
-  end
-  
-  desc "destroy BOXNAME", "Destroys the virtualmachine that was build for a basebox"
-  def destroy(boxname)
-     Veewee::Session.destroy_vm(boxname)
-  end
-  
-  desc "list", "Lists all defined baseboxes"
-  def list
-  Veewee::Session.list_definitions
-  end
-  
-  desc "export [NAME]", "Exports the basebox to the vagrant box format" 
-  method_options :force => :boolean  
-  def export(boxname)
-      if (!boxname.nil?)
-        Veewee::Session.export_box(boxname)
-      end
-  end
-  
-  desc "validate [NAME]", "Validates a box against vagrant compliancy rules"
-  method_option :user,:default => "vagrant", :aliases => "-u", :desc => "user to login with"
-  def validate(boxname)
-      if (!boxname.nil?)
-        Veewee::Session.validate_box(boxname,options)
-      end
-  end
-  
-end
-
 end

data/lib/veewee/command/basebox.rb

@@ -0,0 +1,63 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class Basebox < Vagrant::Command::Base
+      def initialize(argv, env)
+        super
+
+        @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+        @subcommands = Vagrant::Registry.new
+        @subcommands.register(:templates)  { Veewee::Command::BaseboxTemplates }
+        @subcommands.register(:list)       { Veewee::Command::BaseboxList }
+        @subcommands.register(:define)     { Veewee::Command::BaseboxDefine }
+        @subcommands.register(:undefine)   { Veewee::Command::BaseboxUndefine }
+        @subcommands.register(:build)      { Veewee::Command::BaseboxBuild }
+        @subcommands.register(:ostypes)    { Veewee::Command::BaseboxOstypes }
+        @subcommands.register(:destroy)    { Veewee::Command::BaseboxDestroy }
+        @subcommands.register(:export)     { Veewee::Command::BaseboxExport }
+        @subcommands.register(:validate)   { Veewee::Command::BaseboxValidate }
+      end
+
+      def execute
+        if @main_args.include?("-h") || @main_args.include?("--help")
+          # Print the help for all the box commands.
+          return help
+        end
+
+        # If we reached this far then we must have a subcommand. If not,
+        # then we also just print the help and exit.
+        command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+        return help if !command_class || !@sub_command
+        @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+        # Initialize and execute the command class
+        command_class.new(@sub_args, @env).execute
+      end
+
+      # Prints the help out for this command
+      def help
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant basebox <command> [<args>]"
+          opts.separator ""
+          opts.separator "Available subcommands:"
+
+          # Add the available subcommands as separators in order to print them
+          # out as well.
+          keys = []
+          @subcommands.each { |key, value| keys << key.to_s }
+
+          keys.sort.each do |key|
+            opts.separator "     #{key}"
+          end
+
+          opts.separator ""
+          opts.separator "For help on any individual command run `vagrant basebox COMMAND -h`"
+        end
+
+        @env.ui.info(opts.help, :prefix => false)
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_build.rb

@@ -0,0 +1,32 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class BaseboxBuild < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Build the box <boxname>"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox build <boxname>"
+
+          opts.on("-f", "--force", "overwrite the basebox") do |f|
+            options['force'] = f
+          end
+
+          opts.on("-n", "--nogui", "no gui") do |n|
+            options['nogui'] = n
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+        raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+        Veewee::Session.build(argv[0], options)
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_define.rb

@@ -0,0 +1,28 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class BaseboxDefine < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Define a new basebox starting from a template"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox define <boxname> <template>"
+
+          opts.on("-f", "--force", "overwrite the definition") do |f|
+            options['force'] = f
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+        raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 2
+
+        Veewee::Session.define(argv[0], argv[1], options)
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_destroy.rb

@@ -0,0 +1,22 @@
+module Veewee
+  module Command
+    class BaseboxDestroy < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Destroys the virtualmachine that was build for a basebox"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox destroy <boxname>"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+        raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+        Veewee::Session.destroy_vm(argv[0])
+      end
+    end
+  end
+end