regolith 0.1.27 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973264713948f2e5db2ff16f9e3b8c1d3a8655658315965fd40ddd4e977d9a6e
-  data.tar.gz: 5643b91bcf2e95c3f2e47851409e28c2c0993a72fea4f7ab42d18911fa0314a9
+  metadata.gz: 1d8d0ea7b50cad49f91d2a4e85c26ee014820c26f3ed64e127aa0784fff14d2e
+  data.tar.gz: 25d189bb0fec60d8a2922d2b0fab2738cdbed83fedb3b9f289b801fe019ec05d
 SHA512:
-  metadata.gz: e934b3a272665af2195a4a0987705605477f2a0ff0fc53f38406c19ccbb50d94fef8696df638272d31cf0f18431d1207445a4d894d797c1b77abd5708c6d5b26
-  data.tar.gz: f6d5df82730c20811d366b100aa9d666cd1662e060aa71387c2b571014d36105952ee5d7d90bf8afd3b1e2cf844070e0dcf7b4d2214339b76d600e9d6407c900
+  metadata.gz: ee793267f08b1b83d5a3671d69cedce8ed67442fcd563a2fef10c0780dc55cd7eee407fdd15f1253b98170324588e3f56ecb0ff7a3e530dbd429b2a1b5c7afb8
+  data.tar.gz: 106ca0adf1bebbe92d080944d81e18c59da5c79f3ba88eda33cbcf036b8b2cfed513600540055497d90d15b67e84d1c459aba64ad894966ccd4adf39178dc7bb

data/lib/regolith/cli.rb

@@ -61,7 +61,7 @@ module Regolith
         'infrastructure' => {
           'database' => {
             'type' => 'postgresql',
-            'port' => 5432
+            'base_port' => 5432
           }
         }
       }
@@ -87,6 +87,7 @@ module Regolith
       puts "🔧 Creating service '#{service_name}'..."
       config = load_regolith_config
       port = find_available_port(config)
+      db_port = find_available_port_for_db(config)
       service_dir = "services/#{service_name}_service"
 
       puts "  → Generating Rails API app..."
@@ -167,6 +168,7 @@ module Regolith
 
       config['services'][service_name] = {
         'port' => port,
+        'db_port' => db_port,
         'root' => "./#{service_dir}"
       }
       save_regolith_config(config)
@@ -174,6 +176,7 @@ module Regolith
 
       puts "✅ Created service '#{service_name}'"
       puts "🚀 Service running on port #{port}"
+      puts "🗄️  Database running on port #{db_port}"
       puts "→ Next: regolith generate service <another_service> or regolith server"
     end
 
@@ -195,7 +198,7 @@ module Regolith
       
       loop do
         if !used_ports.include?(port) && port_available?(port)
-          puts "🔌 Assigned port #{port}"
+          puts "🔌 Assigned service port #{port}"
           return port
         end
         
@@ -215,6 +218,32 @@ module Regolith
       end
     end
 
+    def find_available_port_for_db(config, starting_port = 5432)
+      used_db_ports = config['services'].values.map { |s| s['db_port'] }.compact
+      port = starting_port
+      
+      loop do
+        if !used_db_ports.include?(port) && port_available?(port)
+          puts "🗄️  Assigned database port #{port}"
+          return port
+        end
+        
+        if used_db_ports.include?(port)
+          puts "⚠️  Database port #{port} already used by another Regolith service"
+        else
+          puts "⚠️  Database port #{port} already in use by system"
+        end
+        
+        port += 1
+        
+        # Safety check for database ports
+        if port > 5450
+          puts "❌ Error: No available database ports found in range #{starting_port}-5450"
+          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")
@@ -244,6 +273,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
@@ -256,12 +286,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)
@@ -278,6 +310,7 @@ module Regolith
 
       config['services'].each do |name, service|
         puts "🚀 #{name}_service running at http://localhost:#{service['port']}"
+        puts "🗄️  #{name}_database running on port #{service['db_port']}"
       end
 
       puts "🧭 Service registry loaded from config/regolith.yml"
@@ -325,35 +358,37 @@ module Regolith
         version: '3.8'
 
         services:
-          db:
+        <% services.each do |name, service| %>
+          <%= name %>_db:
             image: postgres:14
             environment:
-              POSTGRES_DB: #{app_name}_development
+              POSTGRES_DB: <%= name %>_development
               POSTGRES_USER: postgres
               POSTGRES_PASSWORD: password
             ports:
-              - "5432:5432"
+              - "<%= service['db_port'] %>:5432"
             volumes:
-              - postgres_data:/var/lib/postgresql/data
+              - <%= name %>_postgres_data:/var/lib/postgresql/data
 
-        <% services.each do |name, service| %>
           <%= name %>:
             build: <%= service['root'] %>
             ports:
               - "<%= service['port'] %>:3000"
             depends_on:
-              - db
+              - <%= name %>_db
             environment:
-              DATABASE_URL: postgres://postgres:password@db:5432/<%= app_name %>_development
+              DATABASE_URL: postgres://postgres:password@<%= name %>_db:5432/<%= name %>_development
               REGOLITH_SERVICE_NAME: <%= name %>
               REGOLITH_SERVICE_PORT: <%= service['port'] %>
             volumes:
               - <%= service['root'] %>:/app
             command: bash -c "rm -f tmp/pids/server.pid && bundle install && rails server -b 0.0.0.0"
-        <% end %>
 
+        <% end %>
         volumes:
-          postgres_data:
+        <% services.each do |name, service| %>
+          <%= name %>_postgres_data:
+        <% end %>
       YAML
 
       ERB.new(template).result(binding)

data/lib/regolith/version.rb

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

metadata

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