turbot-runner 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2M1ODY0MWFjYzlhZjZiY2RiMTM1ZTdiODQ2Y2I0Y2VjMDI2OTk4Yw==
+    NTQ3ZDQzMjMyYzQyMTg2OWMzZDk0NWVjZjgwYWFiNjU0MmRmYzdmZg==
   data.tar.gz: !binary |-
-    OTg3MWRjMmYzODUyMzQ5NWEzZjMwMjVjZTU0OGI0ODE1OTBjYjJjZA==
+    NmEzOGE5NjViYzc5ZGZhNjZmZjg1MjNmNGNkNTI4ZWVmMDIzNjI1YQ==
 SHA512:
   metadata.gz: !binary |-
-    MzU3ODBjZDgzN2Q4ZTM4ZWQwMDk0ODM1M2MzMjg1MWNjODg4OTc4ZDMyYzE5
-    ZDU5ZTg2ZjYzNmZiMmFjNjc0YTY3OTEwYmUyMzcwMWQxMTEyNTkwOTQxMmIw
-    ZjExNTk5MWE3YTMyMzliODkwZmU5ODEzNGY1OWE4YTQ4YmFmN2I=
+    NmY3ZmMwM2Y2ZDljNWVkODM1MWM3YjcxNjM1M2I3MjAyM2Q4YzYxM2ExNWE0
+    MGM5YmM0MDM2MGYwMTQ1Nzk2NDhmNzNiYzZmYTJmNDNjYmY3NmNhMjA0ZTJj
+    NWJhYTJlZGQ4MzhiMWQ5MjMxYTk1MjQ4ZmU5Y2U1YzE2MjYwZGU=
   data.tar.gz: !binary |-
-    NWFlZTgwZGRhZjg4ZWFlOTM3MzhlMTJhM2Q0NTRjOGFhZjQ1YmI1YTY3ZmVk
-    YTUwZjEyN2QzYmFkZjNiN2M1ZDI2YmNjOTgzMzU5YTBlMDIyOTljOWEwMWM0
-    NjFiNjhmZjRkOTVhYTM5ODI4MGMwMTgwZWNkZTc3YWYxZTUzMzg=
+    NjQ5NDRmN2EyNGM0NzEyZWNjYTQyYWQ5MjA4YTc4YWQ1ODMyYzc0MmUzNmJm
+    OTFkNjczN2E2NGQyNTllMDE1ZGQxMTNhMmY5MmYzMDE0MGY0NDI3YjdlNmVi
+    YjA3ZjE3Mzc4ZmYwMDVlZTQ0ZWI2ZTE1NTZhMmRiZDAwNzYwYWQ=

data/lib/turbot_runner/runner.rb

@@ -17,6 +17,7 @@ module TurbotRunner
       @record_handler = options[:record_handler]
       @log_to_file = options[:log_to_file]
       @timeout = options[:timeout]
+      @scraper_provided = options[:scraper_provided]
       if options[:output_directory]
         assert_absolute_path(options[:output_directory])
         @output_directory = options[:output_directory]
@@ -25,10 +26,10 @@ module TurbotRunner
       end
     end
 
-    def run(opts={})
+    def run
       set_up_output_directory
 
-      if opts[:scraper_provided]
+      if @scraper_provided
         scraper_succeeded = true
       else
         scraper_succeeded = run_script(scraper_config)
@@ -55,8 +56,11 @@ module TurbotRunner
 
     def set_up_output_directory
       FileUtils.mkdir_p(@output_directory)
-      FileUtils.rm_f(output_file('scraper', '.out'))
-      FileUtils.rm_f(output_file('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(output_file(transformer_config[:file], '.out'))

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/lib/runner_spec.rb

@@ -15,7 +15,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
 
       it 'returns true' do
@@ -30,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
 
@@ -41,8 +41,8 @@ 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
@@ -57,9 +57,9 @@ 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
@@ -73,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
 
@@ -111,7 +111,7 @@ describe TurbotRunner::Runner do
 
       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
@@ -144,7 +144,7 @@ describe TurbotRunner::Runner do
 
       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
 
@@ -176,7 +176,7 @@ 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
@@ -252,6 +252,32 @@ describe TurbotRunner::Runner do
         expect(@runner).to succeed
       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
@@ -317,10 +343,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")
@@ -330,6 +354,15 @@ RSpec::Matchers.define :have_output do |expected|
 end
 
 
+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)
@@ -350,17 +383,6 @@ RSpec::Matchers.define(:fail_in_transformer) do
   end
 end
 
-
-RSpec::Matchers.define :have_error_output_matching do |expected|
-  match do |actual|
-    runner, script = actual
-
-    actual_path = File.join(runner.base_directory, 'output', "#{script}.err")
-    actual_output = File.read(actual_path)
-    expect(actual_output).to match(expected)
-  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - OpenCorporates