vagrant 0.7.4 → 0.7.5

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.7.5 (May 16, 2011)
+
+  - `config.ssh.port` can be specified and takes highest precedence if specified.
+    Otherwise, Vagrant will still attempt to auto-detect the port. [GH-363]
+  - Get rid of RubyGems deprecations introduced with RubyGems 1.8.x
+  - Search in pre-release gems for plugins as well as release gems.
+  - Support for Chef-solo `data_bags_path` [GH-362]
+  - Can specify path to Chef binary using `binary_path` [GH-342]
+  - Can specify additional environment data for Chef using `binary_env` [GH-342]
+
 ## 0.7.4 (May 12, 2011)
 
   - Chef environments support (for Chef 0.10) [GH-358]

data/lib/vagrant/config/ssh.rb

@@ -12,9 +12,11 @@ module Vagrant
       attr_accessor :forward_agent
       attr_accessor :forward_x11
       attr_accessor :sudo_shell
+      attr_accessor :port
 
       def initialize
         @sudo_shell = "bash"
+        @port = nil
       end
 
       def private_key_path

data/lib/vagrant/plugin.rb

@@ -21,18 +21,31 @@ module Vagrant
     # load path. This file is loaded to kick off the load sequence
     # for that plugin.
     def self.load!
+      # RubyGems 1.8.0 deprecated `source_index`. Gem::Specification is the
+      # new replacement. For now, we support both, but special-case 1.8.x
+      # so that we avoid deprecation messages.
+      index = Gem::VERSION >= "1.8.0" ? Gem::Specification : Gem.source_index
+
       # Stupid hack since Rails 2.3.x overrides Gem.source_index with their
       # own incomplete replacement which causes issues.
-      index = Gem.source_index
       index = [index.installed_source_index, index.vendor_source_index] if defined?(Rails::VendorGemSourceIndex) && index.is_a?(Rails::VendorGemSourceIndex)
 
       # Look for a vagrant_init.rb in all the gems, but only the
       # latest version of the gems.
       [index].flatten.each do |source|
+        # In 1.6.0, added the option of including prerelease gems, which is
+        # useful for developers.
+        specs = Gem::VERSION >= "1.6.0" ? source.latest_specs(true) : source.latest_specs
+
         source.latest_specs.each do |spec|
-          file = Gem.searcher.matching_files(spec, "vagrant_init.rb").first
-          next if !file
+          file = nil
+          if Gem::VERSION >= "1.8.0"
+            file = spec.matches_for_glob("**/vagrant_init.rb").first
+          else
+            file = Gem.searcher.matching_files(spec, "vagrant_init.rb").first
+          end
 
+          next if !file
           @@plugins << new(spec, file)
         end
       end

data/lib/vagrant/provisioners/chef.rb

@@ -16,6 +16,13 @@ module Vagrant
         end
       end
 
+      # Returns the path to the Chef binary, taking into account the
+      # `binary_path` configuration option.
+      def chef_binary_path(binary)
+        return binary if !config.binary_path
+        return File.join(config.binary_path, binary)
+      end
+
       def chown_provisioning_folder
         vm.ssh.execute do |ssh|
           ssh.sudo!("mkdir -p #{config.provisioning_path}")
@@ -81,6 +88,8 @@ module Vagrant
         attr_accessor :https_proxy_user
         attr_accessor :https_proxy_pass
         attr_accessor :no_proxy
+        attr_accessor :binary_path
+        attr_accessor :binary_env
 
         def initialize
           @provisioning_path = "/tmp/vagrant-chef"
@@ -93,6 +102,8 @@ module Vagrant
           @https_proxy_user = nil
           @https_proxy_pass = nil
           @no_proxy = nil
+          @binary_path = nil
+          @binary_env = nil
         end
 
         # Returns the run list for the provisioning

data/lib/vagrant/provisioners/chef_server.rb

@@ -41,7 +41,7 @@ module Vagrant
       end
 
       def provision!
-        verify_binary("chef-client")
+        verify_binary(chef_binary_path("chef-client"))
         chown_provisioning_folder
         create_client_key_folder
         upload_validation_key
@@ -78,8 +78,9 @@ module Vagrant
       end
 
       def run_chef_client
+        command_env = config.binary_env ? "#{config.binary_env} " : ""
         commands = ["cd #{config.provisioning_path}",
-                    "chef-client -c client.rb -j dna.json"]
+                    "#{command_env}#{chef_binary_path("chef-client")} -c client.rb -j dna.json"]
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_client")
         vm.ssh.execute do |ssh|

data/lib/vagrant/provisioners/chef_solo.rb

@@ -7,6 +7,7 @@ module Vagrant
       class Config < Chef::Config
         attr_accessor :cookbooks_path
         attr_accessor :roles_path
+        attr_accessor :data_bags_path
         attr_accessor :recipe_url
 
         def initialize
@@ -14,6 +15,7 @@ module Vagrant
 
           @cookbooks_path = ["cookbooks", [:vm, "cookbooks"]]
           @roles_path = []
+          @data_bags_path = []
         end
 
         def validate(errors)
@@ -27,10 +29,11 @@ module Vagrant
       def prepare
         share_cookbook_folders
         share_role_folders
+        share_data_bags_folders
       end
 
       def provision!
-        verify_binary("chef-solo")
+        verify_binary(chef_binary_path("chef-solo"))
         chown_provisioning_folder
         setup_json
         setup_solo_config
@@ -49,6 +52,12 @@ module Vagrant
         end
       end
 
+      def share_data_bags_folders
+        host_data_bag_paths.each_with_index do |data_bag, i|
+          env.config.vm.share_folder("v-csdb-#{i}", data_bag_path(i), data_bag)
+        end
+      end
+
       def setup_solo_config
         setup_config("chef_solo_solo", "solo.rb", {
           :node_name => config.node_name,
@@ -56,11 +65,13 @@ module Vagrant
           :cookbooks_path => cookbooks_path,
           :recipe_url => config.recipe_url,
           :roles_path => roles_path,
+          :data_bags_path => data_bags_path,
         })
       end
 
       def run_chef_solo
-        commands = ["cd #{config.provisioning_path}", "chef-solo -c solo.rb -j dna.json"]
+        command_env = config.binary_env ? "#{config.binary_env} " : ""
+        commands = ["cd #{config.provisioning_path}", "#{command_env}#{chef_binary_path("chef-solo")} -c solo.rb -j dna.json"]
 
         env.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
         vm.ssh.execute do |ssh|
@@ -122,6 +133,10 @@ module Vagrant
         host_folder_paths(config.roles_path)
       end
 
+      def host_data_bag_paths
+        host_folder_paths(config.data_bags_path)
+      end
+
       def cookbook_path(i)
         folder_path("cookbooks", i)
       end
@@ -130,6 +145,10 @@ module Vagrant
         folder_path("roles", i)
       end
 
+      def data_bag_path(i)
+        folder_path("data_bags", i)
+      end
+
       def cookbooks_path
         folders_path(config.cookbooks_path, "cookbooks").to_json
       end
@@ -137,6 +156,10 @@ module Vagrant
       def roles_path
         folders_path(config.roles_path, "roles").to_json
       end
+
+      def data_bags_path
+        folders_path(config.data_bags_path, "data_bags").to_json
+      end
     end
   end
 end

data/lib/vagrant/ssh.rb

@@ -154,6 +154,9 @@ module Vagrant
       pnum = opts[:port]
       return pnum if pnum
 
+      # Check if a port was specified in the config
+      return env.config.ssh.port if env.config.ssh.port
+      
       # Check if we have an SSH forwarded port
       pnum = nil
       env.vm.vm.network_adapters.each do |na|

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.4"
+  VERSION = "0.7.5"
 end

data/templates/chef_solo_solo.erb

@@ -6,6 +6,10 @@ cookbook_path <%= cookbooks_path %>
 role_path <%= roles_path %>
 log_level <%= log_level.inspect %>
 
+<% if data_bags_path %>
+data_bag_path <%= data_bags_path %>
+<% end %>
+
 <% if recipe_url -%>
 recipe_url "<%= recipe_url %>"
 <% end -%>

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -42,6 +42,11 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
       @action.expects(:share_role_folders).once
       @action.prepare
     end
+
+    should "share data bag folders" do
+      @action.expects(:share_data_bags_folders).once
+      @action.prepare
+    end
   end
 
   context "provisioning" do
@@ -86,6 +91,22 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
       @action.share_role_folders
     end
   end
+  
+  context "sharing data bag folders" do
+    setup do
+      @host_data_bag_paths = ["foo", "bar"]
+      @action.stubs(:host_data_bag_paths).returns(@host_data_bag_paths)
+    end
+
+    should "share each data bag folder" do
+      share_seq = sequence("share_seq")
+      @host_data_bag_paths.each_with_index do |data_bag, i|
+        @env.config.vm.expects(:share_folder).with("v-csdb-#{i}", @action.data_bag_path(i), data_bag).in_sequence(share_seq)
+      end
+
+      @action.share_data_bags_folders
+    end
+  end
 
   context "host folder paths" do
     should "ignore VM paths" do
@@ -124,6 +145,15 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
       assert_equal result, @action.host_role_paths
     end
   end
+  
+  context "host data bags paths" do
+    should "get folders path for configured data bag path" do
+      result = mock("result")
+      @config.stubs(:data_bags_path).returns("foo")
+      @action.expects(:host_folder_paths).with(@config.data_bags_path).returns(result)
+      assert_equal result, @action.host_data_bag_paths
+    end
+  end
 
   context "folder path" do
     should "return a proper path to a single folder" do
@@ -179,6 +209,19 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     end
   end
 
+  context "data bags path" do
+    should "return a proper path to a single data bag" do
+      expected = File.join(@config.provisioning_path, "data_bags-5")
+      assert_equal expected, @action.data_bag_path(5)
+    end
+
+    should "properly call folders path and return result" do
+      result = [:a, :b, :c]
+      @action.expects(:folders_path).with(@config.data_bags_path, "data_bags").once.returns(result)
+      assert_equal result.to_json, @action.data_bags_path
+    end
+  end
+
   context "generating and uploading chef solo configuration file" do
     setup do
       @vm.ssh.stubs(:upload!)
@@ -192,7 +235,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
         :provisioning_path => @config.provisioning_path,
         :cookbooks_path => @action.cookbooks_path,
         :recipe_url => @config.recipe_url,
-        :roles_path => @action.roles_path
+        :roles_path => @action.roles_path,
+        :data_bags_path => @action.data_bags_path
       })
 
       @action.setup_solo_config

data/test/vagrant/provisioners/chef_test.rb

@@ -78,6 +78,18 @@ class ChefProvisionerTest < Test::Unit::TestCase
     end
   end
 
+  context "chef binary path" do
+    should "return just the binary if no binary path is set" do
+      @config.binary_path = nil
+      assert_equal "foo", @action.chef_binary_path("foo")
+    end
+
+    should "return the joined binary path and binary if set" do
+      @config.binary_path = "/foo"
+      assert_equal File.join(@config.binary_path, "bar"), @action.chef_binary_path("bar")
+    end
+  end
+
   context "permissions on provisioning folder" do
     should "create and chown the folder to the ssh user" do
       ssh_seq = sequence("ssh_seq")

metadata

@@ -2,7 +2,7 @@
 name: vagrant
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Mitchell Hashimoto
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -07:00
-default_executable: 
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
@@ -409,7 +408,6 @@ files:
 - test/vagrant/util/template_renderer_test.rb
 - test/vagrant/vm_test.rb
 - vagrant.gemspec
-has_rdoc: true
 homepage: http://vagrantup.com
 licenses: []
 
@@ -423,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 957057207018250257
+      hash: 3225636291366202094
       segments: 
       - 0
       version: "0"
@@ -436,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vagrant
-rubygems_version: 1.5.0
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Build and distribute virtualized development environments.