update rubocop config and bundle script

.rubocop.yml

@@ -78,6 +78,8 @@ Rails/HelperInstanceVariable:
   Enabled: false
 Rails/NegateInclude:
   Enabled: false
+Rails/Present:
+  Enabled: false
 Rails/ThreeStateBooleanColumn:
   Enabled: false
 Rails/TimeZone:

bin/bundle

@@ -10,106 +10,114 @@
 
 require "rubygems"
 
-m = Module.new do
-  module_function
+m =
+  Module.new do
+    module_function
 
-  def invoked_as_script?
-    File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV.fetch("BUNDLER_VERSION", nil)
-  end
+    def invoked_as_script?
+      File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
+    end
 
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    def env_var_version
+      ENV.fetch("BUNDLER_VERSION", nil)
+    end
 
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
-        bundler_version = a
+    def cli_arg_version
+      return unless invoked_as_script? # don't want to hijack other binstubs
+      return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
+      bundler_version = nil
+      update_index = nil
+      ARGV.each_with_index do |a, i|
+        if update_index && update_index.succ == i &&
+             a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+          bundler_version = a
+        end
+        unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/o
+          next
+        end
+
+        bundler_version = Regexp.last_match(1)
+        update_index = i
       end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/o
+      bundler_version
+    end
 
-      bundler_version = Regexp.last_match(1)
-      update_index = i
+    def gemfile
+      gemfile = ENV.fetch("BUNDLE_GEMFILE", nil)
+      return gemfile if gemfile && !gemfile.empty?
+
+      File.expand_path("../Gemfile", __dir__)
     end
-    bundler_version
-  end
 
-  def gemfile
-    gemfile = ENV.fetch("BUNDLE_GEMFILE", nil)
-    return gemfile if gemfile.present?
+    def lockfile
+      lockfile =
+        case File.basename(gemfile)
+        when "gems.rb"
+          gemfile.sub(/\.rb$/, ".locked")
+        else
+          "#{gemfile}.lock"
+        end
+      File.expand_path(lockfile)
+    end
 
-    File.expand_path("../Gemfile", __dir__)
-  end
+    def lockfile_version
+      return unless File.file?(lockfile)
 
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
-      else "#{gemfile}.lock"
+      lockfile_contents = File.read(lockfile)
+      unless lockfile_contents =~
+               /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/o
+        return
       end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
 
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/o
+      Regexp.last_match(1)
+    end
 
-    Regexp.last_match(1)
-  end
+    def bundler_requirement
+      @bundler_requirement ||=
+        env_var_version || cli_arg_version ||
+          bundler_requirement_for(lockfile_version)
+    end
 
-  def bundler_requirement
-    @bundler_requirement ||=
-      env_var_version ||
-      cli_arg_version ||
-      bundler_requirement_for(lockfile_version)
-  end
+    def bundler_requirement_for(version)
+      return "#{Gem::Requirement.default}.a" unless version
 
-  def bundler_requirement_for(version)
-    return "#{Gem::Requirement.default}.a" unless version
+      bundler_gem_version = Gem::Version.new(version)
 
-    bundler_gem_version = Gem::Version.new(version)
+      bundler_gem_version.approximate_recommendation
+    end
 
-    bundler_gem_version.approximate_recommendation
-  end
+    def load_bundler!
+      ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
+      activate_bundler
+    end
 
-    activate_bundler
-  end
+    def activate_bundler
+      gem_error =
+        activation_error_handling { gem "bundler", bundler_requirement }
+      return if gem_error.nil?
+
+      require_error = activation_error_handling { require "bundler/version" }
+      if require_error.nil? &&
+           Gem::Requirement.new(bundler_requirement).satisfied_by?(
+             Gem::Version.new(Bundler::VERSION)
+           )
+        return
+      end
 
-  def activate_bundler
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
+      warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+      exit 42
     end
-    return if gem_error.nil?
 
-    require_error = activation_error_handling do
-      require "bundler/version"
+    def activation_error_handling
+      yield
+      nil
+    rescue StandardError, LoadError => e
+      e
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
   end
-end
 
 m.load_bundler!
 
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?