bonchi 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af66b530d16c1004fe1d290edf3a28ea189999df19561fbd70f0d2779f31510
-  data.tar.gz: 99edcbb95cbb4cdd4aa6d752b6266e3392f69833654fece86f8cef8918c5441c
+  metadata.gz: '053922f8049bc9788caaf72af772fcd9058945e2964183228c339922109029f4'
+  data.tar.gz: b2058d5ed48143f1eb54c42ecb614087bd4e3a23a461a31d0c749146366454cb
 SHA512:
-  metadata.gz: e58e2d259376816627e4905885d19a5785ca525c1fda135af38c6a849726f37e088c5244b03e46789b164a088a8ece8d9c3153377d3a8476c0f851555b576ed4
-  data.tar.gz: e4d9300d822379d8423fc1f55b6501a6abae8c0441be618ca9651d6af2197b12556de05e4eee96b94f946d51b5f1069e1ed379c6924f69154c4d105071203d68
+  metadata.gz: 24cdf46ea9f71a1bfec30f23d2765b51a1dc036e06059693f14379b192822fd850a28ab667e8439a65ed20cb2cd5b4fd1c818213c5d5c34e46ff9c03d3cbdaa5
+  data.tar.gz: a512b18c8ba6e77f5cbbeaa8584738c1f41a3754fc08ffaa9f6a1a04d76a753194ec55837ce413545b351f59936b1640c1c53d91ac68bc9d40f75a604b04c096

data/lib/bonchi/cli.rb

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

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

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
 
@@ -148,7 +148,7 @@ module Bonchi
     end
 
     def ensure_trailing_newline(content)
-      content.empty? || content.end_with?("\n") ? content : content + "\n"
+      (content.empty? || content.end_with?("\n")) ? content : content + "\n"
     end
 
     def run_pre_setup(commands)

data/lib/bonchi/version.rb

@@ -1,3 +1,3 @@
 module Bonchi
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonchi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Gert Goet
@@ -63,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: []