bonchi 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f726dfa32881aaae2a225b30e26b3a31fe3bfa2714709a33738910c4a42d2daf
-  data.tar.gz: 4ef9df6de06aecfc41d5bf69fe651114123bccb48b0fb9cc67ed8c26f1ab6bcb
+  metadata.gz: d0506e896860d23e52035729f193224f9a1d2a54799b2f7deb73691ddde7ba61
+  data.tar.gz: 831b6a75a71e40d6ccb7d09c8db83aafff0a56ea301d6083649b440245cfb3c6
 SHA512:
-  metadata.gz: 5388c61deec0daf249af8c2033772bf9c2b22d51a894b6cfb75f887d65d14c1bdf298d7e96d6c7513717b0d0676fcb0f5f5a7bf518227be3b380487afd8774f3
-  data.tar.gz: 919fe02691d9f5b4c7ca3c2ac31c8cb365b6bb9533ac56470d2803d972881f3375ee3b72a64ecbb4e983e29898629d331f451808ee20b56e418df7d4ab91a671
+  metadata.gz: 7e483c14fee4002b3cbcb0816a4cd351b190ff50a7e01e0db48606e749df21a954d71ea79c8ad7ae982807f90618f44f6461fbd26ad7814196c1c22c53c51bd0
+  data.tar.gz: 178967a54213235cd13552fb36283a12ccb4ea669533df6abad0a0049fb3063cc7d6332e9e076e7c6cb407650628d597eb884bd3e5827a11cecc355eef3bda80

data/lib/bonchi/cli.rb

@@ -127,16 +127,18 @@ module Bonchi
     desc "remove BRANCH", "Remove a worktree"
     long_desc <<~DESC
       Remove a worktree and its directory. Refuses to remove worktrees
-      with uncommitted changes or untracked files (use `git worktree remove --force` to override).
+      with uncommitted changes or untracked files unless --force is used.
 
       Aliases: rm
     DESC
+    option :force, type: :boolean, default: false, desc: "Force removal even with uncommitted changes"
     def remove(branch)
       path = Git.worktree_path_for(branch)
       abort "Error: No worktree found for branch: #{branch}" unless path
 
-      Git.worktree_remove(path)
+      Git.worktree_remove(path, force: options[:force])
       puts "Removed worktree: #{path}"
+      signal_cd(Git.main_worktree)
     end
 
     desc "prune", "Prune stale worktree admin files"
@@ -183,18 +185,37 @@ module Bonchi
       end
     end
 
-    WORKTREE_YML_TEMPLATE = <<~'YAML'
+    WORKTREE_YML_TEMPLATE = <<~YAML
+      # Worktree configuration for bonchi.
+      # See https://github.com/eval/bonchi
+
       # Files to copy from the main worktree before setup.
       # copy:
       #   - .env.local
 
+      # Files to symlink from the main worktree (useful for large directories).
+      # link:
+      #   - node_modules
+
       # Env var names to allocate unique ports for (from global pool).
       # ports:
       #   - PORT
 
+      # Regex replacements in copied files. Env vars ($VAR) are expanded.
+      # Short form:
+      # replace:
+      #   .env.local:
+      #     - "^PORT=.*": "PORT=$PORT"
+      # Full form (with optional missing: warn, default: halt):
+      # replace:
+      #   .env.local:
+      #     - match: "^PORT=.*"
+      #       with: "PORT=$PORT"
+      #       missing: warn
+
       # Commands to run before the setup command (port env vars are available).
       # pre_setup:
-      #   - sed -i '' "s|^PORT=.*|PORT=$PORT|" .env.local
+      #   - echo "preparing..."
 
       # The setup command to run (default: bin/setup).
       setup: bin/setup

data/lib/bonchi/colors.rb

@@ -0,0 +1,20 @@
+module Bonchi
+  module Colors
+    private
+
+    def color(name)
+      return "" if ENV.key?("NO_COLOR")
+
+      case name
+      when :red then "\e[31m"
+      when :yellow then "\e[33m"
+      end
+    end
+
+    def reset
+      return "" if ENV.key?("NO_COLOR")
+
+      "\e[0m"
+    end
+  end
+end

data/lib/bonchi/config.rb

@@ -2,22 +2,61 @@ require "yaml"
 
 module Bonchi
   class Config
-    attr_reader :copy, :ports, :pre_setup, :setup
+    include Colors
+
+    KNOWN_KEYS = %w[copy link ports replace pre_setup setup].freeze
+
+    attr_reader :copy, :link, :ports, :replace, :pre_setup, :setup
 
     def initialize(path)
       data = YAML.load_file(path)
+
+      unknown = data.keys - KNOWN_KEYS
+      unknown.each { |k| warn "#{color(:yellow)}Warning:#{reset} unknown key '#{k}' in .worktree.yml, ignoring" }
+
       @copy = Array(data["copy"])
+      @link = Array(data["link"])
       @ports = Array(data["ports"])
+      @replace = data["replace"] || {}
       @pre_setup = Array(data["pre_setup"])
       @setup = data["setup"] || "bin/setup"
+
+      validate!
     end
 
     def self.from_main_worktree
-      main = Git.main_worktree
-      path = File.join(main, ".worktree.yml")
+      from_worktree(Git.main_worktree)
+    end
+
+    def self.from_worktree(dir)
+      path = File.join(dir, ".worktree.yml")
       return nil unless File.exist?(path)
 
       new(path)
     end
+
+    private
+
+    def validate!
+      unless @replace.is_a?(Hash)
+        abort "#{color(:red)}Error:#{reset} 'replace' must be a mapping of filename to list of replacements"
+      end
+
+      @replace.each do |file, entries|
+        unless entries.is_a?(Array)
+          abort "#{color(:red)}Error:#{reset} 'replace.#{file}' must be a list of replacements"
+        end
+
+        entries.each do |entry|
+          unless entry.is_a?(Hash)
+            abort "#{color(:red)}Error:#{reset} each replacement in 'replace.#{file}' must be a mapping"
+          end
+        end
+      end
+
+      unless @setup.is_a?(String)
+        abort "#{color(:red)}Error:#{reset} 'setup' must be a string"
+      end
+    end
   end
 end

data/lib/bonchi/git.rb

@@ -4,6 +4,11 @@ module Bonchi
   module Git
     module_function
 
+    def current_branch(worktree = nil)
+      dir = worktree || Dir.pwd
+      `git -C #{dir.shellescape} rev-parse --abbrev-ref HEAD`.strip
+    end
+
     def repo_name
       url = `git remote get-url origin 2>/dev/null`.strip
       base = url.empty? ? `git rev-parse --show-toplevel`.strip : url
@@ -45,8 +50,11 @@ module Bonchi
       system("git", "worktree", "add", path, "-b", branch, base) || abort("Failed to add worktree")
     end
 
-    def worktree_remove(path)
-      system("git", "worktree", "remove", path) || abort("Failed to remove worktree")
+    def worktree_remove(path, force: false)
+      cmd = ["git", "worktree", "remove"]
+      cmd << "--force" if force
+      cmd << path
+      system(*cmd) || abort("Failed to remove worktree")
     end
 
     def worktree_prune

data/lib/bonchi/setup.rb

@@ -3,6 +3,8 @@ require "shellwords"
 
 module Bonchi
   class Setup
+    include Colors
+
     def initialize(worktree: nil)
       @worktree = worktree || Dir.pwd
       @main_worktree = Git.main_worktree
@@ -10,19 +12,32 @@ module Bonchi
 
     def run(args = [])
       if @worktree == @main_worktree
-        abort "Error: already in the main worktree"
+        abort "#{color(:red)}Error:#{reset} already in the main worktree"
       end
 
       config = Config.from_main_worktree
-      abort "Error: .worktree.yml not found in main worktree" unless config
+      abort "#{color(:red)}Error:#{reset} .worktree.yml not found in main worktree" unless config
 
-      ENV["MAIN_WORKTREE"] = @main_worktree
-      ENV["WORKTREE"] = @worktree
+      ENV["WORKTREE_MAIN"] = @main_worktree
+      ENV["WORKTREE_LINKED"] = @worktree
+      ENV["WORKTREE_BRANCH"] = Git.current_branch(@worktree)
+      ENV["WORKTREE_BRANCH_SLUG"] = ENV["WORKTREE_BRANCH"].gsub(/[^a-zA-Z0-9_]/, "_")
+      ENV["WORKTREE_ROOT"] ||= GlobalConfig.new.worktree_root
 
       puts "Setting up worktree from: #{@main_worktree}"
 
-      allocate_ports(config.ports) if config.ports.any?
       copy_files(config.copy)
+      link_files(config.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 config.ports.any?
+      replace_in_files(config.replace) if config.replace.any?
       run_pre_setup(config.pre_setup)
       exec_setup(config.setup, args)
     end
@@ -35,15 +50,71 @@ module Bonchi
       ports.each { |name, port| ENV[name] = port.to_s }
     end
 
+    def link_files(files)
+      files.each do |file|
+        src = File.join(@main_worktree, file)
+        dest = File.join(@worktree, file)
+
+        unless File.exist?(src)
+          puts "#{color(:yellow)}Warning:#{reset} #{file} not found in main worktree, skipping"
+          next
+        end
+
+        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.rm_rf(dest) if File.exist?(dest) || File.symlink?(dest)
+        FileUtils.ln_s(src, dest)
+        puts "Linked #{file} -> #{src}"
+      end
+    end
+
     def copy_files(files)
       files.each do |file|
         src = File.join(@main_worktree, file)
+        dest = File.join(@worktree, file)
         if File.exist?(src)
-          FileUtils.cp(src, File.join(@worktree, file))
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.cp(src, dest)
           puts "Copied #{file}"
         else
-          puts "Warning: #{file} not found in main worktree, skipping"
+          puts "#{color(:yellow)}Warning:#{reset} #{file} not found in main worktree, skipping"
+        end
+      end
+    end
+
+    def replace_in_files(replacements)
+      replacements.each do |file, entries|
+        path = File.join(@worktree, file)
+        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
+        File.write(path, content)
       end
     end
 

data/lib/bonchi/version.rb

@@ -1,3 +1,3 @@
 module Bonchi
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/bonchi.rb

@@ -1,4 +1,5 @@
 require_relative "bonchi/version"
+require_relative "bonchi/colors"
 require_relative "bonchi/global_config"
 require_relative "bonchi/git"
 require_relative "bonchi/config"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gert Goet
@@ -34,6 +34,7 @@ files:
 - exe/bonchi
 - lib/bonchi.rb
 - lib/bonchi/cli.rb
+- lib/bonchi/colors.rb
 - lib/bonchi/config.rb
 - lib/bonchi/git.rb
 - lib/bonchi/global_config.rb