regolith 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca989ab915c1059d2081f5941bbc3d616c6c540b7136b405e196e688fa46d96
-  data.tar.gz: 999859f9c5d8f0701269352d2f48cfead750e4e24e4e1a1b979a5246ee4228f6
+  metadata.gz: 7060833dd481cef26c28a2d4a29d321cda189126fdcf7ac0f004ebf312564e1e
+  data.tar.gz: 662f4f58f156c8be7a085ab148d6fd64a2d6780fc1e19ae5dd664174e5eb1b17
 SHA512:
-  metadata.gz: 9606c17cb93b09a919b07f35bdcea747e0d32a6651a4911984cc67e76906fb5380806f3254591c3ddfe0b3fc4a34b677b53352f4acc201528e6859a599c116e6
-  data.tar.gz: b9dd759f3d6f19353a6d512047f049456fbd570a7260471ebc321c96c7dab6e1273f2e7e4722beb580370792ed0be34638a18bd28edf020d1bd8324d9a7040eb
+  metadata.gz: b72c5c54a008c9325538d72234b070d2c8107b0616a7fafcd6f7f560abe33af5b621eec5f2e9d7fb88e7db8aab9a895564e14282ada183456b24b17b2a697837
+  data.tar.gz: 930e58c5cbbc10777adf74da21fc6b20aa4d5059f748896e7228be2b72a39c8f18b68d626c555ba203b3133035d92b2744f717c07e75292008a0bcad66d00cfe

data/lib/regolith/cli.rb

@@ -21,6 +21,16 @@ module Regolith
         generate_resource(@subcommand, @name)
       when 'server'
         start_server
+      when 'restart'
+        restart_services(@subcommand)
+      when 'stop'
+        stop_services
+      when 'logs'
+        show_logs(@subcommand)
+      when 'status'
+        show_status
+      when 'clean'
+        clean_environment
       when 'console'
         open_console(@subcommand)
       when 'version'
@@ -32,6 +42,95 @@ module Regolith
 
     private
 
+    def restart_services(service_name = nil)
+      unless File.exist?('docker-compose.yml')
+        puts "❌ Error: Not in a Regolith app directory"
+        exit 1
+      end
+
+      if service_name
+        config = load_regolith_config
+        unless config['services'][service_name]
+          puts "❌ Error: Service '#{service_name}' not found"
+          puts "Available services: #{config['services'].keys.join(', ')}"
+          exit 1
+        end
+        puts "🔄 Restarting #{service_name} service..."
+        system("docker-compose restart #{service_name}")
+      else
+        puts "🔄 Restarting all services..."
+        system("docker-compose restart")
+      end
+      puts "✅ Restart complete"
+    end
+
+    def stop_services
+      unless File.exist?('docker-compose.yml')
+        puts "❌ Error: Not in a Regolith app directory"
+        exit 1
+      end
+
+      puts "🛑 Stopping all services..."
+      system("docker-compose down")
+      puts "✅ All services stopped"
+    end
+
+    def show_logs(service_name)
+      unless File.exist?('docker-compose.yml')
+        puts "❌ Error: Not in a Regolith app directory"
+        exit 1
+      end
+
+      unless service_name
+        puts "❌ Error: Service name required"
+        puts "Usage: regolith logs <service_name>"
+        config = load_regolith_config
+        puts "Available services: #{config['services'].keys.join(', ')}"
+        exit 1
+      end
+
+      config = load_regolith_config
+      unless config['services'][service_name]
+        puts "❌ Error: Service '#{service_name}' not found"
+        puts "Available services: #{config['services'].keys.join(', ')}"
+        exit 1
+      end
+
+      puts "📋 Showing logs for #{service_name} (Press Ctrl+C to exit)..."
+      exec("docker-compose logs -f #{service_name}")
+    end
+
+    def show_status
+      unless File.exist?('docker-compose.yml')
+        puts "❌ Error: Not in a Regolith app directory"
+        exit 1
+      end
+
+      puts "📊 Regolith Service Status:"
+      puts ""
+      
+      config = load_regolith_config
+      puts "App: #{config['name']}"
+      puts "Services: #{config['services'].size}"
+      puts ""
+      
+      system("docker-compose ps")
+    end
+
+    def clean_environment
+      unless File.exist?('docker-compose.yml')
+        puts "❌ Error: Not in a Regolith app directory"
+        exit 1
+      end
+
+      puts "🧹 Cleaning Docker environment..."
+      puts "  → Stopping and removing containers..."
+      system("docker-compose down -v")
+      puts "  → Pruning unused Docker resources..."
+      system("docker system prune -f")
+      puts "✅ Environment cleaned"
+    end
+
     def create_new_app(app_name)
       unless app_name
         puts "❌ Error: App name required"
@@ -116,13 +215,16 @@ module Regolith
         exit 1
       end
 
+      # Overwrite Gemfile before bundle install
       puts "🔧 Overwriting Gemfile to remove sqlite3 and other defaults..."
-      ruby_version = `ruby -e 'print RUBY_VERSION'`.strip
-      ruby_major_minor = ruby_version.split('.')[0..1].join('.')
+      
+      major_minor = `ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")'`.strip
 
       custom_gemfile = <<~GEMFILE
         source "https://rubygems.org"
-        ruby "~> #{ruby_major_minor}.0"
+
+        ruby "~> #{major_minor}.0"
+
         gem "rails", "~> 7.2.2.1"
         gem "pg", "~> 1.5"
         gem "puma", ">= 5.0"
@@ -139,17 +241,11 @@ module Regolith
 
       File.write("#{service_dir}/Gemfile", custom_gemfile)
 
+      # Vendor Regolith gem into service for Docker compatibility
       vendor_dir = File.join(service_dir, "vendor")
-      regolith_vendor_dir = File.join(vendor_dir, "regolith")
       FileUtils.mkdir_p(vendor_dir)
-      source_dir = File.expand_path("../..", __dir__)
-      FileUtils.cp_r(source_dir, regolith_vendor_dir)
-      Dir.glob(File.join(regolith_vendor_dir, "regolith-*")).each { |nested_dir| FileUtils.rm_rf(nested_dir) }
-
-      gemspec_path = File.join(regolith_vendor_dir, "regolith.gemspec")
-      File.write(gemspec_path, generate_regolith_gemspec) unless File.exist?(gemspec_path)
-
-      puts "📦 Vendored Regolith gem into #{regolith_vendor_dir}"
+      FileUtils.cp_r(File.expand_path("../..", __dir__), File.join(vendor_dir, "regolith"))
+      puts "📦 Vendored Regolith gem into #{File.join(service_dir, 'vendor', 'regolith')}"
 
       puts "  → Running bundle install..."
       Dir.chdir(service_dir) do
@@ -176,51 +272,35 @@ module Regolith
     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)
-
-  app_rb_path = "#{service_dir}/config/application.rb"
-  app_rb_content = File.read(app_rb_path)
-
-  # Ensure Regolith config block is inserted safely
-  insert_block = <<~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
+      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)
 
-    config.regolith_service_name = '#{service_name}'
-    config.regolith_service_port = #{port}
-  RUBY
+      app_rb_path = "#{service_dir}/config/application.rb"
+      app_rb_content = File.read(app_rb_path)
 
-  app_rb_lines = app_rb_content.lines
-  target_index = app_rb_lines.index { |line| line =~ /^\s*class Application < Rails::Application/ }
+      cors_config = <<~RUBY
 
-  if target_index
-    insertion_point = app_rb_lines.index { |line| line.strip == 'end' && app_rb_lines.index(line) > target_index }
-    if insertion_point
-      app_rb_lines.insert(insertion_point, insert_block)
-      File.write(app_rb_path, app_rb_lines.join)
-    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
 
-  # Clean up boot.rb again just in case
-  boot_path = "#{service_dir}/config/boot.rb"
-  if File.exist?(boot_path)
-    clean_boot_rb = <<~RUBY
-      ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-      require "bundler/setup" # Set up gems listed in the Gemfile.
-    RUBY
-    File.write(boot_path, clean_boot_rb)
-  end
-end
+        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")
+      end
+
+      File.write(app_rb_path, app_rb_content)
+    end
 
     def start_server
       unless File.exist?('docker-compose.yml')
@@ -235,7 +315,7 @@ end
         puts "🚀 #{name}_service running at http://localhost:#{service['port']}"
       end
 
-      puts "🏭 Service registry loaded from config/regolith.yml"
+      puts "🧭 Service registry loaded from config/regolith.yml"
       puts ""
 
       exec("docker-compose up --build")
@@ -245,12 +325,15 @@ end
       unless service_name
         puts "❌ Error: Service name required"
         puts "Usage: regolith console <service_name>"
+        config = load_regolith_config
+        puts "Available services: #{config['services'].keys.join(', ')}"
         exit 1
       end
 
       config = load_regolith_config
       unless config['services'][service_name]
         puts "❌ Error: Service '#{service_name}' not found"
+        puts "Available services: #{config['services'].keys.join(', ')}"
         exit 1
       end
 
@@ -334,6 +417,8 @@ end
 
     def generate_regolith_initializer(service_name)
       <<~RUBY
+        require 'ostruct'
+        
         # Regolith service configuration
         Rails.application.configure do
           config.regolith = OpenStruct.new(
@@ -352,11 +437,23 @@ end
 
     def generate_makefile
       <<~MAKEFILE
-        .PHONY: server console build clean
+        .PHONY: server console build clean restart stop logs status
 
         server:
         	regolith server
 
+        restart:
+        	regolith restart
+
+        stop:
+        	regolith stop
+
+        logs:
+        	regolith logs
+
+        status:
+        	regolith status
+
         console:
         	regolith console
 
@@ -364,8 +461,7 @@ end
         	docker-compose build
 
         clean:
-        	docker-compose down -v
-        	docker system prune -f
+        	regolith clean
       MAKEFILE
     end
 
@@ -376,33 +472,6 @@ end
       RUBY
     end
 
-    def generate_regolith_gemspec
-      <<~GEMSPEC
-        # -*- encoding: utf-8 -*-
-        lib = File.expand_path('../lib', __FILE__)
-        $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-        require 'regolith/version'
-
-        Gem::Specification.new do |gem|
-          gem.name          = "regolith"
-          gem.version       = Regolith::VERSION
-          gem.authors       = ["Regolith Team"]
-          gem.email         = ["team@regolith.dev"]
-          gem.description   = %q{Microservices framework for Ruby}
-          gem.summary       = %q{Build microservices with Ruby and Rails}
-          gem.homepage      = "https://github.com/regolith/regolith"
-
-          gem.files         = Dir['lib/**/*'] + ['README.md']
-          gem.executables   = ['regolith']
-          gem.test_files    = []
-          gem.require_paths = ["lib"]
-
-          gem.add_dependency "rails", ">= 7.0"
-          gem.add_dependency "rack-cors"
-        end
-      GEMSPEC
-    end
-
     def show_help
       puts <<~HELP
         Regolith #{Regolith::VERSION} - Microservices framework
@@ -414,16 +483,30 @@ end
             new <app_name>              Create a new Regolith application
             generate service <name>     Generate a new microservice
             server                      Start all services with Docker Compose
+            restart [service_name]      Restart all services or specific service
+            stop                        Stop all services
+            logs <service_name>         Show logs for a service
+            status                      Show status of all services
+            clean                       Clean Docker environment
             console <service_name>      Open Rails console for a service
             version                     Show version information
 
         EXAMPLES:
             regolith new observatory
             regolith generate service telescope
-            regolith generate service records
             regolith server
+            regolith restart element
+            regolith logs element
+            regolith status
             regolith console telescope
 
+        SERVICE MANAGEMENT:
+            regolith restart            # Restart all services
+            regolith restart element    # Restart just element service
+            regolith logs element       # Follow element service logs
+            regolith stop              # Stop all services
+            regolith clean             # Clean containers and volumes
+
         Get started:
             regolith new myapp
             cd myapp

data/lib/regolith/version.rb

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

metadata

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