turbot 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODM4NTgyMTg4MTczZWFhMjczYjhjMWYwNDQ4OGY0MzJmNTUxN2VkNA==
+  data.tar.gz: !binary |-
+    ZDcxZjdlZWI2ZTY1ODM2NmM3YWVkN2QxYjNhNjU0OGQ1MWZiNmI5Yw==
+SHA512:
+  metadata.gz: !binary |-
+    MjY0MjM5OWIxY2RhM2Q0ZmE2ZTRhZWQ1ZDVmMmM3ZWM2MTdlN2RlOTJlODUz
+    ZjFiNjIzMjgxZWEwMTRiY2NhNjMwZTc1YWI0MzNkOGRhNWM1ZWUzZDlkMGU1
+    YTM4MDc2MmI2NWRlYzIyMzc1NmNmNDNmZDEzOWYzNjEzMmQyNzM=
+  data.tar.gz: !binary |-
+    NjE2ZTNiZTUzODY3N2VkZWIwOTQxMDhhZGY3NDY0YzcwMWFjNGNjNThmNTg2
+    ZDhhNTlkZTk4MDU2N2M3ZTA4ZDBiMWZkMDM4ZDg4YzYzNDliOTVkNmFmZjVh
+    Nzc0ZjM4NWMxOTRkOTdmYjJlNjAwYTU2ZjRlZTU0ZTFmMmJlNzA=

data/lib/turbot/command/bots.rb

@@ -199,10 +199,15 @@ class Turbot::Command::Bots < Turbot::Command::Base
     validate_arguments!
     config = parsed_manifest(Dir.pwd)
 
-    %w(bot_id data_type identifying_fields files publisher).each do |key|
+    %w(bot_id data_type identifying_fields company_fields files publisher).each do |key|
       error("Manifest is missing #{key}") unless config.has_key?(key)
     end
 
+    company_field_keys = %w(name company_number jurisdiction)
+    unless Set.new(config['company_fields'].keys).subset?(Set.new(company_field_keys))
+      error("In manifest, company_fields should contain at least one of #{company_field_keys}")
+    end
+
     type = config["data_type"]
 
     schema = get_schema(type)

data/lib/turbot/distribution.rb

@@ -1,7 +1,7 @@
 module Turbot
   module Distribution
     def self.files
-      Dir[File.expand_path("../../../{bin,data,lib}/**/*", __FILE__)].select do |file|
+      (Dir[File.expand_path("../../../{Gemfile,turbot.gemspec,.gitmodules,schema}", __FILE__)] + Dir[File.expand_path("../../../{.git,bin,data,lib,templates}/**/*", __FILE__)]).select do |file|
         File.file?(file)
       end
     end

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/schema/schemas/company-schema.json

@@ -6,14 +6,17 @@
   "properties": {
     "company_number": {
       "type": "string",
+      "description": "unique identifier given by the corporate register with which it is incorporated",
       "minLength": 1
     },
     "name": {
       "type": "string",
+      "description": "Legal name of the company",
       "minLength": 1
     },
     "jurisdiction_code": {
       "type": "string",
+      "description": "Code representing the jurisdiction/company register which is the canonical record of the company’s existence. Uses underscored ISO 3166-2 to represent it, e.g. es for Spain, us_de for Delaware",
       "minLength": 2,
       "maxLength": 5
     },
@@ -130,9 +133,11 @@
           "minLength": 1
         },
         "number_of_employees": {
-          "type": "number",
-          "description": "The number of employees",
-          "minimum": 0
+          "anyOf": [
+            {"type":"string","minLength": 1},
+            {"type":"number","minimum": 0}
+          ],
+          "description": "The number of employees"
         },
         "merged_into": {
           "type": "object",

data/schema/schemas/includes/address.json

@@ -9,7 +9,7 @@
       "description": "An address object",
       "type": "object",
       "properties": { "street_address": { "type": "string" },
-                      "locality": { "type": "date" },
+                      "locality": {"type":"string"},
                       "region":   { "type": "string" },
                       "postal_code":   { "type": "string" },
                       "country":   { "type": "string" }

data/schema/schemas/includes/alternative_name.json

@@ -3,8 +3,8 @@
   "description": "An alternative name of a company, e.g. abbreviation, trading (including dba or doing business as), legal. As well as trading names etc, it can be used for storing alternative language representations of the legal name, in which case the language should be represented as two-letter ISO-639 code",
   "type": "object",
   "properties": { "company_name": { "type": "string", "minLength": 1 },
-                  "start_date": { "type": "date" },
-                  "end_date": { "type": "date" },
+                  "start_date": {"type":"string","format": "date"},
+                  "end_date": {"type":"string","format": "date"},
                   "language": { "type": "string", "minLength": 2, "maxLength": 2 },
                   "type": { "type": "string", "enum": ["trading", "abbreviation", "legal"] }
   },

data/schema/schemas/includes/filing.json

@@ -3,7 +3,7 @@
   "description": "A statutory filing",
   "type": "object",
   "properties": { "title": { "type": "string" },
-                  "date": { "type": "date" },
+                  "date": {"type":"string","format": "date"},
                   "description":   { "type": "string" },
                   "uid":   { "type": "string" },
                   "url":   { "type": "string" },

data/schema/schemas/includes/industry_code.json

@@ -4,9 +4,12 @@
   "type": "object",
   "properties": { "name": { "type": "string" },
                   "code": { "type": "string" },
-                  "code_scheme_id": { "type": "string", "enum": ["eu_nace_2", "uk_sic_2003", "uk_sic_2007", "us_naics_2002", "us_naics_2007", "be_nace_2008", "dk_db_2007"] },
-                  "start_date":  { "type": "date" },
-                  "end_date":  { "type": "date" }
+                  "code_scheme_id": {
+                    "type": "string",
+                    "description": "An identifier representing industry code scheme. At the moment these are eu_nace_2, uk_sic_2003, uk_sic_2007, us_naics_2002, us_naics_2007, be_nace_2008, dk_db_2007, nz_bic_2006, no_sic_2007, anz_sic_2006, nz_bic_2006, in_nic_2004_mca, ca_qc_cae, lu_nace_2. For other code schemes, or details of these, contact info@opencorporates.com"
+                   },
+                  "start_date":  {"type":"string","format": "date"},
+                  "end_date":  {"type":"string","format": "date"}
   },
   "required": [ "code", "code_scheme_id" ]
 }

data/schema/schemas/includes/officer.json

@@ -4,12 +4,16 @@
   "type": "object",
   "properties": { "name": { "type": "string", "minLength": 1 },
                   "start_date": {
-                    "type": "string",
-                    "format": "date"
+                    "anyOf": [
+                      {"type":"string","format": "date"},
+                      {"type":"null"}
+                    ]
                   },
                   "end_date":   {
-                    "type": "string",
-                    "format": "date"
+                    "anyOf": [
+                      {"type":"string","format": "date"},
+                      {"type":"null"}
+                    ]
                   },
                   "position":   { "type": "string" },
                   "other_attributes": {

data/schema/schemas/includes/previous_name.json

@@ -7,7 +7,7 @@
                     "type": "date",
                     "description": "The end (conversion) date of the name"
                    },
-                  "start_date": { "type": "date" }
+                  "start_date": {"type":"string","format": "date"}
   },
   "required": [ "company_name" ]
 }

data/schema/schemas/includes/share-parcel.json

@@ -13,6 +13,9 @@
         "maximum": 100,
         "minimum": 0
       },
+      "start_date": {"type":"string","format": "date"},
+      "end_date": {"type":"string","format": "date"},
+      "sample_date": {"type":"string","format": "date"},
       "shareholders": {
         "description": "Legal persons who own this share parcel",
         "type": "array",

data/templates/manifest.json

@@ -5,6 +5,7 @@
  "language": "{{language}}",
  "data_type": "primary data",
  "identifying_fields": ["number"],
+ "company_fields": {"name": "company"},
  "files": ["{{scraper_name}}"],
  "frequency": "monthly",
  "publisher": {

data/templates/python/scraper.py

@@ -8,6 +8,7 @@ turbotlib.log("Starting run...") # Optional debug logging
 
 for n in range(0,20):
     data = {"number": n,
+            "company": "Company %s Ltd" % n,
             "message": "Hello %s" % n,
             "sample_date": datetime.datetime.now().isoformat(),
             "source_url": "http://somewhere.com/%s" % n}

data/templates/ruby/scraper.rb

@@ -8,6 +8,7 @@ Turbotlib.log("Starting run...") # optional debug logging
 (1...20).each do |n|
   data = {
     number: n,
+    company: "Company #{n} Ltd",
     message: "Hello #{n}",
     sample_date: Time.now,
     source_url: "http://somewhere.com/#{n}"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: turbot-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,23 +111,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: turbot-runner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,6 +175,28 @@ files:
 - lib/turbot/updater.rb
 - lib/turbot/version.rb
 - lib/vendor/turbot/okjson.rb
+- schema/schemas/company-schema.json
+- schema/schemas/financial-payment-schema.json
+- schema/schemas/includes/address.json
+- schema/schemas/includes/alternative_name.json
+- schema/schemas/includes/company.json
+- schema/schemas/includes/filing.json
+- schema/schemas/includes/financial-payment-data-object.json
+- schema/schemas/includes/industry_code.json
+- schema/schemas/includes/licence-data-object.json
+- schema/schemas/includes/officer.json
+- schema/schemas/includes/previous_name.json
+- schema/schemas/includes/share-parcel-data.json
+- schema/schemas/includes/share-parcel.json
+- schema/schemas/includes/subsidiary-relationship-data.json
+- schema/schemas/includes/total-shares.json
+- schema/schemas/licence-schema.json
+- schema/schemas/primary-data-schema.json
+- schema/schemas/share-parcel-schema.json
+- schema/schemas/simple-financial-payment-schema.json
+- schema/schemas/simple-licence-schema.json
+- schema/schemas/simple-subsidiary-schema.json
+- schema/schemas/subsidiary-relationship-schema.json
 - spec/helper/legacy_help.rb
 - spec/helper/pg_dump_restore_spec.rb
 - spec/schemas/dummy_schema.json
@@ -227,51 +230,29 @@ files:
 - templates/manifest.json
 - templates/python/scraper.py
 - templates/ruby/scraper.rb
-- schema/schemas/company-schema.json
-- schema/schemas/financial-payment-schema.json
-- schema/schemas/includes/address.json
-- schema/schemas/includes/alternative_name.json
-- schema/schemas/includes/company.json
-- schema/schemas/includes/filing.json
-- schema/schemas/includes/financial-payment-data-object.json
-- schema/schemas/includes/industry_code.json
-- schema/schemas/includes/licence-data-object.json
-- schema/schemas/includes/officer.json
-- schema/schemas/includes/previous_name.json
-- schema/schemas/includes/share-parcel-data.json
-- schema/schemas/includes/share-parcel.json
-- schema/schemas/includes/subsidiary-relationship-data.json
-- schema/schemas/includes/total-shares.json
-- schema/schemas/licence-schema.json
-- schema/schemas/primary-data-schema.json
-- schema/schemas/share-parcel-schema.json
-- schema/schemas/simple-financial-payment-schema.json
-- schema/schemas/simple-licence-schema.json
-- schema/schemas/simple-subsidiary-schema.json
-- schema/schemas/subsidiary-relationship-schema.json
 homepage: http://turbot.com/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
+has_rdoc: