shipit-engine 0.42.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c95a2e049279a481503f3ed07a634d3926c1533ddd3b228cde55c3b324df1af1
-  data.tar.gz: b33f1940ee6d4f3909fca272a439604740899a37caa5f11f875ffe543d4332df
+  metadata.gz: 4668d1d19acaaf623140622b9ba8af706517fdebd604ac771febe732633d7628
+  data.tar.gz: fc00a1faaffe66d8f995d3fae986425ccfe9fd617065008efde11c6139eb37ac
 SHA512:
-  metadata.gz: d89afad83961d8ef42c6011116451e2025719345d4aa753a62dae3dac0f59370d33ed71261e812f6bd16bf20583cd29c300023d833db4dda8e851ff5ac068f3e
-  data.tar.gz: f3c90b17a66f5a14e2489869c636206cd5f5a55465d2bd58ab4a947cb82d4fe99cbd1cb057d4d1f8a195417d8964b2d3c66a65c1a115f381cb63b20f4b6aa298
+  metadata.gz: b323de68a8865b1d69e1063982996aaf35335efb947a5a819c975fd52d5b31f019c3bff18b472df503e6c7d0c77cca80a54eaa50c01619b598360b9e678a87f0
+  data.tar.gz: 63dc20636c196f4f2ed05511f8bdd4540ed074c55bfa3997c6397a0408adc64a55992959d171cde55b57be4835263d932f08be6b2747c945314561e0f4efaac3

data/app/models/shipit/deploy_spec/bundler_discovery.rb

@@ -26,9 +26,18 @@ module Shipit
       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 --retry 2)
+        [
+          remove_ruby_version_from_gemfile,
+          (bundle_config_frozen if frozen_mode?),
+          bundle_config_path,
+          (bundle_without_groups unless bundler_without.empty?),
+          install_command
+        ].compact
+      end
+
+      def bundle_config_path
+        "bundle config set --local path #{bundle_path}"
       end
 
       def remove_ruby_version_from_gemfile
@@ -41,11 +50,18 @@ module Shipit
         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 bundle_without_groups
+        "bundle config set without '#{bundler_without.join(':')}'"
+      end
+
+      def frozen_mode?
+        return false unless gemfile_lock_exists?
 
-        '--frozen'
+        config('dependencies', 'bundler', 'frozen') != false
       end
 
       def bundler_without

data/lib/shipit/commands.rb

@@ -41,7 +41,7 @@ module Shipit
           'GITHUB_TOKEN' => github.token
         )
 
-        unless Rails.env.development? || Rails.env.test?
+        if Shipit.use_git_askpass?
           env['GIT_ASKPASS'] = Shipit::Engine.root.join('lib', 'snippets', 'git-askpass').realpath.to_s
         end
 

data/lib/shipit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shipit
-  VERSION = '0.42.1'
+  VERSION = '0.43.2'
 end

data/lib/shipit.rb

@@ -71,7 +71,8 @@ module Shipit
     :internal_hook_receivers,
     :preferred_org_emails,
     :task_execution_strategy,
-    :task_logger
+    :task_logger,
+    :use_git_askpass
   )
 
   def task_execution_strategy
@@ -297,6 +298,10 @@ module Shipit
     @task_logger ||= Logger.new(nil)
   end
 
+  def use_git_askpass?
+    @use_git_askpass.nil? ? true : @use_git_askpass
+  end
+
   protected
 
   def revision_file

data/test/dummy/config/environments/development.rb

@@ -48,6 +48,9 @@ Rails.application.configure do
   # Raises helpful error messages.
   config.assets.raise_runtime_errors = true
 
+  # Disable git askpass in development
+  Shipit.use_git_askpass = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
   if Rails.application.config_for(:database)&.dig('adapter') == 'sqlite3'

data/test/dummy/config/environments/production.rb

@@ -76,4 +76,7 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Make sure git askpass is enabled in production
+  Shipit.use_git_askpass = true
 end

data/test/dummy/config/environments/test.rb

@@ -32,6 +32,9 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Disable git askpass in test
+  Shipit.use_git_askpass = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 

data/test/dummy/db/seeds.rb

@@ -53,7 +53,7 @@ module Shipit
               ]
             },
             "override": [
-              "bundle check --path=/tmp/bundler || bundle install --frozen --path=/tmp/bundler --retry=2 --without=default:production:development:test:staging:benchmark:debug"
+              "bundle config set path /tmp/bundler && (bundle check || bundle config set without 'default:production:development:test:staging:benchmark:debug' || bundle install --frozen --retry=2)"
             ]
           },
           "fetch": [

data/test/models/deploy_spec_test.rb

@@ -67,13 +67,15 @@ module Shipit
       @spec.stubs(:gemfile_lock_exists?).returns(true)
       command = %(
         bundle install
-        --frozen
         --jobs 4
-        --path #{DeploySpec.bundle_path}
         --retry 2
-        --without=default:production:development:test:staging:benchmark:debug
       ).gsub(/\s+/, ' ').strip
+      config_command = "bundle config set --local path #{@spec.bundle_path}"
+      without_command = "bundle config set without 'default:production:development:test:staging:benchmark:debug'"
+
       assert_equal command, @spec.bundle_install.last
+      assert @spec.bundle_install.include?(config_command)
+      assert @spec.bundle_install.include?(without_command)
     end
 
     test '#bundle_install use `dependencies.bundler.without` if present to build the --without argument' do
@@ -81,31 +83,30 @@ module Shipit
       @spec.stubs(:load_config).returns('dependencies' => { 'bundler' => { 'without' => %w[some custom groups] } })
       command = %(
         bundle install
-        --frozen
         --jobs 4
-        --path #{DeploySpec.bundle_path}
         --retry 2
-        --without=some:custom:groups
       ).gsub(/\s+/, ' ').strip
       assert_equal command, @spec.bundle_install.last
+      without_command = "bundle config set without 'some:custom:groups'"
+      assert @spec.bundle_install.include?(without_command)
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.43.2
 platform: ruby
 authors:
 - Jean Boussier