turbot-runner-morph 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzIwY2EwYmEzZDE4ODYyNWY5NTM2MDBjOGRkOGY3NjU5ZjE1OGNjYQ==
+    MzEwODljYjAwYTk0OTJmYjBlNGE4M2Y2MjU1YWMyZGQ3Yjg4N2U5MQ==
   data.tar.gz: !binary |-
-    ZmY2NDJiODhmYmJhODNjNGJjMWI3MGU2YjliMTc3ZWMyMDI1NmY0MQ==
+    OTFiYmEwN2U1NjdhYzE0Zjc0MTU2YWNiYWExMzdjNmM4NTdjZDI0ZA==
 SHA512:
   metadata.gz: !binary |-
-    NTBhMGM4ODkyNThmYzJmMjkyZTQ0M2VlZDNjODY2Y2YzNmFhM2EzMTU1YmY5
-    ODUzMTM0NzA3YWFkZDk0YTIxMzc4NTZiYWVjY2IzNWRkNzk4YWNiNjMxOTVi
-    ZGI1Nzc5YzYzNzI3YzAxZTg4NjI3MzM3ZjgxY2I2NmYxNjZmOWQ=
+    YmZlNDk4NDhkNWIwMTUwNjNlNzJjZDQ1MGFhYTg4ODQwMmJlYTFjMDJhYWYz
+    MWIwZmI2ZDk0NjcxNmNhZjJlYjllYjVkZTBmN2M0YTNmNzRhNjI0MDFkNTlh
+    MmMwMmU3OTcxZjk1NWMzZGRjY2QxNTI1N2M0MThlMjU3MjBlNDA=
   data.tar.gz: !binary |-
-    MjM3YjU4YWU5MmNlODgzN2JjNTQxMjM2Yzc0MDFlM2M4ODI1OGVkNGIyMzJl
-    YzUxZjVkNjMzZDAzYzUxY2JkNDMwYTE4ZmYwZmM0YTZjOGMzODEwMzExYmFm
-    Yzc0MmIzODY3Y2E3Njg1NWI3MjczNWI5NWQxNDVhNGEyYjU4NzM=
+    YmRmODk5YTQyOGRkMTVmYzcwMjVhYmFmZTA4Y2Q1NDE5ZmVhOTkzYTc5ZDhh
+    NDBjNTYwYzc2ODQzNGQ5ZjJmMTQ0Y2Y0MDA5YTYyOWE2NWI2NDI2ZDIxY2Jl
+    ZTRiYmY3ZTc4M2ExZTk1MTViMGZjZmJiYzU4MjU2ODJkMWE2YWM=

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={})
@@ -19,29 +23,47 @@ module TurbotRunner
       else
         @output_directory = File.join(@base_directory, 'output')
       end
+       @scraper_provided = options[:scraper_provided]
     end
 
     def run
       set_up_output_directory
 
-      succeeded = run_script(scraper_config)
+      if @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|
-        succeeded = run_script(
-          transformer_config.merge(:base_directory => @base_directory),
-          input_file=scraper_output_file) && succeeded
+        config = transformer_config.merge(
+          :base_directory => @base_directory,
+        )
+        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
       FileUtils.mkdir_p(@output_directory)
-      FileUtils.rm_f(File.join(@output_directory, 'scraper.out'))
-      FileUtils.rm_f(File.join(@output_directory, 'scraper.err'))
+
+      if !@scraper_provided
+        FileUtils.rm_f(output_file('scraper', '.out'))
+        FileUtils.rm_f(output_file('scraper', '.err'))
+      end
 
       transformers.each do |transformer_config|
-        FileUtils.rm_f(File.join(@output_directory, "#{transformer_config[:file]}.out"))
-        FileUtils.rm_f(File.join(@output_directory, "#{transformer_config[:file]}.err"))
+        FileUtils.rm_f(output_file(transformer_config[:file], '.out'))
+        FileUtils.rm_f(output_file(transformer_config[:file], '.err'))
       end
     end
 

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/lib/runner_spec.rb

@@ -2,10 +2,6 @@ require 'json'
 require 'turbot_runner'
 
 describe TurbotRunner::Runner do
-  before(:each) do
-    Dir.glob('spec/bots/**/output/*').each {|f| File.delete(f)}
-  end
-
   after(:all) do
     puts
     puts 'If all specs passed, you should now run `ruby spec/manual_spec.rb`'
@@ -19,11 +15,11 @@ describe TurbotRunner::Runner do
 
       it 'produces expected output' do
         @runner.run
-        expect([@runner, 'scraper']).to have_output('full-scraper.out')
+        expect(@runner).to have_output('scraper', 'full-scraper.out')
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -34,7 +30,7 @@ describe TurbotRunner::Runner do
 
       it 'produces expected output' do
         @runner.run
-        expect([@runner, 'scraper']).to have_output('full-scraper.out')
+        expect(@runner).to have_output('scraper', 'full-scraper.out')
       end
     end
 
@@ -45,12 +41,12 @@ describe TurbotRunner::Runner do
 
       it 'produces expected outputs' do
         @runner.run
-        expect([@runner, 'scraper']).to have_output('full-scraper.out')
-        expect([@runner, 'transformer']).to have_output('full-transformer.out')
+        expect(@runner).to have_output('scraper', 'full-scraper.out')
+        expect(@runner).to have_output('transformer', 'full-transformer.out')
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -61,13 +57,13 @@ describe TurbotRunner::Runner do
 
       it 'produces expected outputs' do
         @runner.run
-        expect([@runner, 'scraper']).to have_output('full-scraper.out')
-        expect([@runner, 'transformer1']).to have_output('full-transformer.out')
-        expect([@runner, 'transformer2']).to have_output('full-transformer.out')
+        expect(@runner).to have_output('scraper', 'full-scraper.out')
+        expect(@runner).to have_output('transformer1', 'full-transformer.out')
+        expect(@runner).to have_output('transformer2', 'full-transformer.out')
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -77,7 +73,7 @@ describe TurbotRunner::Runner do
           expected_log = "doing...\ndone\n"
           runner = test_runner('logging-bot', :log_to_file => true)
           runner.run
-          expect([runner, 'scraper']).to have_error_output_matching(expected_log)
+          expect(runner).to have_error_output_matching('scraper', expected_log)
         end
       end
 
@@ -110,12 +106,12 @@ 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
         @runner.run
-        expect([@runner, 'scraper']).to have_error_output_matching(/Oh no/)
+        expect(@runner).to have_error_output_matching('scraper', /Oh no/)
       end
 
       it 'still runs the transformers' do
@@ -133,7 +129,7 @@ describe TurbotRunner::Runner do
       end
 
       it 'returns true' do
-        expect(@runner.run).to be(true)
+        expect(@runner).to succeed
       end
     end
 
@@ -143,12 +139,12 @@ 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
         @runner.run
-        expect([@runner, 'transformer2']).to have_error_output_matching(/Oh no/)
+        expect(@runner).to have_error_output_matching('transformer2', /Oh no/)
       end
     end
 
@@ -180,25 +176,25 @@ describe TurbotRunner::Runner do
 
       it 'produces expected output' do
         @runner.run
-        expect([@runner, 'scraper']).to have_output('truncated-scraper.out')
+        expect(@runner).to have_output('scraper', 'truncated-scraper.out')
       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
 
@@ -213,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
 
@@ -223,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
 
@@ -236,6 +232,32 @@ describe TurbotRunner::Runner do
         expect{@runner.run}.to raise_error(TurbotRunner::InvalidDataType)
       end
     end
+
+    context 'when the scraped data is provided' do
+      before do
+        FileUtils.cp(
+          File.join('spec', 'outputs', 'full-scraper.out'),
+          File.join(File.dirname(__FILE__), '../bots', 'bot-with-transformer', 'output', 'scraper.out')
+        )
+        @runner = test_runner('bot-with-transformer', :scraper_provided => true)
+      end
+
+      it 'does not run scraper' do
+        expect(@runner).to receive(:run_script).once.with(
+          hash_including(:file => 'transformer.rb'), anything
+        )
+        @runner.run
+      end
+
+      it 'succeeds' do
+        expect(@runner).to succeed
+      end
+
+      it 'produces expected transformed output' do
+        @runner.run
+        expect(@runner).to have_output('transformer', 'full-transformer.out')
+      end
+    end
   end
 
   describe '#process_output' do
@@ -301,10 +323,8 @@ describe TurbotRunner::Runner do
 end
 
 
-RSpec::Matchers.define :have_output do |expected|
-  match do |actual|
-    runner, script = actual
-
+RSpec::Matchers.define(:have_output) do |script, expected|
+  match do |runner|
     expected_path = File.join('spec', 'outputs', expected)
     expected_output = File.readlines(expected_path).map {|line| JSON.parse(line)}
     actual_path = File.join(runner.base_directory, 'output', "#{script}.out")
@@ -314,16 +334,35 @@ RSpec::Matchers.define :have_output do |expected|
 end
 
 
-RSpec::Matchers.define :have_error_output_matching do |expected|
-  match do |actual|
-    runner, script = actual
-
+RSpec::Matchers.define(:have_error_output_matching) do |script, expected|
+  match do |runner|
     actual_path = File.join(runner.base_directory, 'output', "#{script}.err")
     actual_output = File.read(actual_path)
     expect(actual_output).to match(expected)
   end
 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
+
 def test_runner(name, opts={})
   test_bot_location = File.join(File.dirname(__FILE__), '../bots', name)
   TurbotRunner::Runner.new(test_bot_location, opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner-morph
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openc-json_schema