crabfarm 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58ed7568693ec48b019ca4bf3d8051073938d1b
-  data.tar.gz: c0853a7063ef07de79950d23802993c5d5f4bc27
+  metadata.gz: c550699098370495349bb242274fee302050ec25
+  data.tar.gz: e422e85f42e800ed20c692e2d68e985962de9ae4
 SHA512:
-  metadata.gz: cd5f294f3424f16316633894cfa3e25bfa464ef3a56aaa099d572a1eaf74873de840e89ee7afd7ff7f047f261d7179a9fb9c85c6549ba69b09cb4228e0a93a8c
-  data.tar.gz: a27f2e4ff7adef226539f4ff24301d0c6c2162c47b4a35d519a1737aa0bc4d76878c1b5518cd4de1e5e47454393ba6ac08880364008bd1a620296e7c3c0e4763
+  metadata.gz: 72c0cfe98b46fec0d071b0d03ccec46307fc2698862aa11a11ed25d0bcd2b65c99502ab14c202b0d4da0c47757353ca4ff824262e36f0d57f84ce37177cb09ac
+  data.tar.gz: d519fa4e7b65275ffac76922654a10199f4e222a35a3789960e1d2baf1cc084260c10f966b7a3b3081aeea1b3e4a82f7aff66af71a19fae5a3a17a1e91df39ea

data/lib/crabfarm/utils/processes.rb

@@ -1,5 +1,5 @@
 require 'childprocess'
-require 'crabfarm/utils/stream_dumper'
+require 'linedump'
 
 ChildProcess.posix_spawn = true
 
@@ -22,8 +22,8 @@ module Crabfarm::Utils
       we.close
 
       # register log consumers
-      StreamDumper.register_stream(ro) { |l| _logger.info "[#{_name.upcase}] #{l}" }
-      StreamDumper.register_stream(re) { |l| _logger.warn "[#{_name.upcase}] #{l}" }
+      Linedump.each_line(ro) { |l| _logger.info "[#{_name.upcase}] #{l}" }
+      Linedump.each_line(re) { |l| _logger.warn "[#{_name.upcase}] #{l}" }
 
       proc
     end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ignacio Baixas
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: linedump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -540,7 +554,6 @@ files:
 - lib/crabfarm/utils/processes.rb
 - lib/crabfarm/utils/resolve.rb
 - lib/crabfarm/utils/rspec_runner.rb
-- lib/crabfarm/utils/stream_dumper.rb
 - lib/crabfarm/utils/webdriver.rb
 - lib/crabfarm/version.rb
 homepage: https://github.com/platanus/crabfarm-gem

data/lib/crabfarm/utils/stream_dumper.rb

@@ -1,142 +0,0 @@
-require 'thwait'
-
-module Crabfarm::Utils
-
-  class StreamDumper
-
-    class Reload < StandardError; end
-
-    def self.consumer
-      @@consumer ||= self.new
-    end
-
-    def self.register_stream(_stream, &_block)
-      consumer.register_stream _stream, &_block
-      consumer.restart
-    end
-
-    def initialize
-      @streams = []
-      @lock = Mutex.new
-      @worker = nil
-    end
-
-    def register_stream(_stream, &_block)
-      @lock.synchronize { @streams << Wrapper.new(_stream, _block) }
-    end
-
-    def restart
-      @lock.synchronize do
-        if @worker and @worker.alive?
-          @worker.raise Reload # signal worker to reload streams
-        else
-          @worker = load_worker
-        end
-      end
-    end
-
-  private
-
-    def load_worker
-      Thread.new do
-        looped = 0
-        begin
-          while @streams.count > 0
-            all_streams = dump_streams
-            result = IO.select(all_streams << $stdin, [], all_streams)
-            if result
-              process_ready_streams result[0]
-              discard_errored_streams result[2]
-            end
-            looped += 1
-          end
-        rescue Reload
-          retry
-        rescue SystemExit
-          # nothing
-        end
-      end
-    end
-
-    def process_ready_streams(_streams)
-      _streams.each do |stream|
-        wrapper = find_stream_wrapper stream
-        if wrapper
-          wrapper.process_lines
-          remove_wrapper wrapper, :eof if wrapper.eof?
-        end
-      end
-    end
-
-    def discard_errored_streams(_streams)
-      _streams.each do |stream|
-        wrapper = find_stream_wrapper stream
-        remove_wrapper wrapper, :error if wrapper
-      end
-    end
-
-    def find_stream_wrapper(_stream)
-      @streams.find { |s| s.stream == _stream }
-    end
-
-    def remove_wrapper(_wrapper, _reason)
-      @lock.synchronize { @streams.delete _wrapper }
-    end
-
-    def dump_streams
-      @streams.map(&:stream)
-    end
-
-    class Wrapper
-
-      MAX_LENGTH = 2048
-
-      attr_reader :stream
-
-      def initialize(_stream, _block)
-        @stream = _stream
-        @block = _block
-        @buffer = []
-        @eof = false
-      end
-
-      def eof?
-        @eof
-      end
-
-      def process_lines
-        begin
-          loop do
-            chunk = @stream.read_nonblock(MAX_LENGTH)
-            process_chunk chunk
-          end
-        rescue IO::WaitReadable
-          # nothing, just stop looping
-        rescue EOFError
-          @eof = true
-        rescue Exception => exc
-          puts "Error in stream consumer: #{exc}"
-          @eof = true
-        end
-      end
-
-      def process_chunk(_chunk)
-        index = _chunk.index $/
-
-        unless index.nil?
-          head = _chunk[0..index-1]
-          tail = _chunk[index+1..-1]
-
-          @block.call(@buffer.join + head)
-          @buffer.clear
-
-          process_chunk tail
-        else
-          @buffer << _chunk
-        end
-      end
-
-    end
-
-  end
-end