stable-cli-rails 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8c647151029030baf0e96737f45f20cc6b067b952b032b98eac46e5e14e158
-  data.tar.gz: 5db558cabc869e1f6d6684d26b1d7b08178679194d09ebdbbd42aa67d828aee7
+  metadata.gz: 55fbeca00cb3d5ac0cf360dd86a8022081e3bf8b00af321c8ac8dec7482e7e5b
+  data.tar.gz: a1d3fa2c7d8ffb2ae339e75d4ebdd1aa67e4b1e7b88ef0377ce8d06dc170c94d
 SHA512:
-  metadata.gz: fe68968ac73be6725262a224ceda502eaee576c2aa3a8822a2742577e9f5d6fc05f1c3092c6f7f1c0f011218aaa851949863e3473e8ea95de9e6fd91b94f31dc
-  data.tar.gz: e333ac1da62ceb50a7a77ec83d1c145900f90b8888249c4307102bc1dfb0e3661e0bf97c1efe5a33be27b1aa409e639278ca91643989c3c2c0954d763c665533
+  metadata.gz: 3e90d7e10d507ea30367e375dc99576f0b9902d77f9d7d2facf45e16fe116fff5eaac586eacec099b664b31f05f25dc33ec83db2d5b89926b0bb1fcf196588c8
+  data.tar.gz: 81a7739540c1b55e429867f7c7efd22af8a96559b239710fb290179c67d8ca67e1c6e5fc4448d3f6380cedf61b62fae4c1b737c5f98d532848c63652f2c05dcf

data/lib/stable/cli.rb

@@ -156,7 +156,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
   end
 end

data/lib/stable/commands/list.rb

@@ -1,48 +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(
-          '%<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
+      # 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/services/app_creator.rb

@@ -192,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

@@ -55,7 +55,31 @@ module Stable
           return unless app
 
           updated_app = app.merge(attrs)
-          Stable::Registry.save_app_config(name, updated_app)
+
+          # 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 }
+
+          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_starter.rb

@@ -21,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
 
@@ -51,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
@@ -69,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)
@@ -87,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/process_manager.rb

@@ -36,20 +36,23 @@ module Stable
 
         Process.detach(pid)
 
-        AppRegistry.update(app[:name], started_at: Time.now.to_i, pid: pid)
+        # Wait a moment for Rails to start, then find the actual Rails PID
+        sleep 2
+        rails_pid = find_rails_pid(app[:port])
 
-        pid
+        AppRegistry.update(app[:name], started_at: Time.now.to_i, pid: rails_pid || pid)
+
+        rails_pid || pid
       end
 
       def self.stop(app)
-        pid = app[:pid]
-        return unless pid
+        return unless app[:port]
 
-        output = `lsof -i tcp:#{app[:port]} -t`.strip
-        if output.empty?
+        pids = Stable::Utils::Platform.find_pids_by_port(app[:port])
+        if pids.empty?
           puts "No app running on port #{app[:port]}"
         else
-          output.split("\n").each { |pid| Process.kill('TERM', pid.to_i) }
+          pids.each { |pid| Process.kill('TERM', pid.to_i) rescue nil }
           puts "Stopped #{app[:name]} on port #{app[:port]}"
         end
 
@@ -57,6 +60,45 @@ module Stable
       rescue Errno::ESRCH
         AppRegistry.update(app[:name], started_at: nil, pid: nil)
       end
+
+      # Check if a process with the given PID is still running
+      def self.pid_alive?(pid)
+        return false unless pid
+
+        # Use a cross-platform method to check if PID exists
+        if RUBY_PLATFORM =~ /mingw|mswin|win32/
+          # Windows: use tasklist
+          system("tasklist /FI \"PID eq #{pid}\" 2>NUL | find /I \"#{pid}\" >NUL")
+        else
+          # Unix-like systems: check /proc or use ps
+          begin
+            Process.kill(0, pid)
+            true
+          rescue Errno::ESRCH
+            false
+          rescue Errno::EPERM
+            # Process exists but we don't have permission to signal it
+            true
+          end
+        end
+      end
+
+      # Validate and clean up stale app statuses
+      def self.validate_app_statuses
+        apps = AppRegistry.all
+        apps.each do |app|
+          next unless app[:started_at] && app[:pid]
+
+          unless pid_alive?(app[:pid])
+            AppRegistry.update(app[:name], started_at: nil, pid: nil)
+          end
+        end
+      end
+
+      def self.find_rails_pid(port)
+        pids = Stable::Utils::Platform.find_pids_by_port(port)
+        pids.first
+      end
     end
   end
 end

data/lib/stable/utils/platform.rb

@@ -49,6 +49,35 @@ module Stable
           Dir.home
         end
 
+        def port_in_use?(port)
+          case current
+          when :macos, :linux
+            # Use lsof on Unix-like systems
+            system("lsof -i tcp:#{port} -sTCP:LISTEN > /dev/null 2>&1")
+          when :windows
+            # Use netstat on Windows
+            system("netstat -an | findstr :#{port} > nul 2>&1")
+          else
+            false
+          end
+        end
+
+        def find_pids_by_port(port)
+          case current
+          when :macos, :linux
+            # Use lsof to find PIDs listening on the port
+            output = `lsof -i tcp:#{port} -sTCP:LISTEN -t 2>/dev/null`.strip
+            return [] if output.empty?
+            output.split("\n").map(&:to_i)
+          when :windows
+            # On Windows, this is more complex. For now, return empty array
+            # Could potentially parse netstat output in the future
+            []
+          else
+            []
+          end
+        end
+
         private
 
         def detect_linux_package_manager

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stable-cli-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Danny Simfukwe