bonchi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137e1eebb563dfaf05a9e6928abeb3832ff8e6231f7e1b4ea176037b605b2489
-  data.tar.gz: 8f22938f47fbc5068cb0a40a02fd31c875b5cdc5b7e699b6049752060ec3accb
+  metadata.gz: d0506e896860d23e52035729f193224f9a1d2a54799b2f7deb73691ddde7ba61
+  data.tar.gz: 831b6a75a71e40d6ccb7d09c8db83aafff0a56ea301d6083649b440245cfb3c6
 SHA512:
-  metadata.gz: 47d60879e7c32a8e518c3719d78c6c952dcc850c9897f49e4da0b4370d3a3e07e2d1233cf4b15a8eaf257671eae02aad4fd7d89d40d5a86525b8bf6a3ab6157b
-  data.tar.gz: f6a8c72b294fd4c6e29dff35d20c085463e0411bab413971c934ca43b80b331caa095b726d1cace6305a9db20865a6ec3877de1cdaf89d9d98f3aa9bbef2b284
+  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"
@@ -191,6 +193,10 @@ module Bonchi
       # 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

data/lib/bonchi/config.rb

@@ -4,9 +4,9 @@ module Bonchi
   class Config
     include Colors
 
-    KNOWN_KEYS = %w[copy ports replace pre_setup setup].freeze
+    KNOWN_KEYS = %w[copy link ports replace pre_setup setup].freeze
 
-    attr_reader :copy, :ports, :replace, :pre_setup, :setup
+    attr_reader :copy, :link, :ports, :replace, :pre_setup, :setup
 
     def initialize(path)
       data = YAML.load_file(path)
@@ -15,6 +15,7 @@ module Bonchi
       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"])
@@ -24,8 +25,11 @@ module Bonchi
     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)

data/lib/bonchi/git.rb

@@ -50,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

@@ -26,8 +26,17 @@ module Bonchi
 
       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)
@@ -41,11 +50,30 @@ 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 "#{color(:yellow)}Warning:#{reset} #{file} not found in main worktree, skipping"

data/lib/bonchi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gert Goet