regolith 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d590506b9d76a0cae7c0b4cc1355860e601c42740d8f4de852e41c001cee08e8
-  data.tar.gz: 412b231f3860a025d6f48c6f96aeb2dc5b60d9368d298e05849d490221f0092d
+  metadata.gz: 5fa276472ded40f3c9b79460cc8c603063bba90b2c9f3fe678b96671c519e2e5
+  data.tar.gz: 05a30e0848e755bc2e55d4e83dcdca7b81593ab6c9ecb7a3d5b26baaa086fc31
 SHA512:
-  metadata.gz: f22e33c9f838f9a2c61af3808e8c7e0ba5f65e3729653e4674d8e3562dd184d6184f9b284fdcd657ad0f3ac6327521ccd2edbbea5e9a478b8e822f14edcb523d
-  data.tar.gz: a79ff4e21eba13f58cbed3d598dad134cf34df9ee9e3d7c99d0209397fec42b58ba180c636c7d8f2984902a49b8fd614335d819de156ea1e5bcd76128990122a
+  metadata.gz: 57a83ef606eace382435a56faaa26c2dff33319d4bf32a2e0822c7192f8b31f80517e202f48d7964d95b6706e1b595a1d267f2b3fe8fa6ef3d5c5a767af1aa4f
+  data.tar.gz: f8a8f96681e5453b855d1b4158f59bb5de2646c8b28e7231a7d83476dfaba2a70dcadc5f8d2114475b9abd588ef9295617fd62136ad57870874788637a3928e2

data/lib/regolith/cli.rb

@@ -69,7 +69,7 @@ module Regolith
       File.write('docker-compose.yml', generate_docker_compose(app_name))
       File.write('Makefile', generate_makefile)
       File.write('.bin/regolith', generate_regolith_shim)
-      FileUtils.chmod(0o755, '.bin/regolith')
+      FileUtils.chmod(0755, '.bin/regolith')
     end
 
     def generate_resource(resource_type, resource_name)
@@ -118,7 +118,7 @@ module Regolith
 
       # Overwrite Gemfile before bundle install
       puts "🔧 Overwriting Gemfile to remove sqlite3 and other defaults..."
-
+      
       major_minor = `ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")'`.strip
 
       custom_gemfile = <<~GEMFILE
@@ -137,7 +137,6 @@ module Regolith
           gem "rubocop-rails-omakase", require: false
         end
 
-        # Regolith vendored gem so the container can build without network access to your local gem
         gem "regolith", path: "vendor/regolith"
       GEMFILE
 
@@ -160,7 +159,6 @@ module Regolith
       end
 
       patch_rails_app(service_dir, service_name, port)
-      patch_bootsnap(service_dir)
 
       config['services'][service_name] = {
         'port' => port,
@@ -174,12 +172,37 @@ module Regolith
       puts "→ Next: regolith generate service <another_service> or regolith server"
     end
 
+    # --- New 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
+      )
+
+      if patched != boot
+        File.write(boot_rb_path, patched)
+      end
+    end
+
     def patch_rails_app(service_dir, service_name, port)
       initializer_dir = "#{service_dir}/config/initializers"
       FileUtils.mkdir_p(initializer_dir)
       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)
 
@@ -205,26 +228,6 @@ module Regolith
       File.write(app_rb_path, app_rb_content)
     end
 
-    # ---- Bootsnap Patch: make it optional & non-fatal ----
-    def patch_bootsnap(service_dir)
-      boot_path = File.join(service_dir, "config", "boot.rb")
-      return unless File.exist?(boot_path)
-
-      content = File.read(boot_path)
-
-      # Remove any unconditional bootsnap require and replace with guarded load
-      content.gsub!(/^\s*require\s+["']bootsnap\/setup["']\s*$/, <<~RUBY.strip)
-        begin
-          require "bootsnap/setup"
-        rescue LoadError
-          warn "[regolith] bootsnap not found; continuing without it"
-        end
-      RUBY
-
-      File.write(boot_path, content)
-    end
-    # ------------------------------------------------------
-
     def start_server
       unless File.exist?('docker-compose.yml')
         puts "❌ Error: Not in a Regolith app directory"
@@ -262,7 +265,7 @@ module Regolith
     end
 
     def load_regolith_config
-      return({ 'services' => {} }) unless File.exist?('config/regolith.yml')
+      return { 'services' => {} } unless File.exist?('config/regolith.yml')
       config = YAML.load_file('config/regolith.yml') || {}
       config['services'] ||= {}
       config
@@ -410,4 +413,4 @@ module Regolith
       HELP
     end
   end
-end
+end

data/lib/regolith/version.rb

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

metadata

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