Install taginfo gems using the correct gem binary

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index f2c22fc73a165f2bde47a07087a774b3a8189316..4d9efdefde5959c2df95163512e2c3a0116e7cb7 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -41,13 +41,15 @@ package "osmosis"
 package "curl"
 package "m4"
 
-package "ruby#{node[:passenger][:ruby_version]}"
-package "rubygems#{node[:passenger][:ruby_version]}"
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
+ruby_version = node[:passenger][:ruby_version]
+
+package "ruby#{ruby_version}"
+
+%w(json sqlite3 sinatra sinatra-r18n rack-contrib).each do |gem|
+  gem_package gem do
+    gem_binary "gem#{ruby_version}"
+  end
+end
 
 apache_module "cache"
 apache_module "cache_disk"
@@ -166,12 +168,12 @@ node[:taginfo][:sites].each do |site|
   end
 
   directory "#{directory}/osmium-tool/build" do
-    owner 'taginfo'
-    group 'taginfo'
-    mode '0755'
+    owner "taginfo"
+    group "taginfo"
+    mode "0755"
     action :create
-    subscribes :run, "git[#{directory}/libosmium]"
-    subscribes :run, "git[#{directory}/osmium-tool]"
+    subscribes :create, "git[#{directory}/libosmium]"
+    subscribes :create, "git[#{directory}/osmium-tool]"
   end
 
   execute "compile-osmium" do