bonchi 0.6.0.rc3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8333ff1974d32544950e5519f6ba6cec214a2d62563f98a8969c979efc8de7e
-  data.tar.gz: 9cc9f9147b528b6d4eb893dd8ab0787a65d3d4b64e631277513d001ef15ebcaf
+  metadata.gz: 2af66b530d16c1004fe1d290edf3a28ea189999df19561fbd70f0d2779f31510
+  data.tar.gz: 99edcbb95cbb4cdd4aa6d752b6266e3392f69833654fece86f8cef8918c5441c
 SHA512:
-  metadata.gz: ab3822a6e85532202323eeaa0c8323917a58e7bc3f6e768b0ba5efa5f74ac1106afc405a95b68c3023a471cfd38a3f8d148464dd16cc3bec7052fddf00db48a8
-  data.tar.gz: b22890d111d7c33fd80cbfcbcff9df8dfd2ad819a9174d362e30e5d838bf972c7205e07b8d295aae8fcd81abd3921b169224e80d88ffa3cef840f389a74f4df9
+  metadata.gz: e58e2d259376816627e4905885d19a5785ca525c1fda135af38c6a849726f37e088c5244b03e46789b164a088a8ece8d9c3153377d3a8476c0f851555b576ed4
+  data.tar.gz: e4d9300d822379d8423fc1f55b6501a6abae8c0441be618ca9651d6af2197b12556de05e4eee96b94f946d51b5f1069e1ed379c6924f69154c4d105071203d68

data/lib/bonchi/cli.rb

@@ -97,6 +97,7 @@ module Bonchi
 
       Git.fetch_pr(pr_number)
       Git.worktree_add(path, branch)
+      Git.set_pr_upstream(pr_number)
       puts "PR ##{pr_number} checked out at: #{path}"
 
       signal_cd(path)
@@ -281,17 +282,21 @@ module Bonchi
       # ports:
       #   - PORT
 
-      # Regex replacements in copied files. Env vars ($VAR) are expanded.
-      # Short form:
-      # replace:
+      # Edits applied to files. Env vars ($VAR) are expanded.
+      # Three actions: regex replace, append, upsert (replace-or-append).
+      # edit:
       #   .env.local:
+      #     # Replace — short form
       #     - "^PORT=.*": "PORT=$PORT"
-      # Full form (with optional missing: warn, default: halt):
-      # replace:
-      #   .env.local:
-      #     - match: "^PORT=.*"
-      #       with: "PORT=$PORT"
+      #     # Replace — full form (with optional missing: warn, default: halt)
+      #     - match: "^DATABASE_URL=.*"
+      #       with: "DATABASE_URL=postgres:///myapp_$WORKTREE_BRANCH_SLUG"
       #       missing: warn
+      #     # Append a line unconditionally
+      #     - append: "FOO=bar"
+      #     # Replace if pattern matches, otherwise append
+      #     - upsert: "^DEBUG="
+      #       with: "DEBUG=1"
 
       # Commands to run before the setup command (port env vars are available).
       # pre_setup:

data/lib/bonchi/config.rb

@@ -4,7 +4,7 @@ module Bonchi
   class Config
     include Colors
 
-    KNOWN_KEYS = %w[min_version copy link ports replace pre_setup setup].freeze
+    KNOWN_KEYS = %w[min_version copy link ports replace edit pre_setup setup].freeze
 
     attr_reader :copy, :link, :ports, :replace, :pre_setup, :setup
 
@@ -16,10 +16,14 @@ module Bonchi
 
       check_min_version!(data["min_version"]) if data["min_version"]
 
+      if data.key?("replace") && data.key?("edit")
+        abort "#{color(:red)}Error:#{reset} both 'edit' and 'replace' set in .worktree.yml — use 'edit' (preferred)"
+      end
+
       @copy = Array(data["copy"])
       @link = Array(data["link"])
       @ports = Array(data["ports"])
-      @replace = data["replace"] || {}
+      @replace = data["edit"] || data["replace"] || {}
       @pre_setup = Array(data["pre_setup"])
       @setup = data["setup"] || "bin/setup"
 
@@ -49,17 +53,21 @@ module Bonchi
 
     def validate!
       unless @replace.is_a?(Hash)
-        abort "#{color(:red)}Error:#{reset} 'replace' must be a mapping of filename to list of replacements"
+        abort "#{color(:red)}Error:#{reset} 'edit' must be a mapping of filename to list of edits"
       end
 
       @replace.each do |file, entries|
         unless entries.is_a?(Array)
-          abort "#{color(:red)}Error:#{reset} 'replace.#{file}' must be a list of replacements"
+          abort "#{color(:red)}Error:#{reset} 'edit.#{file}' must be a list of edits"
         end
 
         entries.each do |entry|
           unless entry.is_a?(Hash)
-            abort "#{color(:red)}Error:#{reset} each replacement in 'replace.#{file}' must be a mapping"
+            abort "#{color(:red)}Error:#{reset} each edit in 'edit.#{file}' must be a mapping"
+          end
+
+          if entry.key?("upsert") && !entry.key?("with")
+            abort "#{color(:red)}Error:#{reset} 'upsert' in 'edit.#{file}' requires a 'with' value"
           end
         end
       end

data/lib/bonchi/git.rb

@@ -66,12 +66,20 @@ module Bonchi
     end
 
     def merged?(branch, into: default_base_branch)
-      system("git", "merge-base", "--is-ancestor", branch, into) ||
-        system("git", "merge-base", "--is-ancestor", branch, "origin/#{into}")
+      locally_merged?(branch, into: into) ||
+        remotely_merged?(branch, into: into)
+    end
+
+    def locally_merged?(branch, into: default_base_branch)
+      system("git", "merge-base", "--is-ancestor", branch, into)
+    end
+
+    def remotely_merged?(branch, into: default_base_branch)
+      system("git", "merge-base", "--is-ancestor", branch, "origin/#{into}")
     end
 
     def delete_branch(branch, force: false)
-      flag = force ? "-D" : "-d"
+      flag = (force || !locally_merged?(branch)) ? "-D" : "-d"
       system("git", "branch", flag, branch) || abort("Failed to delete branch: #{branch}")
     end
 
@@ -79,6 +87,15 @@ module Bonchi
       system("git", "fetch", "origin", "pull/#{pr_number}/head:pr-#{pr_number}")
     end
 
+    def set_pr_upstream(pr_number)
+      head_ref = `gh pr view #{pr_number} --json headRefName -q .headRefName`.strip
+      return if head_ref.empty?
+
+      if system("git", "branch", "--set-upstream-to", "origin/#{head_ref}", "pr-#{pr_number}")
+        puts "Upstream set to origin/#{head_ref}"
+      end
+    end
+
     def worktree_dir(branch)
       File.join(GlobalConfig.new.worktree_root, repo_name, branch)
     end

data/lib/bonchi/setup.rb

@@ -21,8 +21,13 @@ module Bonchi
         abort "#{color(:red)}Error:#{reset} already in the main worktree"
       end
 
-      config = Config.from_main_worktree
-      abort "#{color(:red)}Error:#{reset} .worktree.yml not found in main worktree" unless config
+      config = Config.from_worktree(@worktree)
+      if config
+        puts "Using .worktree.yml from linked worktree"
+      else
+        config = Config.from_main_worktree
+        abort "#{color(:red)}Error:#{reset} .worktree.yml not found in main worktree" unless config
+      end
 
       last_step = upto || STEPS.last
       run_steps = STEPS[0..STEPS.index(last_step)]
@@ -37,14 +42,6 @@ module Bonchi
 
       copy_files(config.copy) if run_steps.include?("copy")
       link_files(config.link) if run_steps.include?("link")
-
-      # Prefer linked worktree's .worktree.yml if it was copied or already exists
-      linked_config = Config.from_worktree(@worktree)
-      if linked_config
-        puts "Using .worktree.yml from linked worktree"
-        config = linked_config
-      end
-
       allocate_ports(config.ports) if run_steps.include?("ports") && config.ports.any?
       replace_in_files(config.replace) if run_steps.include?("replace") && config.replace.any?
       run_pre_setup(config.pre_setup) if run_steps.include?("pre_setup")
@@ -96,37 +93,64 @@ module Bonchi
         abort "#{color(:red)}Error:#{reset} #{file} not found" unless File.exist?(path)
 
         content = File.read(path)
-        entries.each do |entry|
-          if entry.is_a?(Hash) && entry.key?("match")
-            pattern = entry["match"]
-            replacement = entry["with"]
-            missing = entry["missing"] || "halt"
-          elsif entry.is_a?(Hash)
-            pattern, replacement = entry.first
-            missing = "halt"
-          else
-            abort "#{color(:red)}Error:#{reset} invalid replace entry in #{file}: #{entry.inspect}"
-          end
-
-          expanded = replacement.gsub(/\$(\w+)/) { ENV[$1] || abort("#{color(:red)}Error:#{reset} $#{$1} not set") }
-          regex = Regexp.new(pattern)
-
-          unless content.match?(regex)
-            if missing == "warn"
-              puts "#{color(:yellow)}Warning:#{reset} pattern #{pattern} not found in #{file}, skipping"
-              next
-            else
-              abort "#{color(:red)}Error:#{reset} pattern #{pattern} not found in #{file}"
-            end
-          end
-
-          content = content.gsub(regex, expanded)
-          puts "Replaced #{pattern} in #{file}"
-        end
+        entries.each { |entry| content = apply_edit(entry, content, file) }
         File.write(path, content)
       end
     end
 
+    def apply_edit(entry, content, file)
+      unless entry.is_a?(Hash)
+        abort "#{color(:red)}Error:#{reset} invalid edit entry in #{file}: #{entry.inspect}"
+      end
+
+      if entry.key?("append")
+        line = expand(entry["append"])
+        puts "Appended to #{file}"
+        ensure_trailing_newline(content) + line + "\n"
+      elsif entry.key?("upsert")
+        unless entry.key?("with")
+          abort "#{color(:red)}Error:#{reset} 'upsert' requires 'with' in #{file}"
+        end
+        pattern = entry["upsert"]
+        replacement = expand(entry["with"])
+        regex = Regexp.new(pattern)
+        if content.match?(regex)
+          puts "Upserted #{pattern} in #{file} (matched)"
+          content.gsub(regex, replacement)
+        else
+          puts "Upserted #{pattern} in #{file} (appended)"
+          ensure_trailing_newline(content) + replacement + "\n"
+        end
+      elsif entry.key?("match")
+        replace(content, entry["match"], expand(entry["with"]), entry["missing"] || "halt", file)
+      else
+        pattern, replacement = entry.first
+        replace(content, pattern, expand(replacement), "halt", file)
+      end
+    end
+
+    def replace(content, pattern, replacement, missing, file)
+      regex = Regexp.new(pattern)
+      unless content.match?(regex)
+        if missing == "warn"
+          puts "#{color(:yellow)}Warning:#{reset} pattern #{pattern} not found in #{file}, skipping"
+          return content
+        else
+          abort "#{color(:red)}Error:#{reset} pattern #{pattern} not found in #{file}"
+        end
+      end
+      puts "Replaced #{pattern} in #{file}"
+      content.gsub(regex, replacement)
+    end
+
+    def expand(value)
+      value.to_s.gsub(/\$(\w+)/) { ENV[$1] || abort("#{color(:red)}Error:#{reset} $#{$1} not set") }
+    end
+
+    def ensure_trailing_newline(content)
+      content.empty? || content.end_with?("\n") ? content : content + "\n"
+    end
+
     def run_pre_setup(commands)
       commands.each do |cmd|
         puts "Running: #{cmd}"

data/lib/bonchi/version.rb

@@ -1,3 +1,3 @@
 module Bonchi
-  VERSION = "0.6.0.rc3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc3
+  version: 0.7.0
 platform: ruby
 authors:
 - Gert Goet
@@ -41,10 +41,14 @@ files:
 - lib/bonchi/port_pool.rb
 - lib/bonchi/setup.rb
 - lib/bonchi/version.rb
-homepage: https://github.com/gertgoet/bonchi
+homepage: https://github.com/eval/bonchi
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/eval/bonchi
+  source_code_uri: https://github.com/eval/bonchi
+  changelog_uri: https://github.com/eval/bonchi/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib