turbot 0.0.30 → 0.0.31

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDA5ZDU1YmEwNTE2ZGM5NDExNWU4ZTZjNDY4NDY4ZjNkZjlmODhjZA==
-  data.tar.gz: !binary |-
-    NzRjMDk5YmYyZGIxN2ZkYmI0OTg4Yjc2MDAzMzA0Yzg5ZTdjNzM3Mg==
+SHA1:
+  metadata.gz: 63a50a991f01d97eccb3b81bd91ec01e8283bcd4
+  data.tar.gz: 033f5a762128b3060e385c39a93333e9a2ab3fca
 SHA512:
-  metadata.gz: !binary |-
-    NTI3NWIxMjM2YzE2YzEwMWE2OThhZDUwMzllZjc1NGMwZjg2Nzk4ZWQ5Zjc3
-    Yjg1ZWY5NWY1ZGEwNWFlOTFmMDVlODE0ZmVkMjM5NDQxZDg0NmJlM2NhYTI0
-    NTYwOTgwODMyNTc1ZmQwOTUwYmIzYTU4MDIxZThjNTVmZTc2MWU=
-  data.tar.gz: !binary |-
-    YTdmOWI5ZDZhZjkxMWExYzM1YmEzN2EyYmUxMjE1MjZkZGI3NDMwZDM1N2Jj
-    MWZkNmFlNWQ4YjViNDY2NzJmNGZiNjZhOTdmZWY0YjFmNjZjNmIyNTRkMDU2
-    NGJiZjUzMGZkMDk0MjEyM2FiMGFjYTIyYjU5MzlmMWY3NzZkZjM=
+  metadata.gz: 7a09713ea6e5355e0cc4db8e7d259b092761a631382d84f3e6e2e804634fb4e1c3fff93c502f8aacadc0934c3ff16691139bf30502bb7b5196295d37953bc554
+  data.tar.gz: 65dfa81262d92982df9b918133b0e84f82b56c7358f2f602bfb43f1acb19e4a3c5885f91a26de13c25740d72f3122d86a78d7f667c51ccd0e248af919a249b4c

data/lib/turbot/command/bots.rb

@@ -160,7 +160,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
 
   def push
     validate_arguments!
-
+    puts "This will submit your bot and its data for review."
+    puts "Are you happy your bot produces valid data (e.g. with `turbot bots:validate`)? [Y/n]"
+    confirmed = ask
+    error("Aborting push") if !confirmed.downcase.empty? && confirmed.downcase != "y"
     working_dir = Dir.pwd
     manifest = parsed_manifest(working_dir)
     #archive_file = File.join(working_dir, 'tmp', "#{manifest['bot_id']}.zip")
@@ -261,6 +264,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
     puts "Sending to turbot... "
 
     runner = PreviewRunner.new(bot, api)
+    Signal.trap("INT") do
+      Process.kill("ABRT", runner.wait_thread[:pid])
+      runner.interrupt
+    end
     runner.run
   end
 
@@ -319,6 +326,13 @@ class PreviewRunner < TurbotRunner::BaseRunner
     puts
   end
 
+  def handle_interrupted_run
+    result = submit_batch
+    puts "Run interrupted!"
+    puts "Sent #{@count} records."
+    puts "View your records at #{result.data[:url]}"
+  end
+
   def handle_successful_run
     result = submit_batch
     puts "Sent #{@count} records."

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/templates/python/scraper.py

@@ -4,7 +4,7 @@ import json
 import datetime
 import turbotlib
 
-turbotlib.log("starting run...")
+turbotlib.log("Starting run...") # Optional debug logging
 
 for n in range(0,20):
     data = {"number": n,
@@ -13,5 +13,3 @@ for n in range(0,20):
             "source_url": "http://somewhere.com/%s" % n}
     # The Turbot specification simply requires us to output lines of JSON
     print json.dumps(data)
-
-turbotlib.log("done!")

data/templates/ruby/scraper.rb

@@ -3,7 +3,7 @@
 require 'json'
 require 'turbotlib'
 
-Turbotlib.log("Starting run...")
+Turbotlib.log("Starting run...") # optional debug logging
 
 (1...20).each do |n|
   data = {
@@ -15,5 +15,3 @@ Turbotlib.log("Starting run...")
   # The Turbot specification simply requires us to output lines of JSON
   puts JSON.dump(data)
 end
-
-Turbotlib.log("Done!")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -42,42 +42,42 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -114,26 +114,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library and command-line tool to deploy and manage apps on Turbot.
@@ -175,23 +175,6 @@ files:
 - lib/turbot/updater.rb
 - lib/turbot/version.rb
 - lib/vendor/turbot/okjson.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/simple-licence-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
@@ -225,6 +208,22 @@ 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
@@ -235,19 +234,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
-has_rdoc: 

data/schema/schemas/simple-licence-schema.json

@@ -1,50 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Simple Licence 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"
-    },
-    "confidence": {
-      "description": "Confidence in accuracy of data",
-      "type": "string",
-      "enum": ["HIGH", "MEDIUM", "LOW"]
-    },
-    "company_name": {
-      "description": "Name of the company holding the licence",
-      "type": "string"
-    },
-    "company_jurisdiction": {
-      "description": "Jurisdiction where company is based",
-      "type": "string"
-    },
-    "licence_number": {
-      "description": "Licence number or code",
-      "type": "string"
-    },
-    "jurisdiction_classification": {
-      "description": "Description of how regulator classifies licence",
-      "type": "string"
-    },
-    "regulator": {
-      "description": "The regulating body that issued the licence",
-      "type": "string"
-    },
-    "licence_jurisdiction": {
-      "description": "Jurisdiction where licence is issued",
-      "type": "string"
-    },
-    "category": {
-      "description": "Category of licence",
-      "type": "string",
-      "enum": ["Financial"]
-    }
-  },
-  "required": ["source_url", "sample_date", "company_name", "company_jurisdiction"]
-}