vagrantup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3304b65afaca240d89ee451787ce3866c934ba3c
-  data.tar.gz: 1b1626fddeb5369a91de4c1c7ba698c0a2bf280e
+  metadata.gz: 9e371c7a61dc9b8d9400cec30e3ebbbc1cfdd1b0
+  data.tar.gz: 312202b025df0c9526443a07fdac7ebe12a66b7f
 SHA512:
-  metadata.gz: 3387e49f37c3400b4ba9ae9c2dc62ca293f5aa71143225f2e2ea3c7f8af30db37b81494af98587cf890f80869b5857834a0ad2e2fbfeca9ca0a5b745cf6d4a2c
-  data.tar.gz: 2b32d38c8879d78f243f4d72b1e3f8600a701d6d3c8b77a7d22fdaec0664f03d2cb5d4e53ad292d5105682fc29bbf0f0401790549e3e9c0d1147e1777293fe13
+  metadata.gz: 06be04e82de2eb5bdde3c8a1461638b4861ba5d18924290d803c71248daad60a9474a38dc3baeda5dd5b3637f586dd4bc26cd823bdf0b639dbec06fd7fd82c8d
+  data.tar.gz: 34df0d3207ede54215a099f1a5ae60b89c4e05cd2f655106cb4ae4a1e5fad538432c5a1ae53d6a0fe8782d6c566a7cdc3c5a11982feb2fbfa45f2c97d8267971

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.0.1 (March 11, 2012)
+
+  - Fix crashing issue which manifested itself in multi-VM environments.
+  - Add missing `rubygems` require in `environment.rb` to avoid
+    possible load errors. [GH-781]
+  - `vagrant destroy` shows a nice error when called without a
+    TTY (and hence can't confirm). [GH-779]
+  - Fix an issue with the `:vagrantfile_name` option to `Vagrant::Environment`
+    not working properly. [GH-778]
+  - `VAGRANT_CWD` environmental variable can be used to set the CWD to
+    something other than the current directory.
+  - Downloading boxes from servers that don't send a content-length
+    now works properly. [GH-788]
+  - The `:facter` option now works for puppet server. [GH-790]
+  - The `--no-provision` and `--provision-with` flags are available to
+    `vagrant reload` now.
+  - `:openbsd` guest which supports only halting at the moment. [GH-773]
+  - `ssh-config -h` now shows help, instead of assuming a host is being
+    specified. For host, you can still use `--host`. [GH-793]
+
 ## 1.0.0 (March 6, 2012)
 
   - `vagrant gem` should now be used to install Vagrant plugins that are

data/lib/vagrant.rb

@@ -178,6 +178,7 @@ Vagrant.guests.register(:fedora)  { Vagrant::Guest::Fedora }
 Vagrant.guests.register(:freebsd) { Vagrant::Guest::FreeBSD }
 Vagrant.guests.register(:gentoo)  { Vagrant::Guest::Gentoo }
 Vagrant.guests.register(:linux)   { Vagrant::Guest::Linux }
+Vagrant.guests.register(:openbsd) { Vagrant::Guest::OpenBSD }
 Vagrant.guests.register(:redhat)  { Vagrant::Guest::Redhat }
 Vagrant.guests.register(:solaris) { Vagrant::Guest::Solaris }
 Vagrant.guests.register(:suse)    { Vagrant::Guest::Suse }

data/lib/vagrant/command/destroy.rb

@@ -30,8 +30,15 @@ module Vagrant
             if options[:force]
               do_destroy = true
             else
-              choice = @env.ui.ask(I18n.t("vagrant.commands.destroy.confirmation",
-                                          :name => vm.name))
+              choice = nil
+              begin
+                choice = @env.ui.ask(I18n.t("vagrant.commands.destroy.confirmation",
+                                            :name => vm.name))
+              rescue Errors::UIExpectsTTY
+                # We raise a more specific error but one which basically
+                # means the same thing.
+                raise Errors::DestroyRequiresForce
+              end
               do_destroy = choice.upcase == "Y"
             end
 

data/lib/vagrant/command/reload.rb

@@ -1,13 +1,18 @@
 require 'optparse'
 
+require 'vagrant/command/start_mixins'
+
 module Vagrant
   module Command
     class Reload < Base
+      include StartMixins
+
       def execute
         options = {}
-
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: vagrant reload [vm-name]"
+          opts.separator ""
+          build_start_options(opts, options)
         end
 
         # Parse the options
@@ -18,7 +23,7 @@ module Vagrant
         with_target_vms(argv[0]) do |vm|
           if vm.created?
             @logger.info("Reloading: #{vm.name}")
-            vm.reload
+            vm.reload(options)
           else
             @logger.info("Not created: #{vm.name}. Not reloading.")
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")

data/lib/vagrant/command/ssh_config.rb

@@ -11,7 +11,7 @@ module Vagrant
 
           opts.separator ""
 
-          opts.on("-h", "--host COMMAND", "Name the host for the config..") do |h|
+          opts.on("--host COMMAND", "Name the host for the config..") do |h|
             options[:host] = h
           end
         end

data/lib/vagrant/command/start_mixins.rb

@@ -0,0 +1,26 @@
+module Vagrant
+  module Command
+    module StartMixins
+      # This adds the standard `start` command line flags to the given
+      # OptionParser, storing the result in the `options` dictionary.
+      #
+      # @param [OptionParser] parser
+      # @param [Hash] options
+      def build_start_options(parser, options)
+        # Setup the defaults
+        options["provision.enabled"] = true
+        options["provision.types"] = nil
+
+        # Add the options
+        parser.on("--[no-]provision", "Enable or disable provisioning") do |p|
+          options["provision.enabled"] = p
+        end
+
+        parser.on("--provision-with x,y,z", Array,
+                "Enable only certain provisioners, by type.") do |list|
+          options["provision.types"] = list
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/command/up.rb

@@ -1,49 +1,34 @@
 require 'optparse'
 
+require 'vagrant/command/start_mixins'
+
 module Vagrant
   module Command
     class Up < Base
-      def execute
-        options = {
-          :provision => true,
-          :provisioners => nil
-        }
+      include StartMixins
 
+      def execute
+        options = {}
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: vagrant up [vm-name] [--[no-]provision] [-h]"
-
           opts.separator ""
-
-          opts.on("--[no-]provision", "Enable or disable provisioning") do |p|
-            options[:provision] = p
-          end
-
-          opts.on("--provision-with x,y,z", Array,
-                  "Enable only certain provisioners, by type.") do |list|
-            options[:provisioners] = list
-          end
+          build_start_options(opts, options)
         end
 
         # Parse the options
         argv = parse_options(opts)
         return if !argv
 
-        # Parameters to send to actions
-        action_params = {
-          "provision.enabled" => options[:provision],
-          "provision.types"   => options[:provisioners]
-        }
-
         # Go over each VM and bring it up
         @logger.debug("'Up' each target VM...")
         with_target_vms(argv[0]) do |vm|
           if vm.created?
             @logger.info("Booting: #{vm.name}")
             vm.ui.info I18n.t("vagrant.commands.up.vm_created")
-            vm.start(action_params)
+            vm.start(options)
           else
             @logger.info("Creating: #{vm.name}")
-            vm.up(action_params)
+            vm.up(options)
           end
         end
       end

data/lib/vagrant/driver/virtualbox.rb

@@ -23,7 +23,7 @@ module Vagrant
       # The version of virtualbox that is running.
       attr_reader :version
 
-      def initialize(uuid)
+      def initialize(uuid=nil)
         # Setup the base
         super()
 

data/lib/vagrant/environment.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'fileutils'
 
 require 'log4r'
+require 'rubygems'  # This is needed for plugin loading below.
 
 require 'vagrant/util/file_mode'
 require 'vagrant/util/platform'
@@ -55,13 +56,16 @@ module Vagrant
       }.merge(opts || {})
 
       # Set the default working directory to look for the vagrantfile
+      opts[:cwd] ||= ENV["VAGRANT_CWD"] if ENV.has_key?("VAGRANT_CWD")
       opts[:cwd] ||= Dir.pwd
       opts[:cwd] = Pathname.new(opts[:cwd])
+      raise Errors::EnvironmentNonExistentCWD if !opts[:cwd].directory?
 
-      # Set the default vagrantfile name, which can be either Vagrantfile
-      # or vagrantfile (capital for backwards compatibility)
-      opts[:vagrantfile_name] ||= ["Vagrantfile", "vagrantfile"]
+      # Set the Vagrantfile name up. We append "Vagrantfile" and "vagrantfile" so that
+      # those continue to work as well, but anything custom will take precedence.
+      opts[:vagrantfile_name] ||= []
       opts[:vagrantfile_name] = [opts[:vagrantfile_name]] if !opts[:vagrantfile_name].is_a?(Array)
+      opts[:vagrantfile_name] += ["Vagrantfile", "vagrantfile"]
 
       # Set instance variables for all the configuration parameters.
       @cwd    = opts[:cwd]

data/lib/vagrant/errors.rb

@@ -148,6 +148,11 @@ module Vagrant
       error_key(:deprecation)
     end
 
+    class DestroyRequiresForce < VagrantError
+      status_code(74)
+      error_key(:destroy_requires_force)
+    end
+
     class DotfileIsDirectory < VagrantError
       status_code(46)
       error_key(:dotfile_is_directory)
@@ -168,6 +173,11 @@ module Vagrant
       error_key(:status_error, "vagrant.downloaders.http")
     end
 
+    class EnvironmentNonExistentCWD < VagrantError
+      status_code(75)
+      error_key(:environment_non_existent_cwd)
+    end
+
     class EnvironmentLockedError < VagrantError
       status_code(52)
       error_key(:environment_locked)
@@ -323,6 +333,11 @@ module Vagrant
       error_key(:ssh_unavailable_windows)
     end
 
+    class UIExpectsTTY < VagrantError
+      status_code(73)
+      error_key(:ui_expects_tty)
+    end
+
     class VagrantInterrupt < VagrantError
       status_code(40)
       error_key(:interrupted)

data/lib/vagrant/guest.rb

@@ -9,6 +9,7 @@ module Vagrant
     autoload :FreeBSD, 'vagrant/guest/freebsd'
     autoload :Gentoo,  'vagrant/guest/gentoo'
     autoload :Linux,   'vagrant/guest/linux'
+    autoload :OpenBSD, 'vagrant/guest/openbsd'
     autoload :Redhat,  'vagrant/guest/redhat'
     autoload :Solaris, 'vagrant/guest/solaris'
     autoload :Suse,    'vagrant/guest/suse'

data/lib/vagrant/guest/openbsd.rb

@@ -0,0 +1,20 @@
+module Vagrant
+  module Guest
+    class OpenBSD < Base
+      def halt
+        vm.channel.sudo("shutdown -p -h now")
+
+        # Wait until the VM's state is actually powered off. If this doesn't
+        # occur within a reasonable amount of time then simply return which
+        # will cause Vagrant to force kill the machine.
+        count = 0
+        while vm.state != :poweroff
+          count += 1
+
+          return if count >= 30
+          sleep 1
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/provisioners/puppet_server.rb

@@ -9,7 +9,9 @@ module Vagrant
         attr_accessor :puppet_server
         attr_accessor :puppet_node
         attr_accessor :options
+        attr_accessor :facter
 
+        def facter; @facter ||= {}; end
         def puppet_server; @puppet_server || "puppet"; end
         def options; @options ||= []; end
       end
@@ -53,7 +55,18 @@ module Vagrant
         options += ["--certname", cn] if cn
         options = options.join(" ")
 
-        command = "puppetd #{options} --server #{config.puppet_server}"
+        # Build up the custom facts if we have any
+        facter = ""
+        if !config.facter.empty?
+          facts = []
+          config.facter.each do |key, value|
+            facts << "FACTER_#{key}='#{value}'"
+          end
+
+          facter = "#{facts.join(" ")} "
+        end
+
+        command = "#{facter}puppetd #{options} --server #{config.puppet_server}"
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
         env[:vm].channel.sudo(command) do |type, data|

data/lib/vagrant/ui.rb

@@ -31,7 +31,14 @@ module Vagrant
     end
 
     # This is a UI implementation that does nothing.
-    class Silent < Interface; end
+    class Silent < Interface
+      def ask(*args)
+        super
+
+        # Silent can't do this, obviously.
+        raise Errors::UIExpectsTTY
+      end
+    end
 
     # This is a UI implementation that outputs the text as is. It
     # doesn't add any color.
@@ -51,6 +58,9 @@ module Vagrant
       def ask(message, opts=nil)
         super(message)
 
+        # We can't ask questions when the output isn't a TTY.
+        raise Errors::UIExpectsTTY if !$stdin.tty?
+
         # Setup the options so that the new line is suppressed
         opts ||= {}
         opts[:new_line] = false if !opts.has_key?(:new_line)
@@ -60,7 +70,7 @@ module Vagrant
         say(:info, message, opts)
 
         # Get the results and chomp off the newline
-        STDIN.gets.chomp
+        $stdin.gets.chomp
       end
 
       # This is used to output progress reports to the UI.
@@ -68,9 +78,13 @@ module Vagrant
       # to the UI. Send `clear_line` to clear the line to show
       # a continuous progress meter.
       def report_progress(progress, total, show_parts=true)
-        percent = (progress.to_f / total.to_f) * 100
-        line    = "Progress: #{percent.to_i}%"
-        line   << " (#{progress} / #{total})" if show_parts
+        if total && total > 0
+          percent = (progress.to_f / total.to_f) * 100
+          line    = "Progress: #{percent.to_i}%"
+          line   << " (#{progress} / #{total})" if show_parts
+        else
+          line    = "Progress: #{progress}"
+        end
 
         info(line, :new_line => false)
       end

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.0.0"
+  VERSION = "1.0.1"
 end

data/lib/vagrant/vm.rb

@@ -156,8 +156,8 @@ module Vagrant
       run_action(:halt, options)
     end
 
-    def reload
-      run_action(:reload)
+    def reload(options=nil)
+      run_action(:reload, options)
     end
 
     def provision

data/templates/locales/en.yml

@@ -36,6 +36,10 @@ en:
 
         %{message}
         Note that this error message will not appear in the next version of Vagrant.
+      destroy_requires_force: |-
+        Destroy doesn't have a TTY to ask for confirmation. Please pass the
+        `--force` flag to force a destroy, otherwise attach a TTY so that
+        the destroy can be confirmed.
       dotfile_is_directory: |-
         The local file Vagrant uses to store data ".vagrant" already exists
         and is a directory! If you are in your home directory, then please run
@@ -141,6 +145,11 @@ en:
         Port: %{port}
         Username: %{username}
         Private key: %{key_path}
+      ui_expects_tty: |-
+        Vagrant is attempting to interface with the UI in a way that requires
+        a TTY. Most actions in Vagrant that require a TTY have configuration
+        switches to disable this requirement. Please do that or run Vagrant
+        with TTY.
       vagrantfile_exists: |-
         `Vagrantfile` already exists in this directory. Remove it before
         running `vagrant init`.
@@ -274,6 +283,11 @@ en:
         not_created: |-
           The environment has not yet been created. Run `vagrant up` to
           create the environment.
+        paused: |-
+          The VM is paused. This VM may have been paused via the VirtualBox
+          GUI or the VBoxManage command line interface. To unpause, please
+          use the VirtualBox GUI and/or VBoxManage command line interface so
+          that vagrant would be able to control the VM again.
         poweroff: |-
           The VM is powered off. To restart the VM, simply run `vagrant up`
         running: |-

data/test/unit/support/isolated_environment.rb

@@ -16,6 +16,14 @@ module Unit
       Vagrant::Environment.new(options)
     end
 
+    # This creates a file in the isolated environment. By default this file
+    # will be created in the working directory of the isolated environment.
+    def file(name, contents)
+      @workdir.join(name).open("w+") do |f|
+        f.write(contents)
+      end
+    end
+
     def vagrantfile(contents, root=nil)
       root ||= @workdir
       root.join("Vagrantfile").open("w+") do |f|

data/test/unit/vagrant/environment_test.rb

@@ -17,8 +17,18 @@ describe Vagrant::Environment do
     end
 
     it "is set to the cwd given" do
-      instance = described_class.new(:cwd => "foobarbaz")
-      instance.cwd.should == Pathname.new("foobarbaz")
+      directory = File.dirname(__FILE__)
+      instance = described_class.new(:cwd => directory)
+      instance.cwd.should == Pathname.new(directory)
+    end
+
+    it "is set to the environmental variable VAGRANT_CWD" do
+      pending "A good temporary ENV thing"
+    end
+
+    it "raises an exception if the CWD doesn't exist" do
+      expect { described_class.new(:cwd => "doesntexist") }.
+        to raise_error(Vagrant::Errors::EnvironmentNonExistentCWD)
     end
   end
 
@@ -120,6 +130,19 @@ VF
       env.config.global.vagrant.dotfile_name.should == "foo"
     end
 
+    it "should load from a custom Vagrantfile" do
+      environment = isolated_environment do |env|
+        env.file("non_standard_name", <<-VF)
+Vagrant::Config.run do |config|
+  config.vagrant.dotfile_name = "custom"
+end
+VF
+      end
+
+      env = environment.create_vagrant_env(:vagrantfile_name => "non_standard_name")
+      env.config.global.vagrant.dotfile_name.should == "custom"
+    end
+
     it "should load VM configuration" do
       environment = isolated_environment do |env|
         env.vagrantfile(<<-VF)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -313,6 +313,7 @@ files:
 - lib/vagrant/command/resume.rb
 - lib/vagrant/command/ssh.rb
 - lib/vagrant/command/ssh_config.rb
+- lib/vagrant/command/start_mixins.rb
 - lib/vagrant/command/status.rb
 - lib/vagrant/command/suspend.rb
 - lib/vagrant/command/up.rb
@@ -354,6 +355,7 @@ files:
 - lib/vagrant/guest/linux.rb
 - lib/vagrant/guest/linux/config.rb
 - lib/vagrant/guest/linux/error.rb
+- lib/vagrant/guest/openbsd.rb
 - lib/vagrant/guest/redhat.rb
 - lib/vagrant/guest/solaris.rb
 - lib/vagrant/guest/suse.rb