carson 2.14.1 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad32a3bc4067fc3833f9ff468633f6167862dfbeadd229e085998a54887fba6
-  data.tar.gz: e3653cbe7da475a2f8a9439493481a91fb2737978a1206a5caa964019d3d9e80
+  metadata.gz: e14a15b6d3d91c0bbf75d0b3652a65ee7339b2c2cdeb56cd0937efe94f90c584
+  data.tar.gz: 1b08caaaf7a4e453ce55256eca2c961b09ffaaae761a6be101e10e3ab0f61397
 SHA512:
-  metadata.gz: b1b3d0488e5410c1319c16c3e5c90577fc9d63307546c2a5c530f6d4af4898ce80f8b17978a7e50d17a6c16c17fdf3acedb35f27920127ef0c24086c0ca9b300
-  data.tar.gz: 3c37e91e582c39553732ed7f9ec002f72619f3b36213c9e77e87234636d68b62c141fd0b778c2e1b48e2f3d35555193cbfcd7d58b81761d2181113213761d08f
+  metadata.gz: d594bcef84c8aa142438ef8b625c71f38366bb19e4a7a8abc48b415b882946b93845d226cac1eecc08a316b94677b8bcdf02edcdb9eac70a55f1f85fd800922b
+  data.tar.gz: 02ea0cc8507330c1dbb8e7e1b6a1f8e4f3a88f0d9aa396b296251cbd70fe916f4fcdb7b564301427d6911052376071f35098e34021c19cb6c28e7d05c84a0f79

data/VERSION

@@ -1 +1 @@
-2.14.1
+2.15.0

data/hooks/pre-push

@@ -7,6 +7,7 @@ style="$(cat "$hooks_dir/workflow_style" 2>/dev/null || echo "branch")"
 
 remote_name="${1:-unknown}"
 remote_url="${2:-unknown}"
+has_commit_push=false
 while read -r local_ref local_sha remote_ref remote_sha; do
 	case "$remote_ref" in
 		refs/heads/main|refs/heads/master)
@@ -14,4 +15,13 @@ while read -r local_ref local_sha remote_ref remote_sha; do
 			exit 1
 			;;
 	esac
+	[[ "$local_sha" != "0000000000000000000000000000000000000000" ]] && has_commit_push=true
 done
+
+if $has_commit_push; then
+	if [[ -n "${CARSON_BIN:-}" ]]; then
+		ruby "$CARSON_BIN" template apply --push-prep || exit 1
+	else
+		carson template apply --push-prep || exit 1
+	fi
+fi

data/lib/carson/cli.rb

@@ -53,7 +53,7 @@ module Carson
 
 		def self.build_parser
 			OptionParser.new do |opts|
-				opts.banner = "Usage: carson [setup|audit|sync|prune|prepare|inspect|onboard [repo_path]|refresh [--all|repo_path]|offboard [repo_path]|template check|template apply|lint policy --source <path-or-git-url>|review gate|review sweep|govern [--dry-run] [--json] [--loop SECONDS]|housekeep|version]"
+				opts.banner = "Usage: carson [setup|audit|check|sync|prune|prepare|inspect|onboard [repo_path]|refresh [--all|repo_path]|offboard [repo_path]|template check|template apply|lint policy --source <path-or-git-url>|review gate|review sweep|govern [--dry-run] [--json] [--loop SECONDS]|housekeep|version]"
 			end
 		end
 
@@ -79,7 +79,7 @@ module Carson
 			when "refresh"
 				parse_refresh_command( argv: argv, parser: parser, err: err )
 			when "template"
-				parse_named_subcommand( command: command, usage: "check|apply", argv: argv, parser: parser, err: err )
+				parse_template_subcommand( argv: argv, parser: parser, err: err )
 			when "lint"
 				parse_lint_subcommand( argv: argv, parser: parser, err: err )
 			when "review"
@@ -143,6 +143,35 @@ module Carson
 			{ command: "#{command}:#{action}" }
 		end
 
+		def self.parse_template_subcommand( argv:, parser:, err: )
+			action = argv.shift
+			if action.to_s.strip.empty?
+				err.puts "#{BADGE} Missing subcommand for template. Use: carson template check|apply"
+				err.puts parser
+				return { command: :invalid }
+			end
+
+			return { command: "template:#{action}" } unless action == "apply"
+
+			options = { push_prep: false }
+			apply_parser = OptionParser.new do |opts|
+				opts.banner = "Usage: carson template apply [--push-prep]"
+				opts.on( "--push-prep", "Apply templates and auto-commit any managed file changes (used by pre-push hook)" ) do
+					options[ :push_prep ] = true
+				end
+			end
+			apply_parser.parse!( argv )
+			unless argv.empty?
+				err.puts "#{BADGE} Unexpected arguments for template apply: #{argv.join( ' ' )}"
+				err.puts apply_parser
+				return { command: :invalid }
+			end
+			{ command: "template:apply", push_prep: options.fetch( :push_prep ) }
+		rescue OptionParser::ParseError => e
+			err.puts "#{BADGE} #{e.message}"
+			{ command: :invalid }
+		end
+
 		def self.parse_lint_subcommand( argv:, parser:, err: )
 			action = argv.shift
 			unless action == "policy"
@@ -235,6 +264,8 @@ module Carson
 				runtime.prepare!
 			when "inspect"
 				runtime.inspect!
+			when "check"
+				runtime.check!
 			when "onboard"
 				runtime.onboard!
 			when "refresh"
@@ -246,7 +277,7 @@ module Carson
 			when "template:check"
 				runtime.template_check!
 			when "template:apply"
-				runtime.template_apply!
+				runtime.template_apply!( push_prep: parsed.fetch( :push_prep, false ) )
 			when "lint:setup"
 				runtime.lint_setup!(
 					source: parsed.fetch( :source ),

data/lib/carson/runtime/audit.rb

@@ -74,6 +74,60 @@ module Carson
 				audit_state == "block" ? EXIT_BLOCK : EXIT_OK
 			end
 
+			# Thin focused command: show required-check status for the current branch's open PR.
+			# Always exits 0 for pending or passing so callers never see a false "Error: Exit code 8".
+			def check!
+				unless gh_available?
+					puts_line "Checks: gh CLI not available."
+					return EXIT_ERROR
+				end
+
+				pr_stdout, pr_stderr, pr_success, = gh_run(
+					"pr", "view", current_branch,
+					"--json", "number,title,url"
+				)
+				unless pr_success
+					error_text = gh_error_text( stdout_text: pr_stdout, stderr_text: pr_stderr, fallback: "no open PR for branch #{current_branch}" )
+					puts_line "Checks: #{error_text}."
+					return EXIT_ERROR
+				end
+				pr_data = JSON.parse( pr_stdout )
+				pr_number = pr_data[ "number" ].to_s
+
+				checks_stdout, checks_stderr, checks_success, checks_exit = gh_run(
+					"pr", "checks", pr_number, "--required", "--json", "name,state,bucket,workflow,link"
+				)
+				if checks_stdout.to_s.strip.empty?
+					error_text = gh_error_text( stdout_text: checks_stdout, stderr_text: checks_stderr, fallback: "required checks unavailable" )
+					puts_line "Checks: #{error_text}."
+					return EXIT_ERROR
+				end
+
+				checks_data = JSON.parse( checks_stdout )
+				failing = checks_data.select { |e| e[ "bucket" ].to_s == "fail" || e[ "state" ].to_s.upcase == "FAILURE" }
+				pending = checks_data.select { |e| e[ "bucket" ].to_s == "pending" }
+				total = checks_data.count
+				# gh exits 8 when required checks are still pending (not a failure).
+				is_pending = !checks_success && checks_exit == 8
+
+				if failing.any?
+					puts_line "Checks: FAIL (#{failing.count} of #{total} failing)."
+					normalise_check_entries( entries: failing ).each { |e| puts_line "  #{e.fetch( :workflow )} / #{e.fetch( :name )} #{e.fetch( :link )}".strip }
+					return EXIT_BLOCK
+				end
+
+				if is_pending || pending.any?
+					puts_line "Checks: pending (#{total - pending.count} of #{total} complete)."
+					return EXIT_OK
+				end
+
+				puts_line "Checks: all passing (#{total} required)."
+				EXIT_OK
+			rescue JSON::ParserError => e
+				puts_line "Checks: invalid gh response (#{e.message})."
+				EXIT_ERROR
+			end
+
 		private
 			def pr_and_check_report
 				report = {

data/lib/carson/runtime/local.rb

@@ -367,7 +367,7 @@ module Carson
 
 			# Applies managed template files as full-file writes from Carson sources.
 			# Also removes superseded files that are no longer part of the managed set.
-			def template_apply!
+			def template_apply!( push_prep: false )
 				fingerprint_status = block_if_outsider_fingerprints!
 				return fingerprint_status unless fingerprint_status.nil?
 
@@ -414,7 +414,10 @@ module Carson
 						puts_line "Templates in sync."
 					end
 				end
-				error_count.positive? ? EXIT_ERROR : EXIT_OK
+				return EXIT_ERROR if error_count.positive?
+
+				push_prep_commit! if push_prep
+				EXIT_OK
 			end
 
 		private
@@ -742,6 +745,33 @@ module Carson
 				git_capture!( "status", "--porcelain" ).strip.empty?
 			end
 
+			def push_prep_commit!
+				# JIT auto-commit is for feature branches only; main is protected from direct commits.
+				return if current_branch == config.main_branch
+
+				dirty = managed_dirty_paths
+				return if dirty.empty?
+
+				git_system!( "add", *dirty )
+				git_system!( "commit", "-m", "chore: sync Carson managed files" )
+				puts_line "Carson committed managed file updates."
+			end
+
+			def managed_dirty_paths
+				template_paths = config.template_managed_files + config.template_superseded_files
+				linters_glob   = Dir.glob( File.join( repo_root, ".github/linters/**/*" ) )
+					.select { |p| File.file?( p ) }
+					.map { |p| p.delete_prefix( "#{repo_root}/" ) }
+				candidates = ( template_paths + linters_glob ).uniq
+				return [] if candidates.empty?
+
+				stdout_text, = git_capture_soft( "status", "--porcelain", "--", *candidates )
+				stdout_text.to_s.lines
+					.reject { |l| l.start_with?( "??" ) }
+					.map { |l| l[ 3.. ].strip }
+					.reject( &:empty? )
+			end
+
 			def inside_git_work_tree?
 				stdout_text, = git_capture_soft( "rev-parse", "--is-inside-work-tree" )
 				stdout_text.to_s.strip == "true"

metadata

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