bonchi 0.1.0 → 0.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1b9e3fb0df2276375aff9ca6d5f416fc2396602570c41d0a2f925f3528cdc1
-  data.tar.gz: 23b137fbe286b1c8a2845348ae8bb30d1c9200851ed7eee0c99face39e3fb7b8
+  metadata.gz: c8bcf10affa988d4bff6b9d78fd53ea1be600a9c03e93bf95f083fadd210e3e6
+  data.tar.gz: 40a744831b24891e328d4dbc400a4da030a98680279e06cd55ab77b0306d5375
 SHA512:
-  metadata.gz: 8f132bd0f26283c4bab9f506553882eee5685e77def350e76c537a180beb44f399fa8540d542ab5be06f85fc8579b1378dde351c887c8291f4cbdeeb9a08f7df
-  data.tar.gz: 71b5b5c3fda5a36dfdce6bb3b16a12401b838663bf57f22e8fdf25193372db458e4598f98c2d09ddbc91882d4567b1fdba6d029cfceae96054ea0b179502cfee
+  metadata.gz: 511dfe169d347f644e9f5c24db3a03ba3faba965ceda23848d06295b58bca16c7de3020164febd7cc2611f26878d421663a709d599edede7a71dc164e8ae891a
+  data.tar.gz: 26f08d5c1e6725088ba9d2268a7ef0fe0daa604351c63afd4a44dd45208f21c68fce9270b8dbbabd104313b950f776de700e8b1a07eececa14d0007676260704

data/lib/bonchi/cli.rb

@@ -22,18 +22,18 @@ module Bonchi
       existing = Git.worktree_path_for(branch)
       if existing
         puts "Worktree already exists: #{existing}"
-        puts "BONCHI_CD:#{existing}"
+        signal_cd(existing)
         return
       end
 
       Git.worktree_add_new_branch(path, branch, base)
       puts "Worktree created at: #{path}"
 
+      signal_cd(path)
+
       if options[:setup] && Config.from_main_worktree
         puts ""
         Setup.new(worktree: path).run
-      else
-        puts "BONCHI_CD:#{path}"
       end
     end
 
@@ -42,7 +42,7 @@ module Bonchi
       existing = Git.worktree_path_for(branch)
       if existing
         puts "Worktree already exists: #{existing}"
-        puts "BONCHI_CD:#{existing}"
+        signal_cd(existing)
         return
       end
 
@@ -54,7 +54,7 @@ module Bonchi
       Git.worktree_add(path, branch)
       puts "Worktree created at: #{path}"
 
-      puts "BONCHI_CD:#{path}"
+      signal_cd(path)
     end
 
     desc "pr NUMBER_OR_URL", "Checkout GitHub PR in worktree"
@@ -66,7 +66,7 @@ module Bonchi
       existing = Git.worktree_path_for(branch)
       if existing
         puts "Worktree already exists: #{existing}"
-        puts "BONCHI_CD:#{existing}"
+        signal_cd(existing)
         return
       end
 
@@ -74,12 +74,12 @@ module Bonchi
       Git.worktree_add(path, branch)
       puts "PR ##{pr_number} checked out at: #{path}"
 
-      puts "BONCHI_CD:#{path}"
+      signal_cd(path)
     end
 
-    desc "setup", "Run setup in current worktree (ports, copy, pre_setup, setup cmd)"
-    def setup
-      Setup.new.run
+    desc "setup [-- ARGS...]", "Run setup in current worktree (ports, copy, pre_setup, setup cmd)"
+    def setup(*args)
+      Setup.new.run(args)
     end
 
     desc "list", "List all worktrees"
@@ -113,6 +113,15 @@ module Bonchi
 
     private
 
+    def signal_cd(path)
+      cd_file = ENV["BONCHI_CD_FILE"]
+      if cd_file
+        File.write(cd_file, path)
+      else
+        puts "cd #{path}"
+      end
+    end
+
     def extract_pr_number(input)
       case input
       when %r{^https://github.com/.*/pull/(\d+)}
@@ -126,13 +135,12 @@ module Bonchi
 
     SHELL_ENV = <<~'SHELL'
       bonchi() {
-          local output
-          output=$(command bonchi "$@")
+          local bonchi_cd_file="${TMPDIR:-/tmp}/bonchi_cd.$$"
+          BONCHI_CD_FILE="$bonchi_cd_file" command bonchi "$@"
           local exit_code=$?
-          echo "$output"
-          if [ $exit_code -eq 0 ]; then
-              local cd_path=$(echo "$output" | grep "^BONCHI_CD:" | cut -d: -f2-)
-              [ -n "$cd_path" ] && cd "$cd_path"
+          if [ $exit_code -eq 0 ] && [ -f "$bonchi_cd_file" ]; then
+              cd "$(cat "$bonchi_cd_file")"
+              rm -f "$bonchi_cd_file"
           fi
           return $exit_code
       }

data/lib/bonchi/version.rb

@@ -1,3 +1,3 @@
 module Bonchi
-  VERSION = "0.1.0"
+  VERSION = "0.2.0.rc1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.rc1
 platform: ruby
 authors:
 - Gert Goet
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="