captive-release 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2072f0317ade9acb540bdc600744ac8fafdb5a5dcab0ad4724b636edf6f58e15
-  data.tar.gz: ad06b764de6d66ae4c46de5209b52200fc56660765e5d084933bc731e016c81c
+  metadata.gz: 51e98c43b123462f3166f453ca8623c9b748fff59c11259840ea5c5e13ead96b
+  data.tar.gz: db1e3f7f2e542786774b8eb72f4501196cccfe5b971a4d4c29a9f3ce6cf9f243
 SHA512:
-  metadata.gz: f9d2674635c60e36badb978ada2917d2d233aab1d346786e17e4dc2c9c89d362dc3dccd21e2edeee46aa23fac787fb07cd6be7afc43a82328484f83444b93c8a
-  data.tar.gz: 4c528def9c38645ac72221918ecbfe10621e9a8fd7b6dab2d36d19148ccf1f03a65acd163f2eb557995027314b710528f4e0fc8897842ca53b926f74aa8b38f8
+  metadata.gz: 396e2ba7f46def9bde2aeba4afdcfefe91e9a0ba4d028e29f5f0881e5c3c4f32dfe3c753a3cd493b78fa80c1e81283ceea9ec2b593a2ffe8ecce7b593a08195f
+  data.tar.gz: da82b40b4abb5f32649022dcf1f54b13c769a5ae046f097768b54b422588fae14154ddbe1b260f676a65c2d8e438efd73cc13e1c4dcbd0def640503c6abdff29

data/lib/captive_release/gemfile_lock_refresh.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module CaptiveRelease
+  # Remet Gemfile.lock d'aplomb après un bump : un .gemspec à la racine porte la version
+  # bumpée, donc Gemfile.lock devient périmé et --deployment le refuse en CI si personne ne
+  # le relance.
+  #
+  # Cette unité change quand la façon de détecter ou de relancer le lock change,
+  # ReleaseCommand quand la suite des étapes change.
+  class GemfileLockRefresh
+    LOCKFILE = "Gemfile.lock"
+
+    def initialize(files: RepoFiles.new("."))
+      @files = files
+    end
+
+    # rescue : une arborescence hostile ne doit jamais faire échouer la release, la détection
+    # n'est qu'une commodité. Une fois vraie, l'exécution du bundle lock, elle, échoue haut
+    # la main si elle rate.
+    def needed?
+      File.exist?(@files.path(LOCKFILE)) && @files.glob("*.gemspec").any?
+    rescue StandardError
+      false
+    end
+
+    def call
+      Shell.run! "bundle lock"
+    end
+  end
+end

data/lib/captive_release/release_command.rb

@@ -28,13 +28,24 @@ module CaptiveRelease
       end
 
       VersionFilesWriting.new(terminal: @terminal).call(prochaine, @config.version_files)
-      GitRelease.new(terminal: @terminal).call(prochaine, @config.version_files.map(&:path))
+      GitRelease.new(terminal: @terminal).call(prochaine, chemins_a_commiter)
       publication.call(prochaine)
       @terminal.say "\n🎉  #{@terminal.bold("Version v#{prochaine} released successfully!")}\n"
     end
 
     private
 
+    def chemins_a_commiter
+      chemins = @config.version_files.map(&:path)
+      return chemins unless (refresh = GemfileLockRefresh.new).needed?
+
+      @terminal.say "\n#{@terminal.bold("Refreshing Gemfile.lock...")}"
+      refresh.call
+      @terminal.done GemfileLockRefresh::LOCKFILE
+
+      chemins + [ GemfileLockRefresh::LOCKFILE ]
+    end
+
     def afficher_changements(courante)
       lien = ChangesSince.url(courante)
       return unless lien

data/lib/captive_release/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CaptiveRelease
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/captive_release.rb

@@ -36,6 +36,7 @@ require_relative "captive_release/build_dispatch_run"
 require_relative "captive_release/build_command"
 require_relative "captive_release/menu"
 require_relative "captive_release/version_choice"
+require_relative "captive_release/gemfile_lock_refresh"
 require_relative "captive_release/git_release"
 require_relative "captive_release/changes_since"
 require_relative "captive_release/release_publication"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-release
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Captive Studio
@@ -34,6 +34,7 @@ files:
 - lib/captive_release/config_loader.rb
 - lib/captive_release/config_writer.rb
 - lib/captive_release/framework_detector.rb
+- lib/captive_release/gemfile_lock_refresh.rb
 - lib/captive_release/git_commands.rb
 - lib/captive_release/git_release.rb
 - lib/captive_release/github_api.rb