bonchi 0.5.0 → 0.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ea42f0b07bb0910477d3964919edc254a7145939ae55b42e0dc1a23c37ebd7
-  data.tar.gz: 3849a192961ddb2490ecec1a07bee617d3b1f3248507cdcdede259d0908fa070
+  metadata.gz: 410601a43918eb8c38d9f2f433d921970853d926b38395710ab08472f00b28b5
+  data.tar.gz: 60cbc29372827892d97a7af57274cf84f5d3c157a5267f320508bb712076da6e
 SHA512:
-  metadata.gz: faf80b431dcfe9ae87988c64ec1af79c55151d3a181bc1524487340122091c16eab450b6c0a57988adc706e885c206e49f5b0516bb6b9f537d011329e6b954b3
-  data.tar.gz: b3b4a45fd8211f27f58d9c54030ef378ad5683e22a0f67b2a4f64ecbd1e1e3fe0a136bd581a8d4a2a31637ee15312a75fa669af324f07aa49659a89adab90069
+  metadata.gz: 58210c5b2e4d21d0782d19afb4f1eac8abfafb6eb5226282475c17612248c2446272a780201754128d626e1111cb9a158723e0d9b6fbbc66dac4d11cc2395e3b
+  data.tar.gz: d0ab19b5878c65d66b71d298962858b1696171cdca96671638a00e7710c0ae970dfcff2223d8eb5285d3b5c3d10acb5634e296daba69d889b27b4bd7c0f51a84

data/lib/bonchi/cli.rb

@@ -19,9 +19,11 @@ module Bonchi
       (e.g. main). If a worktree for BRANCH already exists, switches to it instead.
 
       When a .worktree.yml exists in the main worktree, setup runs automatically
-      (copy files, allocate ports, run pre_setup and setup commands). Skip with --no-setup.
+      (copy files, allocate ports, run pre_setup and setup commands).
+      Skip with --no-setup, or use --upto STEP to run only up to a specific step.
     DESC
     option :setup, type: :boolean, default: true, desc: "Run setup after creating worktree"
+    option :upto, type: :string, desc: "Run setup steps up to and including STEP (copy, link, ports, replace, pre_setup, setup)"
     def create(branch, base = nil)
       base ||= Git.default_base_branch
       path = Git.worktree_dir(branch)
@@ -40,7 +42,7 @@ module Bonchi
 
       if options[:setup] && Config.from_main_worktree
         puts ""
-        Setup.new(worktree: path).run
+        Setup.new(worktree: path).run(upto: options[:upto])
       end
     end
 
@@ -115,8 +117,9 @@ module Bonchi
     end
 
     desc "setup [-- ARGS...]", "Run setup in current worktree (ports, copy, pre_setup, setup cmd)"
+    option :upto, type: :string, desc: "Run steps up to and including STEP (copy, link, ports, replace, pre_setup, setup)"
     def setup(*args)
-      Setup.new.run(args)
+      Setup.new.run(args, upto: options[:upto])
     end
 
     desc "list", "List all worktrees"

data/lib/bonchi/setup.rb

@@ -10,7 +10,13 @@ module Bonchi
       @main_worktree = Git.main_worktree
     end
 
-    def run(args = [])
+    STEPS = %w[copy link ports replace pre_setup setup].freeze
+
+    def run(args = [], upto: nil)
+      if upto && !STEPS.include?(upto)
+        abort "#{color(:red)}Error:#{reset} unknown step '#{upto}'. Valid steps: #{STEPS.join(", ")}"
+      end
+
       if @worktree == @main_worktree
         abort "#{color(:red)}Error:#{reset} already in the main worktree"
       end
@@ -18,6 +24,9 @@ module Bonchi
       config = Config.from_main_worktree
       abort "#{color(:red)}Error:#{reset} .worktree.yml not found in main worktree" unless config
 
+      last_step = upto || STEPS.last
+      run_steps = STEPS[0..STEPS.index(last_step)]
+
       ENV["WORKTREE_MAIN"] = @main_worktree
       ENV["WORKTREE_LINKED"] = @worktree
       ENV["WORKTREE_BRANCH"] = Git.current_branch(@worktree)
@@ -26,8 +35,8 @@ module Bonchi
 
       puts "Setting up worktree from: #{@main_worktree}"
 
-      copy_files(config.copy)
-      link_files(config.link)
+      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)
@@ -36,10 +45,10 @@ module Bonchi
         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)
+      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")
+      exec_setup(config.setup, args) if run_steps.include?("setup")
     end
 
     private

data/lib/bonchi/version.rb

@@ -1,3 +1,3 @@
 module Bonchi
-  VERSION = "0.5.0"
+  VERSION = "0.6.0.rc1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - Gert Goet