bbq-spawn 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a8f9fac05331610bc6102d7fa7d217da2eb4678
-  data.tar.gz: 5a064347a18bfff381c1bf3f54ee028b35ececc4
+  metadata.gz: e4f5ae7e33b564356d09ab25299a44229cc0683a
+  data.tar.gz: b989fe07377ea98cbe2186f24359fd29a375aca7
 SHA512:
-  metadata.gz: 4a5f758fe1dc8493ab42eef3cda068e329d2dcda26001b8b5873539c049d5ccbc8885626157617976c2800da371cd9372a7f647a39a10f671192ba467a9eecd7
-  data.tar.gz: be65348d806a6323a606005bf87c4f23fa11d37bb3be72b7134826b693febe57ac6641641edf424b356316c5eee213262ab7102d074536da600a614d71bcbe13
+  metadata.gz: 8a08a057d2a2aa186aa7605f2c0d1fd388ecb9003726c1924c1d64e1a564ea50fd0e674ae424b0db0e496de74400b79c031c92e95f0254ef420dad78d3c7baba
+  data.tar.gz: c0300a7274ec23f7414a77f58ad19173ab389b73ceacb7d70486fe903cde3875bbae91378551abace14b38985ea049c4255de40273ff6a8ee77a94f67869096f

data/lib/bbq/builtin_strategies.rb

@@ -0,0 +1,25 @@
+module Bbq
+  module Spawn
+    module IOStrategy
+      class Squelch
+        def initialize(writer)
+          @writer = writer
+        end
+
+        def run(io)
+          io.stdout = io.stderr = @writer
+        end
+
+        def after_spawn
+          @writer.close
+        end
+      end
+
+      class Inherit
+        def run(io)
+          io.inherit!
+        end
+      end
+    end
+  end
+end

data/lib/bbq/spawn.rb

@@ -1,8 +1,10 @@
 require "bbq/spawn/version"
+require 'bbq/builtin_strategies'
 require "childprocess"
 require "forwardable"
 require "socket"
 require "timeout"
+require "uri"
 require "net/http"
 
 module Bbq
@@ -10,9 +12,12 @@ module Bbq
     class Executor
       extend Forwardable
 
+      attr_accessor :io_strategy
+
       def_delegators :@process, :start, :stop, :io
 
       def initialize(*args)
+        @strategy = :mute
         @process = ChildProcess.build(*args)
         yield @process if block_given?
         @process
@@ -33,12 +38,14 @@ module Bbq
         @url      = options[:url]
 
         @reader, @writer = IO.pipe
+
+        @strategy = options[:strategy] || IOStrategy::Squelch.new(@writer)
       end
 
       def start
-        @executor.io.stdout = @executor.io.stderr = @writer
+        @strategy.run(@executor.io)
         @executor.start
-        @writer.close
+        @strategy.after_run if @strategy.respond_to? :after_run
       end
 
       def join
@@ -47,15 +54,13 @@ module Bbq
           wait_for_socket   if @port and @host
           wait_for_response if @url
         end
-      rescue Timeout::Error
       end
 
       private
       def wait_for_io
         loop do
-          case @reader.readpartial(8192)
-          when @banner then break
-          end
+          output = @reader.readpartial(8192)
+          break if output.include?(@banner)
         end
       rescue EOFError
       end
@@ -72,13 +77,14 @@ module Bbq
       end
 
       def wait_for_response
+        uri = URI.parse(@url)
         begin
-          Net::HTTP.start(@url) do |http|
+          Net::HTTP.start(uri.host, uri.port) do |http|
             http.open_timeout = 5
             http.read_timeout = 5
-            http.head('/')
+            http.head(uri.path)
           end
-        rescue SocketError
+        rescue SocketError, IOError, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
           retry
         end
       end

data/lib/bbq/spawn/version.rb

@@ -1,5 +1,5 @@
 module Bbq
   module Spawn
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: bbq-spawn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paweł Pacana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Spawn and coordinate background processes for black box testing.
@@ -59,12 +59,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bbq-spawn.gemspec
+- lib/bbq/builtin_strategies.rb
 - lib/bbq/spawn.rb
 - lib/bbq/spawn/version.rb
 homepage: ''
@@ -77,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Spawn and coordinate background processes for black box testing.