vagrantup 0.3.4 → 0.4.0

data/lib/vagrant/box.rb

@@ -56,7 +56,7 @@ module Vagrant
     # of a specific instance.
     attr_accessor :env
 
-    class <<self
+    class << self
       # Returns an array of all created boxes, as strings.
       #
       # @return [Array<String>]
@@ -149,4 +149,4 @@ module Vagrant
       self.class.directory(env, self.name)
     end
   end
-end
+end

data/lib/vagrant/busy.rb

@@ -45,7 +45,7 @@ module Vagrant
 
       def wait_for_not_busy(sleeptime=5)
         if @@trap_thread
-          logger.info "Exiting vagrant immediately!"
+          # logger.info "Exiting vagrant immediately!"
           Thread.kill(@@trap_thread)
           abort
           return # for tests
@@ -55,12 +55,12 @@ module Vagrant
           # Wait while the app is busy
           loop do
             break unless busy?
-            logger.info "Waiting for vagrant to clean itself up..."
+            # logger.info "Waiting for vagrant to clean itself up..."
             sleep sleeptime
           end
 
           # Exit out of the entire script
-          logger.info "Exiting vagrant..."
+          # logger.info "Exiting vagrant..."
           exit
         end
       end

data/lib/vagrant/command.rb

@@ -5,7 +5,7 @@ module Vagrant
   class Command
     attr_reader :env
 
-    class <<self
+    class << self
       # Executes a given subcommand within the current environment (from the
       # current working directory).
       def execute(*args)
@@ -24,4 +24,4 @@ module Vagrant
       Commands::Base.dispatch(env, *args)
     end
   end
-end
+end

data/lib/vagrant/commands/base.rb

@@ -12,7 +12,7 @@ module Vagrant
 
       attr_reader :env
 
-      class <<self
+      class << self
         # Contains the list of registered subcommands. The registered commands are
         # stored in a hash table and are therefore unordered.
         #
@@ -50,22 +50,6 @@ module Vagrant
           klass.dispatch(env, *args)
         end
 
-        # Prints out the list of supported commands and their descriptions (if
-        # available) then exits.
-        def puts_help
-          puts "Usage: vagrant SUBCOMMAND ...\n\n"
-
-          puts "Supported commands:"
-          subcommands.keys.sort.each do |key|
-            klass = subcommands[key]
-            next if klass.description.empty?
-
-            puts "#{' ' * 4}#{key.ljust(20)}#{klass.description}"
-          end
-
-          exit
-        end
-
         # Sets or reads the description, depending on if the value is set in the
         # parameter.
         def description(value=nil)
@@ -92,7 +76,7 @@ module Vagrant
         else
           # Just print out the help, since this top-level command does nothing
           # on its own
-          self.class.puts_help
+          show_help
         end
       end
 
@@ -110,6 +94,23 @@ module Vagrant
       # Methods below are not meant to be overriden/implemented by subclasses
       #-------------------------------------------------------------------
 
+      # Parses the options for a given command and if a name was
+      # given, it calls the single method, otherwise it calls the all
+      # method. This helper is an abstraction which allows commands to
+      # easily be used in both regular and multi-VM environments.
+      def all_or_single(args, method_prefix)
+        args = parse_options(args)
+
+        single_method = "#{method_prefix}_single".to_sym
+        if args[0]
+          send(single_method, args[0])
+        else
+          env.vms.keys.each do |name|
+            send(single_method, name)
+          end
+        end
+      end
+
       # Shows the version
       def puts_version
         File.open(File.join(PROJECT_ROOT, "VERSION"), "r") do |f|
@@ -122,6 +123,12 @@ module Vagrant
       def option_parser(reload=false)
         @option_parser = nil if reload
         @option_parser ||= OptionParser.new do |opts|
+          # The --help flag is available on all children commands, and will
+          # immediately show help.
+          opts.on("--help", "Show help for the current subcommand.") do
+            show_help
+          end
+
           options_spec(opts)
         end
       end
@@ -136,7 +143,6 @@ module Vagrant
       # to parse command line options.
       def parse_options(args)
         option_parser.parse!(args)
-        options
       rescue OptionParser::InvalidOption
         show_help
       end
@@ -156,8 +162,22 @@ module Vagrant
         end
 
         puts option_parser.help
+
+        my_klass = self.class
+        if !my_klass.subcommands.empty?
+          puts "\nSupported subcommands:"
+          my_klass.subcommands.keys.sort.each do |key|
+            klass = my_klass.subcommands[key]
+            next if klass.description.empty?
+
+            puts "#{' ' * 8}#{key.ljust(20)}#{klass.description}"
+          end
+
+          puts "\nFor help on a specific subcommand, run `vagrant SUBCOMMAND --help`"
+        end
+
         exit
       end
     end
   end
-end
+end

data/lib/vagrant/commands/destroy.rb

@@ -11,8 +11,22 @@ module Vagrant
       description "Destroys the vagrant environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.vm.destroy
+        all_or_single(args, :destroy)
+      end
+
+      # Destroys a single VM by name.
+      def destroy_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.destroy
+        else
+          vm.env.logger.info "VM '#{name}' not created. Ignoring."
+        end
       end
 
       def options_spec(opts)
@@ -20,4 +34,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/halt.rb

@@ -11,13 +11,33 @@ module Vagrant
       description "Halts the currently running vagrant environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.vm.execute!(Actions::VM::Halt)
+        all_or_single(args, :halt)
+      end
+
+      def halt_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.halt(options)
+        else
+          vm.env.logger.info "VM '#{name}' not created. Ignoring."
+        end
       end
 
       def options_spec(opts)
         opts.banner = "Usage: vagrant halt"
+
+        # Defaults
+        options[:force] = false
+
+        opts.on("-f", "--force", "Forceful shutdown of virtual machine.") do |v|
+          options[:force] = true
+        end
       end
     end
   end
-end
+end

data/lib/vagrant/commands/package.rb

@@ -8,23 +8,57 @@ module Vagrant
       description "Packages a vagrant environment for distribution"
 
       def execute(args=[])
-        parse_options(args)
+        args = parse_options(args)
 
-        if !options[:base]
-          # Packaging a pre-existing environment
-          env.require_persisted_vm
+        if options[:base]
+          package_base
         else
-          # Packaging a base box; that is a VM not tied to a specific
-          # vagrant environment
-          vm = VM.find(options[:base])
-          vm.env = env if vm
-          env.vm = vm
+          package_single(args[0])
+        end
+      end
 
-          error_and_exit(:vm_base_not_found, :name => options[:base]) unless vm
+      def package_base
+        # Packaging a base box; that is a VM not tied to a specific
+        # vagrant environment
+        vm = VM.find(options[:base], env)
+        if !vm
+          error_and_exit(:vm_base_not_found, :name => options[:base])
+          return # for tests
         end
 
-        error_and_exit(:vm_power_off_to_package) unless env.vm.powered_off?
-        env.vm.package(args[0], options[:include])
+        package_vm(vm)
+      end
+
+      def package_single(name)
+        if name.nil? && env.multivm?
+          error_and_exit(:package_multivm)
+          return
+        end
+
+        vm = if name.nil?
+               env.vms.values.first
+             else
+               env.vms[name.to_sym]
+             end
+
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return
+        elsif !vm.created?
+          error_and_exit(:environment_not_created)
+          return
+        end
+
+        package_vm(vm)
+      end
+
+      def package_vm(vm)
+        if !vm.powered_off?
+          error_and_exit(:vm_power_off_to_package)
+          return # for tests
+        end
+
+        vm.package(options)
       end
 
       def options_spec(opts)
@@ -32,15 +66,21 @@ module Vagrant
 
         # Defaults
         options[:include] = []
+        options[:base] = nil
+        options[:output] = nil
 
-        opts.on("--base [BASE]", "Name or UUID of VM to create a base box from") do |v|
+        opts.on("--base BASE", "Name or UUID of VM to create a base box from") do |v|
           options[:base] = v
         end
 
         opts.on("--include x,y,z", Array, "List of files to include in the package") do |v|
           options[:include] = v
         end
+
+        opts.on("-o", "--output FILE", "File to save the package as.") do |v|
+          options[:output] = v
+        end
       end
     end
   end
-end
+end

data/lib/vagrant/commands/provision.rb

@@ -0,0 +1,31 @@
+module Vagrant
+  class Commands
+    #run the provisioner on a running vm
+    class Provision < Base
+      Base.subcommand "provision", self
+      description "Run the provisioner"
+
+      def execute(args=[])
+        all_or_single(args, :provision)
+      end
+
+      def provision_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.vm.running?
+          vm.provision
+        else
+          vm.env.logger.info "VM '#{name}' not running. Ignoring provision request."
+        end
+      end
+
+      def options_spec(opts)
+        opts.banner = "Usage: vagrant provision"
+      end
+    end
+  end
+end

data/lib/vagrant/commands/reload.rb

@@ -10,8 +10,21 @@ module Vagrant
       description "Reload the vagrant environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.vm.execute!(Actions::VM::Reload)
+        all_or_single(args, :reload)
+      end
+
+      def reload_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.reload
+        else
+          vm.env.logger.info "VM '#{name}' not created. Ignoring."
+        end
       end
 
       def options_spec(opts)
@@ -19,4 +32,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/resume.rb

@@ -10,8 +10,21 @@ module Vagrant
       description "Resumes a suspend vagrant environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.vm.resume
+        all_or_single(args, :resume)
+      end
+
+      def resume_single(name)
+        vm = env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if vm.created?
+          vm.resume
+        else
+          vm.env.logger.info "VM '#{name}' not created. Ignoring."
+        end
       end
 
       def options_spec(opts)
@@ -19,4 +32,4 @@ module Vagrant
       end
     end
   end
-end
+end

data/lib/vagrant/commands/ssh.rb

@@ -10,8 +10,30 @@ module Vagrant
       description "SSH into the currently running environment"
 
       def execute(args=[])
-        env.require_persisted_vm
-        env.ssh.connect
+        args = parse_options(args)
+        ssh_connect(args[0])
+      end
+
+      def ssh_connect(name)
+        if name.nil? && env.multivm?
+          if env.primary_vm.nil?
+            error_and_exit(:ssh_multivm)
+            return # for tests
+          end
+        end
+
+        vm = name.nil? ? env.primary_vm :  env.vms[name.to_sym]
+        if vm.nil?
+          error_and_exit(:unknown_vm, :vm => name)
+          return # for tests
+        end
+
+        if !vm.created?
+          error_and_exit(:environment_not_created)
+          return
+        else
+          vm.ssh.connect
+        end
       end
 
       def options_spec(opts)
@@ -19,4 +41,4 @@ module Vagrant
       end
     end
   end
-end
+end