gemchain 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29cc49ef5619e2bf869d99e3785600c68fce13cac87d5f455103e82ad67964df
-  data.tar.gz: e3ee5374417db2c3bf89028b0eb2527dd698217f850bfc9402e1c68c364aed61
+  metadata.gz: ab27d10beec845df41578b7b6c4d565b7bbc0f9cba1e6a54a0dea436e6e4a6b6
+  data.tar.gz: f174ef1730a64b7ccde749d7bd501718c9e01cbdb45811c364d7c3ee3ad69f65
 SHA512:
-  metadata.gz: 5b37952e40c01005984baae5a1d077b62af99ab7b77f9a464578dd16a02ec33b6e4c3a371ab7bdeadd99fbbc6c1e9c590f0744d0ab80e4100aa431e5a9ab9c46
-  data.tar.gz: 9f9e33a3c2cf12eeb19e0eb641523dfa6e46eadccef43a79352cb4446e6e8ffd77acad93fc1d9697de9c33fa6590634cbd67c20073ff67bafe8895cac62bec96
+  metadata.gz: 6496d418a3d2678a3c68235f2dba7b6e92e6f19e43f9b419b3a84274f2aea7d4dc630255957dbff5742fab85b15aaffc9a53851801d71104ae9efd26f9224279
+  data.tar.gz: aab0e316ac54d912ae20c37ed75da0520d6a8a00deb9969e553de4286c855db40fdf399968b76141b3b3e1f9ceeec65c0bfc963f4f07fba368e8c2cac496ca20

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [0.2.3] — 2026-08-13
+
+### Fixed
+
+- **Release step is idempotent for already-published versions** — a re-run
+  (or a flaky RubyGems API check during mode detection) reached `:release`
+  with the version already published and collided on `git tag`. The release
+  now checks RubyGems first (with a 5s timeout) and skips build/push/tag
+  when the version is already published.
+
+## [0.2.2] — 2026-08-13
+
+### Fixed
+
+- **Release skips the commit when nothing is staged** — a source gem whose
+  version bump was already committed (e.g. a fix shipped together with the
+  bump) crashed the cascade with "nothing to commit, working tree clean".
+  `:release` now checks for staged changes (`git diff --cached --quiet`)
+  and skips the commit while still building, pushing, and tagging.
+
 # Changelog
 
 ## [0.2.1] — 2026-08-12

data/lib/gemchain/cascade.rb

@@ -109,13 +109,15 @@ module Gemchain
       lines.join("\n")
     end
 
-    # True when +name+ is published at +version+ on RubyGems. When rubygems
-    # is unreachable, assume not published so the full mode (bump → test →
-    # release) is preferred — bumping an already-published version is a no-op.
+    # True when +name+ is published at +version+ on RubyGems. Bounded by a
+    # short timeout; when rubygems is unreachable, assume not published so
+    # the full mode (bump → test → release) is preferred — bumping an
+    # already-published version is a no-op, and the executor's release step
+    # additionally skips re-releases of published versions.
     def released_on_rubygems?(name, version)
       require "json"
       require "net/http"
-      body = Net::HTTP.get(URI("https://rubygems.org/api/v1/gems/#{name}.json"))
+      body = Timeout.timeout(5) { Net::HTTP.get(URI("https://rubygems.org/api/v1/gems/#{name}.json")) }
       JSON.parse(body)["version"] == version
     rescue StandardError
       false

data/lib/gemchain/executor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require "timeout"
 
 module Gemchain
   class ExecutionError < Error; end
@@ -23,20 +24,30 @@ module Gemchain
         detail = out.lines.first(5).join.strip if detail.empty?
         raise ExecutionError, "Command failed: #{command.join(' ')}#{detail.empty? ? '' : "\n#{detail}"}"
       end
+
+      # Runs a command and reports success without raising. Used for
+      # conditional checks (e.g. "are there staged changes?").
+      def success?(command, chdir: nil)
+        _out, _err, status = Open3.capture3(*command, chdir: chdir)
+        status.success?
+      end
     end
 
     BUMP_LEVELS = %i[patch minor major].freeze
 
     # @param workspace [Workspace] the gem ecosystem
     # @param steps [Array<Hash>] the plan from Cascade#update
-    # @param runner [#run] command runner (defaults to the real one)
+    # @param runner [#run, #success?] command runner (defaults to the real one)
     # @param confirm [Proc] per-release confirmation, called with a message;
     #   defaults to a [y/N] prompt on stdin
     # @param yes [Boolean] skip confirmations entirely
     # @param bump [Symbol] dependent version bump level (:patch, :minor, :major)
     # @param output [#puts] progress output stream
+    # @param released_check [Proc] (name, version) → published on RubyGems?
+    #   Used to skip releases whose version is already published; defaults
+    #   to a RubyGems API lookup with a short timeout.
     def initialize(workspace:, steps:, runner: nil, confirm: nil, yes: false,
-                   bump: :patch, output: $stdout)
+                   bump: :patch, output: $stdout, released_check: nil)
       @workspace = workspace
       @steps = steps
       @runner = runner || Runner.new
@@ -44,6 +55,7 @@ module Gemchain
       @yes = yes
       @bump = bump.to_sym
       @output = output
+      @released_check = released_check || method(:released_on_rubygems?)
       raise ArgumentError, "bump must be one of #{BUMP_LEVELS.inspect}" unless BUMP_LEVELS.include?(@bump)
     end
 
@@ -162,6 +174,14 @@ module Gemchain
       name = step[:gem]
       version = step[:version] || bump_dependent(dir, name)
 
+      # Idempotency guard: a re-run (or flaky mode detection) can reach
+      # :release with the version already published — re-pushing/tagging
+      # would fail. Skip the release entirely in that case.
+      if @released_check.call(name, version)
+        @output.puts "  ⏭ #{name} #{version} already on RubyGems — skipping release"
+        return
+      end
+
       files = release_files(dir)
       @runner.run(["git", "add", *files], chdir: dir)
 
@@ -170,7 +190,12 @@ module Gemchain
                 else
                   "Bump to #{version} (gemchain)"
                 end
-      @runner.run(["git", "commit", "-m", message], chdir: dir)
+      # Skip the commit when the release's own bump/constraint changes were
+      # already committed (e.g. a fix shipped together with the version
+      # bump) — `git commit` would fail on a clean tree.
+      unless @runner.success?(["git", "diff", "--cached", "--quiet"], chdir: dir)
+        @runner.run(["git", "commit", "-m", message], chdir: dir)
+      end
 
       @runner.run(["gem", "build", "#{name}.gemspec"], chdir: dir)
       @runner.run(["gem", "push", "#{name}-#{version}.gem"], chdir: dir)
@@ -193,6 +218,18 @@ module Gemchain
       status.success?
     end
 
+    # True when +name+ is published at +version+ on RubyGems. Bounded by a
+    # short timeout; on any failure assume NOT published so the release
+    # proceeds (a no-op re-push is safer than silently skipping a real one).
+    def released_on_rubygems?(name, version)
+      require "json"
+      require "net/http"
+      body = Timeout.timeout(5) { Net::HTTP.get(URI("https://rubygems.org/api/v1/gems/#{name}.json")) }
+      JSON.parse(body)["version"] == version
+    rescue StandardError
+      false
+    end
+
     # Dependents get an automatic version bump (they're being re-released
     # with a tightened constraint); the source gem's version comes from the
     # :bump step.

data/lib/gemchain/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gemchain
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemchain
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Kaka Ruto
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Cascade gem updates through interdependent gem ecosystems
 test_files: []