turbot-runner 0.1.45 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFhM2Y1MWE5Y2FjOWMzZjQ3YjNlNjIwYTgyMDg5ZmVmMjUzMmY2Mw==
+    ODg2MmNiYWYyYzA1YjQyMTBiNjU1ZmMzMzU3YjU4OTRkNDAyYzdhMw==
   data.tar.gz: !binary |-
-    NDExODU0YmJkMGUwNDZkNDhhYTc4MTcxYjc3MTE5OGNmMThiYmUwNQ==
+    ZDVhZjA4NDVmZjMyYmI1OGMxZDlhNGU4NWY2MDk2NDc1YjYxNDM2MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTFiYTNmOWUwMjRjY2E2ZjgwZTBmNDU1NDJhMjRlYzA0NTkzNjIwZjMwMWRl
-    OWEwMDQxZjU2OWQwYWM3OWE3OGQxYWU5Y2M0ZmExYWFiYzU3YmNiNjNkZWE0
-    ZGZhOTZlYjc2NmY0ZTdmMzBiOGYyOTI3OGMyMzRlNzJlMzM5YTQ=
+    MmQyMjczNjRjZDAwZmM4YWZjY2Y3ZmExZDE0NzNkMWQ3NWI2OTFhOWU5ZGE4
+    ZGQ2ZGQwNWNlNTIxMWUyZTAyZjMzMmViZTQwNzAxZmJiMmRjZTI0ZWU5ODlk
+    YjY4YTEyZTY5YmEwODkwNjc4MDk1YzI0NDI1ODE3YWRjNTRlNjk=
   data.tar.gz: !binary |-
-    OWY0ZDE5ZTBhOGI2MGEzNDM2OWU1NTkxMmQ4NTIzMzliZDNiOTM1ZjlkOWYx
-    YWYxOWMyODNiOTYxZjhkNzAwNzRkYmIwZjY2MDllN2MyNjA3MzViNWI2NDRj
-    ZjVhYTY0ODM3NDBhZTk5ZmExMWIzYjQ0MzFmNDYzZDQ4NzZiMjM=
+    M2YxNjc1NTFhY2JhYzQxMTg1Y2M2NTk2YTBhOTMwOWZkYTkyY2I4ZjVmOGY5
+    MzhlYjY1MzQ2Njc1MWVmZDMxYjBiNzE0YjRlZTU4M2I2MjQ3ZTY5NzI2YWY2
+    ZTZjOTUzYTRjZTM3MDNhMDkyYWY2ZDk2NDhhODYwNTBmYjYwM2E=

data/lib/turbot_runner/runner.rb

@@ -4,6 +4,10 @@ require 'pathname'
 
 module TurbotRunner
   class Runner
+    RC_OK = 0
+    RC_SCRAPER_FAILED = 1
+    RC_TRANSFORMER_FAILED = 2
+
     attr_reader :base_directory
 
     def initialize(directory, options={})
@@ -21,19 +25,32 @@ module TurbotRunner
       end
     end
 
-    def run
+    def run(opts={})
       set_up_output_directory
 
-      succeeded = run_script(scraper_config)
+      if opts[:scraper_provided]
+        scraper_succeeded = true
+      else
+        scraper_succeeded = run_script(scraper_config)
+      end
+
       # Run the transformers even if the scraper fails
+      transformers_succeeded = true
       transformers.each do |transformer_config|
         config = transformer_config.merge(
           :base_directory => @base_directory,
           :duplicates_allowed => duplicates_allowed
         )
-        succeeded = run_script(config, input_file=scraper_output_file) && succeeded
+        transformers_succeeded = run_script(config, input_file=scraper_output_file) && transformers_succeeded
+      end
+
+      if !scraper_succeeded
+        RC_SCRAPER_FAILED
+      elsif !transformers_succeeded
+        RC_TRANSFORMER_FAILED
+      else
+        RC_OK
       end
-      succeeded
     end
 
     def set_up_output_directory

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.1.45'
+  VERSION = '0.2.0'
 end

data/spec/lib/runner_spec.rb

@@ -19,7 +19,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -46,7 +46,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -63,7 +63,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -106,7 +106,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns false' do
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
 
       it 'writes error to stderr' do
@@ -129,7 +129,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -139,7 +139,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns false' do
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_transformer
       end
 
       it 'writes error to stderr' do
@@ -180,21 +180,21 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
     context 'with a scraper that produces an invalid record' do
       it 'returns false' do
         @runner = test_runner('invalid-record-bot')
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
     end
 
     context 'with a scraper that produces invalid JSON' do
       it 'returns false' do
         @runner = test_runner('invalid-json-bot')
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
     end
 
@@ -209,7 +209,7 @@ describe TurbotRunner::Runner do
           :timeout => 1,
           :log_to_file => true
         )
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
     end
 
@@ -219,7 +219,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns false' do
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
     end
 
@@ -239,7 +239,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'raises returns false' do
-        expect(@runner.run).to be(false)
+        expect(@runner).to fail_in_scraper
       end
     end
 
@@ -249,7 +249,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'raises returns false' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
   end
@@ -330,6 +330,27 @@ RSpec::Matchers.define :have_output do |expected|
 end
 
 
+RSpec::Matchers.define(:succeed) do
+  match do |runner|
+    expect(runner.run).to eq(TurbotRunner::Runner::RC_OK)
+  end
+end
+
+
+RSpec::Matchers.define(:fail_in_scraper) do
+  match do |runner|
+    expect(runner.run).to eq(TurbotRunner::Runner::RC_SCRAPER_FAILED)
+  end
+end
+
+
+RSpec::Matchers.define(:fail_in_transformer) do
+  match do |runner|
+    expect(runner.run).to eq(TurbotRunner::Runner::RC_TRANSFORMER_FAILED)
+  end
+end
+
+
 RSpec::Matchers.define :have_error_output_matching do |expected|
   match do |actual|
     runner, script = actual

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.45
+  version: 0.2.0
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport