veewee 0.2.2 → 0.2.3

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,75 @@
+PATH
+  remote: .
+  specs:
+    veewee (0.2.3)
+      cucumber (>= 1.0.0)
+      highline (~> 1.6.1)
+      net-ssh (>= 2.1.0)
+      popen4 (~> 0.1.2)
+      progressbar
+      rspec (~> 2.5)
+      thor (~> 0.14.6)
+      vagrant (>= 0.9.0)
+      virtualbox (>= 0.9.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    Platform (0.4.0)
+    archive-tar-minitar (0.5.2)
+    builder (3.0.0)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    cucumber (1.1.4)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.7.1)
+      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)
+      json (>= 1.4.6)
+    highline (1.6.11)
+    i18n (0.6.0)
+    json (1.5.4)
+    log4r (1.1.10)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.2.2)
+    open4 (1.3.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)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+    vagrant (0.9.5)
+      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)
+    virtualbox (0.9.2)
+      ffi (~> 1.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  rake
+  veewee!

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

data/lib/veewee/command/basebox_export.rb

@@ -0,0 +1,22 @@
+module Veewee
+  module Command
+    class BaseboxExport < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Exports the basebox to the vagrant box format"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox export <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.export_box(argv[0])
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_list.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class BaseboxList < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Lists all defined baseboxes"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox list"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        Veewee::Session.list_definitions
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_ostypes.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class BaseboxOstypes < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "List the available Operating System types"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox ostypes"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        Veewee::Session.list_ostypes
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_templates.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Veewee
+  module Command
+    class BaseboxTemplates < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "List the currently available basebox templates"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox templates"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        Veewee::Session.list_templates
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_undefine.rb

@@ -0,0 +1,22 @@
+module Veewee
+  module Command
+    class BaseboxUndefine < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Removes the definition of a basebox "
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox undefine <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.undefine(argv[0])
+      end
+    end
+  end
+end

data/lib/veewee/command/basebox_validate.rb

@@ -0,0 +1,26 @@
+module Veewee
+  module Command
+    class BaseboxValidate < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Validates a box against vagrant compliancy rules"
+          opts.separator ""
+          opts.separator "Usage: vagrant basebox validate <boxname>"
+
+          opts.on("-u", "--user", "user to login with") do |u|
+            options['user'] = u
+          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.validate_box(argv[0], options)
+      end
+    end
+  end
+end