regolith 0.1.28 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f69bb3b17c78b25057627158d7ff12fd6a6e13fae842bb0b0ac663614fffccd
-  data.tar.gz: d166ce29e11051e4ddbfbccf7c157ce76ebaf8ac773481db20015b74857ce427
+  metadata.gz: 25e890947b62730f38bc5ad78253819f5c7a52d9c604d8ff6167347282d70ca0
+  data.tar.gz: 85d0b5420d0eb830438011f9a3640c498746525735abfcc761475796c33a52c2
 SHA512:
-  metadata.gz: 131432552c9bcfeab83d7a5e814dc27d2f8a819addccc168fa5c8b05e56f34ad9313923a98c1dafd7ccaa31d591847464164854e75b8b83b00d66f1c3e6a4264
-  data.tar.gz: 037d67f0cf5e6a24f50e24dc46599d9f006c1e8b0baf65ff35769487ff066863fa50ede63f51e3cff196b42d58e23f2d1626c6e6bf131bfd1e3a14d712a5d5e0
+  metadata.gz: 74e5f7521b2ce9fcd73217dcf29dfd5f0af7200116883624cd9e6514cd0ca388acb24476e47ca2b249b16ba7860f8d644a0fdc1aedf7dd9fb1d6c8fbfa3b2292
+  data.tar.gz: 2630ddbfdf6a2ba082552f77d82d211234ba37e6644898f85c3aa6b08f22385ab2b27f64c41e33f835e1f56de2cefbad2fbf7c0d97e5a86b018cd00154dc17b4

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")
@@ -281,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"
@@ -328,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: postgresql://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.28"
+  VERSION = "0.1.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regolith
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.30
 platform: ruby
 authors:
 - Regolith Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-10 00:00:00.000000000 Z
+date: 2025-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport