bonchi 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45384f6de454e34a40006fd28bcdad586dffcbb672d5b0e94c887614b35fee6e
-  data.tar.gz: 8d360abbfdbf1166b6eb7d87d0e18799d19d3b2246704c6e25ea3b7d6b0e0dcf
+  metadata.gz: '053922f8049bc9788caaf72af772fcd9058945e2964183228c339922109029f4'
+  data.tar.gz: b2058d5ed48143f1eb54c42ecb614087bd4e3a23a461a31d0c749146366454cb
 SHA512:
-  metadata.gz: 98a219b540749095fed54cfa5370081827cc79b50cbe2c959c8f1fd4a09db4ceafcb38256f098f2b32119896ef911499f69c9205440c120fad57b0712ac88afe
-  data.tar.gz: 9edb8fb1e158affae3429a229c23e5b1fb1caa0b07d13cce0ec37dddd115e3e99e492d3b5d81194a3afd8af8a03f6a34a9e3d1deee7a54f7f385b2c66e27cb84
+  metadata.gz: 24cdf46ea9f71a1bfec30f23d2765b51a1dc036e06059693f14379b192822fd850a28ab667e8439a65ed20cb2cd5b4fd1c818213c5d5c34e46ff9c03d3cbdaa5
+  data.tar.gz: a512b18c8ba6e77f5cbbeaa8584738c1f41a3754fc08ffaa9f6a1a04d76a753194ec55837ce413545b351f59936b1640c1c53d91ac68bc9d40f75a604b04c096

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)
@@ -114,7 +115,9 @@ module Bonchi
       which ports to allocate, and what setup command to run.
     DESC
     def init
-      path = File.join(Dir.pwd, ".worktree.yml")
+      root = Git.toplevel
+      abort "Error: not inside a git repository" unless root
+      path = File.join(root, ".worktree.yml")
       if File.exist?(path)
         abort "Error: .worktree.yml already exists"
       end
@@ -281,17 +284,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

@@ -24,6 +24,11 @@ module Bonchi
       `git worktree list --porcelain`.lines.first.sub("worktree ", "").strip
     end
 
+    def toplevel
+      root = `git rev-parse --show-toplevel 2>/dev/null`.strip
+      root.empty? ? nil : root
+    end
+
     def worktree_list
       `git worktree list`.lines.map(&:strip).reject(&:empty?)
     end
@@ -87,6 +92,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/port_pool.rb

@@ -1,3 +1,4 @@
+require "set"
 require "yaml"
 require "socket"
 
@@ -6,6 +7,21 @@ module Bonchi
     DEFAULT_MIN = 4000
     DEFAULT_MAX = 5000
 
+    # Ports browsers refuse to connect to (Chrome: ERR_UNSAFE_PORT, Firefox: a
+    # similar block). Allocating one of these for a dev web server makes it
+    # unreachable in the browser even though the server binds fine. This is
+    # Chromium's kRestrictedPorts list (net/base/port_util.cc); ports outside
+    # the pool range are harmless to keep listed. 4045 (lockd) and 4190 (sieve)
+    # fall inside the default 4000..5000 range.
+    UNSAFE_PORTS = [
+      1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 69, 77,
+      79, 87, 95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123,
+      135, 137, 139, 143, 161, 179, 389, 427, 465, 512, 513, 514, 515, 526,
+      530, 531, 532, 540, 548, 554, 556, 563, 587, 601, 636, 989, 990, 993,
+      995, 1719, 1720, 1723, 2049, 3659, 4045, 4190, 5060, 5061, 6000, 6566,
+      6665, 6666, 6667, 6668, 6669, 6697, 10080
+    ].to_set.freeze
+
     def initialize
       @path = GlobalConfig.config_path
       load_config
@@ -26,7 +42,7 @@ module Bonchi
 
         new_ports = {}
         port_names.each do |name|
-          port = (@min..@max).find { |p| !used.include?(p) && port_available?(p) }
+          port = (@min..@max).find { |p| !used.include?(p) && !UNSAFE_PORTS.include?(p) && port_available?(p) }
           abort "Error: no available port for #{name}" unless port
           used << port
           new_ports[name] = port

data/lib/bonchi/setup.rb

@@ -6,7 +6,7 @@ module Bonchi
     include Colors
 
     def initialize(worktree: nil)
-      @worktree = worktree || Dir.pwd
+      @worktree = worktree || Git.toplevel || Dir.pwd
       @main_worktree = Git.main_worktree
     end
 
@@ -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"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.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
@@ -59,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Git worktree manager
 test_files: []