tnargav 1.2.3 → 1.3.3

data/lib/vagrant/plugin/v2/provisioner.rb

@@ -41,6 +41,12 @@ module Vagrant
         # No return value is expected.
         def provision
         end
+
+        # This is the method called when destroying a machine that allows
+        # for any state related to the machine created by the provisioner
+        # to be cleaned up.
+        def cleanup
+        end
       end
     end
   end

data/lib/vagrant/util/downloader.rb

@@ -7,8 +7,12 @@ module Vagrant
   module Util
     # This class downloads files using various protocols by subprocessing
     # to cURL. cURL is a much more capable and complete download tool than
-    # a hand-rolled Ruby library, so we defer to it's expertise.
+    # a hand-rolled Ruby library, so we defer to its expertise.
     class Downloader
+      # Custom user agent provided to cURL so that requests to URL shorteners
+      # are properly tracked.
+      USER_AGENT = "Vagrant/#{VERSION}"
+
       def initialize(source, destination, options=nil)
         @logger      = Log4r::Logger.new("vagrant::util::downloader")
         @source      = source.to_s
@@ -21,7 +25,7 @@ module Vagrant
       end
 
       # This executes the actual download, downloading the source file
-      # to the destination with the given opens used to initialize this
+      # to the destination with the given options used to initialize this
       # class.
       #
       # If this method returns without an exception, the download
@@ -32,6 +36,7 @@ module Vagrant
           "--fail",
           "--location",
           "--max-redirs", "10",
+          "--user-agent", USER_AGENT,
           "--output", @destination
         ]
 

data/lib/vagrant/util/platform.rb

@@ -1,4 +1,5 @@
 require 'rbconfig'
+require 'tmpdir'
 
 require "vagrant/util/subprocess"
 
@@ -39,6 +40,48 @@ module Vagrant
           process.stdout.chomp
         end
 
+        # This checks if the filesystem is case sensitive. This is not a
+        # 100% correct check, since it is possible that the temporary
+        # directory runs a different filesystem than the root directory.
+        # However, this works in many cases.
+        def fs_case_sensitive?
+          tmp_dir = Dir.mktmpdir("vagrant")
+          tmp_file = File.join(tmp_dir, "FILE")
+          File.open(tmp_file, "w") do |f|
+            f.write("foo")
+          end
+
+          # The filesystem is case sensitive if the lowercased version
+          # of the filename is NOT reported as existing.
+          return !File.file?(File.join(tmp_dir, "file"))
+        end
+
+        # This expands the path and ensures proper casing of each part
+        # of the path.
+        def fs_real_path(path)
+          path = Pathname.new(File.expand_path(path))
+          raise "Path must exist for path expansion" if !path.exist?
+          return path if fs_case_sensitive?
+
+          # Build up all the parts of the path
+          original = []
+          while !path.root?
+            original.unshift(path.basename.to_s)
+            path = path.parent
+          end
+
+          # Traverse each part and join it into the resulting path
+          original.each do |single|
+            Dir.entries(path).each do |entry|
+              if entry.downcase == single.downcase
+                path = path.join(entry)
+              end
+            end
+          end
+
+          path
+        end
+
         # Returns a boolean noting whether the terminal supports color.
         # output.
         def terminal_supports_colors?

data/lib/vagrant/util/ssh.rb

@@ -100,6 +100,7 @@ module Vagrant
         # Command line options
         command_options = [
           "-p", options[:port].to_s,
+          "-o", "DSAAuthentication=yes",
           "-o", "LogLevel=FATAL",
           "-o", "StrictHostKeyChecking=no",
           "-o", "UserKnownHostsFile=/dev/null"]
@@ -121,6 +122,10 @@ module Vagrant
             "-o", "ForwardX11Trusted=yes"]
         end
 
+        if ssh_info[:proxy_command]
+          command_options += ["-o", "ProxyCommand=#{ssh_info[:proxy_command]}"]
+        end
+
         # Configurables -- extra_args should always be last due to the way the
         # ssh args parser works. e.g. if the user wants to use the -t option,
         # any shell command(s) she'd like to run on the remote server would

data/lib/vagrant/util/subprocess.rb

@@ -26,8 +26,8 @@ module Vagrant
 
       def initialize(*command)
         @options = command.last.is_a?(Hash) ? command.pop : {}
-        @command = command
-        @command[0] = Which.which(@command[0]) if !File.file? @command[0]
+        @command = command.dup
+        @command[0] = Which.which(@command[0]) if !File.file?(@command[0])
         if !@command[0]
           raise Errors::CommandUnavailableWindows, file: command[0] if Platform.windows?
           raise Errors::CommandUnavailable, file: command[0]
@@ -73,6 +73,20 @@ module Vagrant
         process.io.stderr = stderr_writer
         process.duplex = true
 
+        # If we're in the installer and the command is NOT included
+        # in the installer (external), then remove the DYLD_IMPORT_PATH
+        # environmental variable to run into linker issues. [GH-2219]
+        if Vagrant.in_installer? && ENV["VAGRANT_ORIGINAL_DYLD_LIBRARY_PATH"]
+          installer_dir = ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"].to_s.downcase
+          if !@command[0].downcase.include?(installer_dir)
+            @logger.info("Command not in the installer. Removing DYLD_LIBRARY_PATH")
+            process.environment["DYLD_LIBRARY_PATH"] =
+              ENV["VAGRANT_ORIGINAL_DYLD_LIBRARY_PATH"]
+          else
+            @logger.debug("Command in installer, not touching env vars.")
+          end
+        end
+
         # Set the environment on the process if we must
         if @options[:env]
           @options[:env].each do |k, v|

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "1.2.3"
+  VERSION = "1.3.3"
 end

data/plugins/commands/box/command/remove.rb

@@ -12,7 +12,27 @@ module VagrantPlugins
           # Parse the options
           argv = parse_options(opts)
           return if !argv
-          raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 2
+          raise Vagrant::Errors::CLIInvalidUsage, :help => opts.help.chomp if argv.length < 1
+
+          if !argv[1]
+            # Try to automatically determine the provider.
+            providers = []
+            @env.boxes.all.each do |name, provider|
+              if name == argv[0]
+                providers << provider
+              end
+            end
+
+            if providers.length > 1
+              @env.ui.error(
+                I18n.t("vagrant.commands.box.remove_must_specify_provider",
+                       name: argv[0],
+                       providers: providers.join(", ")))
+              return 1
+            end
+
+            argv[1] = providers[0] || ""
+          end
 
           b = nil
           begin
@@ -22,7 +42,7 @@ module VagrantPlugins
             retry
           end
 
-          raise Vagrant::Errors::BoxNotFound, :name => argv[0] if !b
+          raise Vagrant::Errors::BoxNotFound, :name => argv[0], :provider => argv[1].to_sym if !b
           @env.ui.info(I18n.t("vagrant.commands.box.removing",
                               :name => argv[0],
                               :provider => argv[1]))

data/plugins/commands/box/command/repackage.rb

@@ -28,7 +28,7 @@ module VagrantPlugins
             retry
           end
 
-          raise Vagrant::Errors::BoxNotFound, :name => box_name if !box
+          raise Vagrant::Errors::BoxNotFound, :name => box_name, :provider => box_provider if !box
 
           # Repackage the box
           output_path = Pathname.new(File.expand_path(@env.config_global.package.name, FileUtils.pwd))

data/plugins/commands/destroy/command.rb

@@ -19,12 +19,17 @@ module VagrantPlugins
         return if !argv
 
         @logger.debug("'Destroy' each target VM...")
+        declined = false
         with_target_vms(argv, :reverse => true) do |vm|
-          vm.action(:destroy, :force_confirm_destroy => options[:force])
+          action_env = vm.action(
+            :destroy, :force_confirm_destroy => options[:force])
+
+          declined = true if action_env.has_key?(:force_confirm_destroy_result) &&
+            action_env[:force_confirm_destroy_result] == false
         end
 
-        # Success, exit status 0
-        0
+        # Success if no confirms were declined
+        declined ? 1 : 0
       end
     end
   end

data/plugins/commands/help/command.rb

@@ -0,0 +1,12 @@
+require 'optparse'
+
+module VagrantPlugins
+  module CommandHelp
+    class Command < Vagrant.plugin("2", :command)
+      def execute
+        return @env.cli([]) if @argv.empty?
+        @env.cli([@argv[0], "-h"])
+      end
+    end
+  end
+end

data/plugins/commands/help/plugin.rb

@@ -0,0 +1,17 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommandHelp
+    class Plugin < Vagrant.plugin("2")
+      name "help command"
+      description <<-DESC
+      The `help` command shows help for the given command.
+      DESC
+
+      command("help") do
+        require File.expand_path("../command", __FILE__)
+        Command
+      end
+    end
+  end
+end

data/plugins/commands/plugin/action.rb

@@ -39,12 +39,23 @@ module VagrantPlugins
         end
       end
 
+      # This middleware sequence will update a plugin.
+      def self.action_update
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use BundlerCheck
+          b.use PluginExistsCheck
+          b.use InstallGem
+          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 :PluginExistsCheck, action_root.join("plugin_exists_check")
       autoload :PruneGems, action_root.join("prune_gems")
       autoload :UninstallPlugin, action_root.join("uninstall_plugin")
     end

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

@@ -1,5 +1,6 @@
 require "rubygems"
 require "rubygems/dependency_installer"
+require "rubygems/format"
 
 require "log4r"
 
@@ -19,6 +20,16 @@ module VagrantPlugins
           prerelease  = env[:plugin_prerelease]
           version     = env[:plugin_version]
 
+          # Determine the plugin name we'll look for in the installed set
+          # in order to determine the version and all that.
+          find_plugin_name = plugin_name
+          if plugin_name =~ /\.gem$/
+            # If we're installing from a gem file, determine the name
+            # based on the spec in the file.
+            pkg = Gem::Format.from_file_by_path(plugin_name)
+            find_plugin_name = pkg.spec.name
+          end
+
           # Install the gem
           plugin_name_label = plugin_name
           plugin_name_label += ' --prerelease' if prerelease
@@ -45,7 +56,9 @@ module VagrantPlugins
           # 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
+          plugin_spec = installed_gems.find do |gem|
+            gem.name.downcase == find_plugin_name.downcase
+          end
 
           # Store the installed name so we can uninstall it if things go
           # wrong.
@@ -60,6 +73,18 @@ module VagrantPlugins
                                   :name => plugin_spec.name,
                                   :version => plugin_spec.version.to_s))
 
+          # If the plugin's spec includes a post-install message display it
+          post_install_message = plugin_spec.post_install_message
+          if post_install_message
+            if post_install_message.is_a?(Array)
+              post_install_message = post_install_message.join(" ")
+            end
+
+            env[:ui].info(I18n.t("vagrant.commands.plugin.post_install",
+                                 :name => plugin_spec.name,
+                                 :message => post_install_message.to_s))
+          end
+
           # Continue
           @app.call(env)
         end

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

@@ -0,0 +1,26 @@
+require "set"
+
+module VagrantPlugins
+  module CommandPlugin
+    module Action
+      # This class checks to see if the plugin is installed already, and
+      # if so, raises an exception/error to output to the user.
+      class PluginExistsCheck
+        def initialize(app, env)
+          @app    = app
+        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 !installed.include?(env[:plugin_name])
+            raise Vagrant::Errors::PluginNotInstalled,
+              name: env[:plugin_name]
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/plugins/commands/plugin/command/install.rb

@@ -1,38 +1,21 @@
 require 'optparse'
 
 require_relative "base"
+require_relative "mixin_install_opts"
 
 module VagrantPlugins
   module CommandPlugin
     module Command
       class Install < Base
+        include MixinInstallOpts
+
         def execute
           options = {}
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant plugin install <name> [-h]"
             o.separator ""
-
-            o.on("--entry-point NAME", String,
-                 "The name of the entry point file for loading the plugin.") do |entry_point|
-              options[:entry_point] = entry_point
-            end
-
-            o.on("--plugin-prerelease",
-                 "Allow prerelease versions of this plugin.") do |plugin_prerelease|
-              options[:plugin_prerelease] = plugin_prerelease
-            end
-
-            o.on("--plugin-source PLUGIN_SOURCE", String,
-                 "Add a RubyGems repository source") do |plugin_source|
-              options[:plugin_sources] ||= []
-              options[:plugin_sources] << plugin_source
-            end
-
-            o.on("--plugin-version PLUGIN_VERSION", String,
-                 "Install a specific version of the plugin") do |plugin_version|
-              options[:plugin_version] = plugin_version
-            end
+            build_install_opts(o, options)
           end
 
           # Parse the options

data/plugins/commands/plugin/command/mixin_install_opts.rb

@@ -0,0 +1,30 @@
+module VagrantPlugins
+  module CommandPlugin
+    module Command
+      module MixinInstallOpts
+        def build_install_opts(o, options)
+          o.on("--entry-point NAME", String,
+               "The name of the entry point file for loading the plugin.") do |entry_point|
+            options[:entry_point] = entry_point
+          end
+
+          o.on("--plugin-prerelease",
+               "Allow prerelease versions of this plugin.") do |plugin_prerelease|
+            options[:plugin_prerelease] = plugin_prerelease
+          end
+
+          o.on("--plugin-source PLUGIN_SOURCE", String,
+               "Add a RubyGems repository source") do |plugin_source|
+            options[:plugin_sources] ||= []
+            options[:plugin_sources] << plugin_source
+          end
+
+          o.on("--plugin-version PLUGIN_VERSION", String,
+               "Install a specific version of the plugin") do |plugin_version|
+            options[:plugin_version] = plugin_version
+          end
+        end
+      end
+    end
+  end
+end

data/plugins/commands/plugin/command/root.rb

@@ -25,6 +25,11 @@ module VagrantPlugins
             List
           end
 
+          @subcommands.register(:update) do
+            require_relative "update"
+            Update
+          end
+
           @subcommands.register(:uninstall) do
             require_relative "uninstall"
             Uninstall