fix(setup): added support for bundler 2.x and rubygems 3.x

Resolves #203

libraries/all.rb

@@ -4,6 +4,7 @@
 require File.join(libdir, 'core_ext')
 require File.join(libdir, 'helpers')
 require File.join(libdir, 'archive')
+require File.join(libdir, 'chef_patches')
 Dir[File.join(libdir, 'drivers_base.rb')].each { |f| require f }
 Dir[File.join(libdir, 'drivers_dsl_*.rb')].each { |f| require f }
 Dir[File.join(libdir, 'drivers_source_base.rb')].each { |f| require f }

libraries/chef_patches.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class Chef
+  class Provider
+    class Package < Chef::Provider
+      def shell_out_with_timeout!(*command_args)
+        command_args[0].gsub!(/--no-rdoc|--no-ri/, '--no-document')
+        shell_out!(*add_timeout_option(command_args))
+      end
+    end
+  end
+end

recipes/setup.rb

@@ -70,8 +70,12 @@
   only_if { node['defaults']['webserver']['adapter'] == 'nginx' }
 end
 
+bundler2_applicable = Gem::Requirement.new('>= 3.0.0.beta1').satisfied_by?(
+  Gem::Version.new(Gem::VERSION)
+)
 gem_package 'bundler' do
   action :install
+  version '~> 1' unless bundler2_applicable
 end
 
 if node['platform_family'] == 'debian'

spec/unit/recipes/setup_spec.rb

@@ -189,14 +189,38 @@
   end
 
   context 'Gems' do
-    it 'debian bundler' do
-      expect(chef_run).to install_gem_package(:bundler)
-      expect(chef_run).to create_link('/usr/local/bin/bundle').with(to: '/usr/bin/bundle')
+    context 'when rubygems version is < 3' do
+      before do
+        stub_const('Gem::VERSION', '2.7.8')
+      end
+
+      it 'debian bundler' do
+        expect(chef_run).to install_gem_package(:bundler).with(version: '~> 1')
+        expect(chef_run).to create_link('/usr/local/bin/bundle').with(to: '/usr/bin/bundle')
+      end
+
+      it 'rhel bundler' do
+        expect(chef_run_rhel).to install_gem_package(:bundler).with(version: '~> 1')
+        expect(chef_run_rhel).to create_link('/usr/local/bin/bundle').with(to: '/usr/local/bin/bundler')
+      end
     end
 
-    it 'rhel bundler' do
-      expect(chef_run_rhel).to install_gem_package(:bundler)
-      expect(chef_run_rhel).to create_link('/usr/local/bin/bundle').with(to: '/usr/local/bin/bundler')
+    context 'when rubygems version is >= 3' do
+      before do
+        stub_const('Gem::VERSION', '3.0.2')
+      end
+
+      it 'debian bundler' do
+        expect(chef_run).to install_gem_package(:bundler)
+        expect(chef_run).not_to install_gem_package(:bundler).with(version: '~> 1')
+        expect(chef_run).to create_link('/usr/local/bin/bundle').with(to: '/usr/bin/bundle')
+      end
+
+      it 'rhel bundler' do
+        expect(chef_run_rhel).to install_gem_package(:bundler)
+        expect(chef_run_rhel).not_to install_gem_package(:bundler).with(version: '~> 1')
+        expect(chef_run_rhel).to create_link('/usr/local/bin/bundle').with(to: '/usr/local/bin/bundler')
+      end
     end
   end