turbot-runner 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d18710590570c71d03f72b25680a23cd9d161b
-  data.tar.gz: 50de00d173e491040b426bb78fb1a1d5870c4b5b
+  metadata.gz: 6e85fb58506f16103a8e9a785220a673a4254354
+  data.tar.gz: 84664025f5f4f43fad8e23aa3151a4846370affa
 SHA512:
-  metadata.gz: f7e8f3dd84090c357197c69176190c113e2ae78ca9ae9891df0fd3dd30c1ed6de6f3b9692ddc06f293d3b22b5285c27626c8a3099c83a5596479c83421847060
-  data.tar.gz: 070562a8ee72b05034344084fd8a8a1a4c9415f8814db30a5bf01f91a87f78f89b06c6ed329e346fe4e53843b1600764d5cd8c2d0c23c36372158127780ebb9d
+  metadata.gz: bab922c04adfdd99e6ccafa102e4141db907a2105072f7e2f9ee2720f5693ec0e1708fb9cf6ca09087332d1bb0c7e34272e87c192ff981d0074bb0f42134eef6
+  data.tar.gz: 50f73d518937b38821ae6d5fa386886e03d6b898e8d1042f8a65bcb2e0aa0f1b480509bc9079b49cfd61f688f082c9a89698b08203f9ab15b1951a14fb01e328

data/.travis.yml

@@ -8,4 +8,4 @@ rvm:
   - 2.2.0
   - 2.3.0
 script:
-  bundle exec rspec --exclude-pattern "spec/manual_spec.rb"
+  bundle exec rspec

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/turbot-runner.svg)](https://badge.fury.io/rb/turbot-runner)
 [![Build Status](https://secure.travis-ci.org/openc/turbot-runner.png)](https://travis-ci.org/openc/turbot-runner)
+[![Build Status](https://ci.appveyor.com/api/projects/status/8wvd4ygxhk6wj94s?svg=true)](https://ci.appveyor.com/project/jpmckinney/turbot-runner)
 [![Dependency Status](https://gemnasium.com/openc/turbot-runner.png)](https://gemnasium.com/openc/turbot-runner)
 [![Coverage Status](https://coveralls.io/repos/openc/turbot-runner/badge.png)](https://coveralls.io/r/openc/turbot-runner)
 [![Code Climate](https://codeclimate.com/github/openc/turbot-runner.png)](https://codeclimate.com/github/openc/turbot-runner)

data/appveyor.yml

@@ -0,0 +1,36 @@
+# @see https://mattbrictson.com/how-to-test-ruby-windows
+# @see https://github.com/apiaryio/apiary-client/blob/master/appveyor.yml
+version: '{build}'
+skip_tags: true
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --no-ri --no-rdoc
+  - bundler --version
+  - git submodule update --init --recursive
+build_script:
+  - bundle install --jobs=3 --retry=3
+test_script:
+  - bundle exec rspec -b < Nul
+artifacts:
+  - path: pkg\*.gem
+environment:
+  matrix:
+    - ruby_version: "193"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+# @see https://www.appveyor.com/docs/build-cache
+cache:
+  - C:\Ruby193\bin                 -> appveyor.yml
+  - C:\Ruby193\lib\ruby\gems\1.9.1 -> appveyor.yml
+  - C:\Ruby200\bin                 -> appveyor.yml
+  - C:\Ruby200\lib\ruby\gems\2.0.0 -> appveyor.yml
+  - C:\Ruby21\bin                  -> appveyor.yml
+  - C:\Ruby21\lib\ruby\gems\2.1.0  -> appveyor.yml
+  - C:\Ruby22\bin                  -> appveyor.yml
+  - C:\Ruby22\lib\ruby\gems\2.2.0  -> appveyor.yml

data/lib/turbot_runner/runner.rb

@@ -38,10 +38,10 @@ module TurbotRunner
       # Run the transformers even if the scraper fails
       transformers_succeeded = true
       transformers.each do |transformer_config|
-        config = transformer_config.merge(
+        config = transformer_config.merge({
           :base_directory => @base_directory,
-          :duplicates_allowed => duplicates_allowed
-        )
+          :duplicates_allowed => duplicates_allowed,
+        })
         transformers_succeeded = run_script(config, input_file=scraper_output_file) && transformers_succeeded
       end
 
@@ -166,7 +166,7 @@ module TurbotRunner
         :file => scraper_script,
         :data_type => scraper_data_type,
         :identifying_fields => scraper_identifying_fields,
-        :duplicates_allowed => duplicates_allowed
+        :duplicates_allowed => duplicates_allowed,
       }
     end
 

data/lib/turbot_runner/script_runner.rb

@@ -12,7 +12,7 @@ module TurbotRunner
       @script_config = script_config
       record_handler = options[:record_handler] || BaseHandler.new  # A BaseHandler does nothing
       @processor = Processor.new(self, script_config, record_handler)
-      @timeout = options[:timeout] || 60 * 60 * 24
+      @timeout = options[:timeout] || 86_400
     end
 
     def run

data/lib/turbot_runner/validator.rb

@@ -32,7 +32,7 @@ module TurbotRunner
         end
       end
 
-      return nil
+      nil
     end
 
     def identifying_hash(record, identifying_fields)

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.2.16'
+  VERSION = '0.2.17'
 end

data/schema/schemas/gazette-notice-schema.json

@@ -31,6 +31,13 @@
         "$ref": "includes/entity.json"
       }
     },
+    "related_entities": {
+      "description": "Other entities that the notice is about",
+      "type": "array",
+      "items": {
+        "$ref": "includes/entity.json"
+      }
+    },
     "about": {
       "description": "The content of the notice",
       "type": "object",

data/schema/schemas/includes/classification.json

@@ -18,8 +18,17 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "code",
-    "code_scheme_id"
+  "anyOf": [
+    {
+      "required": [
+        "name"
+      ]
+    },
+    {
+      "required": [
+        "code",
+        "code_scheme_id"
+      ]
+    }
   ]
 }

data/spec/lib/runner_spec.rb

@@ -2,6 +2,11 @@ require 'json'
 require 'turbot_runner'
 
 describe TurbotRunner::Runner do
+  after(:all) do
+    puts
+    puts 'If all specs passed, you should now run `ruby spec/manual.rb`'
+  end
+
   describe '#run' do
     context 'with a bot written in ruby' do
       before do
@@ -74,7 +79,7 @@ describe TurbotRunner::Runner do
 
       context 'when logging to file not enabled' do
         xit 'logs to stderr' do
-          # This is tested in manual_spec.rb
+          # This is tested in manual.rb
         end
       end
     end
@@ -161,7 +166,7 @@ describe TurbotRunner::Runner do
 
     context 'with a bot that is interrupted in scraper' do
       xit 'produces truncated output' do
-        # This is tested in manual_spec.rb
+        # This is tested in manual.rb
       end
     end
 
@@ -357,49 +362,3 @@ describe TurbotRunner::Runner do
     end
   end
 end
-
-
-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")
-    actual_output = File.readlines(actual_path).map {|line| JSON.parse(line)}
-    expect(expected_output).to eq(actual_output)
-  end
-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)
-  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)
-end

data/spec/spec_helper.rb

@@ -1,31 +1,19 @@
 require 'rubygems'
 
-require 'simplecov'
-require 'coveralls'
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter 'spec'
+unless RUBY_PLATFORM =~ /mswin32|mingw32/
+  require 'simplecov'
+  require 'coveralls'
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter 'spec'
+  end
 end
 
 require 'rspec'
 
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f}
 require File.dirname(__FILE__) + '/../lib/turbot_runner'
 
-RSpec::Matchers.define(:fail_validation_with) do |expected_error|
-  match do |record|
-    identifying_fields = ['number']
-    @error = TurbotRunner::Validator.validate('primary-data', record, identifying_fields, Set.new)
-    expect(@error).to eq(expected_error)
-  end
-
-  failure_message do |actual|
-    "Expected error to be #{expected_error}, but was #{@error}"
-  end
-end
-
-RSpec::Matchers.define(:be_valid) do
-  match do |record|
-    identifying_fields = ['number']
-    expect(TurbotRunner::Validator.validate('primary-data', record, identifying_fields, Set.new)).to eq(nil)
-  end
+RSpec.configure do |c|
+  c.include(Helpers)
 end

data/spec/support/custom_matchers.rb

@@ -0,0 +1,73 @@
+RSpec::Matchers.define(:fail_validation_with) do |expected_error|
+  match do |record|
+    identifying_fields = ['number']
+    @error = TurbotRunner::Validator.validate('primary-data', record, identifying_fields, Set.new)
+    expect(@error).to eq(expected_error)
+  end
+
+  failure_message do |actual|
+    "Expected error to be #{expected_error}, but was #{@error}"
+  end
+end
+
+RSpec::Matchers.define(:be_valid) do
+  match do |record|
+    identifying_fields = ['number']
+    expect(TurbotRunner::Validator.validate('primary-data', record, identifying_fields, Set.new)).to eq(nil)
+  end
+end
+
+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")
+    @actual_output = File.readlines(actual_path).map {|line| JSON.parse(line)}
+    expect(@expected_output).to eq(@actual_output)
+  end
+
+  failure_message do |actual|
+    "Expected output to be #{@expected_output}, but was #{@actual_output}"
+  end
+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|
+    @actual_run = runner.run
+    expect(@actual_run).to eq(TurbotRunner::Runner::RC_OK)
+  end
+
+  failure_message do |actual|
+    "Expected output to be TurbotRunner::Runner::RC_OK, but was #{@actual_run}"
+  end
+end
+
+RSpec::Matchers.define(:fail_in_scraper) do
+  match do |runner|
+    @actual_run = runner.run
+    expect(@actual_run).to eq(TurbotRunner::Runner::RC_SCRAPER_FAILED)
+  end
+
+  failure_message do |actual|
+    "Expected output to be TurbotRunner::Runner::RC_SCRAPER_FAILED, but was #{@actual_run}"
+  end
+end
+
+RSpec::Matchers.define(:fail_in_transformer) do
+  match do |runner|
+    @actual_run = runner.run
+    expect(@actual_run).to eq(TurbotRunner::Runner::RC_TRANSFORMER_FAILED)
+  end
+
+  failure_message do |actual|
+    "Expected output to be TurbotRunner::Runner::RC_TRANSFORMER_FAILED, but was #{@actual_run}"
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,6 @@
+module Helpers
+  def test_runner(name, opts={})
+    test_bot_location = File.join(File.dirname(__FILE__), '../bots', name)
+    TurbotRunner::Runner.new(test_bot_location, opts)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- appveyor.yml
 - lib/turbot_runner.rb
 - lib/turbot_runner/base_handler.rb
 - lib/turbot_runner/exceptions.rb
@@ -190,11 +191,13 @@ files:
 - spec/lib/runner_spec.rb
 - spec/lib/utils_spec.rb
 - spec/lib/validator_spec.rb
-- spec/manual_spec.rb
+- spec/manual.rb
 - spec/outputs/full-scraper.out
 - spec/outputs/full-transformer.out
 - spec/outputs/truncated-scraper.out
 - spec/spec_helper.rb
+- spec/support/custom_matchers.rb
+- spec/support/helpers.rb
 - turbot-runner.gemspec
 homepage: http://turbot.opencorporates.com/
 licenses:
@@ -271,9 +274,11 @@ test_files:
 - spec/lib/runner_spec.rb
 - spec/lib/utils_spec.rb
 - spec/lib/validator_spec.rb
-- spec/manual_spec.rb
+- spec/manual.rb
 - spec/outputs/full-scraper.out
 - spec/outputs/full-transformer.out
 - spec/outputs/truncated-scraper.out
 - spec/spec_helper.rb
+- spec/support/custom_matchers.rb
+- spec/support/helpers.rb
 has_rdoc: