turbot-runner 0.2.30 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb3526ea7ac8f3c271e856db5f43dc43fcb74b5
-  data.tar.gz: f71bec0454597ed7623392d82221f7dae5540087
+  metadata.gz: c73a920e178c0ba176b17be1e10a480b4a663ca4
+  data.tar.gz: 9693383fe1630efcd66b820fa93b889774dd7788
 SHA512:
-  metadata.gz: 0fbac87bc3aa0b646d8044f329810a80cbda6e939823fc107d106fcb640310cc4006becf0f9cec5938878f6e56adbbdec3f8f9898a07baab8146ef309b20d270
-  data.tar.gz: 1d1fa48240594c9c273ab3e83fc844b0953ac519d55a3251afe2573cf551548c4245144e844350d39d895e9f2a224227711ce6f8c3d67f664eaca3f3800dd810
+  metadata.gz: ec20be567c6dde2b967e10719998f782905497e895f72c9b59376dff039ccdd573fdac9ad500264e6b5e624c695e91ff323b3cfe3d26387709dfe93cb4e7a7be
+  data.tar.gz: 98ffaeac42ae44c7c2b2cb54deeb45d4902f093539744fcbdf8a688493a8b6b209dd9b00feff2e0d89ab267c19a0c6fc66cce35965ee320aa0ceb3d4c88b9f36

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
   - 2.2
   - 2.3
 before_install:
-  - gem update --system
-  - gem update bundler
+  - gem update --system 2.7.8
+  - gem install bundler -v 1.17.3
 script:
-  bundle exec rspec
+  bin/rspec

data/bin/bundle

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+    module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1 || ">= 0.a"
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../Gemfile", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||= begin
+      env_var_version || cli_arg_version ||
+        lockfile_version || "#{Gem::Requirement.default}.a"
+    end
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    # must dup string for RG < 1.8 compatibility
+    activate_bundler(bundler_version.dup)
+  end
+
+  def activate_bundler(bundler_version)
+    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
+      bundler_version = "< 2"
+    end
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_version
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/turbot_runner.rb

@@ -20,7 +20,7 @@ module TurbotRunner
   end
 
   def self.get_and_validate_schema_path(data_type)
-    hyphenated_name = data_type.to_s.gsub("_", "-").gsub(" ", "-")
+    hyphenated_name = data_type.to_s.gsub(" ", "-")
     path = File.join(SCHEMAS_PATH, "#{hyphenated_name}-schema.json")
     raise TurbotRunner::InvalidDataType.new("Could not find #{path}") unless File.exists?(path)
     path

data/lib/turbot_runner/runner.rb

@@ -124,15 +124,13 @@ module TurbotRunner
       # record handling.
       processor = Processor.new(nil, script_config, @record_handler)
       file = output_file(script_config[:file])
-      File.open(file) do |f|
-        f.each_line do |line|
-          processor.process(line, opts)
+      if File.exist?(file)
+        File.open(file) do |f|
+          f.each_line do |line|
+            processor.process(line, opts)
+          end
         end
       end
-    rescue Errno::ENOENT => e
-      # We only want to catch ENOENT if the output file doesn't exist, and not
-      # if, for instance, a schema file is missing.
-      raise unless e.message == "No such file or directory - #{output_file(script_config[:file])}"
     end
 
     def build_command(script, input_file=nil)

data/lib/turbot_runner/version.rb

@@ -1,3 +1,3 @@
 module TurbotRunner
-  VERSION = '0.2.30'
+  VERSION = '0.2.34'
 end

data/schema/schemas/accounts-statement-schema.json

@@ -20,60 +20,88 @@
     },
     "accounts_type": {
       "description": "The type of accounts – either annual, or quarterly, or null if not known",
-      "enum": ["annual", "quarterly", null]
+      "enum": [
+        "annual",
+        "quarterly",
+        null
+      ]
     },
     "profit": {
       "type": "array",
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "revenue": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "current_assets": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "total_assets": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "fixed_assets": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "current_liabilities": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "total_liabilities": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "cash_at_bank": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/accounts_element.json"
+        "$ref": "includes/accounts-element.json"
       }
     },
     "documents": {
-      "type": ["array","null"],
+      "type": [
+        "array",
+        "null"
+      ],
       "items": {
-        "$ref": "includes/filing_document.json"
+        "$ref": "includes/filing-document.json"
       }
     },
     "filing_type_name": {
@@ -133,15 +161,6 @@
       "type": "string",
       "description": "If the accounts filing has been put on sources.opencorporates.com the path to the filing"
     },
-    "confidence": {
-      "description": "Confidence in accuracy of data",
-      "type": "string",
-      "enum": [
-        "HIGH",
-        "MEDIUM",
-        "LOW"
-      ]
-    },
     "other_attributes": {
       "description": "Use for other attributes for which we don't yet have curated schema attributes",
       "type": "object"
@@ -155,5 +174,5 @@
     "confidence",
     "filing_date",
     "accounts_type"
-    ]
-}
+  ]
+}

data/schema/schemas/alternate-registration-schema.json

@@ -0,0 +1,88 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "A representation of multiple registrations for the same entity",
+  "type": "object",
+  "properties": {
+    "data_type": {
+      "enum": [
+        "alternate-registration"
+      ]
+    },
+    "alternate_entities": {
+      "description": "array of entities that are linked via alternate registrations",
+      "type": "array",
+      "items": {
+        "$ref": "includes/entity.json",
+        "minLength": 2
+      }
+    },
+    "alternate_registration_start_date": {
+      "description": "date when alternate registration started",
+      "type": "string",
+      "format": "date"
+    },
+    "alternate_registration_end_date": {
+      "description": "date when alternate registration ended",
+      "type": "string",
+      "format": "date"
+    },
+    "publication_date": {
+      "description": "the publication date of the filing/notice that gives details of the alternate registration",
+      "type": "string",
+      "format": "date"
+    },
+    "start_date": {
+      "description": "date when alternate registration was valid from",
+      "type": "string",
+      "format": "date"
+    },
+    "start_date_type": {
+      "enum": [
+        "at",
+        "before",
+        "after"
+      ]
+    },
+    "sample_date": {
+      "description": "date when alternate registration was sampled",
+      "type": "string",
+      "format": "date"
+    },
+    "retrieved_at": {
+      "description": "date when alternate registration was retrieved",
+      "type": "string",
+      "format": "date"
+    },
+    "source_url": {
+      "description": "URL of the source of the data (e.g. download URL), or if there is not persistent URL the page from which it can be found (e.g. search page)",
+      "type": "string"
+    },
+    "confidence": {
+      "description": "Confidence in accuracy of data",
+      "enum": [
+        "HIGH",
+        "MEDIUM",
+        "LOW"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "data_type",
+    "alternate_entities",
+    "retrieved_at",
+    "confidence"
+  ],
+  "anyOf": [
+    {
+      "required": [
+        "start_date"
+      ]
+    },
+    {
+      "required": [
+        "sample_date"
+      ]
+    }
+  ]
+}

data/schema/schemas/alternative-name-schema.json

@@ -0,0 +1,69 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Doing Business As, also known as fictitious name or trade name",
+  "type": "object",
+  "properties": {
+    "name": {
+      "description": "The name registered",
+      "type": "string"
+    },
+    "type": {
+      "description": "Type of alternative name",
+      "type": "string",
+      "enum": [
+        "Assumed Name",
+        "Trade Name",
+        "DBA / doing business as",
+        "Fictitious name"
+      ]
+    },
+    "registered_address": {
+      "description": "The address filing was registered to",
+      "type": "object"
+    },
+    "start_date": {
+      "type": "string",
+      "format": "date"
+    },
+    "end_date": {
+      "type": "string",
+      "format": "date"
+    },
+    "source_url": {
+      "description": "Place where this fact can be verified",
+      "type": "string",
+      "minLength": 1
+    },
+    "confidence": {
+      "description": "Confidence in accuracy of data",
+      "type": "string",
+      "enum": [
+        "HIGH",
+        "MEDIUM",
+        "LOW"
+      ]
+    },
+    "sample_date": {
+      "description": "Date on which we know this to be true (usually date this information was retrieved from the source)",
+      "type": "string",
+      "format": "date"
+    },
+    "retrieved_at": {
+      "description": "The time or date at which the source URL was requested",
+      "type": "string",
+      "format": "date"
+    },
+   "other_attributes": {
+    "description": "Dump of all other relevant data for which we don't yet have curated schema attributes",
+    "type": "object"
+    }
+  },
+  "required": [
+    "name",
+    "type",
+    "other_attributes",
+    "retrieved_at",
+    "sample_date",
+    "source_url"
+  ]
+}