carson 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b99975ce01b36b30e333553f7c491ebbf92591a3bc7dbc492633984b80a807a
-  data.tar.gz: 55c64697792a9400be1fef45a68731ac7eab6be3be517c79ae2caebd5f5edc9c
+  metadata.gz: ef5d5bfa64c8a8b7f4d2b4893dd5a3cab05ab2f154bd12ab926837ae396c2fe2
+  data.tar.gz: 106a0dc1a54c05e59ba9fe4eb0d01f647c420ac305d92a5d70cbc3c606300006
 SHA512:
-  metadata.gz: c716497d2db2c235dc5d8fa90c65fda8002722cabd7e8425305ce9c26917ebd48e905aed20564393d01178bd8d12257606097fdbf3ab1a77be71d1e48dc08681
-  data.tar.gz: 7f5358b84901463fbd1b211c3094df9c7c46566f9decc3a99d4d643264fc76e79de8b3c298d642c6efac41ecc16aa07647b52e66b6a822f7fff842345dfd9ab6
+  metadata.gz: 1c1d53528fa822f8d7e4850234a039459f56053762ed8ed1982e7a27c2b1f7fd7820f6565afc2a8cda596971ce4dfab2e2288aeabf8b92e54e2cc5e9266ab213
+  data.tar.gz: 04755a262052a630f8200089d03ff1f5a7c48ab8e68f50097fcdd206a8672da988d51c5f041384752a7d97712854b054aa4fd85b2b7268989190ea248d33bf1f

data/RELEASE.md

@@ -5,6 +5,18 @@ Release-note scope rule:
 - `RELEASE.md` records only version deltas, breaking changes, and migration actions.
 - Operational usage guides live in `MANUAL.md` and `API.md`.
 
+## 2.11.0 — Self-Diagnosing Audit and Duplicate-Remote Prevention
+
+### What changed
+
+- **Audit concise output now names the remote and suggests recovery actions.** "Main sync (origin): ahead by 1 — git fetch origin, or carson setup to switch remote." instead of the opaque "Main sync: ahead by 1 — reset local drift." The remote name is visible; the fix is embedded.
+- **Setup warns when multiple remotes share the same URL.** Interactive mode annotates duplicates with `[duplicate]` and prints a warning. Silent mode logs a `duplicate_remotes:` verbose line. URL normalisation treats SSH and HTTPS variants as equal (`git@github.com:user/repo.git` matches `https://github.com/user/repo`).
+
+### What users must do now
+
+1. Upgrade Carson to `2.11.0`.
+2. If you have duplicate remotes (e.g. both `origin` and `github` pointing to the same URL), remove the stale one with `git remote remove <name>`.
+
 ## 2.10.0 — Lower Ruby Requirement to 3.4
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-2.10.0
+2.11.0

data/lib/carson/runtime/audit.rb

@@ -46,13 +46,13 @@ module Carson
 					puts_verbose "main_vs_remote_main_behind: #{behind_count}"
 					puts_verbose "ACTION: local #{config.main_branch} is ahead of #{config.git_remote}/#{config.main_branch} by #{ahead_count} commit#{plural_suffix( count: ahead_count )}; reset local drift before commit/push workflows."
 					audit_state = "block"
-					audit_concise_problems << "Main sync: ahead by #{ahead_count} — reset local drift."
+					audit_concise_problems << "Main sync (#{config.git_remote}): ahead by #{ahead_count} — git fetch #{config.git_remote}, or carson setup to switch remote."
 				elsif behind_count.positive?
 					puts_verbose "main_vs_remote_main_ahead: #{ahead_count}"
 					puts_verbose "main_vs_remote_main_behind: #{behind_count}"
 					puts_verbose "ACTION: local #{config.main_branch} is behind #{config.git_remote}/#{config.main_branch} by #{behind_count} commit#{plural_suffix( count: behind_count )}; run carson sync."
 					audit_state = "attention" if audit_state == "ok"
-					audit_concise_problems << "Main sync: behind by #{behind_count} — run carson sync."
+					audit_concise_problems << "Main sync (#{config.git_remote}): behind by #{behind_count} — run carson sync."
 				else
 					puts_verbose "main_vs_remote_main_ahead: 0"
 					puts_verbose "main_vs_remote_main_behind: 0"

data/lib/carson/runtime/setup.rb

@@ -1,3 +1,6 @@
+require "set"
+require "uri"
+
 module Carson
 	class Runtime
 		module Setup
@@ -51,6 +54,15 @@ module Carson
 					puts_verbose "detected_remote: none"
 				end
 
+				remotes = list_git_remotes
+				duplicates = duplicate_remote_groups( remotes: remotes )
+				unless duplicates.empty?
+					duplicates.each_value do |group|
+						names = group.map { it.fetch( :name ) }.join( " and " )
+						puts_verbose "duplicate_remotes: #{names} share the same URL"
+					end
+				end
+
 				branch = detect_main_branch
 				if branch && branch != config.main_branch
 					choices[ "git.main_branch" ] = branch
@@ -69,9 +81,18 @@ module Carson
 					return nil
 				end
 
+				duplicates = duplicate_remote_groups( remotes: remotes )
+				duplicate_names = duplicates.values.flatten.map { it.fetch( :name ) }.to_set
+				unless duplicates.empty?
+					duplicates.each_value do |group|
+						names = group.map { it.fetch( :name ) }.join( " and " )
+						puts_line "Remotes #{names} share the same URL. Consider removing the duplicate."
+					end
+				end
+
 				puts_line ""
 				puts_line "Git remote"
-				options = build_remote_options( remotes: remotes )
+				options = build_remote_options( remotes: remotes, duplicate_names: duplicate_names )
 				options << { label: "Other (enter name)", value: :other }
 
 				default_index = 0
@@ -151,12 +172,13 @@ module Carson
 				value.empty? ? nil : value
 			end
 
-			def build_remote_options( remotes: )
+			def build_remote_options( remotes:, duplicate_names: Set.new )
 				sorted = sort_remotes( remotes: remotes )
 				sorted.map do |entry|
 					name = entry.fetch( :name )
 					url = entry.fetch( :url )
-					{ label: "#{name} (#{url})", value: name }
+					tag = duplicate_names.include?( name ) ? " [duplicate]" : ""
+					{ label: "#{name} (#{url})#{tag}", value: name }
 				end
 			end
 
@@ -173,6 +195,35 @@ module Carson
 				well_known.sort_by { |e| WELL_KNOWN_REMOTES.index( e.fetch( :name ) ) || 999 } + others.sort_by { |e| e.fetch( :name ) }
 			end
 
+			# Normalises a remote URL so SSH and HTTPS variants of the same host/path compare equal.
+			# Strips trailing .git, lowercases, converts git@host:path to https://host/path.
+			def normalise_remote_url( url: )
+				text = url.to_s.strip
+				return "" if text.empty?
+
+				# Convert SSH shorthand (git@host:owner/repo) to HTTPS form.
+				if text.match?( /\A[\w.-]+@[\w.-]+:/ )
+					text = text.sub( /\A[\w.-]+@([\w.-]+):/, 'https://\1/' )
+				end
+
+				text = text.delete_suffix( ".git" )
+				text = text.chomp( "/" )
+				text.downcase
+			end
+
+			# Groups remotes that share the same normalised URL. Returns a hash of
+			# normalised_url => [remote entries] for groups with more than one member.
+			def duplicate_remote_groups( remotes: )
+				by_url = {}
+				remotes.each do |entry|
+					key = normalise_remote_url( url: entry.fetch( :url ) )
+					next if key.empty?
+
+					( by_url[ key ] ||= [] ) << entry
+				end
+				by_url.select { |_url, entries| entries.length > 1 }
+			end
+
 			def build_main_branch_options
 				options = []
 				main_exists = branch_exists_locally_or_remote?( branch: "main" )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carson
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Hailei Wang