removes frozen flag and opts for bundle config set frozen true instead

Author: gulkaran

app/models/shipit/deploy_spec/bundler_discovery.rb

@@ -26,9 +26,13 @@ def discover_machine_env
       end
 
       def bundle_install
-        bundle = %(bundle install #{frozen_flag} --jobs 4 --path #{bundle_path} --retry 2)
-        bundle += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
-        [remove_ruby_version_from_gemfile, bundle]
+        install_command = %(bundle install --jobs 4 --path #{bundle_path} --retry 2)
+        install_command += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
+        [
+          remove_ruby_version_from_gemfile,
+          (bundle_config_frozen if frozen_mode?),
+          install_command
+        ].compact
       end
 
       def remove_ruby_version_from_gemfile
@@ -41,11 +45,14 @@ def remove_ruby_version_from_gemfile
         end
       end
 
-      def frozen_flag
-        return unless gemfile_lock_exists?
-        return if config('dependencies', 'bundler', 'frozen') == false
+      def bundle_config_frozen
+        'bundle config set --local frozen true'
+      end
+
+      def frozen_mode?
+        return false unless gemfile_lock_exists?
 
-        '--frozen'
+        config('dependencies', 'bundler', 'frozen') != false
       end
 
       def bundler_without

test/models/deploy_spec_test.rb

@@ -67,7 +67,6 @@ class DeploySpecTest < ActiveSupport::TestCase
       @spec.stubs(:gemfile_lock_exists?).returns(true)
       command = %(
         bundle install
-        --frozen
         --jobs 4
         --path #{DeploySpec.bundle_path}
         --retry 2
@@ -81,7 +80,6 @@ class DeploySpecTest < ActiveSupport::TestCase
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       command = %(
         bundle install
-        --frozen
         --jobs 4
         --path #{DeploySpec.bundle_path}
         --retry 2
@@ -90,22 +88,22 @@ class DeploySpecTest < ActiveSupport::TestCase
       assert_equal command, @spec.bundle_install.last
     end
 
-    test '#bundle_install has --frozen option if Gemfile.lock is present' do
+    test '#bundle_install configures frozen mode if Gemfile.lock is present' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       @spec.stubs(:gemfile_lock_exists?).returns(true)
-      assert @spec.bundle_install.last.include?('--frozen')
+      assert @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
-    test '#bundle_install does not have --frozen option if Gemfile.lock is not present' do
+    test '#bundle_install does not configure frozen mode if Gemfile.lock is not present' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       @spec.stubs(:gemfile_lock_exists?).returns(false)
-      refute @spec.bundle_install.last.include?('--frozen')
+      refute @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
-    test '#bundle_install does not have --frozen if overridden in shipit.yml' do
+    test '#bundle_install does not configure frozen mode if overridden in shipit.yml' do
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'frozen' => false } })
       @spec.stubs(:gemfile_lock_exists?).returns(true)
-      refute @spec.bundle_install.last.include?('--frozen')
+      refute @spec.bundle_install.include?('bundle config set --local frozen true')
     end
 
     test "#provisioning_handler returns `provision.handler` if present" do