stable-cli-rails 0.7.12 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f092ba86af858aef49a2de7704a7039e3f25accafaf9028254469e9621c754ea
-  data.tar.gz: 4ab71b60ae850c74508c790cf0fce5b14c2d12e0c8f2ec793a6b5e5234a95529
+  metadata.gz: 55fbeca00cb3d5ac0cf360dd86a8022081e3bf8b00af321c8ac8dec7482e7e5b
+  data.tar.gz: a1d3fa2c7d8ffb2ae339e75d4ebdd1aa67e4b1e7b88ef0377ce8d06dc170c94d
 SHA512:
-  metadata.gz: 830108d826c9a63cdbaabf2c539b083795d7cf2772e1d8cea0c91d39dcefcaf06e792e1865793d7c7ab1da428b810228a36bbba34038555bcf20aefe03d2c295
-  data.tar.gz: acdf43e4787cf9115eb29b4900f670cb9e2ce0a0fed29ba3f251cf40f00948897a3ed1c1edff3109053031c3ed6d238e4632d28f681fc591548635f9f03951ac
+  metadata.gz: 3e90d7e10d507ea30367e375dc99576f0b9902d77f9d7d2facf45e16fe116fff5eaac586eacec099b664b31f05f25dc33ec83db2d5b89926b0bb1fcf196588c8
+  data.tar.gz: 81a7739540c1b55e429867f7c7efd22af8a96559b239710fb290179c67d8ca67e1c6e5fc4448d3f6380cedf61b62fae4c1b737c5f98d532848c63652f2c05dcf

data/lib/stable/bootstrap.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 
 module Stable
+  # Bootstrap utilities for setting up Stable environment
   module Bootstrap
     def self.run!
       FileUtils.mkdir_p(Paths.root)

data/lib/stable/cli.rb

@@ -9,12 +9,12 @@ require_relative 'scanner'
 require_relative 'registry'
 
 module Stable
+  # Main CLI class for the Stable command-line interface
   class CLI < Thor
     def initialize(*)
       super
       Stable::Bootstrap.run!
       Services::SetupRunner.ensure_dependencies!
-      dedupe_registry!
     end
 
     def self.exit_on_failure?
@@ -156,11 +156,7 @@ module Stable
     end
 
     def port_in_use?(port)
-      system("lsof -i tcp:#{port} > /dev/null 2>&1")
-    end
-
-    def dedupe_registry!
-      Services::AppRegistry.dedupe
+      Stable::Utils::Platform.port_in_use?(port)
     end
   end
 end

data/lib/stable/commands/doctor.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Doctor command - checks system health and dependencies
     class Doctor
       def call
         puts 'Running Stable health checks...'

data/lib/stable/commands/list.rb

@@ -1,47 +1,52 @@
 # frozen_string_literal: true
 
+require_relative '../utils/platform'
+
 module Stable
   module Commands
+    # List command - displays all registered applications
     class List
-      def call
-        apps = Services::AppRegistry.all
+    def call
+      apps = Services::AppRegistry.all
 
-        if apps.empty?
-          puts 'No apps registered.'
-          return
-        end
+      if apps.empty?
+        puts 'No apps registered.'
+        return
+      end
 
-        print_header
+      print_header
 
-        apps.each do |app|
-          puts format_row(app)
-        end
+      apps.each do |app|
+        # Determine status based on whether the app is actually running (port check)
+        status = app_running?(app) ? 'running' : 'stopped'
+        puts format_row(app, status)
       end
+    end
 
-      private
+    private
 
-      def print_header
-        puts 'APP                DOMAIN                     PORT     RUBY       STATUS    '
-        puts '-' * 78
-      end
+    def app_running?(app)
+      return false unless app && app[:port]
 
-      def format_row(app)
-        status =
-          if app[:started_at]
-            'running'
-          else
-            'stopped'
-          end
-
-        format(
-          '%-18s %-26s %-8s %-10s %-10s',
-          app[:name],
-          app[:domain],
-          app[:port],
-          app[:ruby],
-          status
-        )
-      end
+      # Check if something is listening on the app's port (cross-platform)
+      Stable::Utils::Platform.port_in_use?(app[:port])
+    end
+
+    def format_row(app, status)
+      format(
+        '%<name>-18s %<domain>-26s %<port>-8s %<ruby>-10s %<status>-10s',
+        name: app[:name],
+        domain: app[:domain],
+        port: app[:port],
+        ruby: app[:ruby],
+        status: status
+      )
+    end
+
+    def print_header
+      puts 'APP                DOMAIN                     PORT     RUBY       STATUS    '
+      puts '-' * 78
+    end
     end
   end
 end

data/lib/stable/commands/new.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # New command - creates a new Rails application
     class New
       def initialize(name, options)
         @name = name

data/lib/stable/commands/remove.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Remove command - removes a Rails application
     class Remove
       def initialize(name)
         @name = name

data/lib/stable/commands/restart.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Restart command - restarts a Rails application
     class Restart
       def initialize(name)
         @name = name

data/lib/stable/commands/setup.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Setup command - initializes Stable environment
     class Setup
       def call
         Services::SetupRunner.new.call

data/lib/stable/commands/start.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Start command - starts a Rails application
     class Start
       def initialize(name)
         @name = name

data/lib/stable/commands/stop.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Commands
+    # Stop command - stops a Rails application
     class Stop
       def initialize(name)
         @name = name

data/lib/stable/db_manager.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Stable
+  # Database management utilities for Rails applications
   class DBManager
     attr_reader :name, :adapter
 
@@ -101,16 +102,30 @@ module Stable
       )) or abort('Failed to repair MySQL root authentication')
     end
 
-    # Detect MySQL socket on macOS / Linux
+    # Detect MySQL socket on macOS / Linux / Windows
     def mysql_socket
-      paths = [
-        '/opt/homebrew/var/mysql/mysql.sock', # Homebrew macOS
-        '/tmp/mysql.sock',                    # Default
-        '/var/run/mysqld/mysqld.sock' # Linux default
-      ]
+      platform = RUBY_PLATFORM
+
+      paths = case platform
+              when /darwin/ # macOS
+                [
+                  '/opt/homebrew/var/mysql/mysql.sock', # Homebrew macOS
+                  '/tmp/mysql.sock'                     # Fallback
+                ]
+              when /linux/
+                [
+                  '/var/run/mysqld/mysqld.sock', # Linux default
+                  '/tmp/mysql.sock' # Fallback
+                ]
+              when /mingw|mswin|win32/ # Windows
+                # Windows typically uses TCP connections, not sockets
+                return nil
+              else
+                ['/tmp/mysql.sock'] # Generic fallback
+              end
 
       paths.each { |p| return p if File.exist?(p) }
-      abort 'MySQL socket not found. Is MySQL running?'
+      abort 'MySQL socket not found. Is MySQL running? (On Windows, ensure MySQL is configured for TCP connections)'
     end
 
     # Default Rails DB user

data/lib/stable/paths.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Stable
+  # Path utilities for Stable configuration and data directories
   module Paths
     def self.root
-      File.expand_path('~/StableCaddy')
+      ENV['STABLE_TEST_ROOT'] || File.expand_path('~/StableCaddy')
     end
 
     def self.caddy_dir
@@ -21,5 +22,13 @@ module Stable
     def self.apps_file
       File.join(root, 'apps.yml')
     end
+
+    def self.projects_dir
+      File.join(root, 'projects')
+    end
+
+    def self.app_config_file(app_name)
+      File.join(projects_dir, app_name, "#{app_name}.yml")
+    end
   end
 end

data/lib/stable/registry.rb

@@ -4,17 +4,39 @@ require 'yaml'
 require 'fileutils'
 
 module Stable
+  # Application registry for managing Rails app configurations
   class Registry
-    def self.file_path
-      Stable::Paths.apps_file
-    end
+    def self.apps
+      apps = []
+
+      # Read legacy apps.yml file for backward compatibility
+      legacy_file = Stable::Paths.apps_file
+      if File.exist?(legacy_file)
+        legacy_apps = load_legacy_apps(legacy_file)
+        apps.concat(legacy_apps)
+      end
+
+      # Read individual app config files from projects directory
+      projects_dir = Stable::Paths.projects_dir
+      if Dir.exist?(projects_dir)
+        Dir.glob(File.join(projects_dir, '*/')).each do |app_dir|
+          app_name = File.basename(app_dir)
+          config_file = Stable::Paths.app_config_file(app_name)
+
+          next unless File.exist?(config_file)
 
-    def self.save(apps)
-      FileUtils.mkdir_p(Stable.root)
-      File.write(file_path, apps.to_yaml)
+          # Skip if we already have this app from legacy file
+          next if apps.any? { |app| app[:name] == app_name }
+
+          app_config = load_app_config(app_name)
+          apps << app_config if app_config
+        end
+      end
+
+      apps
     end
 
-    def self.apps
+    def self.load_legacy_apps(file_path)
       return [] unless File.exist?(file_path)
 
       data = YAML.load_file(file_path) || []
@@ -27,5 +49,33 @@ module Stable
         end
       end
     end
+
+    def self.save_app_config(app_name, config)
+      config_file = Stable::Paths.app_config_file(app_name)
+      FileUtils.mkdir_p(File.dirname(config_file))
+      File.write(config_file, config.to_yaml)
+    end
+
+    def self.load_app_config(app_name)
+      config_file = Stable::Paths.app_config_file(app_name)
+      return nil unless File.exist?(config_file)
+
+      parse_config_file(config_file)
+    end
+
+    def self.remove_app_config(app_name)
+      config_file = Stable::Paths.app_config_file(app_name)
+      FileUtils.rm_f(config_file)
+    end
+
+    def self.parse_config_file(config_file)
+      data = YAML.load_file(config_file)
+      return nil unless data.is_a?(Hash)
+
+      data.each_with_object({}) do |(k, v), memo|
+        key = k.is_a?(String) ? k.to_sym : k
+        memo[key] = v
+      end
+    end
   end
 end

data/lib/stable/scanner.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Stable
+  # Scanner utility for application discovery and management
   class Scanner
     def self.run
       Registry.save([])

data/lib/stable/services/app_creator.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for creating new Rails applications
     class AppCreator
       def initialize(name, options)
         @name = name
@@ -11,17 +12,19 @@ module Stable
       def call
         ruby = @options[:ruby] || RUBY_VERSION
         port = @options[:port] || next_free_port
-        app_path = File.expand_path(@name)
+        app_path = File.join(Stable::Paths.projects_dir, @name)
         domain = "#{@name}.test"
 
+        # --- Check if app already exists ---
+        config_file = Stable::Paths.app_config_file(@name)
+        abort "App '#{@name}' already exists" if File.exist?(config_file)
+
         # --- Register app in registry ---
         Services::AppRegistry.add(
           name: @name, path: app_path, domain: domain, port: port,
           ruby: ruby, started_at: nil, pid: nil
         )
 
-        abort "Folder already exists: #{app_path}" if File.exist?(app_path)
-
         # --- Ensure Ruby version & RVM ---
         Ruby.ensure_version(ruby)
         Ruby.ensure_rvm!
@@ -45,11 +48,9 @@ module Stable
 
         # --- Create Rails app ---
         puts "Creating Rails app #{@name} (Ruby #{ruby})..."
-        System::Shell.run("bash -lc '#{rvm_cmd} rails new #{app_path} \
-                              --skip-importmap  \
-                              --skip-hotwire  \
-                              --skip-javascript  \
-                              --skip-solid'")
+        rails_cmd = "#{rvm_cmd} rails new #{app_path} " \
+                    '--skip-importmap --skip-hotwire --skip-javascript --skip-solid'
+        System::Shell.run("bash -lc '#{rails_cmd}'")
 
         # --- Write ruby version/gemset ---
         Dir.chdir(app_path) do
@@ -82,7 +83,8 @@ module Stable
         System::Shell.run(rvm_run('bundle install --jobs=4 --retry=3', chdir: app_path))
         System::Shell.run(rvm_run('bundle exec rails db:prepare', chdir: app_path))
 
-        rails_version = `bash -lc 'cd #{app_path} && #{rvm_cmd} bundle exec rails runner "puts Rails.version"'`.strip.to_f
+        rails_check = "cd #{app_path} && #{rvm_cmd} bundle exec rails runner \"puts Rails.version\""
+        rails_version = `bash -lc '#{rails_check}'`.strip.to_f
 
         begin
           rails_ver = Gem::Version.new(rails_version)
@@ -190,7 +192,7 @@ module Stable
       end
 
       def port_in_use?(port)
-        system("lsof -i tcp:#{port} > /dev/null 2>&1")
+        Stable::Utils::Platform.port_in_use?(port)
       end
 
       def wait_for_port(port, timeout: 20)

data/lib/stable/services/app_registry.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Application registry management service
     class AppRegistry
       class << self
         def all
@@ -42,32 +43,43 @@ module Stable
         end
 
         def add(app)
-          apps = Stable::Registry.apps
-          apps.reject! { |a| a[:name] == app[:name] }
-          apps << app
-          Stable::Registry.save(apps)
-        end
-
-        # Remove duplicate app entries (by name) and persist the canonical list
-        def dedupe
-          apps = Stable::Registry.apps
-          apps.uniq! { |a| a[:name] }
-          Stable::Registry.save(apps)
-          apps
+          Stable::Registry.save_app_config(app[:name], app)
         end
 
         def remove(name)
-          apps = Stable::Registry.apps.reject { |a| a[:name] == name }
-          Stable::Registry.save(apps)
+          Stable::Registry.remove_app_config(name)
         end
 
         def update(name, attrs)
-          apps = Stable::Registry.apps
-          idx = apps.index { |a| a[:name] == name }
-          return unless idx
+          app = find(name)
+          return unless app
+
+          updated_app = app.merge(attrs)
+
+          # Check if this is a legacy app (from apps.yml) or new format app
+          config_file = Stable::Paths.app_config_file(name)
+          if File.exist?(config_file)
+            # New format: update individual config file
+            Stable::Registry.save_app_config(name, updated_app)
+          else
+            # Legacy format: update apps.yml file
+            update_legacy_app(name, updated_app)
+          end
+        end
+
+        def update_legacy_app(name, updated_app)
+          legacy_file = Stable::Paths.apps_file
+          return unless File.exist?(legacy_file)
+
+          data = YAML.load_file(legacy_file) || []
+          idx = data.find_index { |app| app['name'] == name || app[:name] == name }
 
-          apps[idx] = apps[idx].merge(attrs)
-          Stable::Registry.save(apps)
+          if idx
+            # Convert symbols to strings for YAML compatibility
+            legacy_format = updated_app.transform_keys(&:to_s)
+            data[idx] = legacy_format
+            File.write(legacy_file, data.to_yaml)
+          end
         end
 
         def mark_stopped(name)

data/lib/stable/services/app_remover.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for removing Rails applications
     class AppRemover
       def initialize(name)
         @name = name

data/lib/stable/services/app_restarter.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for restarting Rails applications
     class AppRestarter
       def initialize(name)
         @name = name

data/lib/stable/services/app_starter.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for starting Rails applications
     class AppStarter
       def initialize(name)
         @name = name
@@ -20,6 +21,14 @@ module Stable
 
         if app_running?(app)
           puts "#{@name} is already running on https://#{app[:domain]} (port #{port})"
+          # Update the registry with the correct PID if it's missing
+          if !app[:pid] || !app[:started_at]
+            rails_pid = find_rails_pid(port)
+            if rails_pid
+              AppRegistry.update(app[:name], started_at: Time.now.to_i, pid: rails_pid)
+              puts "Updated registry with correct PID (#{rails_pid})"
+            end
+          end
           return
         end
 
@@ -50,7 +59,9 @@ module Stable
 
         wait_for_port(port, timeout: 30)
 
-        AppRegistry.update(app[:name], started_at: Time.now.to_i, pid: pid)
+        # Find the actual Rails process PID by checking what's listening on the port
+        rails_pid = find_rails_pid(port)
+        AppRegistry.update(app[:name], started_at: Time.now.to_i, pid: rails_pid)
 
         Stable::Services::CaddyManager.add_app(app[:name], skip_ssl: false)
         Stable::Services::CaddyManager.reload
@@ -68,7 +79,7 @@ module Stable
       end
 
       def port_in_use?(port)
-        system("lsof -i tcp:#{port} > /dev/null 2>&1")
+        Stable::Utils::Platform.port_in_use?(port)
       end
 
       def wait_for_port(port, timeout: 20)
@@ -86,9 +97,22 @@ module Stable
       end
 
       def app_running?(app)
-        return false unless app && app[:port]
+        return false unless app
+
+        # First check if we have PID info and if the process is alive
+        if app[:pid] && app[:started_at]
+          return ProcessManager.pid_alive?(app[:pid])
+        end
+
+        # Fallback to port checking if no PID info available
+        return false unless app[:port]
+
+        Stable::Utils::Platform.port_in_use?(app[:port])
+      end
 
-        system("lsof -i tcp:#{app[:port]} -sTCP:LISTEN > /dev/null 2>&1")
+      def find_rails_pid(port)
+        pids = Stable::Utils::Platform.find_pids_by_port(port)
+        pids.first
       end
     end
   end

data/lib/stable/services/app_stopper.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for stopping Rails applications
     class AppStopper
       def initialize(name)
         @app = AppRegistry.fetch(name)

data/lib/stable/services/caddy_manager.rb

@@ -2,6 +2,7 @@
 
 module Stable
   module Services
+    # Service for managing Caddy web server configuration
     class CaddyManager
       class << self
         def caddyfile

data/lib/stable/services/database/base.rb

@@ -3,6 +3,7 @@
 module Stable
   module Services
     module Database
+      # Base class for database management services
       class Base
         def initialize(app_name:, app_path:, ruby:)
           @app_name = app_name

data/lib/stable/services/database/mysql.rb

@@ -3,6 +3,7 @@
 module Stable
   module Services
     module Database
+      # MySQL database management service
       class MySQL < Base
         def setup
           creds = Stable::Utils::Prompts.mysql_root_credentials

data/lib/stable/services/database/postgres.rb

@@ -3,6 +3,7 @@
 module Stable
   module Services
     module Database
+      # PostgreSQL database management service
       class Postgres < Base
         def setup
           System::Shell.run("createdb #{@database_name}")