vagrant 0.8.6 → 0.8.7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.7 (September 13, 2011)
+
+  - Fix regression with remote paths from chef-solo. [GH-431]
+  - Fix issue where Vagrant crashes if `.vagrant` file becomes invalid. [GH-496]
+  - Issue a warning instead of an error for attempting to forward a port
+    <= 1024. [GH-487]
+
 ## 0.8.6 (August 28, 2011)
 
   - Fix issue with download progress not properly clearing the line. [GH-476]

data/Gemfile

@@ -3,19 +3,15 @@ platform = RbConfig::CONFIG["host_os"].downcase
 
 source "http://rubygems.org"
 
-gem "vagrant", :path => '.'
+gemspec
 
 # Use the following gems straight from git, since Vagrant dev
 # typically coincides with it
 gem "virtualbox", :git => "git://github.com/mitchellh/virtualbox.git"
 
 if platform.include?("mingw") || platform.include?("mswin")
+  # JRuby requires these gems for development, but only
+  # on windows.
   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"
-  gem "mocha"
-end

data/Rakefile

@@ -6,6 +6,6 @@ Bundler::GemHelper.install_tasks
 task :default => :test
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test/unit"
+  t.pattern = 'test/unit/**/*_test.rb'
 end

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

@@ -23,7 +23,10 @@ module Vagrant
         # 1024, which causes the forwarded ports to fail.
         def threshold_check
           @env.env.config.vm.forwarded_ports.each do |name, options|
-            raise Errors::ForwardPortBelowThreshold if options[:hostport] <= 1024
+            if options[:hostport] <= 1024
+              @env.ui.warn I18n.t("vagrant.actions.vm.forward_ports.privileged_ports")
+              return
+            end
           end
         end
 

data/lib/vagrant/data_store.rb

@@ -23,7 +23,12 @@ module Vagrant
 
       if File.exist?(file_path)
         File.open(file_path, "r") do |f|
-          merge!(JSON.parse(f.read))
+          begin
+            merge!(JSON.parse(f.read))
+          rescue JSON::ParserError
+            # Ignore if the data is invalid in the file.
+            # TODO: Log here.
+          end
         end
       end
     end

data/lib/vagrant/errors.rb

@@ -168,11 +168,6 @@ module Vagrant
       error_key(:auto_empty, "vagrant.actions.vm.forward_ports")
     end
 
-    class ForwardPortBelowThreshold < VagrantError
-      status_code(25)
-      error_key(:below_threshold_error, "vagrant.actions.vm.forward_ports")
-    end
-
     class ForwardPortCollision < VagrantError
       status_code(26)
       error_key(:collision_error, "vagrant.actions.vm.forward_ports")

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, therefore
-            # just use the path given.
-            remote_path = path
+            # Path already exists on the virtual machine. Expand it
+            # relative to where we're provisioning.
+            remote_path = File.expand_path(path, config.provisioning_path)
           end
 
           # Return the result

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.6"
+  VERSION = "0.8.7"
 end

data/templates/locales/en.yml

@@ -314,11 +314,6 @@ en:
 
             VM: %{vm_name}
             Forwarded port: %{name} (%{guest_port} => %{host_port})
-          below_threshold_error: |-
-            The host port of all forwarded ports must be above 1024. VirtualBox
-            does not allow host ports to be below 1024. (Guest ports below 1024
-            are fine. For example: SSH on port 22 on the guest can be forwarded
-            to port 2222, but not 222).
           collision_error: |-
             Vagrant cannot forward the specified ports on this VM, since they
             would collide with another VirtualBox virtual machine's forwarded
@@ -336,6 +331,12 @@ en:
           non_nat: |-
             VirtualBox adapter #%{adapter} not configured as "NAT"
             Skipping port forwarding '%{name}'.
+          privileged_ports: |-
+            You are trying to forward to privileged ports (ports <= 1024). Most
+            operating systems restrict this to only privileged process (typically
+            processes running as an administrative user). This is a warning in case
+            the port forwarding doesn't work. If any problems occur, please try a
+            port higher than 1024.
         halt:
           force: Forcing shutdown of VM...
         host_name:

data/test/{vagrant → unit/vagrant}/action/vm/forward_ports_helpers_test.rb

@@ -27,6 +27,7 @@ class ForwardPortsHelpersVMActionTest < Test::Unit::TestCase
     def mock_vm(options={})
       options = {
         :running? => true,
+        :accessible? => true,
         :uuid => :foo
       }.merge(options)
 
@@ -50,6 +51,12 @@ class ForwardPortsHelpersVMActionTest < Test::Unit::TestCase
       @instance.used_ports
     end
 
+    should "ignore VMs which aren't accessible" do
+      @vms << mock_vm(:accessible? => false)
+      @vms[0].expects(:forwarded_ports).never
+      @instance.used_ports
+    end
+
     should "ignore VMs of the same uuid" do
       @vms << mock_vm(:uuid => @vm.uuid)
       @vms[0].expects(:forwarded_ports).never

data/test/{vagrant → unit/vagrant}/action/vm/forward_ports_test.rb

@@ -22,24 +22,21 @@ class ForwardPortsVMActionTest < Test::Unit::TestCase
   context "checking for threshold" do
     setup do
       @klass.any_instance.stubs(:external_collision_check)
+      @env.env.config.vm.forwarded_ports.clear
     end
 
-    should "error if has a port below threshold" do
-      @env.env.config.vm.forwarded_ports.clear
+    should "issue a warning for ports less than 1024" do
       @env.env.config.vm.forward_port("foo", 22, 222)
 
-      assert_raises(Vagrant::Errors::ForwardPortBelowThreshold) {
-        @klass.new(@app, @env)
-      }
+      @env.ui.expects(:warn).once
+      @klass.new(@app, @env)
     end
 
-    should "not error if ports are fine" do
-      @env.env.config.vm.forwarded_ports.clear
+    should "not issue a warning for ports greater than 1024" do
       @env.env.config.vm.forward_port("foo", 22, 2222)
 
-      assert_nothing_raised {
-        @klass.new(@app, @env)
-      }
+      @env.ui.expects(:warn).never
+      @klass.new(@app, @env)
     end
   end
 

data/test/{vagrant → unit/vagrant}/data_store_test.rb

@@ -23,6 +23,14 @@ class DataStoreTest < Test::Unit::TestCase
     }
   end
 
+  should "initialize just fine if the db file contains invalid data" do
+    file = tmp_path.join("data_store_empty_test")
+    File.open(file, "w") { |f| f.write("") }
+
+    instance = @klass.new(file)
+    assert instance.length == 0
+  end
+
   should "be a hash with indifferent access" do
     assert @instance.is_a?(Vagrant::Util::HashWithIndifferentAccess)
   end

data/test/{vagrant → unit/vagrant}/vm_test.rb

@@ -262,6 +262,7 @@ class VMTest < Test::Unit::TestCase
       setup do
         @mock_vm.stubs(:running?).returns(false)
         @mock_vm.stubs(:saved?).returns(false)
+        @mock_vm.stubs(:accessible?).returns(true)
       end
 
       should "not do anything if the VM is already running" do
@@ -286,6 +287,14 @@ class VMTest < Test::Unit::TestCase
         @vm.env.actions.expects(:run).with(:start, :foo => :bar).once
         @vm.start(:foo => :bar)
       end
+
+      should "raise an exception if the VM is not accessible" do
+        @mock_vm.stubs(:accessible?).returns(false)
+
+        assert_raises(Vagrant::Errors::VMInaccessible) {
+          @vm.start
+        }
+      end
     end
   end
 end

data/vagrant.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
   s.add_dependency "json", "~> 1.5.1"
   s.add_dependency "net-ssh", "~> 2.1.4"
   s.add_dependency "net-scp", "~> 1.0.4"
-  s.add_dependency "i18n", "~> 0.5.0"
+  s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "thor", "~> 0.14.6"
   s.add_dependency "virtualbox", "~> 0.9.1"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"
+  s.add_development_dependency "minitest", "~> 2.5.1"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "ruby-debug"
 
   s.files         = `git ls-files`.split("\n")
   s.executables   = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 7
+  version: 0.8.7
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -104,12 +104,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 0
-        - 5
+        - 6
         - 0
-        version: 0.5.0
+        version: 0.6.0
   name: i18n
   type: :runtime
   prerelease: false
@@ -180,13 +180,15 @@ dependencies:
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
-  name: mocha
+        - 2
+        - 5
+        - 1
+        version: 2.5.1
+  name: minitest
   type: :development
   prerelease: false
   requirement: *id011
@@ -200,7 +202,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
+  name: mocha
   type: :development
   prerelease: false
   requirement: *id012
@@ -376,94 +378,94 @@ files:
 - templates/nfs/exports_linux.erb
 - templates/package_Vagrantfile.erb
 - templates/ssh_config.erb
-- test/locales/en.yml
-- test/test_helper.rb
-- test/vagrant/action/box/destroy_test.rb
-- test/vagrant/action/box/download_test.rb
-- test/vagrant/action/box/package_test.rb
-- test/vagrant/action/box/unpackage_test.rb
-- test/vagrant/action/box/verify_test.rb
-- test/vagrant/action/builder_test.rb
-- test/vagrant/action/env/set_test.rb
-- test/vagrant/action/environment_test.rb
-- 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
-- test/vagrant/action/vm/clear_forwarded_ports_test.rb
-- test/vagrant/action/vm/clear_nfs_exports_test.rb
-- test/vagrant/action/vm/clear_shared_folders_test.rb
-- test/vagrant/action/vm/customize_test.rb
-- test/vagrant/action/vm/destroy_test.rb
-- test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
-- test/vagrant/action/vm/discard_state_test.rb
-- test/vagrant/action/vm/export_test.rb
-- test/vagrant/action/vm/forward_ports_helpers_test.rb
-- test/vagrant/action/vm/forward_ports_test.rb
-- test/vagrant/action/vm/halt_test.rb
-- test/vagrant/action/vm/host_name_test.rb
-- test/vagrant/action/vm/import_test.rb
-- test/vagrant/action/vm/match_mac_address_test.rb
-- test/vagrant/action/vm/modify_test.rb
-- test/vagrant/action/vm/network_test.rb
-- test/vagrant/action/vm/nfs_helpers_test.rb
-- test/vagrant/action/vm/nfs_test.rb
-- test/vagrant/action/vm/package_test.rb
-- test/vagrant/action/vm/package_vagrantfile_test.rb
-- test/vagrant/action/vm/provision_test.rb
-- test/vagrant/action/vm/provisioner_cleanup_test.rb
-- test/vagrant/action/vm/resume_test.rb
-- test/vagrant/action/vm/share_folders_test.rb
-- test/vagrant/action/vm/suspend_test.rb
-- test/vagrant/action/warden_test.rb
-- test/vagrant/action_test.rb
-- test/vagrant/box_collection_test.rb
-- test/vagrant/box_test.rb
-- test/vagrant/cli_test.rb
-- test/vagrant/command/base_test.rb
-- test/vagrant/command/group_base_test.rb
-- test/vagrant/command/helpers_test.rb
-- test/vagrant/command/package_test.rb
-- test/vagrant/config/base_test.rb
-- test/vagrant/config/error_recorder_test.rb
-- test/vagrant/config/ssh_test.rb
-- test/vagrant/config/vagrant_test.rb
-- test/vagrant/config/vm/provisioner_test.rb
-- test/vagrant/config/vm_test.rb
-- test/vagrant/config_test.rb
-- test/vagrant/data_store_test.rb
-- test/vagrant/downloaders/base_test.rb
-- test/vagrant/downloaders/file_test.rb
-- test/vagrant/downloaders/http_test.rb
-- test/vagrant/environment_test.rb
-- test/vagrant/errors_test.rb
-- test/vagrant/hosts/base_test.rb
-- test/vagrant/hosts/bsd_test.rb
-- test/vagrant/hosts/linux_test.rb
-- test/vagrant/plugin_test.rb
-- test/vagrant/provisioners/base_test.rb
-- test/vagrant/provisioners/chef_client_test.rb
-- test/vagrant/provisioners/chef_solo_test.rb
-- test/vagrant/provisioners/chef_test.rb
-- test/vagrant/provisioners/puppet_server_test.rb
-- test/vagrant/provisioners/puppet_test.rb
-- test/vagrant/provisioners/shell_test.rb
-- test/vagrant/ssh/session_test.rb
-- test/vagrant/ssh_test.rb
-- test/vagrant/systems/base_test.rb
-- test/vagrant/systems/linux_test.rb
-- test/vagrant/ui_test.rb
-- test/vagrant/util/busy_test.rb
-- test/vagrant/util/counter_test.rb
-- test/vagrant/util/hash_with_indifferent_access_test.rb
-- test/vagrant/util/platform_test.rb
-- test/vagrant/util/retryable_test.rb
-- test/vagrant/util/stacked_proc_runner_test.rb
-- test/vagrant/util/template_renderer_test.rb
-- test/vagrant/vm_test.rb
+- test/unit/locales/en.yml
+- test/unit/test_helper.rb
+- test/unit/vagrant/action/box/destroy_test.rb
+- test/unit/vagrant/action/box/download_test.rb
+- test/unit/vagrant/action/box/package_test.rb
+- test/unit/vagrant/action/box/unpackage_test.rb
+- test/unit/vagrant/action/box/verify_test.rb
+- test/unit/vagrant/action/builder_test.rb
+- test/unit/vagrant/action/env/set_test.rb
+- test/unit/vagrant/action/environment_test.rb
+- test/unit/vagrant/action/general/package_test.rb
+- test/unit/vagrant/action/general/validate_test.rb
+- test/unit/vagrant/action/vm/boot_test.rb
+- test/unit/vagrant/action/vm/check_accessible_test.rb
+- test/unit/vagrant/action/vm/check_box_test.rb
+- test/unit/vagrant/action/vm/check_guest_additions_test.rb
+- test/unit/vagrant/action/vm/clean_machine_folder_test.rb
+- test/unit/vagrant/action/vm/clear_forwarded_ports_test.rb
+- test/unit/vagrant/action/vm/clear_nfs_exports_test.rb
+- test/unit/vagrant/action/vm/clear_shared_folders_test.rb
+- test/unit/vagrant/action/vm/customize_test.rb
+- test/unit/vagrant/action/vm/destroy_test.rb
+- test/unit/vagrant/action/vm/destroy_unused_network_interfaces_test.rb
+- test/unit/vagrant/action/vm/discard_state_test.rb
+- test/unit/vagrant/action/vm/export_test.rb
+- test/unit/vagrant/action/vm/forward_ports_helpers_test.rb
+- test/unit/vagrant/action/vm/forward_ports_test.rb
+- test/unit/vagrant/action/vm/halt_test.rb
+- test/unit/vagrant/action/vm/host_name_test.rb
+- test/unit/vagrant/action/vm/import_test.rb
+- test/unit/vagrant/action/vm/match_mac_address_test.rb
+- test/unit/vagrant/action/vm/modify_test.rb
+- test/unit/vagrant/action/vm/network_test.rb
+- test/unit/vagrant/action/vm/nfs_helpers_test.rb
+- test/unit/vagrant/action/vm/nfs_test.rb
+- test/unit/vagrant/action/vm/package_test.rb
+- test/unit/vagrant/action/vm/package_vagrantfile_test.rb
+- test/unit/vagrant/action/vm/provision_test.rb
+- test/unit/vagrant/action/vm/provisioner_cleanup_test.rb
+- test/unit/vagrant/action/vm/resume_test.rb
+- test/unit/vagrant/action/vm/share_folders_test.rb
+- test/unit/vagrant/action/vm/suspend_test.rb
+- test/unit/vagrant/action/warden_test.rb
+- test/unit/vagrant/action_test.rb
+- test/unit/vagrant/box_collection_test.rb
+- test/unit/vagrant/box_test.rb
+- test/unit/vagrant/cli_test.rb
+- test/unit/vagrant/command/base_test.rb
+- test/unit/vagrant/command/group_base_test.rb
+- test/unit/vagrant/command/helpers_test.rb
+- test/unit/vagrant/command/package_test.rb
+- test/unit/vagrant/config/base_test.rb
+- test/unit/vagrant/config/error_recorder_test.rb
+- test/unit/vagrant/config/ssh_test.rb
+- test/unit/vagrant/config/vagrant_test.rb
+- test/unit/vagrant/config/vm/provisioner_test.rb
+- test/unit/vagrant/config/vm_test.rb
+- test/unit/vagrant/config_test.rb
+- test/unit/vagrant/data_store_test.rb
+- test/unit/vagrant/downloaders/base_test.rb
+- test/unit/vagrant/downloaders/file_test.rb
+- test/unit/vagrant/downloaders/http_test.rb
+- test/unit/vagrant/environment_test.rb
+- test/unit/vagrant/errors_test.rb
+- test/unit/vagrant/hosts/base_test.rb
+- test/unit/vagrant/hosts/bsd_test.rb
+- test/unit/vagrant/hosts/linux_test.rb
+- test/unit/vagrant/plugin_test.rb
+- test/unit/vagrant/provisioners/base_test.rb
+- test/unit/vagrant/provisioners/chef_client_test.rb
+- test/unit/vagrant/provisioners/chef_solo_test.rb
+- test/unit/vagrant/provisioners/chef_test.rb
+- test/unit/vagrant/provisioners/puppet_server_test.rb
+- test/unit/vagrant/provisioners/puppet_test.rb
+- test/unit/vagrant/provisioners/shell_test.rb
+- test/unit/vagrant/ssh/session_test.rb
+- test/unit/vagrant/ssh_test.rb
+- test/unit/vagrant/systems/base_test.rb
+- test/unit/vagrant/systems/linux_test.rb
+- test/unit/vagrant/ui_test.rb
+- test/unit/vagrant/util/busy_test.rb
+- test/unit/vagrant/util/counter_test.rb
+- test/unit/vagrant/util/hash_with_indifferent_access_test.rb
+- test/unit/vagrant/util/platform_test.rb
+- test/unit/vagrant/util/retryable_test.rb
+- test/unit/vagrant/util/stacked_proc_runner_test.rb
+- test/unit/vagrant/util/template_renderer_test.rb
+- test/unit/vagrant/vm_test.rb
 - vagrant.gemspec
 homepage: http://vagrantup.com
 licenses: []