turbot 0.0.22 → 0.0.23

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTFkYjQ5ODY3ZGNiNjY1OWZiZjUxNDI0ODIzZjY5ZDVkNjQ3MTY4Yg==
+  data.tar.gz: !binary |-
+    MGZlYWVkODdhNmE2ZmRmMTI5ODI4Y2E3ZWY4NmNjZjQwNjgzYzJkZA==
+SHA512:
+  metadata.gz: !binary |-
+    NTkzODA2NjM4OWE3ZTkwNGE2NWQ1NTE5NDJkY2JmYTY0MjJlNzY1MWFkODM2
+    ZDQzZTA0YmM2MTc4ODhkZGI0ZDQ5ZjE0ODllOTAwYmM0ZWU1NzdlNzVmOTQ4
+    MGY1OTVlZDM4OWNhNjA3ZWFiYjY0MTIwNTc1ZjczOWQ1NzE1Mjk=
+  data.tar.gz: !binary |-
+    YzgyNmMzZGI2OTg2MzRhMWMzZTdmNjA3MjU5MjYwYWM2ZDVjOGM3NTk0YmYy
+    NGRmMGNkY2JkMDFiYzE0MDg4MGY3YmFmY2FiN2EzYjM5NDMwNjJkNzZkNzYx
+    YTIxNDc5Y2M0OTg4N2M4NTgwYjBhMjkxZmU2OWNmZTRiMmI4MDM=

data/lib/turbot/command/bots.rb

@@ -7,7 +7,7 @@ require 'open3'
 require 'base64'
 require 'shellwords'
 
-# manage bots (create, destroy)
+# manage bots (create, submit data and code)
 #
 class Turbot::Command::Bots < Turbot::Command::Base
 
@@ -209,7 +209,8 @@ class Turbot::Command::Bots < Turbot::Command::Base
       end
       puts line if opts[:dump]
       if JSON.parse(line).slice(*config['identifying_fields']).blank?
-        error("LINE WITH ERROR: #{line}\n\nERRORS: No value provided for identifying fields")
+        error = "Couldn't find any of #{config['identifying_fields']}"
+        error("LINE WITH ERROR: #{line}\n\nERRORS: #{error}")
       end
 
       count += 1
@@ -229,28 +230,28 @@ class Turbot::Command::Bots < Turbot::Command::Base
     validate(:dump => true)
   end
 
-  # bots:single
-  #
-  # Execute bot in same way as OpenCorporates single-record update
-  #
-  # $ heroku bots:single
-  # Enter argument (as JSON object):
-  # {"id": "frob123"}
-  # {"id": "frob123", "stuff": "updated-data-for-this-record"}
-
-  def single
-    # This will need to be language-aware, eventually
-    scraper_path    = shift_argument || scraper_file(Dir.pwd)
-    validate_arguments!
-    print 'Arguments (as JSON object, e.g. {"id":"ABC123"}: '
-    arg = ask
-    count = 0
-    run_scraper_each_line("#{scraper_path} #{bot} #{Shellwords.shellescape(arg)}") do |line|
-      raise "Your scraper returned more than one value!" if count > 1
-      puts line
-      count += 1
-    end
-  end
+#  # bots:single
+#  #
+#  # Execute bot in same way as OpenCorporates single-record update
+#  #
+#  # $ heroku bots:single
+#  # Enter argument (as JSON object):
+#  # {"id": "frob123"}
+#  # {"id": "frob123", "stuff": "updated-data-for-this-record"}
+#
+#  def single
+#    # This will need to be language-aware, eventually
+#    scraper_path    = shift_argument || scraper_file(Dir.pwd)
+#    validate_arguments!
+#    print 'Arguments (as JSON object, e.g. {"id":"ABC123"}: '
+#    arg = ask
+#    count = 0
+#    run_scraper_each_line("#{scraper_path} #{bot} #{Shellwords.shellescape(arg)}") do |line|
+#      raise "Your scraper returned more than one value!" if count > 1
+#      puts line
+#      count += 1
+#    end
+#  end
 
 
   # bots:preview
@@ -269,14 +270,31 @@ class Turbot::Command::Bots < Turbot::Command::Base
 
     api.destroy_draft_data(bot)
 
+    type = config["data_type"]
+    schema = get_schema(type)
+
     result = ""
     run_scraper_each_line("#{scraper_path} #{bot}") do |line|
-      batch << JSON.parse(line)
       spinner(count)
-      if count % 20 == 0
-        result = api.create_draft_data(bot, config, batch.to_json)
-        batch = []
+
+      errors = JSON::Validator.fully_validate(
+        schema,
+        line,
+        {:errors_as_objects => true})
+
+      if errors.empty?
+        batch << JSON.parse(line)
+        if count % 20 == 0
+          result = api.create_draft_data(bot, config, batch.to_json)
+          batch = []
+        end
+      else
+        puts "The following record was not sent to turbot because it didn't validate against the schema:"
+        puts line
+        puts "The validation error was:"
+        puts errors
       end
+
       count += 1
     end
     if !batch.empty?

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.22
-  prerelease: 
+  version: 0.0.23
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-14 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,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
@@ -162,13 +145,8 @@ files:
 - lib/turbot/command/auth.rb
 - lib/turbot/command/base.rb
 - lib/turbot/command/bots.rb
-- lib/turbot/command/config.rb
 - lib/turbot/command/help.rb
-- lib/turbot/command/keys.rb
-- lib/turbot/command/logs.rb
 - lib/turbot/command/ssl.rb
-- lib/turbot/command/status.rb
-- lib/turbot/command/update.rb
 - lib/turbot/command/version.rb
 - lib/turbot/deprecated.rb
 - lib/turbot/deprecated/help.rb
@@ -183,6 +161,22 @@ 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/subsidiary-relationship-schema.json
 - spec/helper/legacy_help.rb
 - spec/helper/pg_dump_restore_spec.rb
 - spec/schemas/dummy_schema.json
@@ -216,45 +210,29 @@ 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: []
+has_rdoc: 

data/lib/turbot/command/config.rb

@@ -1,123 +0,0 @@
-require "turbot/command/base"
-
-# manage bot config vars
-#
-class Turbot::Command::Config < Turbot::Command::Base
-
-  # config
-  #
-  # display the config vars for an bot
-  #
-  # -s, --shell  # output config vars in shell format
-  #
-  #Examples:
-  #
-  # $ turbot config
-  # A: one
-  # B: two
-  #
-  # $ turbot config --shell
-  # A=one
-  # B=two
-  #
-  def index
-    validate_arguments!
-
-    vars = api.get_config_vars(bot)
-    if vars.empty?
-      display("#{bot} has no config vars.")
-    else
-      vars.each {|key, value| vars[key] = value.to_s.strip}
-      if options[:shell]
-        vars.keys.sort.each do |key|
-          display(%{#{key}=#{vars[key]}})
-        end
-      else
-        styled_header("#{bot} Config Vars")
-        styled_hash(vars)
-      end
-    end
-  end
-
-  # config:set KEY1=VALUE1 [KEY2=VALUE2 ...]
-  #
-  # set one or more config vars
-  #
-  #Example:
-  #
-  # $ turbot config:set A=one
-  # Setting config vars and restarting example... done, v123
-  # A: one
-  #
-  # $ turbot config:set A=one B=two
-  # Setting config vars and restarting example... done, v123
-  # A: one
-  # B: two
-  #
-  def set
-    unless args.size > 0 and args.all? { |a| a.include?('=') }
-      error("Usage: turbot config:set KEY1=VALUE1 [KEY2=VALUE2 ...]\nMust specify KEY and VALUE to set.")
-    end
-
-    vars = args.inject({}) do |vars, arg|
-      key, value = arg.split('=', 2)
-      vars[key] = value
-      vars
-    end
-
-    action("Setting config vars and restarting #{bot}") do
-      api.put_config_vars(bot, vars)
-    end
-
-    vars.each {|key, value| vars[key] = value.to_s}
-    styled_hash(vars)
-  end
-
-  alias_command "config:add", "config:set"
-
-  # config:get KEY
-  #
-  # display a config value for an bot
-  #
-  #Examples:
-  #
-  # $ turbot config:get A
-  # one
-  #
-  def get
-    unless key = shift_argument
-      error("Usage: turbot config:get KEY\nMust specify KEY.")
-    end
-    validate_arguments!
-
-    vars = api.get_config_vars(bot)
-    key, value = vars.detect {|k,v| k == key}
-    display(value.to_s)
-  end
-
-  # config:unset KEY1 [KEY2 ...]
-  #
-  # unset one or more config vars
-  #
-  # $ turbot config:unset A
-  # Unsetting A and restarting example... done, v123
-  #
-  # $ turbot config:unset A B
-  # Unsetting A and restarting example... done, v123
-  # Unsetting B and restarting example... done, v124
-  #
-  def unset
-    if args.empty?
-      error("Usage: turbot config:unset KEY1 [KEY2 ...]\nMust specify KEY to unset.")
-    end
-
-    args.each do |key|
-      action("Unsetting #{key} and restarting #{bot}") do
-        api.delete_config_var(bot, key)
-      end
-    end
-  end
-
-  alias_command "config:remove", "config:unset"
-
-end

data/lib/turbot/command/keys.rb

@@ -1,115 +0,0 @@
-require "turbot/command/base"
-
-module Turbot::Command
-
-  # manage authentication keys
-  #
-  class Keys < Base
-
-    # keys
-    #
-    # display keys for the current user
-    #
-    # -l, --long  # display extended information for each key
-    #
-    #Examples:
-    #
-    # $ turbot keys
-    # === email@example.com Keys
-    # ssh-rsa ABCDEFGHIJK...OPQRSTUV== email@example.com
-    #
-    # $ turbot keys --long
-    # === email@example.com Keys
-    # ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp9AJD5QABmOcrkHm6SINuQkDefaR0MUrfgZ1Pxir3a4fM1fwa00dsUwbUaRuR7FEFD8n1E9WwDf8SwQTHtyZsJg09G9myNqUzkYXCmydN7oGr5IdVhRyv5ixcdiE0hj7dRnOJg2poSQ3Qi+Ka8SVJzF7nIw1YhuicHPSbNIFKi5s0D5a+nZb/E6MNGvhxoFCQX2IcNxaJMqhzy1ESwlixz45aT72mXYq0LIxTTpoTqma1HuKdRY8HxoREiivjmMQulYP+CxXFcMyV9kxTKIUZ/FXqlC6G5vSm3J4YScSatPOj9ID5HowpdlIx8F6y4p1/28r2tTl4CY40FFyoke4MQ== email@example.com
-    #
-    def index
-      validate_arguments!
-      keys = api.get_keys
-      if keys.length > 0
-        styled_header("#{Turbot::Auth.user} Keys")
-        keys = if options[:long]
-          keys.map {|key| key["contents"].strip}
-        else
-          keys.map {|key| format_key_for_display(key["contents"])}
-        end
-        styled_array(keys)
-      else
-        display("You have no keys.")
-      end
-    end
-
-    # keys:add [KEY]
-    #
-    # add a key for the current user
-    #
-    # if no KEY is specified, will try to find ~/.ssh/id_[rd]sa.pub
-    #
-    #Examples:
-    #
-    # $ turbot keys:add
-    # Could not find an existing public key.
-    # Would you like to generate one? [Yn] y
-    # Generating new SSH public key.
-    # Uploading SSH public key /.ssh/id_rsa.pub... done
-    #
-    # $ turbot keys:add /my/key.pub
-    # Uploading SSH public key /my/key.pub... done
-    #
-    def add
-      keyfile = shift_argument
-      validate_arguments!
-
-      if keyfile
-        Turbot::Auth.associate_key(keyfile)
-      else
-        # make sure we have credentials
-        Turbot::Auth.get_credentials
-        Turbot::Auth.associate_or_generate_ssh_key
-      end
-    end
-
-    # keys:remove KEY
-    #
-    # remove a key from the current user
-    #
-    #Examples:
-    #
-    # $ turbot keys:remove email@example.com
-    # Removing email@example.com SSH key... done
-    #
-    def remove
-      key = shift_argument
-      if key.nil? || key.empty?
-        error("Usage: turbot keys:remove KEY\nMust specify KEY to remove.")
-      end
-      validate_arguments!
-
-      action("Removing #{key} SSH key") do
-        api.delete_key(key)
-      end
-    end
-
-    # keys:clear
-    #
-    # remove all authentication keys from the current user
-    #
-    #Examples:
-    #
-    # $ turbot keys:clear
-    # Removing all SSH keys... done
-    #
-    def clear
-      validate_arguments!
-
-      action("Removing all SSH keys") do
-        api.delete_keys
-      end
-    end
-
-    protected
-      def format_key_for_display(key)
-        type, hex, local = key.strip.split(/\s/)
-        [type, hex[0,10] + '...' + hex[-10,10], local].join(' ')
-      end
-  end
-end

data/lib/turbot/command/logs.rb

@@ -1,34 +0,0 @@
-require "turbot/command/base"
-require "turbot/helpers/log_displayer"
-
-# display logs for an bot
-#
-class Turbot::Command::Logs < Turbot::Command::Base
-
-  # logs
-  #
-  # display recent log output
-  #
-  # -n, --num NUM        # the number of lines to display
-  # -p, --ps PS          # only display logs from the given process
-  # -s, --source SOURCE  # only display logs from the given source
-  # -t, --tail           # continually stream logs
-  #
-  #Example:
-  #
-  # $ turbot logs
-  # 2012-01-01T12:00:00+00:00 turbot[api]: Config add EXAMPLE by email@example.com
-  # 2012-01-01T12:00:01+00:00 turbot[api]: Release v1 created by email@example.com
-  #
-  def index
-    validate_arguments!
-
-    opts = []
-    opts << "tail=1"                                 if options[:tail]
-    opts << "num=#{options[:num]}"                   if options[:num]
-    opts << "ps=#{URI.encode(options[:ps])}"         if options[:ps]
-    opts << "source=#{URI.encode(options[:source])}" if options[:source]
-    log_displayer = ::Turbot::Helpers::LogDisplayer.new(api, bot, opts)
-    log_displayer.display_logs
-  end
-end

data/lib/turbot/command/status.rb

@@ -1,50 +0,0 @@
-require "turbot/command/base"
-
-# check status of turbot platform
-#
-class Turbot::Command::Status < Turbot::Command::Base
-
-  # status
-  #
-  # display current status of turbot platform
-  #
-  #Example:
-  #
-  # $ turbot status
-  # === Turbot Status
-  # Development: No known issues at this time.
-  # Production:  No known issues at this time.
-  #
-  def index
-    validate_arguments!
-
-    require('excon')
-    status = json_decode(Excon.get("http://turbot.opencorporates.com/current-status.json", :nonblock => false).body)
-
-    styled_header("Turbot Status")
-
-    status['status'].each do |key, value|
-      if value == 'green'
-        status['status'][key] = 'No known issues at this time.'
-      end
-    end
-    styled_hash(status['status'])
-
-    unless status['issues'].empty?
-      display
-      status['issues'].each do |issue|
-        duration = time_ago(issue['created_at']).gsub(' ago', '+')
-        styled_header("#{issue['title']}  #{duration}")
-        changes = issue['updates'].map do |issue|
-          [
-            time_ago(issue['created_at']),
-            issue['update_type'],
-            issue['contents']
-          ]
-        end
-        styled_array(changes, :sort => false)
-      end
-    end
-  end
-
-end

data/lib/turbot/command/update.rb

@@ -1,47 +0,0 @@
-require "turbot/command/base"
-require "turbot/updater"
-
-# update the turbot client
-#
-class Turbot::Command::Update < Turbot::Command::Base
-
-  # update
-  #
-  # update the turbot client
-  #
-  # Example:
-  #
-  # $ turbot update
-  # Updating from v1.2.3... done, updated to v2.3.4
-  #
-  def index
-    validate_arguments!
-    update_from_url("https://toolbelt.turbot.com/download/zip")
-  end
-
-  # update:beta
-  #
-  # update to the latest beta client
-  #
-  # $ turbot update
-  # Updating from v1.2.3... done, updated to v2.3.4.pre
-  #
-  def beta
-    validate_arguments!
-    update_from_url("https://toolbelt.turbot.com/download/beta-zip")
-  end
-
-private
-
-  def update_from_url(url)
-    Turbot::Updater.check_disabled!
-    action("Updating from #{Turbot::VERSION}") do
-      if new_version = Turbot::Updater.update(url)
-        status("updated to #{new_version}")
-      else
-        status("nothing to update")
-      end
-    end
-  end
-
-end