vagrant 0.8.1 → 0.8.2

data/.gitignore

@@ -1,15 +1,22 @@
+# OS-specific
 .DS_Store
-pkg/*
+
+# Vagrant stuff
 Vagrantfile
 .vagrant
+
+# Bundler/Rubygems
 .bundle
-cookbooks/*
+pkg/*
+tags
+Gemfile.lock
+test/tmp/
+
+# Documentation
 _site/*
-!templates/*
-*.org
 .yardoc/
 doc/
-tags
-Gemfile.lock
+
+# IDE junk
 .idea/*
 *.iml

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-## 0.8.1 (unreleased)
+## 0.8.2 (July 22, 2011)
+
+  - Fix issue with SSH disconnects not reconnecting.
+  - Fix chef solo simply not working with roles/data bags. [GH-425]
+  - Multiple chef solo provisioners now work together.
+  - Update Puppet provisioner so no deprecation warning is shown. [GH-421]
+  - Removed error on "provisioner=" in config, as this has not existed
+    for some time now.
+  - Add better validation for networking.
+
+## 0.8.1 (July 20, 2011)
 
   - Repush of 0.8.0 to fix a Ruby 1.9.2 RubyGems issue.
 

data/config/default.rb

@@ -2,6 +2,7 @@ Vagrant::Config.run do |config|
   # default config goes here
   config.vagrant.dotfile_name = ".vagrant"
   config.vagrant.host = :detect
+  config.vagrant.ssh_session_cache = false
 
   config.ssh.username = "vagrant"
   config.ssh.host = "127.0.0.1"

data/lib/vagrant/config/vagrant.rb

@@ -5,6 +5,7 @@ module Vagrant
 
       attr_accessor :dotfile_name
       attr_accessor :host
+      attr_accessor :ssh_session_cache
 
       def validate(errors)
         [:dotfile_name, :host].each do |field|

data/lib/vagrant/config/vm.rb

@@ -67,13 +67,6 @@ module Vagrant
         @provisioners << Provisioner.new(top, name, options, &block)
       end
 
-      # This shows an error message to smooth the transition for the
-      # backwards incompatible provisioner syntax change introduced
-      # in Vagrant 0.7.0.
-      def provisioner=(_value)
-        raise Errors::VagrantError, :_key => :provisioner_equals_not_supported
-      end
-
       def customize(&block)
         push_proc(&block)
       end
@@ -126,6 +119,21 @@ module Vagrant
           end
         end
 
+        # Validate some basic networking
+        network_options.each do |options|
+          next if !options
+
+          ip = options[:ip].split(".")
+
+          if ip.length != 4
+            errors.add(I18n.t("vagrant.config.vm.network_ip_invalid",
+                              :ip => options[:ip]))
+          elsif ip.last == "1"
+            errors.add(I18n.t("vagrant.config.vm.network_ip_ends_one",
+                              :ip => options[:ip]))
+          end
+        end
+
         # Each provisioner can validate itself
         provisioners.each do |prov|
           # TODO: Remove at some point

data/lib/vagrant/provisioners/chef_solo.rb

@@ -4,6 +4,8 @@ module Vagrant
     class ChefSolo < Chef
       register :chef_solo
 
+      extend Util::Counter
+
       class Config < Chef::Config
         attr_accessor :cookbooks_path
         attr_accessor :roles_path
@@ -56,7 +58,6 @@ module Vagrant
         # path element which contains the folder location (:host or :vm)
         paths = [paths] if paths.is_a?(String) || paths.first.is_a?(Symbol)
 
-        index = 0
         paths.map do |path|
           path = [:host, path] if !path.is_a?(Array)
           type, path = path
@@ -65,8 +66,7 @@ module Vagrant
           # or VM path.
           local_path = nil
           local_path = File.expand_path(path, env.root_path) if type == :host
-          remote_path = type == :host ? "#{config.provisioning_path}/chef-solo-#{index}" : path
-          index += 1
+          remote_path = type == :host ? "#{config.provisioning_path}/chef-solo-#{self.class.get_and_update_counter}" : path
 
           # Return the result
           [type, local_path, remote_path]
@@ -76,12 +76,10 @@ module Vagrant
       # Shares the given folders with the given prefix. The folders should
       # be of the structure resulting from the `expanded_folders` function.
       def share_folders(prefix, folders)
-        index = 0
         folders.each do |type, local_path, remote_path|
           if type == :host
-            env.config.vm.share_folder("v-#{prefix}-#{index}",
+            env.config.vm.share_folder("v-#{prefix}-#{self.class.get_and_update_counter}",
                                        remote_path, local_path, :nfs => config.nfs)
-            index += 1
           end
         end
       end

data/lib/vagrant/provisioners/puppet.rb

@@ -118,7 +118,7 @@ module Vagrant
         options = options.join(" ")
 
         commands = ["cd #{manifests_guest_path}",
-                    "puppet #{options}"]
+                    "puppet apply #{options}"]
 
         env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet", :manifest => config.computed_manifest_file)
 

data/lib/vagrant/ssh.rb

@@ -73,8 +73,22 @@ module Vagrant
       opts[:port] ||= port
 
       # Check if we have a currently open SSH session which has the
-      # same options, and use that if possible
-      session, options = @current_session
+      # same options, and use that if possible.
+      #
+      # NOTE: This is experimental and unstable. Therefore it is disabled
+      # by default.
+      session, options = nil
+      session, options = @current_session if env.config.vagrant.ssh_session_cache
+
+      if session && options == opts
+        # Verify that the SSH session is still valid
+        begin
+          session.exec!("echo foo")
+        rescue IOError
+          # Reset the session, we need to reconnect
+          session = nil
+        end
+      end
 
       if !session || options != opts
         env.logger.info("ssh") { "Connecting to SSH: #{env.config.ssh.host} #{opts[:port]}" }

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.1"
+  VERSION = "0.8.2"
 end

data/templates/locales/en.yml

@@ -48,31 +48,6 @@ en:
       multi_vm_required: "A multi-vm environment is required for name specification to this command."
       multi_vm_target_required: "`vagrant %{command}` requires a specific VM name to target in a multi-VM environment."
       no_env: "No Vagrant environment detected. Run `vagrant init` to set one up."
-      provisioner_equals_not_supported: |-
-        The `config.vm.provisioner =` syntax has been removed in Vagrant 0.7.0.
-        Please change your provisioners to use the new syntax described below.
-        All of these changes are reflected on the Vagrant website as well.
-
-        Before:
-
-          config.vm.provisioner = :chef_solo
-          config.chef.cookbooks_path = "my_cookbooks"
-          config.chef.add_recipe "apache"
-
-        After:
-
-          config.vm.provision :chef_solo, :cookbooks_path => "my_cookbooks",
-                                          :run_list => ["recipe[apache]"]
-
-        Instead of just a hash, you may use a block as well to get access to the
-        configuration object:
-
-          config.vm.provision :chef_solo do |chef|
-            chef.cookbooks_path = "my_cookbooks"
-            chef.add_recipe "apache"
-          end
-
-        This error message will be removed in later versions of Vagrant.
       ssh_authentication_failed: |-
         SSH authentication failed! This is typically caused by the public/private
         keypair for the SSH user not being properly set on the guest VM. Please
@@ -190,6 +165,10 @@ en:
         boot_mode_invalid: "Boot mode must be one of: vrdp or gui"
         box_missing: "A box must be specified."
         box_not_found: "The box '%{name}' could not be found."
+        network_ip_invalid: "The host only network IP '%{ip}' is invalid."
+        network_ip_ends_one: |-
+          The host only network IP '%{ip}' must not end in a 1, as this
+          is reserved for the host machine.
         shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
         shared_folder_nfs_owner_group: |-
           Shared folder '%{name}': NFS does not support the owner/group settings.

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

@@ -131,7 +131,7 @@ class NetworkVMActionTest < Test::Unit::TestCase
 
         adapter.expects(:enabled=).with(true)
         adapter.expects(:attachment_type=).with(:host_only).once
-        adapter.expects(:host_interface=).with(@network_name).once
+        adapter.expects(:host_only_interface=).with(@network_name).once
 
         if options[:mac]
           adapter.expects(:mac_address=).with(options[:mac].gsub(':', '')).once

data/test/vagrant/config/vm_test.rb

@@ -53,12 +53,4 @@ class ConfigVMTest < Test::Unit::TestCase
       assert @config.proc_stack.include?(proc)
     end
   end
-
-  context "deprecated config" do
-    should "raise an error for provisioner=" do
-      assert_raises(Vagrant::Errors::VagrantError) {
-        @config.provisioner = :chef_solo
-      }
-    end
-  end
 end

data/test/vagrant/environment_test.rb

@@ -11,11 +11,11 @@ class EnvironmentTest < Test::Unit::TestCase
 
   context "class method check virtualbox version" do
     setup do
-      VirtualBox.stubs(:version).returns("4.0.0")
+      VirtualBox.stubs(:version).returns("4.1.0")
     end
 
     should "not error and exit if everything is good" do
-      VirtualBox.expects(:version).returns("4.0.0")
+      VirtualBox.expects(:version).returns("4.1.0")
       assert_nothing_raised { @klass.check_virtualbox! }
     end
 

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -52,9 +52,17 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "expand host folders properly" do
       path = "foo"
       local_path = File.expand_path(path, @env.root_path)
-      remote_path = "#{@action.config.provisioning_path}/chef-solo-0"
+      remote_path = "#{@action.config.provisioning_path}/chef-solo-1"
       assert_equal [[:host, local_path, remote_path]], @action.expanded_folders([:host, path])
     end
+
+    should "share roles and cookbooks in different folders" do
+      local_roles_path = File.expand_path('roles',@env.root_path)
+      local_cookbooks_path = File.expand_path('cookbooks',@env.root_path)
+      remote_roles_path = @action.expanded_folders([:host,local_roles_path])[0][2]
+      remote_cookbooks_path = @action.expanded_folders([:host,local_cookbooks_path])[0][2]
+      assert_not_equal remote_roles_path, remote_cookbooks_path
+    end
   end
 
   context "guest paths" do

data/test/vagrant/provisioners/puppet_test.rb

@@ -155,25 +155,25 @@ class PuppetProvisionerTest < Test::Unit::TestCase
     end
 
     should "cd into the pp_path directory and run puppet" do
-      expect_puppet_command("puppet #{@config.computed_manifest_file}")
+      expect_puppet_command("puppet apply #{@config.computed_manifest_file}")
       @action.run_puppet_client
     end
 
     should "cd into the pp_path directory and run puppet with given options when given as an array" do
       @config.options = ["--modulepath", "modules", "--verbose"]
-      expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}")
+      expect_puppet_command("puppet apply --modulepath modules --verbose #{@config.computed_manifest_file}")
       @action.run_puppet_client
     end
 
     should "cd into the pp_path directory and run puppet with the options when given as a string" do
       @config.options = "--modulepath modules --verbose"
-      expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}")
+      expect_puppet_command("puppet apply --modulepath modules --verbose #{@config.computed_manifest_file}")
       @action.run_puppet_client
     end
 
     should "cd into the pp_path and run puppet with module paths if set" do
       @config.module_path = "foo"
-      expect_puppet_command("puppet --modulepath '#{File.join(@config.pp_path, 'modules-0')}' #{@config.computed_manifest_file}")
+      expect_puppet_command("puppet apply --modulepath '#{File.join(@config.pp_path, 'modules-0')}' #{@config.computed_manifest_file}")
 
       @action.set_module_paths
       @action.run_puppet_client

data/test/vagrant/ssh_test.rb

@@ -12,7 +12,7 @@ class SshTest < Test::Unit::TestCase
   end
 
   setup do
-    VirtualBox.stubs(:version).returns("4.0.0")
+    VirtualBox.stubs(:version).returns("4.1.0")
   end
 
   context "connecting to external SSH" do

data/vagrant.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"
-  s.add_dependency "virtualbox", "~> 0.9.0"
+  s.add_dependency "virtualbox", "~> 0.9.1"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 -07:00
+date: 2011-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,8 +124,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 1
+        version: 0.9.1
   requirement: *id008
   name: virtualbox
   prerelease: false