vagrantup 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa9368fc2e24fa94ec18e65cd73d03e00def5e8
-  data.tar.gz: 1fafad8a7216fe1f52d1a08ccea1bcf8c11cb494
+  metadata.gz: 10945a478861def10ebc22632b43c45850cdd685
+  data.tar.gz: 5a9ae0cedc2836ccd8a2e9f44439be32dc5ae1e1
 SHA512:
-  metadata.gz: f350c801e88b083f615cf660ff20052cd3366c6fbba307cb9fc9a30b746966428b11630b69163c11b15d15b3a17fb9645d436e07428ebdddaba68d6d63c0cf3a
-  data.tar.gz: b926631edb087fdea0689d3dd3dc1738172f29156792b01f07907b8bf15b723ba469cabd61dc30d008b6f3576b3d41b6390b2bff4242316935890cf03b757e09
+  metadata.gz: 96d0ef294bab657c64c2f25abd17d14e83e417b83b82d4e1a80cde795e7e69fac4271a7a2fbacc105149a929a95851db69cf436df7cdb390a7065a1301e2a93a
+  data.tar.gz: 53fe96f117e3a6acf1cdc020be53c213709009274cf3f6e34199d53dad20e14f3b3f9736b96d1a9b1962ea1afb7c73de2612fc29600125fd9ac09d85ab86db90

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.0.5 (September 18, 2012)
+
+  - Work around a critical bug in VirtualBox 4.2.0 on Windows that
+    causes Vagrant to not work. [GH-1130]
+  - Plugin loading works better on Windows by using the proper
+    file path separator.
+  - NFS works on Fedora 16+. [GH-1140]
+  - NFS works with newer versions of Arch hosts that use systemd. [GH-1142]
+
 ## 1.0.4 (September 13, 2012)
 
   - VirtualBox 4.2 driver. [GH-1120]

data/lib/vagrant/driver/virtualbox_4_2.rb

@@ -1,6 +1,7 @@
 require 'log4r'
 
 require 'vagrant/driver/virtualbox_base'
+require 'vagrant/util/platform'
 
 module Vagrant
   module Driver
@@ -11,6 +12,19 @@ module Vagrant
 
         @logger = Log4r::Logger.new("vagrant::driver::virtualbox_4_2")
         @uuid = uuid
+
+        # "Jank mode." VirtualBox 4.2.0 has a horrendous bug where
+        # showvminfo with `--machinereadable` doesn't return proper output.
+        # In this case, Vagrant works around it by using equally horrendous
+        # regular expressions for the non-machine-readable output of
+        # showvminfo. This, ladies and gentlemen, is jank mode.
+        @jank_mode = false
+        if Util::Platform.windows?
+          if execute("--version").start_with?("4.2.0r")
+            @logger.info("Windows with v4.2.0. Jank mode engage.")
+            @jank_mode = true
+          end
+        end
       end
 
       def clear_forwarded_ports
@@ -23,6 +37,8 @@ module Vagrant
       end
 
       def clear_shared_folders
+        return jank_clear_shared_folders if @jank_mode
+
         info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         info.split("\n").each do |line|
           if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
@@ -71,10 +87,17 @@ module Vagrant
 
         execute("list", "vms").split("\n").each do |line|
           if line =~ /^".+?"\s+\{(.+?)\}$/
-            info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
-            info.split("\n").each do |line|
-              if line =~ /^hostonlyadapter\d+="(.+?)"$/
-                networks.delete($1.to_s)
+            if @jank_mode
+              adapters = jank_read_hostonly_adapters($1.to_s)
+              adapters.each do |adapter|
+                networks.delete(adapter)
+              end
+            else
+              info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
+              info.split("\n").each do |info_line|
+                if info_line =~ /^hostonlyadapter\d+="(.+?)"$/
+                  networks.delete($1.to_s)
+                end
               end
             end
           end
@@ -199,9 +222,10 @@ module Vagrant
 
       def read_forwarded_ports(uuid=nil, active_only=false)
         uuid ||= @uuid
-
         @logger.debug("read_forward_ports: uuid=#{uuid} active_only=#{active_only}")
 
+        return jank_read_forwarded_ports(uuid, active_only) if @jank_mode
+
         results = []
         current_nic = nil
         info = execute("showvminfo", uuid, "--machinereadable", :retryable => true)
@@ -306,6 +330,8 @@ module Vagrant
       end
 
       def read_mac_address
+        return jank_read_mac_address if @jank_mode
+
         info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         info.split("\n").each do |line|
           return $1.to_s if line =~ /^macaddress1="(.+?)"$/
@@ -325,6 +351,8 @@ module Vagrant
       end
 
       def read_network_interfaces
+        return jank_read_network_interfaces if @jank_mode
+
         nics = {}
         info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         info.split("\n").each do |line|
@@ -353,6 +381,8 @@ module Vagrant
       end
 
       def read_state
+        return jank_read_state if @jank_mode
+
         output = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         if output =~ /^name="<inaccessible>"$/
           return :inaccessible
@@ -454,6 +484,123 @@ module Vagrant
       def vm_exists?(uuid)
         raw("showvminfo", uuid).exit_code == 0
       end
+
+      protected
+
+      # JANK MODE METHODS:
+      #
+      # All the methods below are created to work around a horrendous
+      # bug in VirtualBox 4.2.0 on Windows where "showvminfo --machinereadable"
+      # doesn't output enough data. So, instead, on Windows we use the plain
+      # "showvminfo" and parse the human readable output.
+
+      def jank_clear_shared_folders
+        info = execute("showvminfo", @uuid, :retryable => true)
+
+        # Get the shared folders part
+        info = info.split("\n")
+        info = info.drop_while { |line| line !~ /^Shared folders:/i }
+        info = info.take_while { |line| line != "" && line !~ /^Name:/i }
+
+        # Find all the shared folders and delete them all
+        info.each do |line|
+          if line =~ /^Name: '(.+?)'/
+            execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
+          end
+        end
+      end
+
+      def jank_read_forwarded_ports(uuid, active_only)
+        results = []
+
+        info = execute("showvminfo", uuid, :retryable => true)
+        info.split("\n").each do |line|
+          # If we care about active VMs only, then we check the state
+          # to verify the VM is running.
+          if active_only && line =~ /^State:\s+(.+?) \(.+?\)$/ && $1.to_s != "running"
+            return []
+          end
+
+          # Parse out the forwarded port information
+          if line =~ /^NIC (\d) Rule\(\d\):\s+name = (.+?), protocol = .+?, host ip = .*?, host port = (.+?), guest ip = .*?, guest port = (.+?)$/
+            result = [$1.to_i, $2.to_s, $3.to_i, $4.to_i]
+            @logger.debug("  - #{result.inspect}")
+            results << result
+          end
+        end
+
+        results
+      end
+
+      def jank_read_hostonly_adapters(uuid)
+        adapters = []
+
+        nics = jank_read_network_interfaces(uuid)
+        nics.each do |adapter, data|
+          if data[:type] == :hostonly
+            adapters << data[:hostonly]
+          end
+        end
+
+        adapters
+      end
+
+      def jank_read_mac_address
+        info = execute("showvminfo", @uuid, :retryable => true)
+        info.split("\n").each do |line|
+          return $1.to_s if line =~ /^NIC 1:\s+MAC: (.+?),/
+        end
+
+        nil
+      end
+
+      def jank_read_network_interfaces(uuid=nil)
+        uuid ||= @uuid
+        nics = {}
+        info = execute("showvminfo", uuid, :retryable => true)
+        info.split("\n").each do |line|
+          if line =~ /^NIC (\d):\s+MAC: .+?, Attachment: (.+?), Cable/
+            adapter = $1.to_i
+            long_type = $2.to_s
+
+            type = nil
+            data = nil
+            if long_type == "NAT"
+              type = :nat
+            elsif long_type =~ /^Host-only Interface '(.+?)'$/i
+              type = :hostonly
+              data = $1.to_s
+            elsif long_type =~ /^Bridged Interface '(.+?)'$/i
+              type = :bridge
+              data = $1.to_s
+            end
+
+            nics[adapter] ||= {}
+            nics[adapter][:type] = type
+            nics[adapter][:hostonly] = data if type == :hostonly
+            nics[adapter][:bridge] = data if type == :bridge
+          end
+        end
+
+        nics
+      end
+
+      def jank_read_state
+        output = execute("showvminfo", @uuid, :retryable => true)
+        if output =~ /^Name:\s+<inaccessible>$/
+          return :inaccessible
+        elsif output =~ /^State:\s+(.+?) \(.+?\)$/
+          # Silly edge cases for a jank mode. This probably doesn't
+          # cover every case, but if we can get Vagrant MOSTLY working
+          # with this buggy version of VirtualBox on Windows, I'll be
+          # quite happy.
+          state = $1.to_s.downcase.gsub(" ", "")
+          state = "poweroff" if state == "poweredoff"
+          return state.to_sym
+        end
+
+        nil
+      end
     end
   end
 end

data/lib/vagrant/environment.rb

@@ -507,7 +507,7 @@ module Vagrant
     def load_plugins
       # Add our private gem path to the gem path and reset the paths
       # that Rubygems knows about.
-      ENV["GEM_PATH"] = "#{@gems_path}:#{ENV["GEM_PATH"]}"
+      ENV["GEM_PATH"] = "#{@gems_path}#{::File::PATH_SEPARATOR}#{ENV["GEM_PATH"]}"
       ::Gem.clear_paths
 
       # Load the plugins

data/lib/vagrant/hosts/arch.rb

@@ -2,7 +2,7 @@ module Vagrant
   module Hosts
     class Arch < Linux
       def self.match?
-        File.exist?("/etc/rc.conf") && File.exist?("/etc/pacman.conf")
+        File.exist?("/etc/os-release") && File.read("/etc/os-release") =~ /arch linux/i
       end
 
       # Normal, mid-range precedence.
@@ -19,17 +19,36 @@ module Vagrant
         @ui.info I18n.t("vagrant.hosts.arch.nfs_export.prepare")
         sleep 0.5
 
+        nfs_cleanup(id)
+
         output.split("\n").each do |line|
           # This should only ask for administrative permission once, even
           # though its executed in multiple subshells.
           system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
         end
 
-        # We run restart here instead of "update" just in case nfsd
-        # is not starting
-        system("sudo /etc/rc.d/rpcbind restart")
-        system("sudo /etc/rc.d/nfs-common restart")
-        system("sudo /etc/rc.d/nfs-server restart")
+        if systemd?
+          # Call start to be nice. This will be a no-op if things are
+          # already running. Then use exportfs to pick up the changes we
+          # just made.
+          system("sudo systemctl start nfsd.service rpc-idmapd.service rpc-mountd.service rpcbind.service")
+          system("sudo exportfs -r")
+        else
+          # The restarting of services when we might not need to can be
+          # considered evil, but this will be obviated by systemd soon
+          # enough anyway.
+          system("sudo /etc/rc.d/rpcbind restart")
+          system("sudo /etc/rc.d/nfs-common restart")
+          system("sudo /etc/rc.d/nfs-server restart")
+        end
+      end
+
+      protected
+
+      # This tests to see if systemd is used on the system. This is used
+      # in newer versions of Arch, and requires a change in behavior.
+      def systemd?
+        Kernel.system("which systemctl &>/dev/null")
       end
     end
   end

data/lib/vagrant/hosts/fedora.rb

@@ -24,6 +24,23 @@ module Vagrant
         super
 
         @nfs_server_binary = "/etc/init.d/nfs"
+
+        # On Fedora 16+, systemd replaced init.d, so we have to use the
+        # proper NFS binary. This checks to see if we need to do that.
+        release_file = Pathname.new("/etc/redhat-release")
+        begin
+          release_file.open("r") do |f|
+            version_number = /Fedora release ([0-9]+)/.match(f.gets)[1].to_i
+            if version_number >= 16
+              # "service nfs-server" will redirect properly to systemctl
+              # when "service nfs-server restart" is called.
+              @nfs_server_binary = "/usr/sbin/service nfs-server"
+            end
+          end
+        rescue Errno::ENOENT
+          # File doesn't exist, not a big deal, assume we're on a
+          # lower version.
+        end
       end
     end
   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.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Mitchell Hashimoto