From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Dec 2015 14:47:07 +0000 (+0000)
Subject: Install taginfo gems using the correct gem binary
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/da798ac5fefecf2084f8cd9b3cc31fca5d02176a

Install taginfo gems using the correct gem binary
---

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 86ef9d44e..4d9efdefd 100644
--- 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]}"
+ruby_version = node[:passenger][:ruby_version]
 
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
+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"