vagrant 0.7.0.beta → 0.7.0.beta2

data/test/vagrant/provisioners/puppet_server_test.rb

@@ -0,0 +1,69 @@
+require "test_helper"
+
+class PuppetServerProvisionerTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Provisioners::PuppetServer
+
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
+
+    @config = @klass::Config.new
+    @action = @klass.new(@action_env, @config)
+    @env = @action.env
+    @vm = @action.vm
+  end
+
+  context "provisioning" do
+    should "run the proper sequence of methods in order" do
+      prov_seq = sequence("prov_seq")
+      @action.expects(:verify_binary).with("puppetd").once.in_sequence(prov_seq)
+      @action.expects(:run_puppetd_client).once.in_sequence(prov_seq)
+      @action.provision!
+    end
+  end
+
+  context "verifying binary" do
+    setup do
+      @ssh = mock("ssh")
+      @shell = mock("shell")
+      @ssh.stubs(:shell).yields(@shell)
+      @vm.ssh.stubs(:execute).yields(@ssh)
+    end
+
+    should "verify binary exists" do
+      binary = "foo"
+      @shell.expects(:execute).with("sudo -i which #{binary}", anything)
+      @action.verify_binary(binary)
+    end
+  end
+
+  context "running puppetd client" do
+    setup do
+      @cn = "puppet_node"
+      @ssh = mock("ssh")
+      @vm.ssh.stubs(:execute).yields(@ssh)
+    end
+
+    should "run the puppetd client" do
+      @ssh.expects(:exec!).with("sudo -i puppetd  --server #{@config.puppet_server} --certname #{@cn}").once
+      @action.run_puppetd_client
+    end
+
+    should "run puppetd with given options when given as an array" do
+      @config.options = ["--modulepath", "modules", "--verbose"]
+      @ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
+      @action.run_puppetd_client
+    end
+
+    should "run puppetd with the options when given as a string" do
+      @config.options = "--modulepath modules --verbose"
+      @ssh.expects(:exec!).with("sudo -i puppetd --modulepath modules --verbose --server #{@config.puppet_server} --certname #{@cn}").once
+      @action.run_puppetd_client
+    end
+
+    should "check the exit status if that is given" do
+      @ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
+      @ssh.expects(:check_exit_status).with(:foo, anything).once
+      @action.run_puppetd_client
+    end
+  end
+end

data/test/vagrant/provisioners/puppet_test.rb

@@ -2,16 +2,71 @@ require "test_helper"
 
 class PuppetProvisionerTest < Test::Unit::TestCase
   setup do
+    clean_paths
+
+    @klass = Vagrant::Provisioners::Puppet
+
     @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
-    @action = Vagrant::Provisioners::Puppet.new(@action_env)
+    @config = @klass::Config.new
+    @config.top = Vagrant::Config::Top.new(@action_env.env)
+    @config.top.vm.box = "foo"
+    @action = @klass.new(@action_env, @config)
     @env = @action.env
     @vm = @action.vm
   end
 
+  context "config" do
+    setup do
+      @errors = Vagrant::Config::ErrorRecorder.new
+
+      # Set a box
+      @config.top.vm.box = "foo"
+
+      # Start in a valid state (verified by the first test)
+      @config.expanded_manifests_path.mkdir
+      File.open(@config.expanded_manifests_path.join(@config.computed_manifest_file), "w") { |f| f.puts "HELLO" }
+    end
+
+    should "expand the manifest path relative to the root path" do
+      assert_equal File.expand_path(@config.manifests_path, @env.root_path), @config.expanded_manifests_path.to_s
+    end
+
+    should "default the manifest file to the box name" do
+      assert_equal "#{@config.top.vm.box}.pp", @config.computed_manifest_file
+    end
+
+    should "use the custom manifest file if set" do
+      @config.manifest_file = "woot.pp"
+      assert_equal "woot.pp", @config.computed_manifest_file
+    end
+
+    should "be valid" do
+      @config.validate(@errors)
+      assert @errors.errors.empty?
+    end
+
+    should "be invalid if the manifests path doesn't exist" do
+      @config.expanded_manifests_path.rmtree
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if a custom manifests path doesn't exist" do
+      @config.manifests_path = "dont_exist"
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if the manifest file doesn't exist" do
+      @config.expanded_manifests_path.join(@config.computed_manifest_file).unlink
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+  end
+
   context "preparing" do
     should "share manifests" do
-      @action.expects(:check_manifest_dir).once
       @action.expects(:share_manifests).once
       @action.prepare
     end
@@ -22,29 +77,11 @@ class PuppetProvisionerTest < Test::Unit::TestCase
       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(:set_manifest).once.in_sequence(prov_seq)
       @action.expects(:run_puppet_client).once.in_sequence(prov_seq)
       @action.provision!
     end
   end
 
-  context "check manifest_dir" do
-    setup do
-      @env.config.puppet.manifests_path = "manifests"
-    end
-
-    should "should not create the manifest directory if it exists" do
-      File.expects(:directory?).with(@env.config.puppet.manifests_path).returns(true)
-      @action.check_manifest_dir
-    end
-
-    should "create the manifest directory if it does not exist" do
-      File.stubs(:directory?).with(@env.config.puppet.manifests_path).returns(false)
-      Dir.expects(:mkdir).with(@env.config.puppet.manifests_path).once
-      @action.check_manifest_dir
-    end
-  end
-
   context "share manifests folder" do
     setup do
       @manifests_path = "manifests"
@@ -67,7 +104,7 @@ class PuppetProvisionerTest < Test::Unit::TestCase
 
     should "verify binary exists" do
       binary = "foo"
-      @ssh.expects(:exec!).with("which #{binary}", anything)
+      @ssh.expects(:exec!).with("sudo -i which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end
@@ -76,59 +113,37 @@ class PuppetProvisionerTest < Test::Unit::TestCase
     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 #{@env.config.puppet.pp_path}").once.in_sequence(ssh_seq)
-      ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@env.config.puppet.pp_path}").once.in_sequence(ssh_seq)
+      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 "setting the manifest" do
-    setup do
-      @env.config.puppet.stubs(:manifests_path).returns("manifests")
-      @env.config.puppet.stubs(:manifest_file).returns("foo.pp")
-      @env.config.vm.stubs(:box).returns("base")
-    end
-
-    should "set the manifest if it exists" do
-      File.stubs(:exists?).with("#{@env.config.puppet.manifests_path}/#{@env.config.puppet.manifest_file}").returns(true)
-      @action.set_manifest
-    end
-
-    should "raise an error if the manifest does not exist" do
-      File.stubs(:exists?).with("#{@env.config.puppet.manifests_path}/#{@env.config.puppet.manifest_file}").returns(false)
-      assert_raises(Vagrant::Provisioners::PuppetError) {
-        @action.set_manifest
-      }
-    end
-  end
-
   context "running puppet client" do
     setup do
       @ssh = mock("ssh")
       @vm.ssh.stubs(:execute).yields(@ssh)
     end
 
+    def expect_puppet_command(command)
+      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.pp_path}; #{command}'")
+    end
+
     should "cd into the pp_path directory and run puppet" do
-      @ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet  #{@manifest}").once
+      expect_puppet_command("puppet #{@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
-      @env.config.puppet.options = ["--modulepath", "modules", "--verbose"]
-      @ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet --modulepath modules --verbose #{@manifest}").once
+      @config.options = ["--modulepath", "modules", "--verbose"]
+      expect_puppet_command("puppet --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
-      @env.config.puppet.options = "--modulepath modules --verbose"
-      @ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet --modulepath modules --verbose #{@manifest}").once
-      @action.run_puppet_client
-    end
-
-    should "check the exit status if that is given" do
-      @ssh.stubs(:exec!).yields(nil, :exit_status, :foo)
-      @ssh.expects(:check_exit_status).with(:foo, anything).once
+      @config.options = "--modulepath modules --verbose"
+      expect_puppet_command("puppet --modulepath modules --verbose #{@config.computed_manifest_file}")
       @action.run_puppet_client
     end
   end

data/test/vagrant/ssh_test.rb

@@ -12,7 +12,7 @@ class SshTest < Test::Unit::TestCase
   end
 
   setup do
-    VirtualBox.stubs(:version).returns("3.2.4")
+    VirtualBox.stubs(:version).returns("4.0.0")
   end
 
   context "connecting to external SSH" do
@@ -69,6 +69,17 @@ class SshTest < Test::Unit::TestCase
       @ssh.connect
     end
 
+    should "add forward X11 option if enabled" do
+      @env.config.ssh.forward_x11 = true
+      ssh_exec_expect(@ssh.port,
+                      @env.config.ssh.private_key_path,
+                      @env.config.ssh.username,
+                      @env.config.ssh.host) do |args|
+        assert args =~ /-o ForwardX11=yes/
+      end
+      @ssh.connect
+    end
+
     context "on leopard" do
       setup do
         Vagrant::Util::Platform.stubs(:leopard?).returns(true)

data/test/vagrant/systems/base_test.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+
+class BaseSystemTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Systems::Base
+
+    @vm = mock("vm")
+    @instance = @klass.new(@vm)
+  end
+
+  should "provide access to the VM" do
+    assert_equal @vm, @instance.vm
+  end
+
+  should "error on preparing host only network" do
+    assert_raises(@klass::BaseError) { @instance.prepare_host_only_network }
+  end
+end

data/test/vagrant/systems/linux_test.rb

@@ -61,7 +61,7 @@ class LinuxSystemTest < Test::Unit::TestCase
     end
 
     should "execute the proper mount command" do
-      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=#{@vm.env.config.ssh.username},gid=#{@vm.env.config.ssh.username} #{@name} #{@guestpath}").returns(@success_return)
+      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{@vm.env.config.ssh.username}`,gid=`id -g #{@vm.env.config.ssh.username}` #{@name} #{@guestpath}").returns(@success_return)
       mount_folder
     end
 
@@ -107,7 +107,7 @@ class LinuxSystemTest < Test::Unit::TestCase
 
       @vm.stubs(:env).returns(env)
 
-      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=#{uid},gid=#{gid} #{@name} #{@guestpath}").returns(@success_return)
+      @ssh.expects(:exec!).with("sudo mount -t vboxsf -o uid=`id -u #{uid}`,gid=`id -g #{gid}` #{@name} #{@guestpath}").returns(@success_return)
       mount_folder
     end
   end

data/test/vagrant/vm_test.rb

@@ -25,6 +25,7 @@ class VMTest < Test::Unit::TestCase
     setup do
       @vm_name = "foo"
       @mock_vm = mock("vm")
+      @mock_vm.stubs(:running?).returns(false)
       @vm = Vagrant::VM.new(:env => @env, :vm => @mock_vm, :name => @vm_name)
       @mock_vm.stubs(:uuid).returns("foo")
     end
@@ -96,11 +97,14 @@ class VMTest < Test::Unit::TestCase
         }
       end
 
-      context "with a class" do
-        class FakeSystemClass
-          def initialize(vm); end
-        end
+      should "load the given system if specified" do
+        fake_class = Class.new(Vagrant::Systems::Base)
 
+        assert_nothing_raised { @vm.load_system!(fake_class) }
+        assert @vm.system.is_a?(fake_class)
+      end
+
+      context "with a class" do
         should "initialize class if given" do
           @vm.env.config.vm.system = Vagrant::Systems::Linux
 
@@ -109,7 +113,7 @@ class VMTest < Test::Unit::TestCase
         end
 
         should "raise error if class has invalid parent" do
-          @vm.env.config.vm.system = FakeSystemClass
+          @vm.env.config.vm.system = Class.new
           assert_raises(Vagrant::Errors::VMSystemError) {
             @vm.load_system!
           }
@@ -140,6 +144,30 @@ class VMTest < Test::Unit::TestCase
           }
         end
       end
+
+      context "loading the distro" do
+        setup do
+          @vm.vm.stubs(:running?).returns(true)
+        end
+
+        should "not replace the distro if it is nil" do
+          @vm.env.config.vm.system = Class.new(Vagrant::Systems::Base)
+
+          @vm.load_system!
+          assert @vm.system.is_a?(@vm.env.config.vm.system)
+        end
+
+        should "replace the distro if it is not nil" do
+          @vm.env.config.vm.system = Class.new(Vagrant::Systems::Base) do
+            def distro_dispatch
+              :linux
+            end
+          end
+
+          @vm.load_system!
+          assert @vm.system.is_a?(Vagrant::Systems::Linux)
+        end
+      end
     end
 
     context "uuid" do

data/vagrant.gemspec

@@ -1,4 +1,5 @@
-require File.expand_path("../lib/vagrant/version", __FILE__)
+$:.unshift File.expand_path("../lib", __FILE__)
+require "vagrant/version"
 
 Gem::Specification.new do |s|
   s.name          = "vagrant"
@@ -18,10 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency "json", "~> 1.4.6"
   s.add_dependency "mario", "~> 0.0.6"
   s.add_dependency "net-ssh", "~> 2.0.23"
-  s.add_dependency "net-scp", "~> 1.0.3"
-  s.add_dependency "i18n", "~> 0.4.1"
-  s.add_dependency "thor", "~> 0.14.2"
-  s.add_dependency "virtualbox", "~> 0.8.0"
+  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_development_dependency "rake"
   s.add_development_dependency "contest", ">= 0.1.2"

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 7
   - 0
-  - beta
-  version: 0.7.0.beta
+  - beta2
+  version: 0.7.0.beta2
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,8 +104,8 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 4
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -118,9 +118,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: *id007
@@ -134,8 +134,8 @@ dependencies:
         segments: 
         - 0
         - 14
-        - 2
-        version: 0.14.2
+        - 6
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: *id008
@@ -149,8 +149,8 @@ dependencies:
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: *id009
@@ -228,12 +228,16 @@ files:
 - Rakefile
 - bin/vagrant
 - config/default.rb
+- contrib/README.md
+- contrib/emacs/vagrant.el
+- contrib/vim/vagrantfile.vim
 - keys/README.md
 - keys/vagrant
 - keys/vagrant.ppk
 - keys/vagrant.pub
 - lib/vagrant.rb
 - lib/vagrant/action.rb
+- lib/vagrant/action/box.rb
 - lib/vagrant/action/box/destroy.rb
 - lib/vagrant/action/box/download.rb
 - lib/vagrant/action/box/package.rb
@@ -241,10 +245,13 @@ files:
 - lib/vagrant/action/box/verify.rb
 - lib/vagrant/action/builder.rb
 - lib/vagrant/action/builtin.rb
+- lib/vagrant/action/env.rb
 - lib/vagrant/action/env/set.rb
 - lib/vagrant/action/environment.rb
+- lib/vagrant/action/general.rb
 - lib/vagrant/action/general/package.rb
 - lib/vagrant/action/general/validate.rb
+- lib/vagrant/action/vm.rb
 - lib/vagrant/action/vm/boot.rb
 - lib/vagrant/action/vm/check_box.rb
 - lib/vagrant/action/vm/check_guest_additions.rb
@@ -275,6 +282,7 @@ files:
 - lib/vagrant/box.rb
 - lib/vagrant/box_collection.rb
 - lib/vagrant/cli.rb
+- lib/vagrant/command.rb
 - lib/vagrant/command/base.rb
 - lib/vagrant/command/box.rb
 - lib/vagrant/command/destroy.rb
@@ -300,32 +308,45 @@ files:
 - lib/vagrant/config/nfs.rb
 - lib/vagrant/config/package.rb
 - lib/vagrant/config/ssh.rb
+- lib/vagrant/config/top.rb
 - lib/vagrant/config/vagrant.rb
 - lib/vagrant/config/vm.rb
+- lib/vagrant/config/vm/provisioner.rb
+- lib/vagrant/config/vm/sub_vm.rb
 - lib/vagrant/data_store.rb
+- lib/vagrant/downloaders.rb
 - lib/vagrant/downloaders/base.rb
 - lib/vagrant/downloaders/file.rb
 - lib/vagrant/downloaders/http.rb
 - lib/vagrant/environment.rb
 - lib/vagrant/errors.rb
+- lib/vagrant/hosts.rb
 - lib/vagrant/hosts/base.rb
 - lib/vagrant/hosts/bsd.rb
 - lib/vagrant/hosts/linux.rb
 - lib/vagrant/plugin.rb
+- lib/vagrant/provisioners.rb
 - lib/vagrant/provisioners/base.rb
 - lib/vagrant/provisioners/chef.rb
 - lib/vagrant/provisioners/chef_server.rb
 - lib/vagrant/provisioners/chef_solo.rb
 - lib/vagrant/provisioners/puppet.rb
+- lib/vagrant/provisioners/puppet_server.rb
 - lib/vagrant/ssh.rb
+- lib/vagrant/ssh/session.rb
+- lib/vagrant/systems.rb
 - lib/vagrant/systems/base.rb
+- lib/vagrant/systems/debian.rb
+- lib/vagrant/systems/gentoo.rb
 - lib/vagrant/systems/linux.rb
+- lib/vagrant/systems/linux/config.rb
+- lib/vagrant/systems/linux/error.rb
+- lib/vagrant/systems/redhat.rb
 - lib/vagrant/systems/solaris.rb
 - lib/vagrant/test_helpers.rb
 - lib/vagrant/ui.rb
 - lib/vagrant/util.rb
 - lib/vagrant/util/busy.rb
-- lib/vagrant/util/glob_loader.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
 - lib/vagrant/util/plain_logger.rb
 - lib/vagrant/util/platform.rb
@@ -340,7 +361,9 @@ files:
 - templates/commands/init/Vagrantfile.erb
 - templates/config/validation_failed.erb
 - templates/locales/en.yml
-- templates/network_entry.erb
+- templates/network_entry_debian.erb
+- templates/network_entry_gentoo.erb
+- templates/network_entry_redhat.erb
 - templates/nfs/exports.erb
 - templates/nfs/exports_linux.erb
 - templates/package_Vagrantfile.erb
@@ -396,6 +419,7 @@ files:
 - 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
@@ -412,9 +436,11 @@ files:
 - test/vagrant/provisioners/chef_server_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/ssh_session_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
@@ -441,7 +467,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1825032801895729631
+      hash: 4588961819893742536
       segments: 
       - 0
       version: "0"