regolith 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ac619eb909b91c979771e9238eb1706bca5c53c77c1891c3fff99d2e82fd8c
-  data.tar.gz: 415b5a6f37bd51b5e0067f4ecf18880d27a555780e79e347d26f6e27d341a59d
+  metadata.gz: 0f69bb3b17c78b25057627158d7ff12fd6a6e13fae842bb0b0ac663614fffccd
+  data.tar.gz: d166ce29e11051e4ddbfbccf7c157ce76ebaf8ac773481db20015b74857ce427
 SHA512:
-  metadata.gz: 1e70b07ed8e9bb4caf3713824b655e53e23525fe7ac0824d5ce26f6b2dfff9869472346197f5c1d89f1852f3a68d3d5cae07df7e4a4e02936531941a1a30777b
-  data.tar.gz: d2166421a7ac77330c152a44b1eab6295fa1494738c5c6095d01803e39d2d8bf667275cce8e60c5795ae25de879dc4476565468fdfd96f709b712bdf3eb726cd
+  metadata.gz: 131432552c9bcfeab83d7a5e814dc27d2f8a819addccc168fa5c8b05e56f34ad9313923a98c1dafd7ccaa31d591847464164854e75b8b83b00d66f1c3e6a4264
+  data.tar.gz: 037d67f0cf5e6a24f50e24dc46599d9f006c1e8b0baf65ff35769487ff066863fa50ede63f51e3cff196b42d58e23f2d1626c6e6bf131bfd1e3a14d712a5d5e0

data/lib/regolith/cli.rb

@@ -177,7 +177,45 @@ module Regolith
       puts "→ Next: regolith generate service <another_service> or regolith server"
     end
 
-    # --- FIXED: Helper to make Bootsnap optional ---
+    # --- Port collision prevention ---
+    def port_available?(port)
+      # Check if port is free on the system
+      begin
+        server = TCPServer.new('127.0.0.1', port)
+        server.close
+        true
+      rescue Errno::EADDRINUSE, Errno::EACCES
+        false
+      end
+    end
+
+    def find_available_port(config, starting_port = 3001)
+      used_ports = config['services'].values.map { |s| s['port'] }.compact
+      port = starting_port
+      
+      loop do
+        if !used_ports.include?(port) && port_available?(port)
+          puts "🔌 Assigned port #{port}"
+          return port
+        end
+        
+        if used_ports.include?(port)
+          puts "⚠️  Port #{port} already used by another Regolith service"
+        else
+          puts "⚠️  Port #{port} already in use by system"
+        end
+        
+        port += 1
+        
+        # Safety check - don't go crazy high
+        if port > 4000
+          puts "❌ Error: No available ports found in range #{starting_port}-4000"
+          exit 1
+        end
+      end
+    end
+
+    # --- Helper to make Bootsnap optional ---
     def make_bootsnap_optional(service_dir)
       boot_rb_path = File.join(service_dir, "config", "boot.rb")
       return unless File.exist?(boot_rb_path)
@@ -206,6 +244,7 @@ module Regolith
       app_rb_content = File.read(app_rb_path)
 
       cors_config = <<~RUBY
+
     # Regolith configuration
     config.middleware.insert_before 0, Rack::Cors do
       allow do
@@ -218,12 +257,14 @@ module Regolith
     config.regolith_service_port = #{port}
       RUBY
 
-      # Find the end of the Application class and insert before it
-      if app_rb_content =~ /^(\s*)end\s*$/
-        app_rb_content.gsub!(/^(\s*)end\s*$/) do |match|
-          indent = $1
-          "#{cors_config}\n#{indent}end"
-        end
+      # More precise regex - find the Application class and its specific end
+      # This handles the case where there's both a class and module end
+      app_rb_content.gsub!(/(class\s+Application\s*<\s*Rails::Application.*?)(^\s*end$)/m) do |match|
+        class_content = $1
+        class_end = $2
+        
+        # Insert the config before the class end
+        "#{class_content}#{cors_config}\n#{class_end}"
       end
 
       File.write(app_rb_path, app_rb_content)

data/lib/regolith/version.rb

@@ -1,4 +1,4 @@
 # lib/regolith/version.rb
 module Regolith
-  VERSION = "0.1.26"
+  VERSION = "0.1.28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regolith
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Regolith Team