vagrantup 0.6.8 → 0.6.9

data/test/vagrant/action/general/package_test.rb

@@ -173,11 +173,25 @@ class PackageGeneralActionTest < Test::Unit::TestCase
         seq = sequence("seq")
         @instance.files_to_copy.each do |from, to|
           FileUtils.expects(:mkdir_p).with(to.parent).in_sequence(seq)
+          File.expects(:directory?).with(from).returns(false).in_sequence(seq)
           FileUtils.expects(:cp).with(from, to).in_sequence(seq)
         end
 
         @instance.copy_include_files
       end
+
+      should "create the include directory and recursively copy globbed files to it" do
+        @env["package.include"] = ["foo*.txt"]
+        seq = sequence("seq")
+        @instance.files_to_copy.each do |from, to|
+          FileUtils.expects(:mkdir_p).with(to.parent).in_sequence(seq)
+          File.expects(:directory?).with(from).returns(true).in_sequence(seq)
+          Dir.expects(:glob).with(from).returns(from).in_sequence(seq)
+          FileUtils.expects(:cp_r).with(from, to.parent).in_sequence(seq)
+        end
+
+        @instance.copy_include_files
+      end
     end
 
     context "compression" do

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

@@ -16,6 +16,24 @@ class NetworkVMActionTest < Test::Unit::TestCase
   end
 
   context "initializing" do
+    should "raise an error if on windows and networking is enabled" do
+      Vagrant::Util::Platform.stubs(:windows?).returns(true)
+      @env.env.config.vm.network("foo")
+
+      assert_raises(Vagrant::Errors::NetworkNotImplemented) {
+        @klass.new(@app, @env)
+      }
+    end
+
+    should "not raise an error if not on windows and networking is enabled" do
+      Vagrant::Util::Platform.stubs(:windows?).returns(false)
+      @env.env.config.vm.network("foo")
+
+      assert_nothing_raised {
+        @klass.new(@app, @env)
+      }
+    end
+
     should "verify no bridge collisions for each network enabled" do
       @env.env.config.vm.network("foo")
       @klass.any_instance.expects(:verify_no_bridge_collision).returns(true).once.with() do |options|

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

@@ -103,6 +103,10 @@ class ProvisionVMActionTest < Test::Unit::TestCase
         should "set :chef_server to the ChefServer provisioner" do
           provisioner_expectation(:chef_server, Vagrant::Provisioners::ChefServer)
         end
+
+        should "set :puppet to the Puppet provisioner" do
+          provisioner_expectation(:puppet, Vagrant::Provisioners::Puppet)
+        end
       end
     end
 

data/test/vagrant/command/helpers_test.rb

@@ -39,7 +39,7 @@ class CommandHelpersTest < Test::Unit::TestCase
 
     context "without multivm" do
       setup do
-        @env.stubs(:vms).returns({ :one => 1, :two => 2 })
+        @env.stubs(:vms_ordered => [1, 2], :vms => {:one => 1, :two => 2})
       end
 
       should "raise an exception if a name is specified" do
@@ -59,7 +59,7 @@ class CommandHelpersTest < Test::Unit::TestCase
 
     context "with multivm" do
       setup do
-        @env.stubs(:vms).returns(:one => 1, :two => 2)
+        @env.stubs(:vms_ordered => [1, 2], :vms => {:one => 1, :two => 2})
       end
 
       should "return all the VMs if no name is specified" do

data/test/vagrant/config/vm_test.rb

@@ -32,6 +32,14 @@ class ConfigVMTest < Test::Unit::TestCase
       @config.define(:foo) {}
       assert @config.has_multi_vms?
     end
+
+    should "retain vm definition order" do
+      @config.define(:a) {}
+      @config.define(:b) {}
+      @config.define(:c) {}
+
+      assert_equal [:a, :b, :c], @config.defined_vm_keys
+    end
   end
 
   context "customizing" do

data/test/vagrant/provisioners/puppet_test.rb

@@ -0,0 +1,135 @@
+require "test_helper"
+
+class PuppetProvisionerTest < Test::Unit::TestCase
+  setup do
+    @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
+
+    @action = Vagrant::Provisioners::Puppet.new(@action_env)
+    @env = @action.env
+    @vm = @action.vm
+  end
+
+  context "preparing" do
+    should "share manifests" do
+      @action.expects(:check_manifest_dir).once
+      @action.expects(:share_manifests).once
+      @action.prepare
+    end
+  end
+
+  context "provisioning" do
+    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(: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"
+      @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)
+      @action.share_manifests
+    end
+  end
+
+  context "verifying binary" do
+    setup do
+      @ssh = mock("ssh")
+      @vm.ssh.stubs(:execute).yields(@ssh)
+    end
+
+    should "verify binary exists" do
+      binary = "foo"
+      @ssh.expects(:exec!).with("which #{binary}", anything)
+      @action.verify_binary(binary)
+    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 #{@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)
+      @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
+
+    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
+      @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
+      @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
+      @action.run_puppet_client
+    end
+  end
+end

data/test/vagrant/ssh_test.rb

@@ -195,16 +195,15 @@ class SshTest < Test::Unit::TestCase
     end
 
     should "return false if SSH connection times out" do
-      Net::SSH.expects(:start)
-      assert !@ssh.up?
-    end
+      @env.config.ssh.timeout = 0.5
 
-    should "allow the thread the configured timeout time" do
-      @thread = mock("thread")
-      @thread.stubs(:[])
-      Thread.expects(:new).returns(@thread)
-      @thread.expects(:join).with(@env.config.ssh.timeout).once
-      @ssh.up?
+      Net::SSH.stubs(:start).with() do
+        # Sleep here to artificially fake timeout
+        sleep 1
+        true
+      end
+
+      assert !@ssh.up?
     end
 
     should "return false if the connection is refused" do
@@ -222,7 +221,11 @@ class SshTest < Test::Unit::TestCase
     end
 
     should "specifity the timeout as an option to execute" do
-      @ssh.expects(:execute).with(:timeout => @env.config.ssh.timeout).yields(true)
+      @ssh.expects(:execute).yields(true).with() do |opts|
+        assert_equal @env.config.ssh.timeout, opts[:timeout]
+        true
+      end
+
       assert @ssh.up?
     end
 
@@ -230,6 +233,11 @@ class SshTest < Test::Unit::TestCase
       @ssh.expects(:execute).raises(Net::SSH::AuthenticationFailed)
       assert_raises(Vagrant::Errors::SSHAuthenticationFailed) { @ssh.up? }
     end
+
+    should "only get the port once (in the main thread)" do
+      @ssh.expects(:port).once.returns(2222)
+      @ssh.up?
+    end
   end
 
   context "getting the ssh port" do

data/test/vagrant/vm_test.rb

@@ -119,7 +119,8 @@ class VMTest < Test::Unit::TestCase
       context "with a symbol" do
         should "initialize proper symbols" do
           valid = {
-            :linux => Vagrant::Systems::Linux
+            :linux => Vagrant::Systems::Linux,
+            :solaris => Vagrant::Systems::Solaris
           }
 
           valid.each do |symbol, klass|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -207,7 +207,6 @@ files:
 - .yardopts
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -302,6 +301,7 @@ files:
 - lib/vagrant/provisioners/chef.rb
 - lib/vagrant/provisioners/chef_server.rb
 - lib/vagrant/provisioners/chef_solo.rb
+- lib/vagrant/provisioners/puppet.rb
 - lib/vagrant/ssh.rb
 - lib/vagrant/systems/base.rb
 - lib/vagrant/systems/linux.rb
@@ -398,6 +398,7 @@ 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_test.rb
 - test/vagrant/ssh_session_test.rb
 - test/vagrant/ssh_test.rb
 - test/vagrant/systems/linux_test.rb

data/Gemfile.lock

@@ -1,76 +0,0 @@
-GIT
-  remote: git://github.com/mitchellh/virtualbox.git
-  revision: 041996145591d20acf3e04fef3d4709f826d878a
-  specs:
-    virtualbox (0.7.6.dev)
-      ffi (~> 0.6.3)
-
-PATH
-  remote: .
-  specs:
-    vagrant (0.6.8)
-      archive-tar-minitar (= 0.5.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      json (~> 1.4.6)
-      mario (~> 0.0.6)
-      net-scp (~> 1.0.3)
-      net-ssh (~> 2.0.23)
-      thor (~> 0.14.2)
-      virtualbox (~> 0.7.6)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    archive-tar-minitar (0.5.2)
-    bluecloth (2.0.9)
-    columnize (0.3.1)
-    contest (0.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    i18n (0.4.1)
-    json (1.4.6)
-    linecache (0.43)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mario (0.0.6)
-    mocha (0.9.8)
-      rake
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.0.23)
-    rake (0.8.7)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    thor (0.14.3)
-    yard (0.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bluecloth
-  contest (>= 0.1.2)
-  mocha
-  rake
-  ruby-debug
-  ruby-debug19
-  vagrant!
-  virtualbox!
-  yard (~> 0.6.1)