vagrantup 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfcb796c5e978beb88e68c498fcd3e8fce2d236e
-  data.tar.gz: 3f78d29f52fe07097b71829e6400379548dc3fae
+  metadata.gz: 7987b8b05b53d439752efd835d69fb49f6c4acaa
+  data.tar.gz: 1eb3052430da1bde3227df39f30b12c5bfab6d30
 SHA512:
-  metadata.gz: 862bc46fd94295df359dbd4903d21083adb04220ec96928db43765c15b9bb6a946e9828ab68a3dd5aa70d67a7a505e449f11002b5b4cfcf29809ddc213875952
-  data.tar.gz: 720ae318636e3c926c1f6f0d167838b068fe8944a75a0e9a031826c84ec8ad70a37332af560c54f5523e1129daf0d1c90bb066d53f71dc3244bb1f0044b03f81
+  metadata.gz: 5f130096790cd9b8e3954ce26366cd00d023093a2906bee5574ad73de17f1d886ce90dc6ffb528a2594bc9c65d49163152dbd38d1a3d1f829f2008f8abc1267d
+  data.tar.gz: 7c21f13ad6a8ebe7cce682fc10242a2e905fefdda6a828f6a9bf28abac9bed86b3dbe10a8a63dacf13572fd310537450f45fdc8abc06ffb637df562903f679a9

data/.gitignore

@@ -17,6 +17,9 @@ _site/*
 .yardoc/
 doc/
 
+# Rubinius
+*.rbc
+
 # IDE junk
 .idea/*
 *.iml

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.6 (August 28, 2011)
+
+  - Fix issue with download progress not properly clearing the line. [GH-476]
+  - NFS should work properly on Fedora. [GH-450]
+  - Arguments can be specified to the `shell` provisioner via the `args` option. [GH-475]
+  - Vagrant behaves much better when there are "inaccessible" VMs. [GH-453]
+
 ## 0.8.5 (August 15, 2011)
 
 Note: 0.8.3 and 0.8.4 was yanked due to RubyGems encoding issue.

data/Gemfile

@@ -1,3 +1,6 @@
+require "rbconfig"
+platform = RbConfig::CONFIG["host_os"].downcase
+
 source "http://rubygems.org"
 
 gem "vagrant", :path => '.'
@@ -6,6 +9,11 @@ gem "vagrant", :path => '.'
 # typically coincides with it
 gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
 
+if platform.include?("mingw") || platform.include?("mswin")
+  gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
+  gem "jruby-win32ole", "~> 0.8.5", :platforms => :jruby
+end
+
 group :test do
   gem "rake"
   gem "contest", ">= 0.1.2"

data/config/default.rb

@@ -19,7 +19,6 @@ Vagrant::Config.run do |config|
   config.vm.box_url = nil
   config.vm.base_mac = nil
   config.vm.forward_port("ssh", 22, 2222, :auto => true)
-  config.vm.disk_image_format = 'VMDK'
   config.vm.boot_mode = "vrdp"
   config.vm.system = :linux
 

data/lib/vagrant/action/builtin.rb

@@ -101,6 +101,7 @@ module Vagrant
       # now, these are limited to what are needed internally.
       register(:before_action_run, Builder.new do
         use General::Validate
+        use VM::CheckAccessible
       end)
     end
   end

data/lib/vagrant/action/vm.rb

@@ -2,6 +2,7 @@ module Vagrant
   class Action
     module VM
       autoload :Boot,                'vagrant/action/vm/boot'
+      autoload :CheckAccessible,     'vagrant/action/vm/check_accessible'
       autoload :CheckBox,            'vagrant/action/vm/check_box'
       autoload :CheckGuestAdditions, 'vagrant/action/vm/check_guest_additions'
       autoload :CleanMachineFolder,  'vagrant/action/vm/clean_machine_folder'

data/lib/vagrant/action/vm/check_accessible.rb

@@ -0,0 +1,23 @@
+module Vagrant
+  class Action
+    module VM
+      class CheckAccessible
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env["vm"] && env["vm"].created? && !env["vm"].vm.accessible?
+            # The VM we are attempting to manipulate is inaccessible. This
+            # is a very bad situation and can only be fixed by the user. It
+            # also prohibits us from actually doing anything with the virtual
+            # machine, so we raise an error.
+            raise Errors::VMInaccessible
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/vm/forward_ports_helpers.rb

@@ -11,7 +11,7 @@ module Vagrant
         # @return [Array<String>]
         def used_ports
           result = VirtualBox::VM.all.collect do |vm|
-            if vm.running? && vm.uuid != @env["vm"].uuid
+            if vm.accessible? && vm.running? && vm.uuid != @env["vm"].uuid
               vm.network_adapters.collect do |na|
                 na.nat_driver.forwarded_ports.collect do |fp|
                   fp.hostport.to_i

data/lib/vagrant/command/provision.rb

@@ -6,7 +6,9 @@ module Vagrant
       def execute
         target_vms.each do |vm|
           if vm.created?
-            if vm.vm.running?
+            if !vm.vm.accessible?
+              raise Errors::VMInaccessible
+            elsif vm.vm.running?
               vm.provision
             else
               vm.env.ui.info I18n.t("vagrant.commands.common.vm_not_running")

data/lib/vagrant/command/ssh.rb

@@ -27,8 +27,6 @@ module Vagrant
       end
 
       def ssh_connect
-        raise Errors::VMNotCreatedError if !ssh_vm.created?
-        raise Errors::VMNotRunningError if !ssh_vm.vm.running?
         ssh_vm.ssh.connect
       end
 
@@ -37,6 +35,12 @@ module Vagrant
           vm = self.name.nil? && env.multivm? ? env.primary_vm : nil
           raise Errors::MultiVMTargetRequired, :command => "ssh" if !vm && target_vms.length > 1
           vm = target_vms.first if !vm
+
+          # Basic checks that are required for proper SSH
+          raise Errors::VMNotCreatedError if !vm.created?
+          raise Errors::VMInaccessible if !vm.vm.accessible?
+          raise Errors::VMNotRunningError if !vm.vm.running?
+
           vm
         end
       end

data/lib/vagrant/command/ssh_config.rb

@@ -8,6 +8,7 @@ module Vagrant
         raise Errors::MultiVMTargetRequired, :command => "ssh_config" if target_vms.length > 1
         vm = target_vms.first
         raise Errors::VMNotCreatedError if !vm.created?
+        raise Errors::VMInaccessible if !vm.vm.accessible?
 
         # We need to fix the file permissions of the key if they aren't set
         # properly, otherwise if the user attempts to SSH in, it won't work!

data/lib/vagrant/command/status.rb

@@ -3,10 +3,19 @@ module Vagrant
     class StatusCommand < NamedBase
       register "status", "Shows the status of the current Vagrant environment."
 
-      def route
+      def execute
         state = nil
         results = target_vms.collect do |vm|
-          state = vm.created? ? vm.vm.state.to_s : "not_created"
+          if vm.created?
+            if vm.vm.accessible?
+              state = vm.vm.state.to_s
+            else
+              state = "inaccessible"
+            end
+          else
+            state = "not_created"
+          end
+
           "#{vm.name.to_s.ljust(25)}#{state.gsub("_", " ")}"
         end
 

data/lib/vagrant/config/vm.rb

@@ -19,7 +19,6 @@ module Vagrant
       attr_reader :shared_folders
       attr_reader :network_options
       attr_reader :provisioners
-      attr_accessor :disk_image_format
       attr_accessor :system
 
       def initialize

data/lib/vagrant/downloaders/http.rb

@@ -49,6 +49,7 @@ module Vagrant
               # Progress reporting is limited to every 25 segments just so
               # we're not constantly updating
               if segment_count % 25 == 0
+                env.ui.clear_line
                 env.ui.report_progress(progress, total)
                 segment_count = 0
               end
@@ -56,6 +57,9 @@ module Vagrant
               # Store the segment
               destination_file.write(segment)
             end
+
+            # Clear the line one last time so that the progress meter disappears
+            env.ui.clear_line
           end
         end
       rescue SocketError

data/lib/vagrant/errors.rb

@@ -319,6 +319,11 @@ module Vagrant
       error_key(:failure, "vagrant.actions.vm.import")
     end
 
+    class VMInaccessible < VagrantError
+      status_code(54)
+      error_key(:vm_inaccessible)
+    end
+
     class VMNotCreatedError < VagrantError
       status_code(6)
       error_key(:vm_creation_required)

data/lib/vagrant/hosts.rb

@@ -1,8 +1,9 @@
 module Vagrant
   module Hosts
     autoload :Base,  'vagrant/hosts/base'
+    autoload :Arch,  'vagrant/hosts/arch'
     autoload :BSD,   'vagrant/hosts/bsd'
+    autoload :Fedora, 'vagrant/hosts/fedora'
     autoload :Linux, 'vagrant/hosts/linux'
-    autoload :Arch,  'vagrant/hosts/arch'
   end
 end

data/lib/vagrant/hosts/base.rb

@@ -8,41 +8,39 @@ module Vagrant
       # The {Environment} which this host belongs to.
       attr_reader :env
 
-      class << self
-        # Loads the proper host for the given value. If the value is nil
-        # or is the symbol `:detect`, then the host class will be detected
-        # using the `RUBY_PLATFORM` constant.
-        #
-        # @param [Environment] env
-        # @param [String] klass
-        # @return [Base]
-        def load(env, klass)
-          klass = detect if klass.nil? || klass == :detect
-          return nil if !klass
-          return klass.new(env)
-        end
+      # Loads the proper host for the given value. If the value is nil
+      # or is the symbol `:detect`, then the host class will be detected
+      # using the `RUBY_PLATFORM` constant.
+      #
+      # @param [Environment] env
+      # @param [String] klass
+      # @return [Base]
+      def self.load(env, klass)
+        klass = detect if klass.nil? || klass == :detect
+        return nil if !klass
+        return klass.new(env)
+      end
 
-        # Detects the proper host class for current platform and returns
-        # the class.
-        #
-        # @return [Class]
-        def detect
-          # More coming soon
-          classes = {
-            :darwin => BSD,
-            :bsd => BSD,
-            :arch => Arch,
-            :linux => Linux
-          }
+      # Detects the proper host class for current platform and returns
+      # the class.
+      #
+      # @return [Class]
+      def self.detect
+        [BSD, Linux].each do |type|
+          result = type.distro_dispatch
+          return result if result
+        end
 
-          classes.each do |type, klass|
-            return klass if Util::Platform.send("#{type}?")
-          end
+        nil
+      rescue Exception
+        nil
+      end
 
-          nil
-        rescue Exception
-          nil
-        end
+      # This must be implemented by subclasses to dispatch to the proper
+      # distro-specific class for the host. If this returns nil then it is
+      # an invalid host class.
+      def self.distro_dispatch
+        nil
       end
 
       # Initialzes a new host. This method shouldn't be called directly,

data/lib/vagrant/hosts/bsd.rb

@@ -1,3 +1,5 @@
+require 'vagrant/util/platform'
+
 module Vagrant
   module Hosts
     # Represents a BSD host, such as FreeBSD and Darwin (Mac OS X).
@@ -5,6 +7,10 @@ module Vagrant
       include Util
       include Util::Retryable
 
+      def self.distro_dispatch
+        return self if Util::Platform.darwin? || Util::Platform.bsd?
+      end
+
       def nfs?
         retryable(:tries => 10, :on => TypeError) do
           system("which nfsd > /dev/null 2>&1")

data/lib/vagrant/hosts/fedora.rb

@@ -0,0 +1,11 @@
+module Vagrant
+  module Hosts
+    class Fedora < Linux
+      def initialize(*args)
+        super
+
+        @nfs_server_binary = "/etc/init.d/nfs"
+      end
+    end
+  end
+end

data/lib/vagrant/hosts/linux.rb

@@ -1,3 +1,5 @@
+require 'vagrant/util/platform'
+
 module Vagrant
   module Hosts
     # Represents a Linux based host, such as Ubuntu.
@@ -5,6 +7,26 @@ module Vagrant
       include Util
       include Util::Retryable
 
+      def self.distro_dispatch
+        return nil if !Util::Platform.linux?
+        return Arch if File.exist?("/etc/rc.conf") && File.exist?("/etc/pacman.conf")
+
+        if File.exist?("/etc/redhat-release")
+          # Check if we have a known redhat release
+          File.open("/etc/redhat-release") do |f|
+            return Fedora if f.gets =~ /^Fedora/
+          end
+        end
+
+        return self
+      end
+
+      def initialize(*args)
+        super
+
+        @nfs_server_binary = "/etc/init.d/nfs-kernel-server"
+      end
+
       def nfs?
         retryable(:tries => 10, :on => TypeError) do
           # Check procfs to see if NFSd is a supported filesystem
@@ -29,7 +51,7 @@ module Vagrant
 
         # We run restart here instead of "update" just in case nfsd
         # is not starting
-        system("sudo /etc/init.d/nfs-kernel-server restart")
+        system("sudo #{@nfs_server_binary} restart")
       end
 
       def nfs_cleanup

data/lib/vagrant/provisioners/chef_solo.rb

@@ -74,9 +74,9 @@ module Vagrant
             # Path exists on the host, setup the remote path
             remote_path = "#{config.provisioning_path}/chef-solo-#{get_and_update_counter(:cookbooks_path)}"
           else
-            # Path already exists on the virtual machine. Expand it
-            # relative to where we're provisioning.
-            remote_path = File.expand_path(path, config.provisioning_path)
+            # Path already exists on the virtual machine, therefore
+            # just use the path given.
+            remote_path = path
           end
 
           # Return the result

data/lib/vagrant/provisioners/shell.rb

@@ -7,11 +7,13 @@ module Vagrant
         attr_accessor :inline
         attr_accessor :path
         attr_accessor :upload_path
+        attr_accessor :args
 
         def initialize
           @inline = nil
           @path = nil
           @upload_path = "/tmp/vagrant-shell"
+          @args = nil
         end
 
         def expanded_path
@@ -37,6 +39,11 @@ module Vagrant
           if !upload_path
             errors.add(I18n.t("vagrant.provisioners.shell.upload_path_not_set"))
           end
+
+          # If there are args and its not a string, that is a problem
+          if args && !args.is_a?(String)
+            errors.add(I18n.t("vagrant.provisioners.shell.args_not_string"))
+          end
         end
       end
 
@@ -64,7 +71,9 @@ module Vagrant
       end
 
       def provision!
-        commands = ["chmod +x #{config.upload_path}", config.upload_path]
+        args = ""
+        args = " #{config.args}" if config.args
+        commands = ["chmod +x #{config.upload_path}", "#{config.upload_path}#{args}"]
 
         with_script_file do |path|
           # Upload the script to the VM

data/lib/vagrant/util/platform.rb

@@ -27,13 +27,6 @@ module Vagrant
           false
         end
 
-        def arch?
-          linux? &&
-            File.exist?('/etc/rc.conf') &&
-            File.exist?('/etc/pacman.conf') &&
-            File.exist?('/etc/rc.d/')
-        end
-
         # Returns boolean noting whether this is a 64-bit CPU. This
         # is not 100% accurate and there could easily be false negatives.
         #

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 = "0.8.5"
+  VERSION = "0.8.6"
 end

data/lib/vagrant/vm.rb

@@ -141,6 +141,7 @@ module Vagrant
     end
 
     def start(options=nil)
+      raise Errors::VMInaccessible if !@vm.accessible?
       return if @vm.running?
       return resume if @vm.saved?
 

data/templates/locales/en.yml

@@ -144,6 +144,11 @@ en:
           http://vagrantup.com/docs/getting-started/setup/windows_x64.html
 
       vm_creation_required: "VM must be created before running this command. Run `vagrant up` first."
+      vm_inaccessible: |-
+        Your VM has become "inaccessible." Unfortunately, this is a critical error
+        with VirtualBox that Vagrant can not cleanly recover from. Please open VirtualBox
+        and clear out your inaccessible virtual machines or find a way to fix
+        them.
       vm_not_found: "A VM by the name of %{name} was not found."
       vm_not_running: "VM must be running to open SSH connection."
 
@@ -191,6 +196,11 @@ en:
           stopped without properly closing the session. Run `vagrant up`
           to resume this virtual machine. If any problems persist, you may
           have to destroy and restart the virtual machine.
+        inaccessible: |-
+          The VM is inaccessible! This is a rare case which means that VirtualBox
+          can't find your VM configuration. This usually happens when upgrading
+          VirtualBox, moving to a new computer, etc. Please consult VirtualBox
+          for how to handle this issue.
         output: |-
           Current VM states:
 
@@ -509,6 +519,7 @@ en:
         running_puppetd: "Running Puppet agent..."
 
       shell:
+        args_not_string: "Shell provisioner `args` must be a string."
         path_and_inline_set: "Only one of `path` or `inline` may be set."
         no_path_or_inline: "One of `path` or `inline` must be set."
         path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"

data/test/vagrant/action/vm/check_accessible_test.rb

@@ -0,0 +1,61 @@
+require 'test_helper'
+
+class CheckAccessibleVMActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::VM::CheckAccessible
+  end
+
+  context "calling" do
+    setup do
+      @app, @env = action_env
+      @instance = @klass.new(@app, @env)
+    end
+
+    should "continue up the chain if the VM is nil" do
+      @env["vm"] = nil
+
+      @app.expects(:call).once
+
+      assert_nothing_raised {
+        @instance.call(@env)
+      }
+    end
+
+    should "continue up the chain if the VM is not created" do
+      @env["vm"] = mock("vm")
+      @env["vm"].stubs(:created?).returns(false)
+
+      @app.expects(:call).once
+
+      assert_nothing_raised {
+        @instance.call(@env)
+      }
+    end
+
+    should "continue up the chain if the VM is created and accessible" do
+      @env["vm"] = mock("vm")
+      @env["vm"].stubs(:created?).returns(true)
+      @env["vm"].stubs(:vm).returns(mock("real_vm"))
+      @env["vm"].vm.stubs(:accessible?).returns(true)
+
+      @app.expects(:call).once
+
+      assert_nothing_raised {
+        @instance.call(@env)
+      }
+    end
+
+    should "fail if the VM is not accessible" do
+      @env["vm"] = mock("vm")
+      @env["vm"].stubs(:created?).returns(true)
+      @env["vm"].stubs(:vm).returns(mock("real_vm"))
+      @env["vm"].vm.stubs(:accessible?).returns(false)
+
+      @app.expects(:call).never
+
+      assert_raises(Vagrant::Errors::VMInaccessible) {
+        @instance.call(@env)
+      }
+    end
+  end
+end

data/test/vagrant/provisioners/shell_test.rb

@@ -64,5 +64,16 @@ class ShellProvisionerTest < Test::Unit::TestCase
 
       @action.provision!
     end
+
+    should "append arguments if provided" do
+      @config.args = "foo bar baz"
+      commands = ["chmod +x #{@config.upload_path}", "#{@config.upload_path} #{@config.args}"]
+
+      p_seq = sequence("provisioning")
+      @action.vm.ssh.expects(:upload!).with(@config.expanded_path.to_s, @config.upload_path).in_sequence(p_seq)
+      @ssh.expects(:sudo!).with(commands).in_sequence(p_seq)
+
+      @action.provision!
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -223,6 +223,7 @@ files:
 - lib/vagrant/action/general/validate.rb
 - lib/vagrant/action/vm.rb
 - lib/vagrant/action/vm/boot.rb
+- lib/vagrant/action/vm/check_accessible.rb
 - lib/vagrant/action/vm/check_box.rb
 - lib/vagrant/action/vm/check_guest_additions.rb
 - lib/vagrant/action/vm/clean_machine_folder.rb
@@ -297,6 +298,7 @@ files:
 - lib/vagrant/hosts/arch.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
+- lib/vagrant/hosts/fedora.rb
 - lib/vagrant/hosts/linux.rb
 - lib/vagrant/plugin.rb
 - lib/vagrant/provisioners.rb
@@ -361,6 +363,7 @@ files:
 - test/vagrant/action/general/package_test.rb
 - test/vagrant/action/general/validate_test.rb
 - test/vagrant/action/vm/boot_test.rb
+- test/vagrant/action/vm/check_accessible_test.rb
 - test/vagrant/action/vm/check_box_test.rb
 - test/vagrant/action/vm/check_guest_additions_test.rb
 - test/vagrant/action/vm/clean_machine_folder_test.rb