consolle 0.2.9 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 826cb825a86940fa018abc635b0c7b5914999d85da2c079801d7b98a85166adb
-  data.tar.gz: 919448817dd2064b93214be249eeb840bb328ef3c907ab9f8456daf2a8d45992
+  metadata.gz: 985e37c4ac0dab7d0404e36898e75e23e4337a9d5e57b379f4e4f6b57e6461b2
+  data.tar.gz: fe8fa63ff1d743359391c81a0d3f1a472d494f72eb86a88d6be1e852d1f57e5f
 SHA512:
-  metadata.gz: a3fb3a9902a388e4fe3d551e867c4d6ceec83aff1087e54a48f972c5bb1e029b9216ca4baa5a7c83d1eeee9905285607093cb09e790eda60583f7a66efa501d3
-  data.tar.gz: 4a5de0ff45adc32c57a35595b6743133a7f4d5cf1911d0c6dba50c5cd1ae11b0779942845af3a69d8d01c6ddb77745a81d106dfa2639b3e41ee34c91c593fcf2
+  metadata.gz: d490d26a53d2db34d1943c162dcbeea8b359632c36846ddf803afcee7b6d93f11cc1e759e9e06b66b743d2fd38c2d8ba71a39ac5623318f106227229bf977ad6
+  data.tar.gz: 94610670b7059fe04fff2fb143b63502c29171b3f435c06f808897f74cbd05e16732efcf89ea9a27e4944680501d0b7ed93879ce10e5b67b02e57349ada15815

data/.version

@@ -1 +1 @@
-0.2.9
+0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    consolle (0.2.9)
+    consolle (0.3.1)
       logger (~> 1.0)
       thor (~> 1.0)
 

data/lib/consolle/adapters/rails_console.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'timeout'
 require 'securerandom'
 require 'fileutils'
+require_relative '../constants'
 
 module Consolle
   module Adapters
@@ -20,7 +21,7 @@ module Consolle
         @rails_env = rails_env || 'development'
         @verbose = verbose
         @command = command || 'bin/rails console'
-        @wait_timeout = wait_timeout || 15
+        @wait_timeout = wait_timeout || Consolle::DEFAULT_WAIT_TIMEOUT
         @server_pid = nil
       end
 
@@ -270,13 +271,20 @@ module Consolle
         File.unlink(pid_file) if File.exist?(pid_file)
       end
 
-      def wait_for_server(timeout: 15)
+      def wait_for_server(timeout: Consolle::DEFAULT_WAIT_TIMEOUT)
         deadline = Time.now + timeout
         server_pid = nil
         error_found = false
         error_message = nil
         last_log_check = Time.now
         ssh_auth_detected = false
+        
+        # Record the initial log file position to avoid reading old errors
+        initial_log_pos = if File.exist?(@log_path)
+                           File.size(@log_path)
+                         else
+                           0
+                         end
 
         puts "Waiting for console to start (timeout: #{timeout}s)..." if @verbose
 
@@ -290,12 +298,15 @@ module Consolle
             rescue Errno::ESRCH
               # Process died - check log for error
               if File.exist?(@log_path)
-                log_content = File.read(@log_path)
-                if log_content.include?('[Server] Error:')
-                  error_lines = log_content.lines.grep(/\[Server\] Error:/)
-                  error_message = error_lines.last.strip if error_lines.any?
-                else
-                  error_message = "Server process died unexpectedly"
+                File.open(@log_path, 'r') do |f|
+                  f.seek(initial_log_pos)
+                  log_content = f.read
+                  if log_content.include?('[Server] Error:')
+                    error_lines = log_content.lines.grep(/\[Server\] Error:/)
+                    error_message = error_lines.last.strip if error_lines.any?
+                  else
+                    error_message = "Server process died unexpectedly"
+                  end
                 end
               else
                 error_message = "Server process died unexpectedly"
@@ -308,29 +319,32 @@ module Consolle
           # Check log file periodically for errors or SSH auth messages
           if Time.now - last_log_check > 0.5
             last_log_check = Time.now
-            if File.exist?(@log_path)
-              log_content = File.read(@log_path)
-              
-              # Check for explicit errors
-              if log_content.include?('[Server] Error:')
-                error_lines = log_content.lines.grep(/\[Server\] Error:/)
-                error_message = error_lines.last.strip if error_lines.any?
-                error_found = true
-                break
-              end
-              
-              # Check for SSH authentication messages
-              if !ssh_auth_detected && (log_content.include?('SSH') || 
-                                       log_content.include?('ssh') || 
-                                       log_content.include?('Authenticating') ||
-                                       log_content.include?('authentication') ||
-                                       log_content.include?('1Password') ||
-                                       @command.include?('kamal') ||
-                                       @command.include?('ssh'))
-                ssh_auth_detected = true
-                puts "SSH authentication detected, extending timeout..." if @verbose
-                # Extend deadline for SSH auth
-                deadline = Time.now + [timeout, 60].max
+            if File.exist?(@log_path) && File.size(@log_path) > initial_log_pos
+              File.open(@log_path, 'r') do |f|
+                f.seek(initial_log_pos)
+                log_content = f.read
+                
+                # Check for explicit errors
+                if log_content.include?('[Server] Error:')
+                  error_lines = log_content.lines.grep(/\[Server\] Error:/)
+                  error_message = error_lines.last.strip if error_lines.any?
+                  error_found = true
+                  break
+                end
+                
+                # Check for SSH authentication messages
+                if !ssh_auth_detected && (log_content.include?('SSH') || 
+                                         log_content.include?('ssh') || 
+                                         log_content.include?('Authenticating') ||
+                                         log_content.include?('authentication') ||
+                                         log_content.include?('1Password') ||
+                                         @command.include?('kamal') ||
+                                         @command.include?('ssh'))
+                  ssh_auth_detected = true
+                  puts "SSH authentication detected, extending timeout..." if @verbose
+                  # Extend deadline for SSH auth
+                  deadline = Time.now + [timeout, 60].max
+                end
               end
             end
           end

data/lib/consolle/cli.rb

@@ -7,6 +7,7 @@ require 'socket'
 require 'timeout'
 require 'securerandom'
 require 'date'
+require_relative 'constants'
 require_relative 'adapters/rails_console'
 
 module Consolle
@@ -132,7 +133,7 @@ module Consolle
     LONGDESC
     method_option :rails_env, type: :string, aliases: '-e', desc: 'Rails environment', default: 'development'
     method_option :command, type: :string, aliases: '-c', desc: 'Custom console command', default: 'bin/rails console'
-    method_option :wait_timeout, type: :numeric, aliases: '-w', desc: 'Timeout for console startup (seconds)', default: 15
+    method_option :wait_timeout, type: :numeric, aliases: '-w', desc: 'Timeout for console startup (seconds)', default: Consolle::DEFAULT_WAIT_TIMEOUT
     def start
       ensure_rails_project!
       ensure_project_directories

data/lib/consolle/constants.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Consolle
+  # Default timeout for console startup (in seconds)
+  DEFAULT_WAIT_TIMEOUT = 25
+end

data/lib/consolle/server/console_supervisor.rb

@@ -4,6 +4,7 @@ require 'pty'
 require 'timeout'
 require 'fcntl'
 require 'logger'
+require_relative '../constants'
 require_relative '../errors'
 
 # Ruby 3.4.0+ extracts base64 as a default gem
@@ -32,7 +33,7 @@ module Consolle
         @rails_env = rails_env
         @command = command || 'bin/rails console'
         @logger = logger || Logger.new(STDOUT)
-        @wait_timeout = wait_timeout || 15
+        @wait_timeout = wait_timeout || Consolle::DEFAULT_WAIT_TIMEOUT
         @pid = nil
         @reader = nil
         @writer = nil
@@ -317,6 +318,13 @@ module Consolle
               chunk = @reader.read_nonblock(4096)
               output << chunk
               marker_found = output.include?(marker)
+              
+              # Respond to cursor position request during initialization
+              if chunk.include?("\e[6n")
+                logger.debug "[ConsoleSupervisor] Detected cursor position request during init, sending response"
+                @writer.write("\e[1;1R")
+                @writer.flush
+              end
             rescue IO::WaitReadable
               IO.select([@reader], nil, nil, 0.1)
             rescue Errno::EIO
@@ -387,12 +395,17 @@ module Consolle
 
       def wait_for_prompt(timeout: 15, consume_all: false)
         output = +''
-        deadline = Time.now + timeout
+        start_time = Time.now
+        deadline = start_time + timeout
         prompt_found = false
         last_data_time = Time.now
 
+        logger.info "[ConsoleSupervisor] Waiting for prompt with timeout: #{timeout}s (deadline: #{deadline}, now: #{start_time})"
+
         loop do
-          if Time.now > deadline
+          current_time = Time.now
+          if current_time > deadline
+            logger.error "[ConsoleSupervisor] Timeout reached. Current: #{current_time}, Deadline: #{deadline}, Elapsed: #{current_time - start_time}s"
             logger.error "[ConsoleSupervisor] Output so far: #{output.inspect}"
             logger.error "[ConsoleSupervisor] Stripped: #{strip_ansi(output).inspect}"
             raise Timeout::Error, "No prompt after #{timeout} seconds"
@@ -414,6 +427,13 @@ module Consolle
             last_data_time = Time.now
             logger.debug "[ConsoleSupervisor] Got chunk: #{chunk.inspect}"
 
+            # Respond to cursor position request (ESC[6n)
+            if chunk.include?("\e[6n")
+              logger.debug "[ConsoleSupervisor] Detected cursor position request, sending response"
+              @writer.write("\e[1;1R")  # Report cursor at position 1,1
+              @writer.flush
+            end
+
             clean = strip_ansi(output)
             # Check each line for prompt pattern
             clean.lines.each do |line|

data/lib/consolle.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'consolle/version'
+require_relative 'consolle/constants'
 require_relative 'consolle/errors'
 require_relative 'consolle/cli'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consolle
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.1
 platform: ruby
 authors:
 - nacyot
@@ -79,6 +79,7 @@ files:
 - lib/consolle.rb
 - lib/consolle/adapters/rails_console.rb
 - lib/consolle/cli.rb
+- lib/consolle/constants.rb
 - lib/consolle/errors.rb
 - lib/consolle/server/console_socket_server.rb
 - lib/consolle/server/console_supervisor.rb