regolith 0.1.23 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41ea8405c6a144230c7f4be3a1e2605cc2f80f05524850bad3e680e37d4187b4
-  data.tar.gz: c4ba815538da010c8f3b23b3b27b2c84b107d1d3ad64c267a7d0efe5c6ce4487
+  metadata.gz: b0ac619eb909b91c979771e9238eb1706bca5c53c77c1891c3fff99d2e82fd8c
+  data.tar.gz: 415b5a6f37bd51b5e0067f4ecf18880d27a555780e79e347d26f6e27d341a59d
 SHA512:
-  metadata.gz: d2b4ca0d0e63b168706b29a54cb5344b7fe1a83cbc184773f848eafd73155aba7ed0748177ae22fab09c9e0c9df6c55ab0bf685e27104d9713831290fa1fe7d8
-  data.tar.gz: 757cf66d57106245541095029d9aea8f24b43aaae2a231afabc715dc3546308509c6f5077c631fe7722ed066150f9f586dc21a1bbba17a5a1bb7b0fd622bd1d6
+  metadata.gz: 1e70b07ed8e9bb4caf3713824b655e53e23525fe7ac0824d5ce26f6b2dfff9869472346197f5c1d89f1852f3a68d3d5cae07df7e4a4e02936531941a1a30777b
+  data.tar.gz: d2166421a7ac77330c152a44b1eab6295fa1494738c5c6095d01803e39d2d8bf667275cce8e60c5795ae25de879dc4476565468fdfd96f709b712bdf3eb726cd

data/lib/regolith/cli.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'erb'
 require 'timeout'
 require 'rubygems'
+require 'socket'
 
 module Regolith
   class CLI
@@ -85,7 +86,7 @@ module Regolith
     def generate_service(service_name)
       puts "🔧 Creating service '#{service_name}'..."
       config = load_regolith_config
-      port = 3001 + (config['services']&.size || 0)
+      port = find_available_port(config)
       service_dir = "services/#{service_name}_service"
 
       puts "  → Generating Rails API app..."
@@ -176,26 +177,23 @@ module Regolith
       puts "→ Next: regolith generate service <another_service> or regolith server"
     end
 
-    # --- Helper to make Bootsnap optional ---
+    # --- FIXED: 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)
 
       boot = File.read(boot_rb_path)
-      patched = boot.sub(
-        /^\s*require\s+["']bootsnap\/setup["']\s*$/,
-        <<~'RUBY'.strip
-          begin
-            require "bootsnap/setup"
-          rescue LoadError
-            warn "[regolith] bootsnap not found; continuing without it"
-          end
-        RUBY
-      )
+      
+      # Replace the entire bootsnap line (with or without comment)
+      patched = boot.gsub(/require\s+["']bootsnap\/setup["'].*$/, <<~'RUBY'.strip)
+        begin
+          require "bootsnap/setup"
+        rescue LoadError
+          warn "[regolith] bootsnap not found; continuing without it"
+        end
+      RUBY
 
-      if patched != boot
-        File.write(boot_rb_path, patched)
-      end
+      File.write(boot_rb_path, patched)
     end
 
     def patch_rails_app(service_dir, service_name, port)
@@ -208,22 +206,24 @@ 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
+        origins '*'
+        resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options, :head]
+      end
+    end
 
-        # Regolith configuration
-        config.middleware.insert_before 0, Rack::Cors do
-          allow do
-            origins '*'
-            resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options, :head]
-          end
-        end
-
-        config.regolith_service_name = '#{service_name}'
-        config.regolith_service_port = #{port}
+    config.regolith_service_name = '#{service_name}'
+    config.regolith_service_port = #{port}
       RUBY
 
-      app_rb_content.gsub!(/class Application < Rails::Application.*?
-  end/m) do |match|
-        match.gsub(/(\n  end)$/, "#{cors_config}\1")
+      # 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
       end
 
       File.write(app_rb_path, app_rb_content)
@@ -394,7 +394,7 @@ module Regolith
 
         COMMANDS:
             new <app_name>              Create a new Regolith application
-            generate service <name>     Generate a new microservice
+            generate service <n>     Generate a new microservice
             server                      Start all services with Docker Compose
             console <service_name>      Open Rails console for a service
             version                     Show version information

data/lib/regolith/version.rb

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

metadata

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