turbot-runner 0.0.23 → 0.0.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI0ZTFhZmVhMGZiNmU0NzRiYjkzYmZlZjIyMWEzMWY3MDU0NTIwNA==
+    YTNmMmJmZDNkNDllMTk0MjFmYTkxOTMxZWI3NzNiYjdlYzQ2NzgzMg==
   data.tar.gz: !binary |-
-    M2JlMWRiMjRlZjI0MDI5MTAxZjVhZjEwZDFlNTVkMGJmOGMxNDQwNA==
+    MThhNmM4ZGM3OTU2NDAyZGRkM2EzZTE2ZTA4ZDQzMjFmNTE3ODFmNw==
 SHA512:
   metadata.gz: !binary |-
-    ZWYzMjIxYzAzNDU0YWRlNzNjYjNmODQyY2E0MTBiNzQyMzc0Yjc4M2U2NThj
-    MjdiZDVkZTA1Nzg5ZmVhNmUxMWZmMzA3OTdlOTJlZDJkZmQxODkxMTg1OGM4
-    ZmMxZjJmN2M1YWIzM2NiOTA1ZjM5Nzg3NzY2YzM3NzRhZjJiM2Q=
+    Yjc0NjdiZTc2NWE1NzAwMGIzMTBhNTIxNGE5YmQ4ZjFmMWMwZjcyMWJlYWFk
+    ZDM0YjcyNDRiYTE2MjMzOTQ4MDA4YzkwNjAzOGUyOGNjNmI3Y2U3YzEwODdk
+    YmQ1ZjYzYjdmNGY5ODIwZjZhMjQ5ODQ5OThlNWU4MDg1M2I5ODM=
   data.tar.gz: !binary |-
-    OWJmMDcwMTFiYmNmMmJlOThhYzQ1ZWRhZGQ5ZmU4NTZkYjMwYjVmZmUzM2E3
-    MzBhZTgzYjk5NmMxNjBlM2MzZDFlOTQ4ZTJiZTI0NGMwNDYxNDA5NmM3MDBl
-    OGYwMWI0ZDg3ZDI4NmYyNGQ3MTAzY2VkZjkzOGQyY2M2OWZjNTU=
+    YjNkMDAyMTBkYjY4YTg5ZWM5NDdlOGE2OWE5OGNkMzRkMDI1MjA4OWJjMDQ3
+    NTJiODM4MzIzNDQ2ZDg2ZTNlZDJkYTNmMzk4ODExODlhOTdjNTU0NDc5MmI1
+    NWIyMTY2MTVjOGI1OWYxNmNjMzJlOTdlZDU1Yzk0NzQxODc1ZmQ=

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

data/lib/turbot_runner.rb

@@ -1,9 +1,11 @@
 #require 'active_support/core_ext/hash/slice'
 #require 'active_support/core_ext/object/to_query'
 require 'json'
+require 'json-schema'
 require 'open3'
 require 'set'
 require 'timeout'
+require 'io/wait'
 
 module TurbotRunner
   class ScriptError < StandardError; end
@@ -128,20 +130,33 @@ module TurbotRunner
           @status = :successful
           handle_successful_run
         end
+
+        handle_stderr(scraper_runner.drain_stderr)
+
+        transformers.each do |transformer|
+          runner = transformer['runner']
+          handle_stderr(runner.drain_stderr)
+        end
+
       rescue ScriptError => e
         if @interrupted
           @status = :interrupted
           handle_interrupted_run
         else
           @status = :failed
-          @error = e
           handle_failed_run
         end
       end
     ensure
+      handle_stderr(scraper_runner.drain_stderr)
       scraper_runner.close unless scraper_runner.nil?
+
       transformers.each do |transformer|
-        transformer['runner'].close unless transformer['runner'].nil?
+        runner = transformer['runner']
+        if !runner.nil?
+          handle_stderr(runner.drain_stderr)
+          runner.close
+        end
       end
     end
 
@@ -226,8 +241,8 @@ module TurbotRunner
     def handle_interrupted_run
     end
 
-    def handle_failed_run
-      raise NotImplementedError
+    def handle_stderr(data)
+      $stderr.write(data)
     end
 
     def scraper_file
@@ -278,6 +293,14 @@ module TurbotRunner
       end
     end
 
+    def drain_stderr
+      output = ''
+      while @stderr.ready?
+        output += @stderr.read(256)
+      end
+      output
+    end
+
     def success?
       if finished?
         @wait_thread.value.success?
@@ -291,7 +314,7 @@ module TurbotRunner
     end
 
     def raise_if_failed!
-      raise TurbotRunner::ScriptError.new(@stderr.read()) if failed?
+      raise TurbotRunner::ScriptError if failed?
     end
 
     def finished?

data/spec/dummy-bot-python/scraper.py

@@ -1,6 +1,11 @@
+from __future__ import print_function
+
 import json
+import sys
+
+print('hello from python', file=sys.stderr)
 
-print json.dumps({'n': 5, 'hello': 'hello, 5'})
-print json.dumps({'n': 6, 'hello': 'hello, 6'})
-print json.dumps({'n': 7})
-print json.dumps({'n': 8, 'hello': 'hello, 8'})
+print(json.dumps({'n': 5, 'hello': 'hello, 5'}))
+print(json.dumps({'n': 6, 'hello': 'hello, 6'}))
+print(json.dumps({'n': 7}))
+print(json.dumps({'n': 8, 'hello': 'hello, 8'}))

data/spec/dummy-bot-ruby/scraper.rb

@@ -1,5 +1,7 @@
 require 'json'
 
+$stderr.puts('hello from ruby')
+
 puts({:n => 1, :hello => 'hello, 1'}.to_json)
 puts({:n => 2, :hello => 'hello, 2'}.to_json)
 puts({:n => 3}.to_json)

data/spec/dummy-broken-bot-ruby/scraper.rb

@@ -1,4 +1,6 @@
 require 'json'
 
+$stderr.puts('hello')
+
 puts({h: 1}.to_json)
 raise "oops"

data/spec/turbot_runner_spec.rb

@@ -9,6 +9,9 @@ class SpecRunner < TurbotRunner::BaseRunner
       []
     end
   end
+
+  def handle_failed_run
+  end
 end
 
 class BrokenRunner < TurbotRunner::BaseRunner
@@ -25,6 +28,14 @@ end
 
 
 describe TurbotRunner::BaseRunner do
+  before do
+    $stderr = StringIO.new
+  end
+
+  after do
+    $stderr = STDERR
+  end
+
   it 'can run a ruby bot' do
     runner = SpecRunner.new('spec/dummy-bot-ruby')
 
@@ -37,6 +48,7 @@ describe TurbotRunner::BaseRunner do
     expect(runner).to receive(:handle_valid_record).with({'n' => 4, 'goodbye' => 'goodbye, 4'}, 'goodbye')
     expect(runner).to receive(:handle_successful_run)
     runner.run
+    expect($stderr.string).to eq("hello from ruby\n")
   end
 
   it 'can run a python bot' do
@@ -51,6 +63,7 @@ describe TurbotRunner::BaseRunner do
     expect(runner).to receive(:handle_valid_record).with({'n' => 8, 'goodbye' => 'goodbye, 8'}, 'goodbye')
     expect(runner).to receive(:handle_successful_run)
     runner.run
+    expect($stderr.string).to eq("hello from python\n")
   end
 
   describe "broken bots" do
@@ -62,10 +75,11 @@ describe TurbotRunner::BaseRunner do
         runner.run
       end
 
-      it 'should set `error` attribute of runner with exception message' do
+      it 'should write exception to stderr' do
         runner = BrokenRunner.new('spec/dummy-broken-bot-ruby')
         runner.run
-        expect(runner.error.to_s).to match(/oops/)
+        expect($stderr.string).to match(/^hello/)
+        expect($stderr.string).to match(/oops/)
       end
     end
 
@@ -77,6 +91,12 @@ describe TurbotRunner::BaseRunner do
         expect(runner).to receive(:handle_failed_run)
         runner.run
       end
+
+      it 'should write exception to stderr' do
+        runner = BrokenRunner.new('spec/dummy-broken-bot-ruby')
+        runner.run
+        expect($stderr.string).to match(/oops/)
+      end
     end
 
     describe "sucessful bot with failing transformer" do
@@ -86,6 +106,12 @@ describe TurbotRunner::BaseRunner do
         expect(runner).to receive(:handle_failed_run) # the transformer breaks immediately
         runner.run
       end
+
+      it 'should write exception to stderr' do
+        runner = BrokenRunner.new('spec/dummy-broken-bot-ruby')
+        runner.run
+        expect($stderr.string).to match(/oops/)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema