Merge pull request #167 from cloudamatic/revert-166-hotfix_gem

Revert "workaround for deprecated gem option"
cloudamatic · Oct 10, 2019 · 0f86dce · 0f86dce
2 parents 84e09d3 + 8459931
commit 0f86dce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cookbooks/mu-master/recipes/init.rb b/cookbooks/mu-master/recipes/init.rb
@@ -399,7 +399,6 @@
     package_name "bundler"
     action :upgrade if rubydir == "/usr/local/ruby-current"
     notifies :run, "bash[fix #{rubydir} gem permissions]", :delayed
-    options('-q --no-documentation')
   end
   execute "#{bundler_path} install" do
     cwd "#{MU_BASE}/lib/modules"
@@ -421,7 +420,6 @@
         action :remove
         only_if { ::Dir.exist?(dir) }
         only_if { ::Dir.exist?(gemdir) }
-        options('-q --no-documentation')
       end
       execute "rm -rf #{gemdir}/knife-windows-#{Regexp.last_match[1]}"
     }

diff --git a/cookbooks/mu-php54/recipes/default.rb b/cookbooks/mu-php54/recipes/default.rb
@@ -38,9 +38,7 @@
 
     # What we really mean is "chef_gem" but that insists on running
     # at compile time, before any of its dependencies are ready.
-    gem_package "mysql" do
-      options('-q --no-documentation')
-    end
+    gem_package "mysql"
 
     # Sundry libraries for PHP
     ["libmcrypt", "libmcrypt-devel", "php-devel", "php-pdo", "php-mysql", "php-pgsql", "php-gd", "php-pspell", "php-snmp", "php-xmlrpc", "php-xml", "php-mbstring", "php-mcrypt", "php-pear"].each { |pkg|