shipit-engine 0.43.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a115bf18d2ceef6d9174c41bf746c8c0e7481b9967f546ee26ff9dfad8cde608
-  data.tar.gz: 5e3856d83fdd58ec6f169ce4a01e2782606cddeda43b24705075e62237c79709
+  metadata.gz: 4668d1d19acaaf623140622b9ba8af706517fdebd604ac771febe732633d7628
+  data.tar.gz: fc00a1faaffe66d8f995d3fae986425ccfe9fd617065008efde11c6139eb37ac
 SHA512:
-  metadata.gz: b1763e4292845af68b81ff1e60dc34377a962834a797975293429726371b9a8868be7a47193a777e3e10bcfb171dc429d09b86aaf83f202e065716245c650214
-  data.tar.gz: 9a6f799a3d538f45c781443798f7076a52e98499d6e56cc477b250ca5a390759b3344c6d5a1809cc894bb88ad456d64b6d3910ab3322b371b88ed314dd83b538
+  metadata.gz: b323de68a8865b1d69e1063982996aaf35335efb947a5a819c975fd52d5b31f019c3bff18b472df503e6c7d0c77cca80a54eaa50c01619b598360b9e678a87f0
+  data.tar.gz: 63dc20636c196f4f2ed05511f8bdd4540ed074c55bfa3997c6397a0408adc64a55992959d171cde55b57be4835263d932f08be6b2747c945314561e0f4efaac3

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

@@ -27,11 +27,11 @@ module Shipit
 
       def bundle_install
         install_command = %(bundle install --jobs 4 --retry 2)
-        install_command += " --without=#{bundler_without.join(':')}" unless bundler_without.empty?
         [
           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
@@ -54,6 +54,10 @@ module Shipit
         '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?
 

data/lib/shipit/version.rb

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

data/test/dummy/db/seeds.rb

@@ -53,7 +53,7 @@ module Shipit
               ]
             },
             "override": [
-              "bundle config set path /tmp/bundler && (bundle check || bundle install --frozen --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

@@ -69,12 +69,13 @@ module Shipit
         bundle install
         --jobs 4
         --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
@@ -84,9 +85,10 @@ module Shipit
         bundle install
         --jobs 4
         --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 configures frozen mode if Gemfile.lock is present' do

metadata

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