simp-rake-helpers 5.11.4 → 5.12.2

data/lib/simp/rake.rb

@@ -9,9 +9,12 @@ module Simp::Rake
   require 'parallel'
   require 'tempfile'
   require 'facter'
+  require 'simp/command_utils'
   require 'simp/rpm'
   require 'simp/rake/pkg'
 
+  include Simp::CommandUtils
+
   attr_reader(:puppetfile)
   attr_reader(:module_paths)
 
@@ -96,16 +99,6 @@ module Simp::Rake
     exec pager rescue exec "/bin/sh", "-c", pager
   end
 
-  # Originally snarfed from
-  # http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-  def which(cmd)
-    command = Facter::Core::Execution.which(cmd)
-
-    warn "Warning: Command #{cmd} not found on the system." unless command
-
-    return command
-  end
-
   def help
     run_pager
 

data/lib/simp/rake/build/build.rb

@@ -25,7 +25,7 @@ module Simp::Rake::Build
       namespace :build do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 
@@ -76,7 +76,8 @@ module Simp::Rake::Build
               #
               # Clean env will give bundler the environment present before
               # Bundler is activated.
-              ::Bundler.with_clean_env do
+              clean_env_method = Bundler.respond_to?(:with_unbundled_env) ? :with_unbundled_env : :with_clean_env
+              ::Bundler.send(clean_env_method) do
                 out = %x(bundle #{args[:action]} 2>&1)
                 status = $?.success?
                 puts out if verbose
@@ -94,7 +95,8 @@ module Simp::Rake::Build
         namespace :yum do
           task :prep do
             if $simp6
-              @build_dir = $simp6_build_dir
+              # `$simp6_build_dir` is set by the build:auto task
+              @build_dir = $simp6_build_dir || @distro_build_dir
 
               unless @build_dir
                 if ENV['SIMP_BUILD_yum_dir'] && File.exist?(File.join(ENV['SIMP_BUILD_yum_dir'], 'yum_data'))
@@ -469,10 +471,10 @@ module Simp::Rake::Build
           ##############################################################################
 
           desc <<-EOM
-          Create a workspace for a new distribution.
+          Create a new yum directory tree for a new distribution.
 
-          Creates a YUM scaffold under
-          #{@build_dir}/yum_data/SIMP{:simp_version}_{:os}{:os_version}_{:arch}.
+          Creates a YUM directory tree under
+          {dist_build_dir}/yum_data/SIMP{:simp_version}_{:os}{:os_version}_{:arch}.
 
           * :os           - The Operating System that you wish to use.
                             Supported OSs: #{@target_dists}.join(', ')
@@ -482,31 +484,45 @@ module Simp::Rake::Build
                             Default: Auto
 
           * :arch         - The architecture that you support. Default: x86_64
+
+          Set ENV['SIMP_BUILD_yum_dir'] to override the path of {dist_build_dir}
+
+          Will not overwrite existing directories or package.yaml files
           EOM
-          task :scaffold,[:os,:os_version,:simp_version,:arch] => [:prep] do |t,args|
+          task :scaffold,[:os,:os_version,:simp_version,:arch] do |t,args|
             # @simp_version is set in the main Rakefile
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
-            target_dir = get_target_dir(args)
-
-            unless File.exist?(target_dir)
-              mkdir_p(target_dir)
-              puts("Created #{target_dir}")
-            end
-
-            # Put together the rest of the scaffold directories
-            Dir.chdir(@build_base_dir) do
-              if $simp6
-                mkdir('../my_repos') unless File.exist?('../my_repos')
-              else
-                mkdir('my_repos') unless File.exist?('my_repos')
-              end
-            end
-
-            Dir.chdir(target_dir) do
-              mkdir('repos') unless File.exist?('repos')
-              mkdir('packages') unless File.exist?('packages')
+            major_os_ver = args[:os_version].split('.').first
+            build_dir = distro_build_dir(
+              File.join(@base_dir,'build'), args[:os], major_os_ver, args[:arch]
+            )
+            build_dir = ENV['SIMP_BUILD_yum_dir'] if File.directory?(ENV['SIMP_BUILD_yum_dir'].to_s)
+            ENV['SIMP_BUILD_yum_dir'] ||= build_dir  # <-- for hacky :prep task
+
+            target_dir = File.join(build_dir,'yum_data')
+
+            # Create directories
+            my_repos = $simp6 ? '../my_repos' : 'my_repos'
+            [
+              target_dir,
+              File.join(target_dir,'repos'),
+              File.join(target_dir,'packages'),
+              File.expand_path(my_repos,target_dir)
+            ].each { |dir| mkdir_p(dir, verbose: false) }
+
+            # Create example packages.yaml
+            packages_yaml_path = File.join(target_dir, 'packages.yaml')
+            unless File.exists? packages_yaml_path
+              pkg = 'example-package-name'
+              pkg_file = "#{pkg}-1.0.0-1.el#{major_os_ver}.#{args[:arch]}.rpm"
+              yum_url = "https://yum.server/#{args[:os]}/#{major_os_ver}/#{args[:arch]}"
+              pkg_url = "#{yum_url}/#{pkg_file}"
+              yaml = { pkg => { rpm_name: pkg_file, source: pkg_url } }.to_yaml
+              File.open(packages_yaml_path,'w'){|f| f.puts yaml.gsub(/^/,'# ') }
+              puts "Created #{target_dir}"
+              puts "Created example file at #{packages_yaml_path}"
             end
           end
 
@@ -525,7 +541,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :sync,[:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :sync,[:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             # @simp_version is set in the main Rakefile
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
@@ -550,7 +566,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :diff,[:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :diff,[:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 
@@ -616,7 +632,7 @@ module Simp::Rake::Build
 
           * :arch         - The architecture that you support. Default: x86_64
           EOM
-          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:prep, :scaffold] do |t,args|
+          task :fetch,[:pkg,:os,:os_version,:simp_version,:arch] => [:scaffold, :prep] do |t,args|
             args.with_defaults(:simp_version => @simp_version.split('-').first)
             args.with_defaults(:arch => @build_arch)
 

data/lib/simp/rake/build/constants.rb

@@ -3,6 +3,10 @@ require 'rake/tasklib'
 module Simp::Rake; end
 module Simp::Rake::Build; end
 module Simp::Rake::Build::Constants
+  def distro_build_dir(build_dir, build_distro, build_version, build_arch)
+    File.join(build_dir, 'distributions', build_distro, build_version, build_arch)
+  end
+
   def init_member_vars( base_dir )
     return if @member_vars_initialized
 
@@ -36,7 +40,7 @@ module Simp::Rake::Build::Constants
     @simp_dvd_dirs     = ["SIMP","ks","Config"]
     @member_vars_initialized = true
 
-    @distro_build_dir = File.join(@build_dir, 'distributions', @build_distro, @build_version, @build_arch)
+    @distro_build_dir  = distro_build_dir(@build_dir, @build_distro, @build_version, @build_arch)
     @dvd_src           = File.join(@distro_build_dir, 'DVD')
     @dvd_dir           = File.join(@distro_build_dir, 'DVD_Overlay')
 

data/lib/simp/rake/build/iso.rb

@@ -26,7 +26,7 @@ module Simp::Rake::Build
       namespace :iso do
         task :prep do
           if $simp6
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
           end
         end
 

data/lib/simp/rake/build/pkg.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/rake -T
 
 require 'simp/yum'
-require 'simp/local_gpg_signing_key.rb'
 require 'simp/rake/pkg'
 require 'simp/rake/build/constants'
 require 'simp/rake/build/rpmdeps'
@@ -17,9 +16,18 @@ module Simp::Rake::Build
     def initialize( base_dir )
       init_member_vars( base_dir )
 
+      @cpu_limit = get_cpu_limit
       @verbose = ENV.fetch('SIMP_PKG_verbose','no') == 'yes'
       @rpm_build_metadata = 'last_rpm_build_metadata.yaml'
       @rpm_dependency_file = File.join(@base_dir, 'build', 'rpm', 'dependencies.yaml')
+      @build_keys_dir = ENV.fetch('SIMP_PKG_build_keys_dir', File.join(@base_dir, '.dev_gpgkeys'))
+      @long_gpg_socket_err_msg = <<~EOM
+        If the problem is 'socket name <xxx> is too long', use SIMP_PKG_build_keys_dir
+        to override
+        #{@build_keys_dir}
+        with a shorter path. The socket name must be < 108 characters.
+
+      EOM
 
       define_tasks
     end
@@ -35,7 +43,7 @@ module Simp::Rake::Build
 
           # This doesn't get caught for things like 'rake clean'
           if $simp6 && $simp6_build_dir
-            @build_dir = $simp6_build_dir
+            @build_dir = $simp6_build_dir || @distro_build_dir
             @dvd_src = File.join(@build_dir, File.basename(@dvd_src))
           end
 
@@ -66,7 +74,7 @@ module Simp::Rake::Build
           @build_dirs.each_pair do |k,dirs|
             Parallel.map(
               Array(dirs),
-              :in_processes => get_cpu_limit,
+              :in_processes => @cpu_limit,
               :progress => t.name
             ) do |dir|
               Dir.chdir(dir) do
@@ -95,7 +103,7 @@ module Simp::Rake::Build
           @build_dirs.each_pair do |k,dirs|
             Parallel.map(
               Array(dirs),
-              :in_processes => get_cpu_limit,
+              :in_processes => @cpu_limit,
               :progress => t.name
             ) do |dir|
               Dir.chdir(dir) do
@@ -109,36 +117,49 @@ module Simp::Rake::Build
         desc <<-EOM
           Prepare a GPG signing key to sign build packages
 
-            * :key - the name of the directory under build/build_keys to
-                     prepare (defaults to 'dev')
+            * :key - the name of the build keys subdirectory to prepare
+              (defaults to 'dev')
+
+              - The default build keys directory is
+                `#{@build_keys_dir}`
+
 
           When :key is `dev`, a temporary signing key is created, if needed:
 
-            - A 14-day `dev` key will be created if none exists, including:
-              - The `<build_dir>/build_keys/dev/` dir
-              - gpgagent assets to create/update the key
+            * A 14-day `dev` key will be created if none exists or the existing
+              key has expired.  This includes creating
+              - A `dev` directory in the build keys directory
+              - gpg-agent assets to create/update the key within that `dev`
+                directory
 
           When :key is *not* `dev`, the logic is much stricter:
 
-            - You must already have create `<build_dir>/build_keys/<:key>/`
-              directoy, and placed a valid GPG signing key inside
+            - You must already have created the `<:key>` subdirectory within
+              the build keys directory and placed a valid GPG signing key and
+              requisite gpg-agent assets to access the key within the directory.
             - If the directory or key are missing, the task will fail.
 
           ENV vars:
             - Set `SIMP_PKG_verbose=yes` to report file operations as they happen.
+            - Set `SIMP_PKG_build_keys_dir` to override the default build keys path.
         EOM
         task :key_prep,[:key] => [:prep] do |t,args|
           args.with_defaults(:key => 'dev')
           key = args.key
-          build_keys_dir = File.join(@build_dir, 'build_keys')
-          key_dir = File.join(build_keys_dir,key)
+          key_dir = File.join(@build_keys_dir,key)
           dvd_dir = @dvd_src
 
-          FileUtils.mkdir_p build_keys_dir
+          FileUtils.mkdir_p @build_keys_dir
 
-          Dir.chdir(build_keys_dir) do
+          Dir.chdir(@build_keys_dir) do
             if key == 'dev'
-              Simp::LocalGpgSigningKey.new(key_dir,{verbose: @verbose}).ensure_key
+              require 'simp/local_gpg_signing_key'
+
+              begin
+                Simp::LocalGpgSigningKey.new(key_dir,{verbose: @verbose}).ensure_key
+              rescue Exception => e
+                raise("#{e.message}\n\n#{@long_gpg_socket_err_msg}")
+              end
             else
               unless File.directory?(key_dir)
                 fail("Could not find GPG keydir '#{key_dir}' in '#{Dir.pwd}'")
@@ -356,41 +377,79 @@ module Simp::Rake::Build
           Sign a set of RPMs.
 
             Signs any unsigned RPMs in the specified directory
-              * :key - The key directory to use under #{@build_dir}/build_keys
-                * Defaults to #{File.join(File.dirname(@rpm_dir), '*RPMS')}
+              * :key - The key directory to use under the build keys directory
+                * key defaults to 'dev'
+                * build keys directory defaults to
+                  `#{@build_keys_dir}`
               * :rpm_dir - A directory containing RPM files to sign. Will recurse!
-                * Defaults to 'dev'
+                * Defaults to #{File.join(File.dirname(@rpm_dir), '*RPMS')}
               * :force - Force rpms that are already signed to be resigned
                 * Defaults to 'false', can be enabled with 'true'
+              * :digest_algo - Digest algorithm to be used when signing the RPMs
+                * Defaults to 'sha256'
+
+          ENV vars:
+            * Set `SIMP_RPM_verbose=yes` to report RPM operations as they happen.
+            * Set `SIMP_PKG_build_keys_dir` to override the default build keys path.
+            * Set `SIMP_PKG_rpmsign_timeout` to override the maximum time in seconds
+              to wait for an individual RPM signing operation to complete.
+              - Defaults to 60 seconds.
         EOM
-        task :signrpms,[:key,:rpm_dir,:force] => [:prep,:key_prep] do |t,args|
-          which('rpmsign') || raise(StandardError, 'Could not find rpmsign on your system. Exiting.')
+        task :signrpms,[:key,:rpm_dir,:force,:digest_algo] => [:prep,:key_prep] do |t,args|
+          require 'simp/rpm_signer'
 
           args.with_defaults(:key => 'dev')
           args.with_defaults(:rpm_dir => File.join(File.dirname(@rpm_dir), '*RPMS'))
           args.with_defaults(:force => 'false')
+          args.with_defaults(:digest_algo => 'sha256')
 
           force = (args[:force].to_s == 'false' ? false : true)
+          timeout = ENV['SIMP_PKG_rpmsign_timeout'] ? ENV['SIMP_PKG_rpmsign_timeout'].to_i : 60
+
+          opts = {
+            :digest_algo        => args[:digest_algo],
+            :force              => force,
+            :max_concurrent     => @cpu_limit,
+            :progress_bar_title => t.name,
+            :timeout_seconds    => timeout,
+            :verbose            => @verbose
+          }
 
-          rpm_dirs = Dir.glob(args[:rpm_dir])
-          to_sign = []
+          results = nil
+          begin
+            results = Simp::RpmSigner.sign_rpms(
+              args[:rpm_dir],
+              File.join(@build_keys_dir, args[:key]),
+              opts
+            )
+          rescue Exception => e
+            raise("#{e.message}\n\n#{@long_gpg_socket_err_msg}")
+          end
 
-          rpm_dirs.each do |rpm_dir|
-            Find.find(rpm_dir) do |rpm|
-              next unless File.readable?(rpm)
-              to_sign << rpm if rpm =~ /\.rpm$/
+          if results
+            successes = results.select { |rpm,status| status == :signed }
+            failures = results.select { |rpm,status| status == :unsigned }
+            already_signed = results.select { |rpm,status| status == :skipped_already_signed }
+
+            if opts[:verbose]
+              puts
+              puts 'Summary'
+              puts '======='
+              puts "# RPMs already signed:      #{already_signed.size}"
+              puts "# RPMs successfully signed: #{successes.size}"
+              puts "# RPM signing failures:     #{failures.size}"
+              puts
             end
-          end
 
-          Parallel.map(
-            to_sign,
-            :in_processes => get_cpu_limit,
-            :progress => t.name
-          ) do |rpm|
-            rpm_info = Simp::RPM.new(rpm)
-
-            if force || !rpm_info.signature
-              Simp::RPM.signrpm(rpm, "#{@build_dir}/build_keys/#{args[:key]}")
+            if !failures.empty?
+              if ((results.size - already_signed.size) == (failures.size))
+                detail = already_signed.empty? ? '' : 'unsigned '
+                raise("ERROR: Failed to sign all #{detail}RPMs in #{args[:rpm_dir]}")
+              else
+                err_msg = "ERROR: Failed to sign some RPMs in #{args[:rpm_dir]}:\n"
+                err_msg += "  #{failures.keys.join("\n  ")}"
+                raise(err_msg)
+              end
             end
           end
         end
@@ -446,7 +505,9 @@ module Simp::Rake::Build
                 $stderr.puts "pkg:checksig: Warning no GPG keys found in #{key_dirs_tried}"
               end
             end
-            public_keys += Dir.glob(File.join(@build_dir, 'build_keys', '*', 'RPM-GPG-KEY*'))
+
+            # be sure to include any development keys packaged with the DVD
+            public_keys += Dir.glob(File.join(@dvd_src, 'RPM-GPG-KEY*'))
 
             # Only import thngs that look like GPG keys...
             public_keys.each do |key|
@@ -464,8 +525,9 @@ module Simp::Rake::Build
             rpm_dirs.each do |rpm_dir|
               Find.find(rpm_dir) do |path|
                 if (path =~ /.*\.rpm$/)
-                  result = %x{#{rpm_cmd} --checksig #{path}}.strip
-                  if result !~ /:.*\(\S+\).* OK$/
+                  %x{#{rpm_cmd} --checksig #{path}}.strip
+                  result = $?
+                  unless result && (result.exitstatus == 0)
                     bad_rpms << path.split(/\s/).first
                   end
                 end
@@ -665,9 +727,9 @@ protect=1
         #   can be pulled out into a library that is easily unit-testable
         def require_rebuild?(dir, yum_helper, opts={ :unique_namespace => generate_namespace, :fetch => false, :verbose => @verbose, :check_git => false, :prefix => '' })
           result = false
-
-
           rpm_metadata = File.exist?(@rpm_dependency_file) ? YAML.load(File.read(@rpm_dependency_file)) : {}
+          dir_relpath = Pathname.new(dir).relative_path_from(Pathname.new(Dir.pwd)).to_path
+          $stderr.puts "\n  require_rebuild? (#{dir_relpath}):" if @verbose
 
           Dir.chdir(dir) do
             if File.exist?('metadata.json')
@@ -687,10 +749,23 @@ protect=1
             else
               spec_file = Dir.glob(File.join('build', '*.spec'))
               fail("No spec file found in #{dir}/build") if spec_file.empty?
+              $stderr.puts "    Found spec file: #{File.expand_path(spec_file.first)}" if @verbose
               new_rpm_info = Simp::RPM.new(spec_file.first)
             end
 
+            if @verbose
+              $stderr.puts '    Details:'
+              $stderr.puts "        Puppetfile name: #{File.basename(dir)}"
+              $stderr.puts "        RPM name:        #{new_rpm_info.name}"
+              $stderr.puts "        Local directory: #{dir}"
+            end
+
             if opts[:check_git]
+              git_origin_url = nil
+              ['origin','upstream'].each do |r|
+                git_origin_url = %x(git config --get remote.#{r}.url).strip if git_origin_url.to_s.empty?
+              end
+              $stderr.puts "        Git origin URL:  #{git_origin_url}" if @verbose
               require_tag = false
 
               #FIXME The check below is insufficient. See logic in compare_latest_tag,
@@ -709,28 +784,59 @@ protect=1
 
               begin
                 rpm_version = Gem::Version.new(new_rpm_info.version)
+                rpm_release = new_rpm_info.release.match(/^(\d+)[.-_]?/) ? new_rpm_info.release.match(/^(\d+)[.-_]?/)[1] : nil
+                if @verbose
+                  $stderr.puts '        ' + [
+                    "RPM version-rel: #{ "#{rpm_version}-#{rpm_release}".ljust(10) }  ",
+                    "(semver: #{rpm_version}, relver: #{rpm_release})",
+                  ].join
+                end
               rescue ArgumentError
-                $stderr.puts ">>#{new_rpm_info.basename}: Could not determine RPM version"
+                $stderr.puts ">>#{new_rpm_info.basename}: Could not determine RPM version from '#{new_rpm_info.version}'"
               end
 
               begin
                 if latest_tag.empty?
                   require_tag = true
+                  $stderr.puts "        Latest Git tag semver:   (none)" if @verbose
                 else
-                  latest_tag_version = Gem::Version.new(latest_tag)
+                  # Gem::Version interprets an RPM-style release suffix like
+                  # `1.2.3-4` as `1.2.3.pre.4`, which is *less* than `1.2.3`.
+                  # So we compare SemVer first, then relver numbers if needed
+                  latest_tag_version = Gem::Version.new(latest_tag.sub(/-\d+$/,''))
+                  latest_tag_release = latest_tag.match(/-(\d+)$/) ? latest_tag.match(/-(\d+)$/)[1].to_i : nil
+                  if @verbose
+                    $stderr.puts '        ' + [
+                      "Latest Git tag:  #{latest_tag.ljust(10)}  ",
+                      "(semver: #{latest_tag_version}#{latest_tag_release ? ", relver: #{latest_tag_release}" : nil})",
+                    ].join
+                  end
                 end
               rescue ArgumentError
-                $stderr.puts ">>#{new_rpm_info.basename}: Invalid git tag version '#{latest_tag}' "
+                $stderr.puts ">>#{git_origin_url}: Invalid git tag version '#{latest_tag}' "
               end
 
               if rpm_version && latest_tag_version
-                if rpm_version > latest_tag_version
+                # undefined behavior, so far (this current logic skips it):
+                #   what to do if rpm_release is set and latest_tag_release is nil?
+                if latest_tag_release &&
+                   rpm_release &&
+                   (rpm_version == latest_tag_version) &&
+                   (rpm_release > latest_tag_release)
+                  require_tag = true
+                elsif rpm_version > latest_tag_version
                   require_tag = true
                 end
               end
 
               if opts[:verbose] && require_tag
-                $stderr.puts  "#{opts[:prefix]}Git Release Tag Required: #{new_rpm_info.basename} #{latest_tag} => #{new_rpm_info.version}"
+                $stderr.puts [
+                  "#{opts[:prefix]}Git Release Tag Required: ",
+                  "[#{git_origin_url || dir_relpath }] ",
+                  "tag: #{latest_tag} => ",
+                  "rpm: #{new_rpm_info.version}#{latest_tag_release ? "-#{rpm_release}" : nil} ",
+                  "[#{new_rpm_info.basename}]",
+                ].join
               end
             end
 
@@ -749,7 +855,6 @@ protect=1
                     if new_rpm_info.package_newer?(package, published_rpm)
                       if opts[:verbose]
                         $stderr.puts "#{opts[:prefix]}RPM Publish Required: #{published_rpm} => #{new_rpm_info.rpm_name(package)}"
-
                       end
                       result = true
                     else
@@ -781,7 +886,7 @@ protect=1
                     end
                   else
                     if opts[:verbose]
-                      $stderr.puts "#{opts[:prefix]}RPM Publish Required: #{new_rpm_info.rpm_name(package)}"
+                      $stderr.puts "#{opts[:prefix]}RPM Publish Required (new RPM): #{new_rpm_info.rpm_name(package)}"
                     end
                     result = true
                   end
@@ -819,7 +924,7 @@ protect=1
           Parallel.map(
             # Allow for shell globs
             Array(dirs),
-            :in_processes => get_cpu_limit,
+            :in_processes => @cpu_limit,
             :progress => task.name
           ) do |dir|
             fail("Could not find directory #{dir}") unless Dir.exist?(dir)
@@ -867,8 +972,19 @@ protect=1
                       $stderr.puts("First 'rake pkg:rpm' attempt for #{dir} failed, running bundle and trying again.")
                     end
 
-                    ::Bundler.with_clean_env do
-                      %x{bundle install --with development}
+                    if Bundler.respond_to?(:with_unbundled_env)
+                      # Bundler 2.1+
+                      clean_env_method = :with_unbundled_env
+                      bundle_install_cmd = %{bundle config set with 'development' && bundle install}
+                    else
+                      # Old Bundler
+                      clean_env_method = :with_clean_env
+                      bundle_install_cmd = %{bundle install --with development}
+                    end
+
+                    ::Bundler.send(clean_env_method) do
+                      %x{#{bundle_install_cmd}}
+
                       output = %x{#{cmd} 2>&1}
 
                       unless $?.success?