vagrant 0.8.10 → 0.9.0

data/lib/vagrant/command/box.rb

@@ -1,32 +1,57 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class BoxCommand < GroupBase
-      register "box", "Commands to manage system boxes"
+    class Box < Base
+      def initialize(argv, env)
+        super
 
-      desc "add NAME URI", "Add a box to the system"
-      def add(name, uri)
-        Box.add(env, name, uri)
-      end
+        @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
-      desc "remove NAME", "Remove a box from the system"
-      def remove(name)
-        b = env.boxes.find(name)
-        raise Errors::BoxNotFound, :name => name if !b
-        b.destroy
+        @subcommands = Registry.new
+        @subcommands.register(:add)       { Vagrant::Command::BoxAdd }
+        @subcommands.register(:remove)    { Vagrant::Command::BoxRemove }
+        @subcommands.register(:repackage) { Vagrant::Command::BoxRepackage }
+        @subcommands.register(:list)      { Vagrant::Command::BoxList }
       end
 
-      desc "repackage NAME", "Repackage an installed box into a `.box` file."
-      def repackage(name)
-        b = env.boxes.find(name)
-        raise Errors::BoxNotFound, :name => name if !b
-        b.repackage
+      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
 
-      desc "list", "Lists all installed boxes"
-      def list
-        boxes = env.boxes.sort
-        return env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), :prefix => false) if boxes.empty?
-        boxes.each { |b| env.ui.info(b.name, :prefix => false) }
+      # Prints the help out for this command
+      def help
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant box <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 }
+
+          keys.sort.each do |key|
+            opts.separator "     #{key}"
+          end
+
+          opts.separator ""
+          opts.separator "For help on any individual command run `vagrant box COMMAND -h`"
+        end
+
+        @env.ui.info(opts.help, :prefix => false)
       end
     end
   end

data/lib/vagrant/command/box_add.rb

@@ -0,0 +1,33 @@
+require 'optparse'
+
+module Vagrant
+  module Command
+    class BoxAdd < Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant box add <name> <url>"
+          opts.separator ""
+
+          opts.on("-f", "--force", "Overwrite an existing box if it exists.") do |f|
+            options[:force] = f
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        # If we're force adding, then be sure to destroy any existing box if it
+        # exists.
+        if options[:force]
+          existing = @env.boxes.find(argv[0])
+          existing.destroy if existing
+        end
+
+        @env.boxes.add(argv[0], argv[1])
+      end
+    end
+  end
+end

data/lib/vagrant/command/box_list.rb

@@ -0,0 +1,25 @@
+require 'optparse'
+
+module Vagrant
+  module Command
+    class BoxList < Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant box list"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        boxes = @env.boxes.sort
+        if boxes.empty?
+          return @env.ui.warn(I18n.t("vagrant.commands.box.no_installed_boxes"), :prefix => false)
+        end
+        boxes.each { |b| @env.ui.info(b.name, :prefix => false) }
+      end
+    end
+  end
+end

data/lib/vagrant/command/box_remove.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Vagrant
+  module Command
+    class BoxRemove < Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant box remove <name>"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        b = @env.boxes.find(argv[0])
+        raise Errors::BoxNotFound, :name => argv[0] if !b
+        b.destroy
+      end
+    end
+  end
+end

data/lib/vagrant/command/box_repackage.rb

@@ -0,0 +1,23 @@
+require 'optparse'
+
+module Vagrant
+  module Command
+    class BoxRepackage < Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant box repackage <name>"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        b = @env.boxes.find(argv[0])
+        raise Errors::BoxNotFound, :name => argv[0] if !b
+        b.repackage
+      end
+    end
+  end
+end

data/lib/vagrant/command/destroy.rb

@@ -1,14 +1,25 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class DestroyCommand < NamedBase
-      register "destroy", "Destroy the environment, deleting the created virtual machines"
-
+    class Destroy < Base
       def execute
-        target_vms.each do |vm|
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant destroy [vm-name]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("'Destroy' each target VM...")
+        with_target_vms(argv[0]) do |vm|
           if vm.created?
+            @logger.info("Destroying: #{vm.name}")
             vm.destroy
           else
-            vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_created")
+            @logger.info("Not destroying #{vm.name}, since it isn't created.")
+            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
       end

data/lib/vagrant/command/halt.rb

@@ -1,15 +1,33 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class HaltCommand < NamedBase
-      class_option :force, :type => :boolean, :default => false, :aliases => "-f"
-      register "halt", "Halt the running VMs in the environment"
-
+    class Halt < Base
       def execute
-        target_vms.each do |vm|
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant halt [vm-name] [--force] [-h]"
+
+          opts.separator ""
+
+          opts.on("-f", "--force", "Force shut down (equivalent of pulling power)") do |f|
+            options[:force] = f
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("Halt command: #{argv.inspect} #{options.inspect}")
+        with_target_vms(argv[0]) do |vm|
           if vm.created?
-            vm.halt(options)
+            @logger.info("Halting #{vm.name}")
+            vm.halt(:force => options[:force])
           else
-            vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_created")
+            @logger.info("Not halting #{vm.name}, since not created.")
+            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
       end

data/lib/vagrant/command/init.rb

@@ -1,13 +1,36 @@
+require 'optparse'
+
+require 'vagrant/util/template_renderer'
+
 module Vagrant
   module Command
-    class InitCommand < Base
-      argument :box_name, :type => :string, :optional => true, :default => "base"
-      argument :box_url, :type => :string, :optional => true
-      source_root File.expand_path("templates/commands/init", Vagrant.source_root)
-      register "init [box_name] [box_url]", "Initializes the current folder for Vagrant usage"
-
+    class Init < Base
       def execute
-        template "Vagrantfile.erb", env.cwd.join("Vagrantfile")
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant init [box-name] [box-url]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        save_path = @env.cwd.join("Vagrantfile")
+        raise Errors::VagrantfileExistsError if save_path.exist?
+
+        template_path = ::Vagrant.source_root.join("templates/commands/init/Vagrantfile")
+        contents = Vagrant::Util::TemplateRenderer.render(template_path,
+                                                          :box_name => argv[0] || "base",
+                                                          :box_url => argv[1])
+
+        # Write out the contents
+        save_path.open("w+") do |f|
+          f.write(contents)
+        end
+
+        @env.ui.info(I18n.t("vagrant.commands.init.success"),
+                     :prefix => false)
       end
     end
   end

data/lib/vagrant/command/package.rb

@@ -1,33 +1,64 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class PackageCommand < NamedBase
-      class_option :base, :type => :string, :default => nil
-      class_option :output, :type => :string, :default => nil
-      class_option :include, :type => :array, :default => nil
-      class_option :vagrantfile, :type => :string, :default => nil
-      register "package", "Package a Vagrant environment for distribution"
-
+    class Package < Base
       def execute
-        return package_base if options[:base]
-        package_target
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant package [vm-name] [--base name] [--output name.box]"
+          opts.separator "                       [--include one,two,three] [--vagrantfile file]"
+
+          opts.separator ""
+
+          opts.on("--base NAME", "Name of a VM in virtualbox to package as a base box") do |b|
+            options[:base] = b
+          end
+
+          opts.on("--output NAME", "Name of the file to output") do |o|
+            options[:output] = o
+          end
+
+          opts.on("--include x,y,z", Array, "Additional files to package with the box.") do |i|
+            options[:include] = i
+          end
+
+          opts.on("--vagrantfile file", "Vagrantfile to package with the box.") do |v|
+            options[:vagrantfile] = v
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("package options: #{options.inspect}")
+        if options[:base]
+          package_base(options)
+        else
+          package_target(argv[0], options)
+        end
       end
 
       protected
 
-      def package_base
-        vm = VM.find(options[:base], env)
+      def package_base(options)
+        vm = VM.new(options[:base], @env, @env.config.global, :base => true)
         raise Errors::BaseVMNotFound, :name => options[:base] if !vm.created?
-        package_vm(vm)
+        @logger.debug("Packaging base VM: #{vm.name}")
+        package_vm(vm, options)
       end
 
-      def package_target
-        raise Errors::MultiVMTargetRequired, :command => "package" if target_vms.length > 1
-        vm = target_vms.first
-        raise Errors::VMNotCreatedError if !vm.created?
-        package_vm(vm)
+      def package_target(name, options)
+        with_target_vms(name, true) do |vm|
+          raise Errors::VMNotCreatedError if !vm.created?
+          @logger.debug("Packaging VM: #{vm.name}")
+          package_vm(vm, options)
+        end
       end
 
-      def package_vm(vm)
+      def package_vm(vm, options)
         opts = options.inject({}) do |acc, data|
           k,v = data
           acc["package.#{k}"] = v

data/lib/vagrant/command/provision.rb

@@ -1,20 +1,33 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class ProvisionCommand < NamedBase
-      register "provision", "Rerun the provisioning scripts on a running VM"
-
+    class Provision < Base
       def execute
-        target_vms.each do |vm|
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant provision [vm-name]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        # Go over each VM and provision!
+        @logger.debug("'provision' each target VM...")
+        with_target_vms(argv[0]) do |vm|
           if vm.created?
-            if !vm.vm.accessible?
-              raise Errors::VMInaccessible
-            elsif vm.vm.running?
+            if vm.state == :running
+              @logger.info("Provisioning: #{vm.name}")
               vm.provision
             else
-              vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_running")
+              @logger.info("#{vm.name} not running. Not provisioning.")
+              vm.ui.info I18n.t("vagrant.commands.common.vm_not_running")
             end
           else
-            vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_created")
+            @logger.info("#{vm.name} not created. Not provisioning.")
+            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
       end

data/lib/vagrant/command/reload.rb

@@ -1,14 +1,27 @@
+require 'optparse'
+
 module Vagrant
   module Command
-    class ReloadCommand < NamedBase
-      register "reload", "Reload the environment, halting it then restarting it."
-
+    class Reload < Base
       def execute
-        target_vms.each do |vm|
+        options = {}
+
+        opts = OptionParser.new do |opts|
+          opts.banner = "Usage: vagrant reload [vm-name]"
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("'reload' each target VM...")
+        with_target_vms(argv[0]) do |vm|
           if vm.created?
+            @logger.info("Reloading: #{vm.name}")
             vm.reload
           else
-            vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_created")
+            @logger.info("Not created: #{vm.name}. Not reloading.")
+            vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")
           end
         end
       end