vagrant 0.1.4 → 0.2.0.pre

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -0,0 +1,142 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class ChefSoloProvisionerTest < Test::Unit::TestCase
+  setup do
+    @action = Vagrant::Provisioners::ChefSolo.new
+
+    Vagrant::SSH.stubs(:execute)
+    Vagrant::SSH.stubs(:upload!)
+
+    mock_config
+  end
+
+  context "preparing" do
+    should "share cookbook folders" do
+      @action.expects(:share_cookbook_folders).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(:chown_provisioning_folder).once.in_sequence(prov_seq)
+      @action.expects(:setup_json).once.in_sequence(prov_seq)
+      @action.expects(:setup_solo_config).once.in_sequence(prov_seq)
+      @action.expects(:run_chef_solo).once.in_sequence(prov_seq)
+      @action.provision!
+    end
+  end
+
+  context "sharing cookbook folders" do
+    setup do
+      @host_cookbook_paths = ["foo", "bar"]
+      @action.stubs(:host_cookbook_paths).returns(@host_cookbook_paths)
+    end
+
+    should "share each cookbook folder" do
+      share_seq = sequence("share_seq")
+      @host_cookbook_paths.each_with_index do |cookbook, i|
+        Vagrant.config.vm.expects(:share_folder).with("vagrant-chef-solo-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq)
+      end
+
+      @action.share_cookbook_folders
+    end
+  end
+
+  context "host cookbooks paths" do
+    should "expand the path of the cookbooks relative to the environment root path" do
+      @cookbook = "foo"
+      @expanded = "bar"
+      File.expects(:expand_path).with(@cookbook, Vagrant::Env.root_path).returns(@expanded)
+
+      mock_config do |config|
+        config.chef.cookbooks_path = @cookbook
+      end
+
+      assert_equal [@expanded], @action.host_cookbook_paths
+    end
+
+    should "return as an array if was originally a string" do
+      File.stubs(:expand_path).returns("foo")
+
+      mock_config do |config|
+        config.chef.cookbooks_path = "foo"
+      end
+
+      assert_equal ["foo"], @action.host_cookbook_paths
+    end
+
+    should "return the array of cookbooks if its an array" do
+      cookbooks = ["foo", "bar"]
+      mock_config do |config|
+        config.chef.cookbooks_path = cookbooks
+      end
+
+      expand_seq = sequence('expand_seq')
+      cookbooks.each do |cookbook|
+        File.expects(:expand_path).with(cookbook, Vagrant::Env.root_path).returns(cookbook)
+      end
+
+      assert_equal cookbooks, @action.host_cookbook_paths
+    end
+  end
+
+  context "cookbooks path" do
+    should "return a proper path to a single cookbook" do
+      expected = File.join(Vagrant.config.chef.provisioning_path, "cookbooks-5")
+      assert_equal expected, @action.cookbook_path(5)
+    end
+
+    should "return array-representation of cookbook paths if multiple" do
+      @cookbooks = (0..5).inject([]) do |acc, i|
+        acc << @action.cookbook_path(i)
+      end
+
+      mock_config do |config|
+        config.chef.cookbooks_path = @cookbooks
+      end
+
+      assert_equal @cookbooks.to_json, @action.cookbooks_path
+    end
+
+    should "return a single string representation if cookbook paths is single" do
+      @cookbooks = @action.cookbook_path(0)
+
+      mock_config do |config|
+        config.chef.cookbooks_path = @cookbooks
+      end
+
+      assert_equal @cookbooks.to_json, @action.cookbooks_path
+    end
+  end
+
+  context "generating and uploading chef solo configuration file" do
+    should "upload properly generate the configuration file using configuration data" do
+      expected_config = <<-config
+file_cache_path "#{Vagrant.config.chef.provisioning_path}"
+cookbook_path #{@action.cookbooks_path}
+config
+
+      StringIO.expects(:new).with(expected_config).once
+      @action.setup_solo_config
+    end
+
+    should "upload this file as solo.rb to the provisioning folder" do
+      @action.expects(:cookbooks_path).returns("cookbooks")
+      StringIO.expects(:new).returns("foo")
+      File.expects(:join).with(Vagrant.config.chef.provisioning_path, "solo.rb").once.returns("bar")
+      Vagrant::SSH.expects(:upload!).with("foo", "bar").once
+      @action.setup_solo_config
+    end
+  end
+
+  context "running chef solo" do
+    should "cd into the provisioning directory and run chef solo" do
+      ssh = mock("ssh")
+      ssh.expects(:exec!).with("cd #{Vagrant.config.chef.provisioning_path} && sudo chef-solo -c solo.rb -j dna.json").once
+      Vagrant::SSH.expects(:execute).yields(ssh)
+      @action.run_chef_solo
+    end
+  end
+end

data/test/vagrant/provisioners/chef_test.rb

@@ -0,0 +1,116 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
+
+class ChefProvisionerTest < Test::Unit::TestCase
+  setup do
+    @action = Vagrant::Provisioners::Chef.new
+
+    Vagrant::SSH.stubs(:execute)
+    Vagrant::SSH.stubs(:upload!)
+
+    mock_config
+  end
+
+  context "preparing" do
+    should "raise an ActionException" do
+      assert_raises(Vagrant::Actions::ActionException) {
+        @action.prepare
+      }
+    end
+  end
+
+  context "config" do
+    setup do
+      @config = Vagrant::Provisioners::Chef::ChefConfig.new
+      @config.run_list.clear
+    end
+
+    should "not include the 'json' key in the config dump" do
+      result = JSON.parse(@config.to_json)
+      assert !result.has_key?("json")
+    end
+
+    should "provide accessors to the run list" do
+      @config.run_list << "foo"
+      assert !@config.run_list.empty?
+      assert_equal ["foo"], @config.run_list
+    end
+
+    should "provide a writer for the run list" do
+      data = mock("data")
+
+      assert_nothing_raised {
+        @config.run_list = data
+        assert_equal data, @config.run_list
+      }
+    end
+
+    should "add a recipe to the run list" do
+      @config.add_recipe("foo")
+      assert_equal "recipe[foo]", @config.run_list[0]
+    end
+
+    should "not wrap the recipe in 'recipe[]' if it was in the name" do
+      @config.add_recipe("recipe[foo]")
+      assert_equal "recipe[foo]", @config.run_list[0]
+    end
+
+    should "add a role to the run list" do
+      @config.add_role("user")
+      assert_equal "role[user]", @config.run_list[0]
+    end
+
+    should "not wrap the role in 'role[]' if it was in the name" do
+      @config.add_role("role[user]")
+      assert_equal "role[user]", @config.run_list[0]
+    end
+  end
+
+  context "permissions on provisioning folder" 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 #{Vagrant.config.chef.provisioning_path}").once.in_sequence(ssh_seq)
+      ssh.expects(:exec!).with("sudo chown #{Vagrant.config.ssh.username} #{Vagrant.config.chef.provisioning_path}").once.in_sequence(ssh_seq)
+      Vagrant::SSH.expects(:execute).yields(ssh)
+      @action.chown_provisioning_folder
+    end
+  end
+
+  context "generating and uploading json" do
+    def assert_json
+      Vagrant::SSH.expects(:upload!).with do |json, path|
+        data = JSON.parse(json.read)
+        yield data
+        true
+      end
+
+      @action.setup_json
+    end
+
+    should "merge in the extra json specified in the config" do
+      Vagrant.config.chef.json = { :foo => "BAR" }
+      assert_json do |data|
+        assert_equal "BAR", data["foo"]
+      end
+    end
+
+    should "add the directory as a special case to the JSON" do
+      assert_json do |data|
+        assert_equal Vagrant.config.vm.project_directory, data["vagrant"]["directory"]
+      end
+    end
+
+    should "add the config to the JSON" do
+      assert_json do |data|
+        assert_equal Vagrant.config.vm.project_directory, data["vagrant"]["config"]["vm"]["project_directory"]
+      end
+    end
+
+    should "upload a StringIO to dna.json" do
+      StringIO.expects(:new).with(anything).returns("bar")
+      File.expects(:join).with(Vagrant.config.chef.provisioning_path, "dna.json").once.returns("baz")
+      Vagrant::SSH.expects(:upload!).with("bar", "baz").once
+      @action.setup_json
+    end
+  end
+end

data/test/vagrant/ssh_test.rb

@@ -6,21 +6,31 @@ class SshTest < Test::Unit::TestCase
   end
 
   context "connecting to SSH" do
-    setup do
-      @script = Vagrant::SSH::SCRIPT
-    end
-
     test "should call exec with defaults when no options are supplied" do
       ssh = Vagrant.config.ssh
-      Kernel.expects(:exec).with("#{@script} #{ssh[:username]} #{ssh[:password]} #{ssh[:host]} #{Vagrant::SSH.port}")
+      ssh_exec_expect(Vagrant::SSH.port,
+                      Vagrant.config.ssh.private_key_path,
+                      Vagrant.config.ssh.username,
+                      Vagrant.config.ssh.host)
       Vagrant::SSH.connect
     end
 
     test "should call exec with supplied params" do
-      args = {:username => 'bar', :password => 'baz', :host => 'bak', :port => 'bag'}
-      Kernel.expects(:exec).with("#{@script} #{args[:username]} #{args[:password]} #{args[:host]} #{args[:port]}")
+      args = {:username => 'bar', :private_key_path => 'baz', :host => 'bak', :port => 'bag'}
+      ssh_exec_expect(args[:port], args[:private_key_path], args[:username], args[:host])
       Vagrant::SSH.connect(args)
     end
+
+    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}/
+        # TODO options not tested for as they may be removed, they may be removed
+        true
+      end
+    end
   end
 
   context "executing ssh commands" do
@@ -29,7 +39,7 @@ class SshTest < Test::Unit::TestCase
         assert_equal Vagrant.config.ssh.host, host
         assert_equal Vagrant.config.ssh.username, username
         assert_equal Vagrant::SSH.port, opts[:port]
-        assert_equal Vagrant.config.ssh.password, opts[:password]
+        assert_equal [Vagrant.config.ssh.private_key_path], opts[:keys]
         true
       end
       Vagrant::SSH.execute
@@ -89,6 +99,17 @@ class SshTest < Test::Unit::TestCase
         assert !Vagrant::SSH.up?
       }
     end
+
+    should "specifity the timeout as an option to execute" do
+      Vagrant::SSH.expects(:execute).with(:timeout => Vagrant.config.ssh.timeout).yields(true)
+      assert Vagrant::SSH.up?
+    end
+
+    should "error and exit if a Net::SSH::AuthenticationFailed is raised" do
+      Vagrant::SSH.expects(:execute).raises(Net::SSH::AuthenticationFailed)
+      Vagrant::SSH.expects(:error_and_exit).once
+      Vagrant::SSH.up?
+    end
   end
 
   context "getting the ssh port" do

data/test/vagrant/stacked_proc_runner_test.rb

@@ -0,0 +1,43 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class StackedProcRunnerTest < Test::Unit::TestCase
+  class TestClass
+    include Vagrant::StackedProcRunner
+  end
+
+  setup do
+    @instance = TestClass.new
+    @instance.proc_stack.clear
+  end
+
+  should "not run the procs right away" do
+    obj = mock("obj")
+    obj.expects(:foo).never
+    @instance.push_proc { |config| obj.foo }
+    @instance.push_proc { |config| obj.foo }
+    @instance.push_proc { |config| obj.foo }
+  end
+
+  should "run the blocks when run_procs! is ran" do
+    obj = mock("obj")
+    obj.expects(:foo).times(2)
+    @instance.push_proc { obj.foo }
+    @instance.push_proc { obj.foo }
+    @instance.run_procs!
+  end
+
+  should "run the blocks with the same arguments" do
+    passed_config = mock("config")
+    @instance.push_proc { |config| assert passed_config.equal?(config) }
+    @instance.push_proc { |config| assert passed_config.equal?(config) }
+    @instance.run_procs!(passed_config)
+  end
+
+  should "not clear the blocks after running" do
+    obj = mock("obj")
+    obj.expects(:foo).times(2)
+    @instance.push_proc { obj.foo }
+    @instance.run_procs!
+    @instance.run_procs!
+  end
+end

data/test/vagrant/vm_test.rb

@@ -35,6 +35,29 @@ class VMTest < Test::Unit::TestCase
   context "vagrant VM instance" do
     setup do
       @vm = Vagrant::VM.new(@mock_vm)
+      @mock_vm.stubs(:uuid).returns("foo")
+    end
+
+    context "uuid" do
+      should "call UUID on VM object" do
+        uuid = mock("uuid")
+        @mock_vm.expects(:uuid).once.returns(uuid)
+        assert_equal uuid, @vm.uuid
+      end
+
+      should "return nil if vm is nil" do
+        @vm.expects(:vm).returns(nil)
+        assert @vm.uuid.nil?
+      end
+    end
+
+    context "reloading" do
+      should "load the same VM and set it" do
+        new_vm = mock("vm")
+        VirtualBox::VM.expects(:find).with(@mock_vm.uuid).returns(new_vm)
+        @vm.reload!
+        assert_equal new_vm, @vm.vm
+      end
     end
 
     context "packaging" do

data/vagrant.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vagrant}
-  s.version = "0.1.4"
+  s.version = "0.2.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mitchell Hashimoto", "John Bender"]
-  s.date = %q{2010-03-09}
+  s.date = %q{2010-03-15}
   s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.}
   s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
-  s.executables = ["vagrant", "vagrant-box", "vagrant-down", "vagrant-halt", "vagrant-init", "vagrant-package", "vagrant-reload", "vagrant-resume", "vagrant-ssh", "vagrant-suspend", "vagrant-up"]
+  s.executables = ["vagrant", "vagrant-box", "vagrant-down", "vagrant-halt", "vagrant-init", "vagrant-package", "vagrant-reload", "vagrant-resume", "vagrant-ssh", "vagrant-status", "vagrant-suspend", "vagrant-up"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"
@@ -34,17 +34,23 @@ Gem::Specification.new do |s|
      "bin/vagrant-reload",
      "bin/vagrant-resume",
      "bin/vagrant-ssh",
+     "bin/vagrant-status",
      "bin/vagrant-suspend",
      "bin/vagrant-up",
      "config/default.rb",
+     "keys/README.md",
+     "keys/vagrant",
+     "keys/vagrant.pub",
      "lib/vagrant.rb",
      "lib/vagrant/actions/base.rb",
      "lib/vagrant/actions/box/add.rb",
      "lib/vagrant/actions/box/destroy.rb",
      "lib/vagrant/actions/box/download.rb",
      "lib/vagrant/actions/box/unpackage.rb",
+     "lib/vagrant/actions/collection.rb",
      "lib/vagrant/actions/runner.rb",
      "lib/vagrant/actions/vm/boot.rb",
+     "lib/vagrant/actions/vm/customize.rb",
      "lib/vagrant/actions/vm/destroy.rb",
      "lib/vagrant/actions/vm/down.rb",
      "lib/vagrant/actions/vm/export.rb",
@@ -60,6 +66,7 @@ Gem::Specification.new do |s|
      "lib/vagrant/actions/vm/start.rb",
      "lib/vagrant/actions/vm/suspend.rb",
      "lib/vagrant/actions/vm/up.rb",
+     "lib/vagrant/active_list.rb",
      "lib/vagrant/box.rb",
      "lib/vagrant/busy.rb",
      "lib/vagrant/commands.rb",
@@ -68,10 +75,14 @@ Gem::Specification.new do |s|
      "lib/vagrant/downloaders/file.rb",
      "lib/vagrant/downloaders/http.rb",
      "lib/vagrant/env.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/ssh.rb",
+     "lib/vagrant/stacked_proc_runner.rb",
      "lib/vagrant/util.rb",
      "lib/vagrant/vm.rb",
-     "script/vagrant-ssh-expect.sh",
      "templates/Vagrantfile",
      "test/test_helper.rb",
      "test/vagrant/actions/base_test.rb",
@@ -79,8 +90,10 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/destroy_test.rb",
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/collection_test.rb",
      "test/vagrant/actions/runner_test.rb",
      "test/vagrant/actions/vm/boot_test.rb",
+     "test/vagrant/actions/vm/customize_test.rb",
      "test/vagrant/actions/vm/destroy_test.rb",
      "test/vagrant/actions/vm/down_test.rb",
      "test/vagrant/actions/vm/export_test.rb",
@@ -96,6 +109,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/vm/start_test.rb",
      "test/vagrant/actions/vm/suspend_test.rb",
      "test/vagrant/actions/vm/up_test.rb",
+     "test/vagrant/active_list_test.rb",
      "test/vagrant/box_test.rb",
      "test/vagrant/busy_test.rb",
      "test/vagrant/commands_test.rb",
@@ -104,7 +118,12 @@ Gem::Specification.new do |s|
      "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/downloaders/http_test.rb",
      "test/vagrant/env_test.rb",
+     "test/vagrant/provisioners/base_test.rb",
+     "test/vagrant/provisioners/chef_server_test.rb",
+     "test/vagrant/provisioners/chef_solo_test.rb",
+     "test/vagrant/provisioners/chef_test.rb",
      "test/vagrant/ssh_test.rb",
+     "test/vagrant/stacked_proc_runner_test.rb",
      "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb",
      "vagrant.gemspec"
@@ -121,8 +140,10 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/box/destroy_test.rb",
      "test/vagrant/actions/box/download_test.rb",
      "test/vagrant/actions/box/unpackage_test.rb",
+     "test/vagrant/actions/collection_test.rb",
      "test/vagrant/actions/runner_test.rb",
      "test/vagrant/actions/vm/boot_test.rb",
+     "test/vagrant/actions/vm/customize_test.rb",
      "test/vagrant/actions/vm/destroy_test.rb",
      "test/vagrant/actions/vm/down_test.rb",
      "test/vagrant/actions/vm/export_test.rb",
@@ -138,6 +159,7 @@ Gem::Specification.new do |s|
      "test/vagrant/actions/vm/start_test.rb",
      "test/vagrant/actions/vm/suspend_test.rb",
      "test/vagrant/actions/vm/up_test.rb",
+     "test/vagrant/active_list_test.rb",
      "test/vagrant/box_test.rb",
      "test/vagrant/busy_test.rb",
      "test/vagrant/commands_test.rb",
@@ -146,7 +168,12 @@ Gem::Specification.new do |s|
      "test/vagrant/downloaders/file_test.rb",
      "test/vagrant/downloaders/http_test.rb",
      "test/vagrant/env_test.rb",
+     "test/vagrant/provisioners/base_test.rb",
+     "test/vagrant/provisioners/chef_server_test.rb",
+     "test/vagrant/provisioners/chef_solo_test.rb",
+     "test/vagrant/provisioners/chef_test.rb",
      "test/vagrant/ssh_test.rb",
+     "test/vagrant/stacked_proc_runner_test.rb",
      "test/vagrant/util_test.rb",
      "test/vagrant/vm_test.rb"
   ]
@@ -156,14 +183,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<virtualbox>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<virtualbox>, [">= 0.5.2"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_runtime_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<json>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<git-style-binaries>, [">= 0.1.10"])
       s.add_runtime_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     else
-      s.add_dependency(%q<virtualbox>, [">= 0.5.0"])
+      s.add_dependency(%q<virtualbox>, [">= 0.5.2"])
       s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
       s.add_dependency(%q<net-scp>, [">= 1.0.2"])
       s.add_dependency(%q<json>, [">= 1.2.0"])
@@ -171,7 +198,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<archive-tar-minitar>, ["= 0.5.2"])
     end
   else
-    s.add_dependency(%q<virtualbox>, [">= 0.5.0"])
+    s.add_dependency(%q<virtualbox>, [">= 0.5.2"])
     s.add_dependency(%q<net-ssh>, [">= 2.0.19"])
     s.add_dependency(%q<net-scp>, [">= 1.0.2"])
     s.add_dependency(%q<json>, [">= 1.2.0"])