crabfarm 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10577d223677baa807f27aa55fc8f2ccf19f189
-  data.tar.gz: 7d07015295fe0325a85d73396821872e0e3542d3
+  metadata.gz: 3610a6364cc2081accde4aacc948d762f2b6ac89
+  data.tar.gz: e092a121bac1f17fcf81533d728aa4f2ef351907
 SHA512:
-  metadata.gz: 45015ef058a82381fc1db17791bb99c362c37c8bf0cf24e29d0862c76c44f006c47e60f6d2689b545be7ec564ce05857565ca7bc00d43f592cba0f58a58f658e
-  data.tar.gz: 83dc7148c8ed7b793290b0c197ad6ad10b1853d196d5c650a471cd4a26531d424177a303d82a25a4780a806d0b075683234318bef9f10f0ed1283f03f807d4df
+  metadata.gz: 355ee339b70832814a16412a1b24b86c66a466fef46f4c6e667621001f0605b77b77aea5abf88a37f6ad86bc188727ac0c2e045f891527549e9b7f03c9ed41dd
+  data.tar.gz: a72d719e6baccd90ee3f97f76ef1f9422596e6c99fb16b6bd66bb5a96e8808f30348af897acc984d42592892a5489e66ecde432a62fb7e82446f1ef952277988

data/lib/crabfarm/configuration.rb

@@ -32,7 +32,7 @@ module Crabfarm
       # Recorder configuration
       [:recorder_driver, :string, 'Recorder driver name, defaults to \'firefox\'']
     ]
-    .map { |o| Option.new *o }
+    .map { |o| Option.new(*o) }
 
     OPTIONS.each do |var|
       define_method "set_#{var.name}" do |val|
@@ -103,8 +103,7 @@ module Crabfarm
         load_images: phantom_load_images,
         proxy: proxy,
         ssl: phantom_ssl,
-        bin_path: phantom_bin_path,
-        log_file: log_path ? File.join(log_path, 'phantom.log') : nil
+        bin_path: phantom_bin_path
       }
     end
 

data/lib/crabfarm/crabtrap_runner.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'crabfarm/utils/processes'
 
 module Crabfarm
   class CrabtrapRunner
@@ -7,11 +8,11 @@ module Crabfarm
 
     def initialize(_config={})
       @config = _config;
-      @pid = nil
+      @process = nil
     end
 
     def is_running?
-      not @pid.nil?
+      not @process.nil?
     end
 
     def port
@@ -24,36 +25,33 @@ module Crabfarm
 
     def start
       logger.info "Starting crabtrap in port #{port}"
-      @pid = spawn_crabtrap
-      logger.info "Crabtrap started (PID: #{@pid})"
+      @process = spawn_crabtrap
+      logger.info "Crabtrap started (PID: #{@process.pid})"
     end
 
     def stop
-      unless @pid.nil?
-        logger.info "Stopping crabtrap (PID: #{@pid})"
-        Process.kill("INT", @pid)
-        Process.wait @pid
+      unless @process.nil?
+        logger.info "Stopping crabtrap (PID: #{@process.pid})"
+        @process.stop
+        @process = nil
         logger.info "Crabtrap stopped"
-        @pid = nil
       end
     end
 
   private
 
     def spawn_crabtrap
-      pid = nil
+      proc = nil
       begin
-        pid = Process.spawn({}, crabtrap_cmd)
+        proc = Utils::Processes.start_logged_process 'crabtrap', crabtrap_cmd, logger
         Timeout::timeout(CRABTRAP_START_TM) { wait_for_server }
-        return pid
-      rescue Errno::ENOENT
+      rescue ChildProcess::LaunchError
         raise BinaryMissingError.new 'crabtrap', @config[:bin_path]
       rescue Timeout::Error
-        Process.kill "INT", pid
-        Process.wait pid
+        proc.stop
         raise
       end
-      pid
+      proc
     end
 
     def crabtrap_cmd
@@ -61,7 +59,7 @@ module Crabfarm
       cmd << mode.to_s
       cmd << @config[:bucket_path] if mode != :pass
       cmd << "--port=#{port}"
-      cmd.join(' ')
+      cmd
     end
 
     def wait_for_server

data/lib/crabfarm/phantom_runner.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'crabfarm/utils/processes'
 
 module Crabfarm
   class PhantomRunner
@@ -7,7 +8,7 @@ module Crabfarm
 
     def initialize(_config={})
       @config = _config;
-      @pid = nil
+      @process = nil
     end
 
     def port
@@ -15,36 +16,34 @@ module Crabfarm
     end
 
     def start
-      Crabfarm.logger.info "Starting phantomjs in port #{port}"
-      @pid = spawn_phantomjs
-      Crabfarm.logger.info "Phantomjs started (PID: #{@pid})"
+      logger.info "Starting phantomjs in port #{port}"
+      @process = spawn_phantomjs
+      logger.info "Phantomjs started (PID: #{@process.pid})"
     end
 
     def stop
-      unless @pid.nil?
-        Crabfarm.logger.info "Stopping phantomjs (PID: #{@pid})"
-        Process.kill "INT", @pid
-        Process.wait @pid, Process::WNOHANG
-        Crabfarm.logger.info "Phantomjs stopped (PID: #{@pid})"
-        @pid = nil
+      unless @process.nil?
+        logger.info "Stopping phantomjs (PID: #{@process.pid})"
+        @process.stop
+        @process = nil
+        logger.info "Phantomjs stopped"
       end
     end
 
   private
 
     def spawn_phantomjs
-      pid = nil
+      proc = nil
       begin
-        pid = Process.spawn({}, phantomjs_cmd)
+        proc = Utils::Processes.start_logged_process 'phantomjs', phantomjs_cmd, logger
         Timeout::timeout(PHANTOM_START_TM) { wait_for_server }
-        return pid
-      rescue Errno::ENOENT
+      rescue ChildProcess::LaunchError
         raise BinaryMissingError.new 'phantomjs', @config[:bin_path]
       rescue Timeout::Error
-        Process.kill "INT", pid
-        Process.wait pid
+        proc.stop
         raise
       end
+      proc
     end
 
     def phantomjs_cmd
@@ -54,9 +53,8 @@ module Crabfarm
       cmd << "--webdriver=#{port}"
       cmd << "--ssl-protocol=#{@config[:ssl]}" unless @config[:ssl].nil?
       cmd << "--ignore-ssl-errors=true"
-      cmd << "--webdriver-loglevel=WARN"
-      cmd << "--webdriver-logfile=#{@config[:log_file]}" unless @config[:log_file].nil?
-      cmd.join(' ')
+      cmd << "--webdriver-loglevel=DEBUG"
+      cmd
     end
 
     def wait_for_server
@@ -69,5 +67,9 @@ module Crabfarm
       end
     end
 
+    def logger
+      Crabfarm.logger
+    end
+
   end
 end

data/lib/crabfarm/utils/processes.rb

@@ -0,0 +1,30 @@
+require 'childprocess'
+
+ChildProcess.posix_spawn = true
+
+module Crabfarm
+  module Utils
+    module Processes
+
+      def self.start_logged_process(_name, _cmd, _logger, _env={})
+        ro, wo = IO.pipe
+        re, we = IO.pipe
+
+        proc = ChildProcess.build(*_cmd)
+        proc.environment.merge! _env
+        proc.io.stdout = wo
+        proc.io.stderr = we
+        proc.start
+
+        wo.close
+        we.close
+
+        Thread.new { ro.each_line { |l| _logger.info "[#{_name.upcase}] #{l}" } }
+        Thread.new { re.each_line { |l| _logger.warn "[#{_name.upcase}] #{l}" } }
+
+        proc
+      end
+
+    end
+  end
+end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Ignacio Baixas
@@ -142,6 +142,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +434,7 @@ files:
 - lib/crabfarm/templates/state_spec.rb.erb
 - lib/crabfarm/transition_service.rb
 - lib/crabfarm/utils/port_discovery.rb
+- lib/crabfarm/utils/processes.rb
 - lib/crabfarm/version.rb
 - lib/crabfarm.rb
 - bin/crabfarm