turbot 0.1.18 → 0.1.19

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjExNGE1NTc3M2RhNzBlNGQ2MGM4MmY4MzRkM2ZmZjMwMzY1ODViMg==
+    ZjNkN2MwZDFkOWVkNTI4ODgzMDBjYTI0MzVkNGU1ZjIxOTU2MDZiZg==
   data.tar.gz: !binary |-
-    MDhkYWIxZTdmZDUxNzdhOWYyMmViMjc0ZGRkY2RkNjczYmNhNDgzYw==
+    MjMzOTQ4NTg1MDIzYjE1YzZhNDQ3NzIxOTAwMWRmZDRkNzI3NjU3NQ==
 SHA512:
   metadata.gz: !binary |-
-    ODVmYmMzNjdhODQ0NmUyODcxZjIwMjRiZDBjYmJmMzg0ZmRlYTliOWVjMjdi
-    MTUwOTVlZjg5OWE4YzVhMmMxYmI3OGJiMDc3NmRiMmFkOTJlZWUyNzdkNWZl
-    YmYzYWM5NDMwNmUyODJkNjQ5Y2ZiNmEyN2E0OGUxZmVkYTA5OWY=
+    Y2QyMWIzN2ViMTMwMmViNGVlZmQyMWFlOWM1MGNiY2ZkYmNhMTZiZmVmMjZk
+    MTEzMWM0MzFkNzc0MGU0NDZhMTI2NmNjNzg4M2YwYzk4ZjMzOWUxMGYzZmM2
+    NTNjYWFjODEwOTZiYmE3OTM1NjlkYzMxZjkzOTUzNTMwMTFiM2I=
   data.tar.gz: !binary |-
-    NWI0NzkyNjRkNGM4ZGY2ZmU1OWEwYjJmZTAzNWRjNmIzNjkxZjg2ZTkzY2Yx
-    OGUxZWZlZDdkMjg2NDdiM2VjMmZjODI2MGZmY2Q4YjUxM2EyNzVlODA5YTM1
-    ODFjMWM2YjM3ZDdhZjU1OWI1OGFhN2U1MDg2Y2UxZjQwOTUwZDE=
+    MWVkN2ZlNzJhYTQwMDQxZTI5NWIyNDMyNDY2ODJhMjAxYzYzNjkwZmJhZmZh
+    ODY2MmNkMDU2ODMwM2U3ZTcxNGE5YzQxOWVhODc2MDFmZDdhZjgzMmU4MDZi
+    NTk1MGNmMTU3MjA1ZDVmM2YwYmViOTNlZjkxZjU4NmI3OWM2MmU=

data/lib/turbot/command/bots.rb

@@ -2,7 +2,6 @@ require "turbot/command/base"
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/slice'
 require 'zip'
-require 'json-schema'
 require 'open3'
 require 'base64'
 require 'shellwords'
@@ -179,7 +178,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
     response = File.open(archive_path) {|file| api.update_code(bot, file)}
     case response
     when Turbot::API::SuccessResponse
-      puts "Your bot has been pushed to Turbot and will be reviewed for inclusion as soon as we can. THANKYOU!"
+      puts "Your bot has been pushed to Turbot and will be reviewed for inclusion as soon as we can. THANK YOU!"
     when Turbot::API::FailureResponse
       error(response.message)
     end
@@ -205,12 +204,6 @@ class Turbot::Command::Bots < Turbot::Command::Base
 
     type = config["data_type"]
 
-    schema = get_schema(type)
-
-    if !schema || !File.exists?(schema)
-      error("No schema found for data_type: #{type}")
-    end
-
     handler = ValidationHandler.new
     runner = TurbotRunner::Runner.new(Dir.pwd, :record_handler => handler)
     rc = runner.run
@@ -329,11 +322,6 @@ class Turbot::Command::Bots < Turbot::Command::Base
     File.join(Dir.pwd, 'manifest.json')
   end
 
-  def get_schema(type)
-    hyphenated_name = type.to_s.gsub("_", "-").gsub(" ", "-")
-    File.expand_path("../../../../schema/schemas/#{hyphenated_name}-schema.json", __FILE__)
-  end
-
   def create_zip_archive(archive_path, basepath, subpaths)
     Zip.continue_on_exists_proc = true
     Zip::File.open(archive_path, Zip::File::CREATE) do |zipfile|

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbotlib
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.30
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -175,35 +175,6 @@ 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-for-nesting.json
-- schema/schemas/includes/company.json
-- schema/schemas/includes/filing.json
-- schema/schemas/includes/financial-payment-data-object.json
-- schema/schemas/includes/identifier.json
-- schema/schemas/includes/industry_code.json
-- schema/schemas/includes/licence-data-object.json
-- schema/schemas/includes/officer.json
-- schema/schemas/includes/organisation.json
-- schema/schemas/includes/permission.json
-- schema/schemas/includes/person.json
-- schema/schemas/includes/person_name.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/includes/unknown_entity_type.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

data/schema/schemas/company-schema.json

@@ -1,237 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "A company in OpenCorporates",
-  "type": "object",
-  "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
-    },
-    "incorporation_date": {
-      "type": "string",
-      "format": "date"
-    },
-    "dissolution_date": {
-      "type": "string",
-      "format": "date"
-    },
-    "retrieved_at": {
-      "type": "string",
-      "format": "date-time"
-    },
-    "current_status": {
-      "type": "string"
-    },
-    "company_type": {
-      "type": "string"
-    },
-    "registry_url": {
-      "type": "string"
-    },
-    "website": {
-      "type": "string",
-      "minLength": 5
-    },
-    "telephone_number": {
-      "type": "string",
-      "minLength": 4
-    },
-    "fax_number": {
-      "type": "string",
-      "minLength": 4
-    },
-    "registered_address": {
-      "$ref": "includes/address.json"
-    },
-    "headquarters_address": {
-      "$ref": "includes/address.json"
-    },
-    "mailing_address": {
-      "$ref": "includes/address.json"
-    },
-    "officers": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/officer.json"
-      }
-    },
-    "share_parcels": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/share-parcel.json"
-      }
-    },
-    "total_shares": {
-      "$ref": "includes/total-shares.json"
-    },
-    "filings": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/filing.json"
-      }
-    },
-    "identifiers": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/identifier.json"
-      }
-    },
-    "industry_codes": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/industry_code.json"
-      }
-    },
-    "previous_names": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/previous_name.json"
-      }
-    },
-    "alternative_names": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/alternative_name.json"
-      }
-    },
-    "branch": {
-      "type": [
-        "string",
-        "null"
-      ],
-      "description": "A flag to denote whether a company is a branch entity. This should only be set if the company is a type of branch (otherwise should be null). In general the only option here is 'F' for a 'Foreign' branch, i.e. an out-of-jurisdiction entity that has registered as having a presence in the jurisdiction. In the US this is sometimes called a Foreign Corporation",
-      "enum": [
-        "F",
-        "L",
-        null
-      ]
-    },
-    "all_attributes": {
-      "type": "object",
-      "description": "Other arbitrary attributes for a given company",
-      "properties": {
-        "jurisdiction_of_origin": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "description": "The jurisdiction of the 'home' company if this is a branch",
-          "minLength": 1
-        },
-        "home_company_number": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "description": "If the entity is a 'branch', this is the company_number of the 'home' company in the home company's jurisdiction",
-          "minLength": 1
-        },
-        "home_legal_name": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "description": "The legal name of the 'home' company in its jurisdiction if this is a branch, and the name is different from the legal name of the branch",
-          "minLength": 1
-        },
-        "registered_agent_address": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "description": "The address of the 'Agent', a public address to which legal papers can be served",
-          "minLength": 1
-        },
-        "registered_agent_name": {
-          "type": [
-            "string",
-            "null"
-          ],
-          "description": "The 'Agent' of the company – a person or entity that is empowered to accept service for the company",
-          "minLength": 1
-        },
-        "number_of_employees": {
-          "anyOf": [
-            {
-              "type": "string",
-              "minLength": 1
-            },
-            {
-              "type": "number",
-              "minimum": 0
-            }
-          ],
-          "description": "The number of employees"
-        },
-        "merged_into": {
-          "type": "object",
-          "description": "Information on the merger of this company into a 'survivor' company",
-          "properties": {
-            "surviving_company": {
-              "type": [
-                "object"
-              ],
-              "description": "the surviving_company that this has been merged into",
-              "properties": {
-                "name": {
-                  "type": "string",
-                  "description": "The legal name of the surviving company",
-                  "minLength": 1
-                },
-                "company_number": {
-                  "type": "string",
-                  "description": "The company_number of the surviving company, if known",
-                  "minLength": 1
-                },
-                "jurisdiction": {
-                  "type": "string",
-                  "description": "The jurisdiction of incorporation of the surviving company",
-                  "minLength": 2
-                }
-              },
-              "anyOf": [
-                {
-                  "required": [
-                    "name"
-                  ]
-                },
-                {
-                  "required": [
-                    "company_number"
-                  ]
-                }
-              ]
-            },
-            "effective_date": {
-              "type": "string",
-              "format": "date",
-              "description": "The date of the merger"
-            }
-          },
-          "additionalProperties": false,
-          "required": [
-            "surviving_company"
-          ]
-        }
-      }
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "company_number",
-    "name",
-    "jurisdiction_code"
-  ]
-}

data/schema/schemas/financial-payment-schema.json

@@ -1,32 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "A Financial-Payment is a payment from government to a recipient",
-  "type": "object",
-  "properties": {
-    "sample_date": {
-      "type": "string",
-      "format": "date"
-    },
-    "source_jurisdiction": {
-      "description": "Jurisdiction of the source of the data",
-      "type": "string"
-    },
-    "company": {
-      "$ref": "includes/company.json"
-    },
-    "data": {
-      "type": "array",
-      "description": "This is an array of data objects, that is the objects which actually contain the data about the datum. Generally there will only be one element in this, although in for some types of data_types there may naturally be several releated to the same company, e.g. shareholders",
-      "items": {
-        "$ref": "includes/financial-payment-data-object.json"
-      },
-      "additionalItems": false
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "company",
-    "data",
-    "sample_date"
-  ]
-}

data/schema/schemas/includes/address.json

@@ -1,46 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "oneOf": [
-    {
-      "type": [
-        "string",
-        "null"
-      ],
-      "minLength": 2
-    },
-    {
-      "name": "Address",
-      "description": "An address object",
-      "type": "object",
-      "properties": {
-        "street_address": {
-          "type": "string"
-        },
-        "locality": {
-          "type": "string"
-        },
-        "region": {
-          "type": "string"
-        },
-        "postal_code": {
-          "type": "string"
-        },
-        "country": {
-          "type": "string"
-        }
-      },
-      "anyOf": [
-        {
-          "required": [
-            "street_address"
-          ]
-        },
-        {
-          "required": [
-            "postal_code"
-          ]
-        }
-      ]
-    }
-  ]
-}

data/schema/schemas/includes/alternative_name.json

@@ -1,36 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "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": "string",
-      "format": "date"
-    },
-    "end_date": {
-      "type": "string",
-      "format": "date"
-    },
-    "language": {
-      "type": "string",
-      "minLength": 2,
-      "maxLength": 2
-    },
-    "type": {
-      "type": "string",
-      "enum": [
-        "trading",
-        "abbreviation",
-        "legal"
-      ]
-    }
-  },
-  "required": [
-    "company_name",
-    "type"
-  ]
-}