vagrantup 1.0.7 → 1.1.0

data/plugins/commands/box/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandBox
+    class Plugin < Vagrant.plugin("2")
+      name "box command"
+      description "The `box` command gives you a way to manage boxes."
+
+      command("box") do
+        require File.expand_path("../command/root", __FILE__)
+        Command::Root
+      end
+    end
+  end
+end

data/plugins/commands/destroy/command.rb

@@ -0,0 +1,31 @@
+module VagrantPlugins
+  module CommandDestroy
+    class Command < Vagrant.plugin("2", :command)
+      def execute
+        options = {}
+        options[:force] = false
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant destroy [vm-name]"
+          o.separator ""
+
+          o.on("-f", "--force", "Destroy without confirmation.") do |f|
+            options[:force] = f
+          end
+        end
+
+        # Parse the options
+        argv = parse_options(opts)
+        return if !argv
+
+        @logger.debug("'Destroy' each target VM...")
+        with_target_vms(argv, :reverse => true) do |vm|
+          vm.action(:destroy, :force_confirm_destroy => options[:force])
+        end
+
+        # Success, exit status 0
+        0
+      end
+    end
+  end
+end

data/plugins/commands/destroy/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandDestroy
+    class Plugin < Vagrant.plugin("2")
+      name "destroy command"
+      description <<-DESC
+      The `destroy` command deletes and removes the files and record of your virtual machines.
+      All data is lost and a new VM will have to be created using `up`
+      DESC
+
+      command("destroy") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/plugins/commands/halt/command.rb

@@ -0,0 +1,33 @@
+require 'optparse'
+
+module VagrantPlugins
+  module CommandHalt
+    class Command < Vagrant.plugin("2", :command)
+      def execute
+        options = {}
+        options[:force] = false
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant halt [vm-name] [--force] [-h]"
+          o.separator ""
+
+          o.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) do |vm|
+          vm.action(:halt, :force_halt => options[:force])
+        end
+
+        # Success, exit status 0
+        0
+      end
+    end
+  end
+end

data/plugins/commands/halt/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandHalt
+    class Plugin < Vagrant.plugin("2")
+      name "halt command"
+      description <<-DESC
+      The `halt` command shuts your virtual machine down forcefully.
+      The command `up` recreates it.
+      DESC
+
+      command("halt") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/{lib/vagrant/command/init.rb → plugins/commands/init/command.rb}

@@ -2,9 +2,9 @@ require 'optparse'
 
 require 'vagrant/util/template_renderer'
 
-module Vagrant
-  module Command
-    class Init < Base
+module VagrantPlugins
+  module CommandInit
+    class Command < Vagrant.plugin("2", :command)
       def execute
         options = {}
 
@@ -17,7 +17,7 @@ module Vagrant
         return if !argv
 
         save_path = @env.cwd.join("Vagrantfile")
-        raise Errors::VagrantfileExistsError if save_path.exist?
+        raise Vagrant::Errors::VagrantfileExistsError if save_path.exist?
 
         template_path = ::Vagrant.source_root.join("templates/commands/init/Vagrantfile")
         contents = Vagrant::Util::TemplateRenderer.render(template_path,

data/plugins/commands/init/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandInit
+    class Plugin < Vagrant.plugin("2")
+      name "init command"
+      description <<-DESC
+      The `init` command sets up your working directory to be a
+      Vagrant-managed environment.
+      DESC
+
+      command("init") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/plugins/commands/package/command.rb

@@ -0,0 +1,83 @@
+require 'optparse'
+
+module VagrantPlugins
+  module CommandPackage
+    class Command < Vagrant.plugin("2", :command)
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant package [vm-name] [--base name] [--output name.box]"
+          o.separator "                       [--include one,two,three] [--vagrantfile file]"
+
+          o.separator ""
+
+          o.on("--base NAME", "Name of a VM in virtualbox to package as a base box") do |b|
+            options[:base] = b
+          end
+
+          o.on("--output NAME", "Name of the file to output") do |output|
+            options[:output] = output
+          end
+
+          o.on("--include x,y,z", Array, "Additional files to package with the box.") do |i|
+            options[:include] = i
+          end
+
+          o.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
+
+        # Success, exit status 0
+        0
+      end
+
+      protected
+
+      def package_base(options)
+        # XXX: This whole thing is hardcoded and very temporary. The whole
+        # `vagrant package --base` process is deprecated for something much
+        # better in the future. We just hardcode this to keep VirtualBox working
+        # for now.
+        provider = Vagrant.plugin("2").manager.providers[:virtualbox]
+        vm = Vagrant::Machine.new(
+          options[:base],
+          :virtualbox, provider,
+          nil, @env.config_global,
+          nil, nil,
+          @env, true)
+        @logger.debug("Packaging base VM: #{vm.name}")
+        package_vm(vm, options)
+      end
+
+      def package_target(name, options)
+        with_target_vms(name, :single_target => true) do |vm|
+          @logger.debug("Packaging VM: #{vm.name}")
+          package_vm(vm, options)
+        end
+      end
+
+      def package_vm(vm, options)
+        opts = options.inject({}) do |acc, data|
+          k,v = data
+          acc["package.#{k}"] = v
+          acc
+        end
+
+        vm.action(:package, opts)
+      end
+    end
+  end
+end

data/plugins/commands/package/plugin.rb

@@ -0,0 +1,18 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandPackage
+    class Plugin < Vagrant.plugin("2")
+      name "package command"
+      description <<-DESC
+      The `package` command will take a previously existing Vagrant
+      environment and package it into a box file.
+      DESC
+
+      command("package") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/plugins/commands/plugin/action.rb

@@ -0,0 +1,52 @@
+require "pathname"
+
+require "vagrant/action/builder"
+
+module VagrantPlugins
+  module CommandPlugin
+    module Action
+      # This middleware sequence will install a plugin.
+      def self.action_install
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BundlerCheck
+          b.use InstallGem
+          b.use PruneGems
+        end
+      end
+
+      # This middleware sequence licenses paid addons.
+      def self.action_license
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BundlerCheck
+          b.use LicensePlugin
+        end
+      end
+
+      # This middleware sequence will list all installed plugins.
+      def self.action_list
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BundlerCheck
+          b.use ListPlugins
+        end
+      end
+
+      # This middleware sequence will uninstall a plugin.
+      def self.action_uninstall
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BundlerCheck
+          b.use UninstallPlugin
+          b.use PruneGems
+        end
+      end
+
+      # The autoload farm
+      action_root = Pathname.new(File.expand_path("../action", __FILE__))
+      autoload :BundlerCheck, action_root.join("bundler_check")
+      autoload :InstallGem, action_root.join("install_gem")
+      autoload :LicensePlugin, action_root.join("license_plugin")
+      autoload :ListPlugins, action_root.join("list_plugins")
+      autoload :PruneGems, action_root.join("prune_gems")
+      autoload :UninstallPlugin, action_root.join("uninstall_plugin")
+    end
+  end
+end

data/plugins/commands/plugin/action/bundler_check.rb

@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module CommandPlugin
+    module Action
+      class BundlerCheck
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Bundler sets up its own custom gem load paths such that our
+          # own gems are never loaded. Therefore, give an error if a user
+          # tries to install gems while within a Bundler-managed environment.
+          if defined?(Bundler)
+            require 'bundler/shared_helpers'
+            if Bundler::SharedHelpers.in_bundle?
+              raise Vagrant::Errors::GemCommandInBundler
+            end
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/plugins/commands/plugin/action/install_gem.rb

@@ -0,0 +1,70 @@
+require "rubygems"
+require "rubygems/dependency_installer"
+
+require "log4r"
+
+module VagrantPlugins
+  module CommandPlugin
+    module Action
+      # This action takes the `:plugin_name` variable in the environment
+      # and installs it using the RubyGems API.
+      class InstallGem
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::plugins::plugincommand::installgem")
+        end
+
+        def call(env)
+          plugin_name = env[:plugin_name]
+
+          # Install the gem
+          env[:ui].info(I18n.t("vagrant.commands.plugin.installing",
+                               :name => plugin_name))
+          installed_gems = env[:gem_helper].with_environment do
+            installer = Gem::DependencyInstaller.new(:document => [])
+
+            begin
+              installer.install(plugin_name)
+            rescue Gem::GemNotFoundException
+              raise Vagrant::Errors::PluginInstallNotFound,
+                :name => plugin_name
+            end
+          end
+
+          # The plugin spec is the last installed gem since RubyGems
+          # currently always installed the requested gem last.
+          @logger.debug("Installed #{installed_gems.length} gems.")
+          plugin_spec = installed_gems.last
+
+          # Store the installed name so we can uninstall it if things go
+          # wrong.
+          @installed_plugin_name = plugin_spec.name
+
+          # Mark that we installed the gem
+          @logger.info("Adding the plugin to the state file...")
+          env[:plugin_state_file].add_plugin(plugin_spec.name)
+
+          # Tell the user
+          env[:ui].success(I18n.t("vagrant.commands.plugin.installed",
+                                  :name => plugin_spec.name,
+                                  :version => plugin_spec.version.to_s))
+
+          # Continue
+          @app.call(env)
+        end
+
+        def recover(env)
+          # If any error happens, we uninstall it and remove it from
+          # the state file. We can only do this if we successfully installed
+          # the gem in the first place.
+          if @installed_plugin_name
+            new_env = env.dup
+            new_env.delete(:interrupted)
+            new_env[:plugin_name] = @installed_plugin_name
+            new_env[:action_runner].run(Action.action_uninstall, new_env)
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/commands/plugin/action/license_plugin.rb

@@ -0,0 +1,54 @@
+require "fileutils"
+require "pathname"
+require "rubygems"
+require "set"
+
+require "log4r"
+
+module VagrantPlugins
+  module CommandPlugin
+    module Action
+      # This middleware licenses a plugin by copying the license file to
+      # the proper place.
+      class LicensePlugin
+        def initialize(app, env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant::plugins::plugincommand::license")
+        end
+
+        def call(env)
+          # Get the list of installed plugins according to the state file
+          installed = Set.new(env[:plugin_state_file].installed_plugins)
+
+          # If the plugin we're trying to license doesn't exist in the
+          # state file, then it is an error.
+          if !installed.include?(env[:plugin_name])
+            raise Vagrant::Errors::PluginNotFound, :name => env[:plugin_name]
+          end
+
+          # Verify the license file exists
+          license_file = Pathname.new(env[:plugin_license_path])
+          if !license_file.file?
+            raise Vagrant::Errors::PluginInstallLicenseNotFound,
+              :name => env[:plugin_name],
+              :path => license_file.to_s
+          end
+
+          # Copy it in.
+          final_path = env[:home_path].join("license-#{env[:plugin_name]}.lic")
+          @logger.info("Copying license from: #{license_file}")
+          @logger.info("Copying license to: #{final_path}")
+          env[:ui].info(I18n.t("vagrant.commands.plugin.installing_license",
+                               :name => env[:plugin_name]))
+          FileUtils.cp(license_file, final_path)
+
+          # Installed!
+          env[:ui].success(I18n.t("vagrant.commands.plugin.installed_license",
+                                 :name => env[:plugin_name]))
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end