consolle 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fdeb782267d3cb951cd1e8fece86486dc48eaf1c2e686e782b256e0dc60745e
-  data.tar.gz: d078d1aad3ca4bc063aa5ef15d67f0c66273e30a64ea822dd4a4122c173938f7
+  metadata.gz: 7b0fccfa081563dfbdbb310a8822ccca827150906aac1208e3b72fa754eb8ab6
+  data.tar.gz: 05ab3780cce3a62638540641146dae880f7cdbe75d5ede45ce71ba32433af2ec
 SHA512:
-  metadata.gz: 4afbcd6b93ea353b556000ef601acefcfd0bd0e4f76fc89053c2a20c3b72ccddd4a95ee5073f61420a310011fc2cd6df44ccbb17ee319d777645f5d97fb673e6
-  data.tar.gz: '069a0849b85439b2b9314c2e165ddba1486f86db8b30f13b4346bd137b5607799978c81a78182e6a7f1b956c061763b075a12068fd626445772f9524a6705a4a'
+  metadata.gz: 45c5bff6c8b43e6029fb1e4d0f12cc83ce2f5925f0882c8b628394868b52f119c92e4fcc6dccaae7190e72ebdf30cc71cc1b7aeb021f6c9fbaff127fd67b9524
+  data.tar.gz: e96701a1acea38c2c90c51e4c5df56ff9e038e48551b5d34c3d17d74b4c6ad0044a8123553e1ebf2000415654da192a5f60890924b08ab904d9ad13ee8728512

data/.version

@@ -1 +1 @@
-0.2.6
+0.2.7

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 # Ruby 3.4.0+ requires base64 as a gem
-gem "base64", "~> 0.2"
+gem 'base64', '~> 0.2'

data/Gemfile.lock

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

data/bin/cone

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../lib/consolle"
+require_relative '../lib/consolle'
 
-Consolle::CLI.start(ARGV)
+Consolle::CLI.start(ARGV)

data/bin/consolle

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative "../lib/consolle"
+require_relative '../lib/consolle'
 
-Consolle::CLI.start(ARGV)
+Consolle::CLI.start(ARGV)

data/consolle.gemspec

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require_relative "lib/consolle/version"
+require_relative 'lib/consolle/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "consolle"
+  spec.name          = 'consolle'
   spec.version       = Consolle::VERSION
-  spec.authors       = ["nacyot"]
-  spec.email         = ["propellerheaven@gmail.com"]
+  spec.authors       = ['nacyot']
+  spec.email         = ['propellerheaven@gmail.com']
 
-  spec.summary       = "PTY-based Rails console management library"
-  spec.description   = "Consolle is a library that manages Rails console through PTY (Pseudo-Terminal). Moving away from the traditional eval-based execution method, it manages the actual Rails console process as a subprocess to provide a more stable and secure execution environment."
-  spec.homepage      = "https://github.com/nacyot/consolle"
-  spec.required_ruby_version = ">= 3.1.0"
-  spec.license       = "MIT"
+  spec.summary       = 'PTY-based Rails console management library'
+  spec.description   = 'Consolle is a library that manages Rails console through PTY (Pseudo-Terminal). Moving away from the traditional eval-based execution method, it manages the actual Rails console process as a subprocess to provide a more stable and secure execution environment.'
+  spec.homepage      = 'https://github.com/nacyot/consolle'
+  spec.required_ruby_version = '>= 3.1.0'
+  spec.license = 'MIT'
 
   spec.metadata = {
-    "homepage_uri" => spec.homepage,
-    "source_code_uri" => "https://github.com/nacyot/consolle",
-    "changelog_uri" => "https://github.com/nacyot/consolle/blob/main/CHANGELOG.md",
-    "bug_tracker_uri" => "https://github.com/nacyot/consolle/issues",
-    "rubygems_mfa_required" => "true"
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => 'https://github.com/nacyot/consolle',
+    'changelog_uri' => 'https://github.com/nacyot/consolle/blob/main/CHANGELOG.md',
+    'bug_tracker_uri' => 'https://github.com/nacyot/consolle/issues',
+    'rubygems_mfa_required' => 'true'
   }
 
   # Specify which files should be added to the gem when it is released.
@@ -27,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = "bin"
+  spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   # Runtime dependencies
-  spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "logger", "~> 1.0"
+  spec.add_dependency 'logger', '~> 1.0'
+  spec.add_dependency 'thor', '~> 1.0'
 
   # Development dependencies
-  spec.add_development_dependency "rspec", "~> 3.0"
-end
+  spec.add_development_dependency 'rspec', '~> 3.0'
+end

data/lib/consolle/adapters/rails_console.rb

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
 
-require "socket"
-require "json"
-require "timeout"
-require "securerandom"
-require "fileutils"
+require 'socket'
+require 'json'
+require 'timeout'
+require 'securerandom'
+require 'fileutils'
 
 module Consolle
   module Adapters
     class RailsConsole
       attr_reader :socket_path, :process_pid, :pid_path, :log_path
 
-      def initialize(socket_path: nil, pid_path: nil, log_path: nil, rails_root: nil, rails_env: nil, verbose: false, command: nil)
+      def initialize(socket_path: nil, pid_path: nil, log_path: nil, rails_root: nil, rails_env: nil, verbose: false,
+                     command: nil)
         @socket_path = socket_path || default_socket_path
         @pid_path = pid_path || default_pid_path
         @log_path = log_path || default_log_path
         @rails_root = rails_root || Dir.pwd
-        @rails_env = rails_env || "development"
+        @rails_env = rails_env || 'development'
         @verbose = verbose
-        @command = command || "bin/rails console"
+        @command = command || 'bin/rails console'
         @server_pid = nil
       end
 
@@ -27,14 +28,14 @@ module Consolle
 
         # Start socket server daemon
         start_server_daemon
-        
+
         # Wait for server to be ready
         wait_for_server(timeout: 10)
-        
+
         # Get server status
         status = get_status
-        @server_pid = status["pid"] if status && status["success"]
-        
+        @server_pid = status['pid'] if status && status['success']
+
         true
       rescue StandardError => e
         stop_server_daemon
@@ -57,10 +58,10 @@ module Consolle
 
       def running?
         return false unless File.exist?(@socket_path)
-        
+
         # Check if socket is responsive
         status = get_status
-        status && status["success"] && status["running"]
+        status && status['success'] && status['running']
       rescue StandardError
         false
       end
@@ -69,50 +70,48 @@ module Consolle
         # Return the server daemon PID from pid file
         pid_file = @pid_path
         return nil unless File.exist?(pid_file)
-        
+
         File.read(pid_file).strip.to_i
       rescue StandardError
         nil
       end
 
       def send_code(code, timeout: 15)
-        unless running?
-          raise RuntimeError, "Console is not running"
-        end
+        raise 'Console is not running' unless running?
 
         request = {
-          "action" => "eval",
-          "code" => code,
-          "timeout" => timeout,
-          "request_id" => SecureRandom.uuid
+          'action' => 'eval',
+          'code' => code,
+          'timeout' => timeout,
+          'request_id' => SecureRandom.uuid
         }
 
         response = send_request(request, timeout: timeout + 5)
-        
+
         # Format response for compatibility
-        if response["success"]
+        if response['success']
           {
-            "success" => true,
-            "result" => response["result"],
-            "execution_time" => response["execution_time"],
-            "request_id" => response["request_id"]
+            'success' => true,
+            'result' => response['result'],
+            'execution_time' => response['execution_time'],
+            'request_id' => response['request_id']
           }
         else
           {
-            "success" => false,
-            "error" => response["error"] || "Unknown",
-            "message" => response["message"] || "Unknown error",
-            "request_id" => response["request_id"]
+            'success' => false,
+            'error' => response['error'] || 'Unknown',
+            'message' => response['message'] || 'Unknown error',
+            'request_id' => response['request_id']
           }
         end
       end
 
       def get_status
         request = {
-          "action" => "status",
-          "request_id" => SecureRandom.uuid
+          'action' => 'status',
+          'request_id' => SecureRandom.uuid
         }
-        
+
         send_request(request, timeout: 5)
       rescue StandardError
         nil
@@ -121,30 +120,30 @@ module Consolle
       private
 
       def default_socket_path
-        File.join(Dir.pwd, "tmp", "cone", "cone.socket")
+        File.join(Dir.pwd, 'tmp', 'cone', 'cone.socket')
       end
 
       def default_pid_path
-        File.join(Dir.pwd, "tmp", "cone", "cone.pid")
+        File.join(Dir.pwd, 'tmp', 'cone', 'cone.pid')
       end
 
       def default_log_path
-        File.join(Dir.pwd, "tmp", "cone", "cone.log")
+        File.join(Dir.pwd, 'tmp', 'cone', 'cone.log')
       end
 
       def server_command
-        consolle_lib_path = File.expand_path("../..", __dir__)
-        
+        consolle_lib_path = File.expand_path('../..', __dir__)
+
         # Build server command
         [
-          "ruby",
-          "-I", consolle_lib_path,
-          "-e", server_script,
-          "--",
+          'ruby',
+          '-I', consolle_lib_path,
+          '-e', server_script,
+          '--',
           @socket_path,
           @rails_root,
           @rails_env,
-          @verbose ? "debug" : "info",
+          @verbose ? 'debug' : 'info',
           @pid_path,
           @log_path,
           @command
@@ -156,31 +155,31 @@ module Consolle
           begin
             require 'consolle/server/console_socket_server'
             require 'logger'
-            
+          #{'  '}
             socket_path, rails_root, rails_env, log_level, pid_path, log_path, command = ARGV
-            
+          #{'  '}
             # Write initial log
             log_file = log_path || socket_path.sub(/\\.socket$/, '.log')
             File.open(log_file, 'a') { |f| f.puts "[Server] Starting... PID: \#{Process.pid}" }
-            
+          #{'  '}
             # Daemonize
             Process.daemon(true, false)
-            
+          #{'  '}
             # Redirect output
             $stdout.reopen(log_file, 'a')
             $stderr.reopen(log_file, 'a')
             $stdout.sync = $stderr.sync = true
-            
+          #{'  '}
             # Write PID file
             pid_file = pid_path || socket_path.sub(/\\.socket$/, '.pid')
             File.write(pid_file, Process.pid.to_s)
-            
+          #{'  '}
             puts "[Server] Daemon started, PID: \#{Process.pid}"
-            
+          #{'  '}
             # Create logger with appropriate level
             logger = Logger.new(log_file)
             logger.level = (log_level == 'debug') ? Logger::DEBUG : Logger::INFO
-            
+          #{'  '}
             # Start server
             server = Consolle::Server::ConsoleSocketServer.new(
               socket_path: socket_path,
@@ -189,12 +188,12 @@ module Consolle
               logger: logger,
               command: command
             )
-            
+          #{'  '}
             puts "[Server] Starting server with log level: \#{log_level}..."
             server.start
-            
+          #{'  '}
             puts "[Server] Server started, entering sleep..."
-            
+          #{'  '}
             # Keep running
             sleep
           rescue => e
@@ -209,7 +208,7 @@ module Consolle
         # Ensure directory exists
         socket_dir = File.dirname(@socket_path)
         FileUtils.mkdir_p(socket_dir) unless Dir.exist?(socket_dir)
-        
+
         # Start server process
         log_file = @log_path
         pid = Process.spawn(
@@ -217,7 +216,7 @@ module Consolle
           out: log_file,
           err: log_file
         )
-        
+
         Process.detach(pid)
       end
 
@@ -225,27 +224,32 @@ module Consolle
         # Read PID file
         pid_file = @pid_path
         return unless File.exist?(pid_file)
-        
+
         pid = File.read(pid_file).to_i
-        
+
         # Kill process
         begin
-          Process.kill("TERM", pid)
-          
+          Process.kill('TERM', pid)
+
           # Wait for socket to disappear
           10.times do
             break unless File.exist?(@socket_path)
+
             sleep 0.1
           end
-          
+
           # Force kill if needed
           if File.exist?(@socket_path)
-            Process.kill("KILL", pid) rescue nil
+            begin
+              Process.kill('KILL', pid)
+            rescue StandardError
+              nil
+            end
           end
         rescue Errno::ESRCH
           # Process already dead
         end
-        
+
         # Clean up files
         File.unlink(@socket_path) if File.exist?(@socket_path)
         File.unlink(pid_file) if File.exist?(pid_file)
@@ -253,43 +257,44 @@ module Consolle
 
       def wait_for_server(timeout: 10)
         deadline = Time.now + timeout
-        
+
         while Time.now < deadline
           return true if File.exist?(@socket_path) && get_status
+
           sleep 0.1
         end
-        
+
         raise "Server failed to start within #{timeout} seconds"
       end
 
       def send_request(request, timeout: 30)
         Timeout.timeout(timeout) do
           socket = UNIXSocket.new(@socket_path)
-          
+
           # Send request
           socket.write(JSON.generate(request))
           socket.write("\n")
           socket.flush
-          
+
           # Read response
           response_data = socket.gets
           socket.close
-          
+
           JSON.parse(response_data)
         end
       rescue Timeout::Error
         {
-          "success" => false,
-          "error" => "Timeout",
-          "message" => "Request timed out after #{timeout} seconds"
+          'success' => false,
+          'error' => 'Timeout',
+          'message' => "Request timed out after #{timeout} seconds"
         }
       rescue StandardError => e
         {
-          "success" => false,
-          "error" => e.class.name,
-          "message" => e.message
+          'success' => false,
+          'error' => e.class.name,
+          'message' => e.message
         }
       end
     end
   end
-end
+end