turbot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3f0ab307a669b16bddf151198102baf92d2a7cde
-  data.tar.gz: 687db33bf9d6c883fd34df56116bfdd41dff4db8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmMyOTU2MTY5ZTEwYWU5ZTFhMTlhNDQ5ODA0NDBmYzE0MmJhYjU2NA==
+  data.tar.gz: !binary |-
+    NmQ4NWJhMWE0ZTA3N2FiNGE0OGExM2ZkYzdhY2ExNzFhYTNjYTExOA==
 SHA512:
-  metadata.gz: ebee66e048f815818f5263b84817c9dd0b0b95d5828f420e26c86a427cecb2ef8e266643559d2834dd8bcbc9f429c306d6ed96490ed2d726fb4ff0102d3d28f3
-  data.tar.gz: f2d2eb912d29965e70b53412ae210d78128d6a8d39e999f43668464486ca7984213f04f1e545591ea9adba18a71504d18184332743f9253fb95ab14da362c8a3
+  metadata.gz: !binary |-
+    YTNkNmRkYTk0N2VkZDk3MWNhMTk5NGEyMzM2Zjg4M2Q2MTQ4Njg4MWU3MGM0
+    NWQ1YmYzN2Y5MzJkOTI2ZGU1N2U0MjZkYjE4OTNhMWE4YjA4MDVmZDAzOTRj
+    MDNkNDc3ZTY2ZTE2NWZkZjViMzg3YmEyMDU0ZGU4MmQyNTg5ZDc=
+  data.tar.gz: !binary |-
+    ODNkZGZlOWY1MDU1ZmM4MjZkNGU4ODhmOGE1ZmY4YWRjOTg4MjQzZTRhMDNj
+    MzY3ZTg4MjJlNTQyNmMyM2I1N2Y5NTNhYWMyMTQzM2U2NjM0Mzk3NmEyZDg1
+    YmFkNWI1Y2UzY2QxMWEzODQ4ODJhZGQwNGRjMjU3MjQyNWRkMTE=

data/lib/turbot/command/base.rb

@@ -43,7 +43,7 @@ protected
 
     help = extract_help_from_caller(caller.first)
     resolved_method = (method.to_s == "index") ? nil : method.to_s
-    command = [ self.namespace, resolved_method ].compact.join(":")
+    command = [self.namespace, resolved_method].compact.join(":")
     banner = extract_banner(help) || command
 
     Turbot::Command.register_command(

data/lib/turbot/command/bots.rb

@@ -273,6 +273,8 @@ class Turbot::Command::Bots < Turbot::Command::Base
   #
   #Execute the bot locally and write the bot's output to STDOUT.
   #
+  #  -q, --quiet # only output validation errors
+  #
   #Example:
   #
   #  $ turbot bots:dump
@@ -283,7 +285,11 @@ class Turbot::Command::Bots < Turbot::Command::Base
     validate_arguments!
     error_if_no_local_bot_found
 
-    handler = Turbot::Handlers::DumpHandler.new
+    if options[:quiet]
+      handler = Turbot::Handlers::BaseHandler.new
+    else
+      handler = Turbot::Handlers::DumpHandler.new
+    end
     runner = TurbotRunner::Runner.new(working_directory, :record_handler => handler)
     rc = runner.run
 

data/lib/turbot/command/help.rb

@@ -48,7 +48,7 @@ private
   def help_for(items, name_key, description_key)
     size = items.map { |namespace| namespace[name_key].size }.max
     items.sort_by { |namespace| namespace[name_key] }.each do |namespace|
-      puts "  %-#{size}s  # %s" % [ namespace[name_key], namespace[description_key] ]
+      puts "  %-#{size}s  # %s" % [namespace[name_key], namespace[description_key]]
     end
   end
 

data/lib/turbot/command.rb

@@ -57,8 +57,7 @@ module Turbot
     end
 
     def self.prepare_run(cmd, args=[])
-      command = parse(cmd)
-
+      command = commands[cmd] || commands[command_aliases[cmd]]
       @current_command = cmd
 
       opts = {}
@@ -66,12 +65,14 @@ module Turbot
 
       parser = OptionParser.new do |parser|
         # remove OptionParsers Officious['version'] to avoid conflicts
-        # see: https://github.com/ruby/ruby/blob/trunk/lib/optparse.rb#L814
+        # see: https://github.com/ruby/ruby/blob/6860034546808d4f67ba8f407f3d7aced0c54c5a/lib/optparse.rb#L989
         parser.base.long.delete('version')
-        (command && command[:options] || []).each do |option|
-          parser.on(*option[:args]) do |value|
-            opts[option[:name].gsub('-', '_').to_sym] = value
-            ARGV.join(' ') =~ /(#{option[:args].map {|arg| arg.split(' ', 2).first}.join('|')})/
+        if command && command[:options]
+          command[:options].each do |option|
+            parser.on(*option[:args]) do |value|
+              opts[option[:name].gsub('-', '_').to_sym] = value
+              ARGV.join(' ') =~ /(#{option[:args].map {|arg| arg.split(' ', 2).first}.join('|')})/
+            end
           end
         end
       end
@@ -86,12 +87,11 @@ module Turbot
       end
 
       args.concat(invalid_options)
-
       @invalid_arguments = invalid_options
 
       if command
         command_instance = command[:klass].new(args.dup, opts.dup)
-        [ command_instance, command[:method] ]
+        [command_instance, command[:method]]
       else
         error([
           "`#{cmd}` is not a turbot command.",
@@ -102,14 +102,8 @@ module Turbot
     end
 
     def self.run(command, arguments=[])
-      begin
-        object, method = prepare_run(command, arguments.dup)
-        object.send(method)
-      rescue Interrupt, StandardError, SystemExit => error
-        # load likely error classes, as they may not be loaded yet due to defered loads
-        require 'rest_client'
-        raise(error)
-      end
+      object, method = prepare_run(command, arguments.dup)
+      object.send(method)
     rescue SocketError => e
       error 'Unable to connect to Turbot API, please check internet connectivity and try again.'
     rescue OptionParser::ParseError
@@ -120,10 +114,6 @@ module Turbot
       end
     end
 
-    def self.parse(command)
-      commands[command] || commands[command_aliases[command]]
-    end
-
     def self.extract_error(body, options = {})
       if block_given?
         default_error = yield

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/support/bot_helper.rb

@@ -65,10 +65,12 @@ module BotHelper
     end
   end
 
-  def create_scraper_file(bot_directory, record = {'name' => 'foo'})
+  def create_scraper_file(bot_directory, records = [{'name' => 'foo'}])
     File.open(File.join(bot_directory, 'scraper.rb'), 'w') do |f|
       f.write("require 'json'\n")
-      f.write("puts JSON.dump(#{record.inspect})\n")
+      records.each do |record|
+        f.write("puts JSON.dump(#{record.inspect})\n")
+      end
     end
   end
 

data/spec/turbot/command/bots_spec.rb

@@ -330,7 +330,7 @@ STDOUT
       it 'reports invalid records' do
         bot_directory = create_bot_directory
         create_manifest_file(bot_directory)
-        create_scraper_file(bot_directory, {'name' => 1})
+        create_scraper_file(bot_directory, [{'name' => 1}])
 
         stderr, stdout = execute_in_directory('bots:validate', bot_directory)
 
@@ -348,7 +348,7 @@ STDOUT
       it 'reports invalid JSON' do
         bot_directory = create_bot_directory
         create_manifest_file(bot_directory)
-        create_scraper_file(bot_directory, '{')
+        create_scraper_file(bot_directory, ['{'])
 
         stderr, stdout = execute_in_directory('bots:validate', bot_directory)
 
@@ -364,7 +364,7 @@ STDOUT
       it 'reports records without identifying fields' do
         bot_directory = create_bot_directory
         create_manifest_file(bot_directory)
-        create_scraper_file(bot_directory, {})
+        create_scraper_file(bot_directory, [{}])
 
         stderr, stdout = execute_in_directory('bots:validate', bot_directory)
 
@@ -550,6 +550,28 @@ Bot ran successfully!
 STDOUT
       end
 
+      it 'reports only validation errors' do
+        set_turbot_runner_schemas
+
+        bot_directory = create_bot_directory
+        create_manifest_file(bot_directory)
+        create_scraper_file(bot_directory, [{'name' => 'foo'}, {'name' => 1}])
+
+        allow_any_instance_of(Turbot::Command::Base).to receive(:working_directory).and_return(bot_directory)
+        stderr, stdout = execute('bots:dump --quiet')
+        restore_working_directory_method
+
+        expect(stderr).to eq('')
+        expect(stdout).to eq <<-STDOUT
+
+The following record is invalid:
+{"name":1}
+ * Property of wrong type: name (must be of type string)
+
+Bot failed!
+STDOUT
+      end
+
       it 'errors if no local bot is found' do
         stderr, stdout = execute('bots:dump')
 

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - OpenCorporates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !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: text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: turbot-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: turbot-runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -157,9 +157,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -231,17 +231,17 @@ 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.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to deploy and manage bots on Turbot
@@ -262,4 +262,3 @@ test_files:
 - spec/turbot/command/help_spec.rb
 - spec/turbot/command/version_spec.rb
 - spec/turbot/command_spec.rb
-has_rdoc: