turbot 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDkzYjBhNWJkZGQ0OTJhN2U1NzI5Yzk5M2E5MjlkYTE0YzUxY2Q4ZA==
+  data.tar.gz: !binary |-
+    YzI4OTE4MTZiOWFmMmMyYTJmN2RlNjI3YjZkNmZmNTRjNmRhZmUwOQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZGRmMTEzNDU5YzIzNGFhMmYwNTllYjk5YzM5YjU1ZWVhYWRmZTFjNmJkMDgw
+    N2ExYzhmZGUyYzg4MGE0YjIwMDA5M2FjOGUyYzI5MmY5NDA0Yzg1ODk2N2E1
+    YmE4YmQ1OTI1OWNmY2I1MjVhODNkOGY5MDhiNzVhMmUyNGQzZTU=
+  data.tar.gz: !binary |-
+    MWM0Zjg1MmVhZDk5MjMzZTMxZjljN2NjZTdlNzZkZTllMjFiNzBkNzhiNTJh
+    MjJjZGM2YjVmNzMyNGZlM2FkNTQyMDk1YzAyNjUzZTBkM2Q3MWYwNGUxZjJj
+    OTBmZjU2NTRhZjMxNjEzYTNjOWVhZmQ2ZjQzMjk0NDJkY2Y2N2E=

data/lib/turbot/command/bots.rb

@@ -96,35 +96,27 @@ class Turbot::Command::Bots < Turbot::Command::Base
     validate_arguments!
     language = options[:language] || "ruby"
     puts "Generating #{language} code..."
+    FileUtils.mkdir(bot)
+    case language
+    when "ruby"
+      scraper = "scraper.rb"
+    when "python"
+      scraper = "scraper.py"
+    end
     manifest_template = File.expand_path("../../../../templates/manifest.json", __FILE__)
-    scraper_template = File.expand_path("../../../../templates/#{language}", __FILE__)
+    scraper_template = File.expand_path("../../../../templates/#{scraper}", __FILE__)
     license_template = File.expand_path("../../../../templates/LICENSE.txt", __FILE__)
     manifest = JSON.parse(open(manifest_template).read.sub(/{{bot_id}}/, bot))
 
-    # Language-specific stuff
-    FileUtils.cp(scraper_template, bot)
-
-    # Same for all languages
+    FileUtils.cp(scraper_template, "#{bot}/#{scraper}")
     FileUtils.cp(license_template, "#{bot}/LICENSE.txt")
     open("#{bot}/manifest.json", "w") do |f|
-      f.write(JSON.pretty_generate(manifest))
-    end
-
-    if language == "ruby"
-      FileUtils.chdir(bot)
-      Open3::popen3("bundle", options) do |_, stdout, stderr, wait_thread|
-        status = wait_thread.value.exitstatus
-        if status > 0
-          message = "Bundle failed!"
-          message += stderr.read()
-          error(message)
-        end
-      end
+      f.write(manifest.to_json)
     end
 
     api.create_bot(bot, manifest)
 
-      # TODO handle errors
+    # TODO handle errors
 
     puts "Created new bot template at #{bot}!"
   end

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Turbot
@@ -14,7 +13,6 @@ 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,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 3.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 3.2.17
 - !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,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,45 +199,28 @@ files:
 - templates/manifest.json
 - templates/python/scraper.py
 - templates/ruby/scraper.rb
-- schema/schemas/company-schema.json
-- schema/schemas/includes/address.json
-- schema/schemas/includes/base-statement.json
-- schema/schemas/includes/company.json
-- schema/schemas/includes/filing.json
-- schema/schemas/includes/license-data.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/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.2
+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: []

data/schema/schemas/company-schema.json

@@ -1,112 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Company Schema",
-  "type": "object",
-  "description": "A company in OpenCorporates",
-  "properties": {
-    "company_number": {
-      "type": "string",
-      "minLength": 1
-    },
-    "name": {
-      "type": "string",
-      "minLength": 1
-    },
-    "jurisdiction_code": {
-      "type": "string",
-      "minLength": 2,
-      "maxLength": 5
-    },
-    "incorporation_date": {
-      "type": "date"
-    },
-    "dissolution_date": {
-      "type": "date"
-    },
-    "retrieved_at": {
-      "type": "date-time"
-    },
-    "current_status": {
-      "type": "string"
-    },
-    "company_type": {
-      "type": "string"
-    },
-    "registry_url": {
-      "type": "string"
-    },
-    "registered_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"
-      }
-    },
-    "previous_names": {
-      "type": "array",
-      "items": {
-        "$ref": "includes/previous_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 \u2013 a person or entity that is empowered to accept service for the company",
-          "minLength": 1
-        },
-        "number_of_employees": {
-          "type": "number",
-          "description": "The number of employees",
-          "minimum": 0
-        }
-      }
-    }
-  },
-  "additionalProperties": false,
-  "required": ["company_number", "name", "jurisdiction_code"]
-}

data/schema/schemas/includes/address.json

@@ -1,23 +0,0 @@
-{ "oneOf":
-  [
-    {
-      "type": ["string","null"],
-      "minLength": 2
-    },
-    {
-      "name": "Address",
-      "description": "An address object",
-      "type": "object",
-      "properties": { "street_address": { "type": "string" },
-                      "locality": { "type": "date" },
-                      "region":   { "type": "string" },
-                      "postal_code":   { "type": "string" },
-                      "country":   { "type": "string" }
-      },
-      "anyOf": [ { "required": ["street_address"] },
-                 { "required": ["postal_code"] }
-               ]
-    }
-  ]
-}
-

data/schema/schemas/includes/base-statement.json

@@ -1,27 +0,0 @@
-{
-  "name": "Base statement",
-  "description": "A base statement which must be extended by a schema to be used in OpenCorporates",
-  "type": "object",
-  "properties": {
-    "source_url": {
-      "description": "Place where this fact can be verified",
-      "type": "string"
-    },
-    "source_jurisdiction": {
-      "description": "Jurisdiction of the source of the data",
-      "type": "string"
-    },
-    "sample_date": {
-      "description": "Date on which this fact was known to be true",
-      "type": "string"
-    },
-    "company": {
-      "$ref" : "../includes/company.json"
-    },
-    "data": {
-      "type": "array",
-      "additionalItems": false
-    }
-  },
-  "required": ["source_url", "data", "sample_date", "company"]
-}

data/schema/schemas/includes/company.json

@@ -1,14 +0,0 @@
-{
-  "name": "Company",
-  "description": "A company which is the subject of a statement",
-  "type": "object",
-  "properties": {
-    "name": { "type": "string" },
-    "jurisdiction": { "type": "string" },
-    "identifier": {
-      "type": "string",
-      "pattern": "^[^/]+/[^/]+$"
-    }
-  },
-  "required": [ "name", "jurisdiction" ]
-}

data/schema/schemas/includes/filing.json

@@ -1,20 +0,0 @@
-{
-  "name": "Filing",
-  "description": "A statutory filing",
-  "type": "object",
-  "properties": { "title": { "type": "string" },
-                  "date": { "type": "date" },
-                  "description":   { "type": "string" },
-                  "uid":   { "type": "string" },
-                  "url":   { "type": "string" },
-                  "filing_type_code":   { "type": "string" },
-                  "filing_type_name":   { "type": "string" },
-                  "other_attributes": { "type": "object" }
-  },
-  "required": [ "date" ],
-  "anyOf": [ { "required": ["title"] },
-             { "required": ["description"] },
-             { "required": ["filing_type_name"] }
-           ]
-}
-

data/schema/schemas/includes/license-data.json

@@ -1,27 +0,0 @@
-{
-  "name": "License Data",
-  "type": "object",
-  "properties": {
-    "data_type": { "enum": [ "licence" ] },
-    "properties": {
-      "type": "object",
-      "properties": {
-        "regulator": {
-          "description": "The regulating body that issued the licence",
-          "type": "string"},
-        "jurisdiction_code": {
-          "description": "The jurisdiction for which licence was issued",
-          "type": "string"},
-        "licence_number": {
-          "type": "string"},
-        "jurisdiction_classification": {
-          "type": "array",
-          "minItems": 1},
-        "oc_classification": {
-          "type": "array"}
-      },
-      "required": [ "jurisdiction_code", "jurisdiction_classification" ]
-    }
-  },
-  "required": [ "data_type", "properties" ]
-}

data/schema/schemas/includes/officer.json

@@ -1,14 +0,0 @@
-{
-  "name": "Officer",
-  "description": "An officer (director, senior executive) of a company",
-  "type": "object",
-  "properties": { "name": { "type": "string", "minLength": 1 },
-                  "start_date": { "type": "date" },
-                  "end_date":   { "type": "date" },
-                  "position":   { "type": "string" },
-                  "other_attributes": { "type": "object" },
-                  "uid":   { "type": "string" }
-  },
-  "required": [ "name" ]
-}
-

data/schema/schemas/includes/previous_name.json

@@ -1,11 +0,0 @@
-{
-  "name": "PreviousName",
-  "description": "A previous name of a company",
-  "type": "object",
-  "properties": { "company_name": { "type": "string", "minLength": 1 },
-                  "con_date": { "type": "date" },
-                  "start_date": { "type": "date" }
-  },
-  "required": [ "company_name" ]
-}
-

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

@@ -1,67 +0,0 @@
-{
-  "name": "Share Parcel Data",
-  "type": "object",
-  "properties": {
-    "data_type": { "enum": [ "share_parcel" ] },
-    "properties": {
-      "type": "object",
-      "required": ["shareholders"],
-      "properties": {
-        "number_of_shares": {
-          "description": "Number of shares, if known",
-          "type": "integer"},
-        "percentage_of_shares": {
-          "description": "Percentage of shares, if known",
-          "type": "number",
-          "maximum": 100,
-          "minimum": 0
-        },
-        "shareholders": {
-          "description": "Legal persons who own this share parcel",
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "anyOf": [
-              {"type": "object",
-               "name": "person",
-               "required": ["name"],
-               "properties": {
-                 "name": {
-                   "description": "Name of natural person or company",
-                   "type": "string"
-                 },
-                 "jurisdiction": {
-                   "description": "Jurisdiction of registration, if company",
-                   "type": "string"
-                 },
-                 "company_number": {
-                   "description": "Company number, if company and known",
-                   "type": "string"
-                 },
-                 "identifier": {
-                   "description": "Unique identifier of person",
-                   "type": "string"
-                 },
-                 "type": {
-                   "description": "Type of person if known (company or natural person)",
-                   "enum" : ["Company", "Person"]
-                 },
-                 "address": {
-                   "description": "Address given for owner of parcel",
-                   "type": "string"
-                 },
-                 "address_country": {
-                   "description": "Country part of owner's address",
-                   "type": "string"
-                 }
-
-               }
-              }
-            ]
-          }
-        }
-      }
-    }
-  },
-  "required": [ "data_type", "properties" ]
-}

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

@@ -1,60 +0,0 @@
-{
-  "name": "Share Parcel",
-  "type": "object",
-  "description": "A parcel of shares in a company",
-    "required": ["shareholders"],
-    "properties": {
-      "number_of_shares": {
-        "description": "Number of shares, if known",
-        "type": "integer"},
-      "percentage_of_shares": {
-        "description": "Percentage of shares, if known",
-        "type": "number",
-        "maximum": 100,
-        "minimum": 0
-      },
-      "shareholders": {
-        "description": "Legal persons who own this share parcel",
-        "type": "array",
-        "minItems": 1,
-        "items": {
-          "type": "object",
-          "name": "shareholder",
-          "required": ["name"],
-          "properties": {
-            "name": {
-              "description": "Name of natural person or company",
-              "type": "string",
-              "minLength": 1
-            },
-            "jurisdiction": {
-              "description": "Jurisdiction of registration, if company",
-              "type": "string"
-            },
-            "company_number": {
-              "description": "Company number, if company and known",
-              "type": "string"
-            },
-            "identifier": {
-              "description": "Unique identifier of person",
-              "type": "string"
-            },
-            "type": {
-              "description": "Type of person if known (company or natural person)",
-              "enum" : ["Company", "Person"]
-            },
-            "address": {
-              "description": "Address given for owner of parcel",
-              "type": "string"
-            },
-            "address_country": {
-              "description": "Country part of owner's address",
-              "type": "string"
-            }
-
-          }
-        }
-    }
-  },
-  "required": [ ]
-}

data/schema/schemas/includes/subsidiary-relationship-data.json

@@ -1,52 +0,0 @@
-{
-  "name": "Share Parcel Data",
-  "type": "object",
-  "properties": {
-    "data_type": { "enum": [ "subsidiary_relationship" ] },
-    "properties": {
-      "type": "object",
-      "required": ["subsidiary"],
-      "additionalProperties": false,
-      "properties": {
-        "direct": {
-          "description": "If the control is direct (if via an intermediary, this value should be false; if unknown, left blank)",
-          "type": "boolean"},
-        "significant": {
-          "description": "Does the source define the control as somehow significant?",
-          "type": "boolean"},
-        "subsidiary": {
-          "description": "Company that is controlled",
-          "type": "object",
-          "required": ["name"],
-          "additionalProperties": false,
-          "properties": {
-            "name": {
-              "description": "Name of company",
-              "type": "string"
-            },
-            "jurisdiction": {
-              "description": "Jurisdiction of registration",
-              "type": "string"
-            },
-            "company_number": {
-              "description": "Company number, if company and known",
-              "type": "string"
-            },
-            "identifier": {
-              "description": "Unique identifier of person",
-              "type": "string"
-            },
-            "address": {
-              "description": "Address given for owner of parcel",
-              "type": "string"
-            },
-            "address_country": {
-              "description": "Country part of owner's address",
-              "type": "string"
-            }
-          }
-        }
-      }
-    }
-  }
-}

data/schema/schemas/includes/total-shares.json

@@ -1,10 +0,0 @@
-{
-  "name": "TotalShares",
-  "description": "The total number of shares a company has issued",
-  "type": "object",
-  "properties": { "number": { "type": "integer" },
-                  "share_class": { "type": "string", "minLength": 1 }
-  },
-  "required": [ "number" ]
-}
-

data/schema/schemas/licence-schema.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Licence Schema",
-  "type": "object",
-  "allOf" : [
-    // The following is a basic statement with sample_date, etc
-    { "$ref": "includes/base-statement.json" },
-    // And this overrides it to provide data-type-specific information
-    {
-      "properties": {
-        "data": {
-          "items": {
-            "allOf": [
-              { "$ref": "includes/license-data.json" }
-            ]
-          }
-        }
-      }
-    }
-  ]
-}

data/schema/schemas/primary-data-schema.json

@@ -1,17 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "title": "Primary Data Schema",
-    "type": "object",
-    "properties": {
-        "source_url": {
-            "description": "Place where this fact can be verified",
-            "type": "string"
-        },
-        "sample_date": {
-            "description": "Date on which this fact was known to be true",
-            "type": "string"
-        }
-    },
-    "required": ["source_url", "sample_date"],
-    "additionalProperties": true
-}

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

@@ -1,21 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Share Parcel Schema",
-  "type": "object",
-  "allOf" : [
-    // The following is a basic statement with sample_date, etc
-    { "$ref": "includes/base-statement.json" },
-    // And this overrides it to provide data-type-specific information
-    {
-      "properties": {
-        "data": {
-          "items": {
-            "allOf": [
-              { "$ref": "includes/share-parcel-data.json" }
-            ]
-          }
-        }
-      }
-    }
-  ]
-}

data/schema/schemas/subsidiary-relationship-schema.json

@@ -1,19 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Subsidiary Relationship Schema",
-  "type": "object",
-  "allOf" : [
-    { "$ref": "includes/base-statement.json" },
-    {
-      "properties": {
-        "data": {
-          "items": {
-            "allOf": [
-              { "$ref": "includes/subsidiary-relationship-data.json" }
-            ]
-          }
-        }
-      }
-    }
-  ]
-}