vagrant 0.7.0.beta2 → 0.7.0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
-## 0.7.0.beta2 (January 13, 2010)
+## 0.7.0 (January 19, 2011)
 
+  - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since
+    the API is so different. Stay with the 0.6.x series if you have VirtualBox
+    3.2.x.
   - Puppet server provisioner. [GH-262]
   - Use numeric uid/gid in mounting shared folders to increase portability. [GH-252]
   - HTTP downloading follows redirects. [GH-163]
@@ -23,17 +26,14 @@
     change is not backwards compatible. [GH-265]
   - Provisioners are now RVM-friendly, meaning if you installed chef or puppet
     with an RVM managed Ruby, Vagrant now finds then. [GH-254]
-
-## 0.7.0.beta (December 24, 2010)
-
-  - VirtualBox 4.0 support. Support for VirtualBox 3.2 is _dropped_, since
-    the API is so different. Stay with the 0.6.x series if you have VirtualBox
-    3.2.x.
   - Changed the unused host only network destroy mechanism to check for
     uselessness after the VM is destroyed. This should result in more accurate
     checks.
   - Networks are no longer disabled upon halt/destroy. With the above
     change, its unnecessary.
+  - Puppet supports `module_path` configuration to mount local modules directory
+    as a shared folder and configure puppet with it. [GH-270]
+  - `ssh-config` now outputs `127.0.0.1` as the host instead of `localhost`.
 
 ## 0.6.9 (December 21, 2010)
 

data/config/default.rb

@@ -5,7 +5,6 @@ Vagrant::Config.run do |config|
 
   config.ssh.username = "vagrant"
   config.ssh.host = "localhost"
-  config.ssh.port = 22
   config.ssh.forwarded_port_key = "ssh"
   config.ssh.max_tries = 10
   config.ssh.timeout = 30

data/lib/vagrant/config/ssh.rb

@@ -5,7 +5,6 @@ module Vagrant
 
       attr_accessor :username
       attr_accessor :host
-      attr_accessor :port
       attr_accessor :forwarded_port_key
       attr_accessor :max_tries
       attr_accessor :timeout
@@ -18,7 +17,7 @@ module Vagrant
       end
 
       def validate(errors)
-        [:username, :host, :port, :forwarded_port_key, :max_tries, :timeout, :private_key_path].each do |field|
+        [:username, :host, :forwarded_port_key, :max_tries, :timeout, :private_key_path].each do |field|
           errors.add(I18n.t("vagrant.config.common.error_empty", :field => field)) if !instance_variable_get("@#{field}".to_sym)
         end
 

data/lib/vagrant/errors.rb

@@ -245,6 +245,11 @@ module Vagrant
       error_key(:ssh_key_bad_permissions)
     end
 
+    class SSHPortNotDetected < VagrantError
+      status_code(50)
+      error_key(:ssh_port_not_detected)
+    end
+
     class SSHUnavailable < VagrantError
       status_code(45)
       error_key(:ssh_unavailable)

data/lib/vagrant/provisioners/puppet.rb

@@ -10,12 +10,14 @@ module Vagrant
       class Config < Vagrant::Config::Base
         attr_accessor :manifest_file
         attr_accessor :manifests_path
+        attr_accessor :module_path
         attr_accessor :pp_path
         attr_accessor :options
 
         def initialize
           @manifest_file = nil
           @manifests_path = "manifests"
+          @module_path = nil
           @pp_path = "/tmp/vagrant-puppet"
           @options = []
         end
@@ -32,51 +34,90 @@ module Vagrant
           manifest_file || "#{top.vm.box}.pp"
         end
 
+        # Returns the module paths as an array of paths expanded relative to the
+        # root path.
+        def expanded_module_paths
+          return [] if !module_path
+
+          # Get all the paths and expand them relative to the root path, returning
+          # the array of expanded paths
+          paths = module_path
+          paths = [paths] if !paths.is_a?(Array)
+          paths.map do |path|
+            Pathname.new(path).expand_path(env.root_path)
+          end
+        end
+
         def validate(errors)
           super
 
+          # Manifests path/file validation
           if !expanded_manifests_path.directory?
             errors.add(I18n.t("vagrant.provisioners.puppet.manifests_path_missing", :path => expanded_manifests_path))
-            return
+          else
+            if !expanded_manifests_path.join(computed_manifest_file).file?
+              errors.add(I18n.t("vagrant.provisioners.puppet.manifest_missing", :manifest => computed_manifest_file))
+            end
           end
 
-          errors.add(I18n.t("vagrant.provisioners.puppet.manifest_missing", :manifest => computed_manifest_file)) if !expanded_manifests_path.join(computed_manifest_file).file?
+          # Module paths validation
+          expanded_module_paths.each do |path|
+            if !path.directory?
+              errors.add(I18n.t("vagrant.provisioners.puppet.module_path_missing", :path => path))
+            end
+          end
         end
       end
 
       def prepare
+        set_module_paths
         share_manifests
+        share_module_paths
       end
 
       def provision!
         verify_binary("puppet")
-        create_pp_path
         run_puppet_client
       end
 
       def share_manifests
-        env.config.vm.share_folder("manifests", config.pp_path, config.manifests_path)
+        env.config.vm.share_folder("manifests", manifests_guest_path, config.expanded_manifests_path)
       end
 
-      def verify_binary(binary)
-        vm.ssh.execute do |ssh|
-          ssh.exec!("sudo -i which #{binary}", :error_class => PuppetError, :_key => :puppet_not_detected, :binary => binary)
+      def share_module_paths
+        count = 0
+        @module_paths.each do |from, to|
+          # Sorry for the cryptic key here, but VirtualBox has a strange limit on
+          # maximum size for it and its something small (around 10)
+          env.config.vm.share_folder("v-pp-m#{count}", to, from)
+          count += 1
+        end
+      end
+
+      def set_module_paths
+        @module_paths = {}
+        config.expanded_module_paths.each_with_index do |path, i|
+          @module_paths[path] = File.join(config.pp_path, "modules-#{i}")
         end
       end
 
-      def create_pp_path
+      def manifests_guest_path
+        File.join(config.pp_path, "manifests")
+      end
+
+      def verify_binary(binary)
         vm.ssh.execute do |ssh|
-          ssh.exec!("sudo mkdir -p #{config.pp_path}")
-          ssh.exec!("sudo chown #{env.config.ssh.username} #{config.pp_path}")
+          ssh.exec!("sudo -i which #{binary}", :error_class => PuppetError, :_key => :puppet_not_detected, :binary => binary)
         end
       end
 
       def run_puppet_client
         options = [config.options].flatten
+        options << "--modulepath '#{@module_paths.values.join(':')}'" if !@module_paths.empty?
         options << config.computed_manifest_file
         options = options.join(" ")
 
-        command = "sudo -i 'cd #{config.pp_path}; puppet #{options}'"
+        command = "sudo -i 'cd #{manifests_guest_path}; puppet #{options}'"
 
         env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet", :manifest => config.computed_manifest_file)
 

data/lib/vagrant/ssh.rb

@@ -142,8 +142,7 @@ module Vagrant
 
     # Returns the port which is either given in the options hash or taken from
     # the config by finding it in the forwarded ports hash based on the
-    # `config.ssh.forwarded_port_key` or use the default port given by `config.ssh.port`
-    # when port forwarding isn't used.
+    # `config.ssh.forwarded_port_key`.
     def port(opts={})
       # Check if port was specified in options hash
       pnum = opts[:port]
@@ -161,8 +160,8 @@ module Vagrant
 
       return pnum.hostport if pnum
 
-      # Fall back to the default
-      return env.config.ssh.port
+      # This should NEVER happen.
+      raise Errors::SSHPortNotDetected
     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 = "0.7.0.beta2"
+  VERSION = "0.7.0"
 end

data/templates/commands/init/Vagrantfile.erb

@@ -24,18 +24,19 @@ Vagrant::Config.run do |config|
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
   # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder("v-data", "/vagrant_data", "../data")
+  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
 
   # Enable provisioning with chef solo, specifying a cookbooks path (relative
   # to this Vagrantfile), and adding some recipes and/or roles.
   #
-  # config.vm.provisioner = :chef_solo
-  # config.chef.cookbooks_path = "cookbooks"
-  # config.chef.add_recipe "mysql"
-  # config.chef.add_role "web"
+  # config.vm.provision :chef_solo do |chef|
+  #   chef.cookbooks_path = "cookbooks"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
   #
-  # You may also specify custom JSON attributes:
-  # config.chef.json = { :mysql_password => "foo" }
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { :mysql_password => "foo" }
+  # end
 
   # Enable provisioning with chef server, specifying the chef server URL,
   # and the path to the validation key (relative to this Vagrantfile).
@@ -47,9 +48,10 @@ Vagrant::Config.run do |config|
   # HTTP instead of HTTPS depending on your configuration. Also change the
   # validation key to validation.pem.
   #
-  # config.vm.provisioner = :chef_server
-  # config.chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  # config.chef.validation_key_path = "ORGNAME-validator.pem"
+  # config.vm.provision :chef_server do |chef|
+  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+  #   chef.validation_key_path = "ORGNAME-validator.pem"
+  # end
   #
   # If you're using the Opscode platform, your validator client is
   # ORGNAME-validator, replacing ORGNAME with your organization name.
@@ -57,5 +59,5 @@ Vagrant::Config.run do |config|
   # IF you have your own Chef Server, the default validation client name is
   # chef-validator, unless you changed the configuration.
   #
-  # config.chef.validation_client_name = "ORGNAME-validator"
+  #   chef.validation_client_name = "ORGNAME-validator"
 end

data/templates/locales/en.yml

@@ -84,6 +84,10 @@ en:
         permissions on the following file to 0600 and then try running this command again:
 
         %{key_path}
+      ssh_port_not_detected: |-
+        Vagrant couldn't determine the SSH port for your VM! This is a rare,
+        exceptional event, and a bug should be filed. Please try recreating your
+        VM (vagrant destroy, then vagrant up). Sorry!
       ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
       ssh_unavailable_windows: |-
         `vagrant ssh` isn't available on the Windows platform. The
@@ -475,6 +479,7 @@ en:
         running_puppet: "Running Puppet with %{manifest}..."
         manifest_missing: "The Puppet %{manifest} manifest is missing. You cannot configure this box."
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
+        module_path_missing: "The configured module path doesn't exist: %{path}"
 
       puppet_server:
         not_detected: |-

data/templates/ssh_config.erb

@@ -1,5 +1,5 @@
 Host <%= host_key %>
-  HostName localhost
+  HostName 127.0.0.1
   User <%= ssh_user %>
   Port <%= ssh_port %>
   UserKnownHostsFile /dev/null

data/test/vagrant/provisioners/puppet_test.rb

@@ -41,6 +41,20 @@ class PuppetProvisionerTest < Test::Unit::TestCase
       assert_equal "woot.pp", @config.computed_manifest_file
     end
 
+    should "return an empty array if no module path is set" do
+      @config.module_path = nil
+      assert_equal [], @config.expanded_module_paths
+    end
+
+    should "return array of module paths expanded relative to root path" do
+      @config.module_path = "foo"
+
+      result = @config.expanded_module_paths
+      assert result.is_a?(Array)
+      assert_equal 1, result.length
+      assert_equal File.expand_path(@config.module_path, @env.root_path), result[0].to_s
+    end
+
     should "be valid" do
       @config.validate(@errors)
       assert @errors.errors.empty?
@@ -63,11 +77,27 @@ class PuppetProvisionerTest < Test::Unit::TestCase
       @config.validate(@errors)
       assert !@errors.errors.empty?
     end
+
+    should "be invalid if a specified module path doesn't exist" do
+      @config.module_path = "foo"
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be valid if all module paths exist" do
+      @config.module_path = "foo"
+      @config.expanded_module_paths.first.mkdir
+      @config.validate(@errors)
+      assert @errors.errors.empty?
+    end
   end
 
   context "preparing" do
     should "share manifests" do
-      @action.expects(:share_manifests).once
+      pre_seq = sequence("prepare")
+      @action.expects(:set_module_paths).once.in_sequence(pre_seq)
+      @action.expects(:share_manifests).once.in_sequence(pre_seq)
+      @action.expects(:share_module_paths).once.in_sequence(pre_seq)
       @action.prepare
     end
   end
@@ -76,26 +106,30 @@ class PuppetProvisionerTest < Test::Unit::TestCase
     should "run the proper sequence of methods in order" do
       prov_seq = sequence("prov_seq")
       @action.expects(:verify_binary).with("puppet").once.in_sequence(prov_seq)
-      @action.expects(:create_pp_path).once.in_sequence(prov_seq)
       @action.expects(:run_puppet_client).once.in_sequence(prov_seq)
       @action.provision!
     end
   end
 
   context "share manifests folder" do
-    setup do
-      @manifests_path = "manifests"
-      @pp_path = "/tmp/vagrant-puppet"
-      @action.stubs(:manifests_path).returns(@manifests_path)
-      @action.stubs(:pp_path).returns(@pp_path)
-    end
-
     should "share manifest folder" do
-      @env.config.vm.expects(:share_folder).with("manifests", @pp_path, @manifests_path)
+      @env.config.vm.expects(:share_folder).with("manifests", @action.manifests_guest_path, @config.expanded_manifests_path)
       @action.share_manifests
     end
   end
 
+  context "sharing module paths" do
+    should "share all the module paths" do
+      @config.module_path = ["foo", "bar"]
+      @config.expanded_module_paths.each_with_index do |path, i|
+        @env.config.vm.expects(:share_folder).with("v-pp-m#{i}", File.join(@config.pp_path, "modules-#{i}"), path)
+      end
+
+      @action.set_module_paths
+      @action.share_module_paths
+    end
+  end
+
   context "verifying binary" do
     setup do
       @ssh = mock("ssh")
@@ -109,25 +143,15 @@ class PuppetProvisionerTest < Test::Unit::TestCase
     end
   end
 
-  context "create pp path" do
-    should "create and chown the folder to the ssh user" do
-      ssh_seq = sequence("ssh_seq")
-      ssh = mock("ssh")
-      ssh.expects(:exec!).with("sudo mkdir -p #{@config.pp_path}").once.in_sequence(ssh_seq)
-      ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@config.pp_path}").once.in_sequence(ssh_seq)
-      @vm.ssh.expects(:execute).yields(ssh)
-      @action.create_pp_path
-    end
-  end
-
   context "running puppet client" do
     setup do
       @ssh = mock("ssh")
       @vm.ssh.stubs(:execute).yields(@ssh)
+      @action.set_module_paths
     end
 
     def expect_puppet_command(command)
-      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.pp_path}; #{command}'")
+      @ssh.expects(:exec!).with("sudo -i 'cd #{@action.manifests_guest_path}; #{command}'")
     end
 
     should "cd into the pp_path directory and run puppet" do
@@ -146,5 +170,13 @@ class PuppetProvisionerTest < Test::Unit::TestCase
       expect_puppet_command("puppet --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}")
+
+      @action.set_module_paths
+      @action.run_puppet_client
+    end
   end
 end

data/test/vagrant/ssh_test.rb

@@ -19,6 +19,7 @@ class SshTest < Test::Unit::TestCase
     setup do
       mock_ssh
       @ssh.stubs(:check_key_permissions)
+      @ssh.stubs(:port).returns(2222)
       Kernel.stubs(:exec)
       Kernel.stubs(:system).returns(true)
 
@@ -53,8 +54,8 @@ class SshTest < Test::Unit::TestCase
     end
 
     should "call exec with supplied params" do
-      args = {:username => 'bar', :private_key_path => 'baz', :host => 'bak', :port => 'bag'}
-      ssh_exec_expect(args[:port], args[:private_key_path], args[:username], args[:host])
+      args = {:username => 'bar', :private_key_path => 'baz', :host => 'bak'}
+      ssh_exec_expect(@ssh.port, args[:private_key_path], args[:username], args[:host])
       @ssh.connect(args)
     end
 
@@ -116,10 +117,10 @@ class SshTest < Test::Unit::TestCase
 
     def ssh_exec_expect(port, key_path, uname, host)
       Kernel.expects(:exec).with() do |arg|
-        assert arg =~ /^ssh/
-        assert arg =~ /-p #{port}/
-        assert arg =~ /-i #{key_path}/
-        assert arg =~ /#{uname}@#{host}/
+        assert arg =~ /^ssh/, "ssh command expected"
+        assert arg =~ /-p #{port}/, "-p #{port} expected"
+        assert arg =~ /-i #{key_path}/, "-i #{key_path} expected"
+        assert arg =~ /#{uname}@#{host}/, "#{uname}@{host} expected"
         yield arg if block_given?
         true
       end
@@ -198,6 +199,7 @@ class SshTest < Test::Unit::TestCase
     setup do
       mock_ssh
       @ssh.stubs(:check_key_permissions)
+      @ssh.stubs(:port).returns(2222)
     end
 
     should "return true if SSH connection works" do

data/vagrant.gemspec

@@ -22,7 +22,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.8.1"
+  s.add_dependency "virtualbox", "~> 0.8.2"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 7
   - 0
-  - beta2
-  version: 0.7.0.beta2
+  version: 0.7.0
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,8 +148,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 1
-        version: 0.8.1
+        - 2
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -467,7 +466,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4588961819893742536
+      hash: -3286949326636393746
       segments: 
       - 0
       version: "0"