regolith 0.1.22 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa276472ded40f3c9b79460cc8c603063bba90b2c9f3fe678b96671c519e2e5
-  data.tar.gz: 05a30e0848e755bc2e55d4e83dcdca7b81593ab6c9ecb7a3d5b26baaa086fc31
+  metadata.gz: d447572c7f8e6230414cfb4b13ffeb32de77ec6f79612bfaccb620e9140466bc
+  data.tar.gz: 16c7e26aad9c1f8261d9a27a5acdaf86fb5a80321fcac227ee79ac7aeeade7af
 SHA512:
-  metadata.gz: 57a83ef606eace382435a56faaa26c2dff33319d4bf32a2e0822c7192f8b31f80517e202f48d7964d95b6706e1b595a1d267f2b3fe8fa6ef3d5c5a767af1aa4f
-  data.tar.gz: f8a8f96681e5453b855d1b4158f59bb5de2646c8b28e7231a7d83476dfaba2a70dcadc5f8d2114475b9abd588ef9295617fd62136ad57870874788637a3928e2
+  metadata.gz: efb74771a03f353f38818391cdb8acf34d6ecc7081443a270e714b286a846917528da0adea6dd675924166790a2a81215b710ce2d817e0769a985ff1edb0f8cf
+  data.tar.gz: 22ec3dafdab950d8d25b2d7ab92c8db6e7c41361603756524f955c01782d8fdd26fe8ce1aad4f2ecfb68d49d55aa9b4e067b0bca2b15401a0c9339478e1fef54

data/lib/regolith/cli.rb

@@ -116,6 +116,10 @@ module Regolith
         exit 1
       end
 
+      # Fix bootsnap issue IMMEDIATELY after rails new
+      puts "🔧 Making bootsnap optional..."
+      make_bootsnap_optional(service_dir)
+
       # Overwrite Gemfile before bundle install
       puts "🔧 Overwriting Gemfile to remove sqlite3 and other defaults..."
       
@@ -172,26 +176,23 @@ module Regolith
       puts "→ Next: regolith generate service <another_service> or regolith server"
     end
 
-    # --- New 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)
@@ -200,29 +201,28 @@ module Regolith
       File.write("#{initializer_dir}/regolith.rb", generate_regolith_initializer(service_name))
       File.write("#{service_dir}/Dockerfile", generate_dockerfile)
 
-      # Call the Bootsnap patcher here
-      make_bootsnap_optional(service_dir)
-
       app_rb_path = "#{service_dir}/config/application.rb"
       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)
@@ -393,7 +393,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.22"
+  VERSION = "0.1.25"
 end

metadata

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