turbot 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTRjNjM4ODc0ODAxZjM3OTJkNTE2MTBmMzBmZTk2NTMyNTBjZDViOA==
+    MTBlYjBjNWI0NzVjOWJjZTIwMjJkNGIzOGVjYzY3OTk1MGEwMzg1YQ==
   data.tar.gz: !binary |-
-    YjEyZWVjYTZiZTdiYjNjNWY1ZDYxODIzYzM0NWMzYTAzZjc1NzYyZQ==
+    YTU2NzI1ZDMyZDg5ZGJmZTdiZWUyNWQ2YmE1OTQ4ODQ0MmYxYTZiYw==
 SHA512:
   metadata.gz: !binary |-
-    YjNiY2NiOTEzYzcwYjJmMmE5YTY2ODZmMmIyZTE2ODgxMTZlMTczYjA5YTkw
-    MzkzMjRjNzAxZDUyMDlhNTZkNDAwODRjZWQ1NjBmMDhiMDdjYzVhYWY2YzFi
-    YzJjZWEwNTE3YWRlOTJiM2ZlYjk2YjkxOWMwOTdiZDM1ZWI4NjI=
+    YTUwZTI0OThlZDg0NTY3NGFjZDMxNzVmYzgzYzc1MWM3NWI2OWQxMjU5Yzgx
+    ZjAxMGNiN2NmYzM4NDE4ODU3YTc4MGE4MDU3OTVlYzI1YzU4YmZjMDAzMzFm
+    NjZiNjUwYzgzNWQ3YjkwN2IxZWE0MzgzZGRkZjQwYjJiY2Q2M2E=
   data.tar.gz: !binary |-
-    Y2VkNGM2MGIyNjcyYzA4NzY1YjJlMjBhNDY4NjgxNzI2N2M1ZTgxMGFhMjA1
-    NWYzZWExM2M5YTJhNWQyZDQ1ZDAyNjdmNWNkZWI1ZTYyNDBiZGNiODU0OWVk
-    Mzg3MTliYWM3OThjOTRlMWRjYzllYjYwNzQ3MTdhNmQ4NmM2ODA=
+    NTNiYjBjNjIyMjk0NWM2NjJiYTQ4ZTdmYTE3MGM2YmRmZmVmZTg2YjdjZDli
+    MjE0YmU5NDJiZTNlY2U1YjRiMWMyMmZhMGI5NGJkNzhhMmViM2VhMzZhMzA5
+    ZDRkMmU0MjI0ZGQwM2QzZWJkOWI1NzRiY2JjYTg2OGRiMjdhOGI=

data/lib/turbot/command/bots.rb

@@ -1,4 +1,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'
@@ -22,10 +24,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
   #
   def index
     validate_arguments!
-    bots = api.get_bots
+    bots = api.list_bots
     unless bots.empty?
       styled_header("Bots")
-      styled_array(bots.map{|k,data| data['name']})
+      styled_array(bots.map{|bot| bot['bot_id']})
     else
       display("You have no bots.")
     end
@@ -90,9 +92,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
   # Created new bot template at my_amazing_bot!
 
   def generate
+    puts "running generate"
     validate_arguments!
     language = options[:language] || "ruby"
-    puts "Generating #{language} codes..."
+    puts "Generating #{language} code..."
     FileUtils.mkdir(bot)
     case language
     when "ruby"
@@ -102,11 +105,17 @@ class Turbot::Command::Bots < Turbot::Command::Base
     end
     manifest_template = File.expand_path("../../../../templates/manifest.json", __FILE__)
     scraper_template = File.expand_path("../../../../templates/#{scraper}", __FILE__)
-    manifest = open(manifest_template).read.sub(/{{bot_id}}/, bot)
+    manifest = JSON.parse(open(manifest_template).read.sub(/{{bot_id}}/, bot))
+
     FileUtils.cp(scraper_template, "#{bot}/#{scraper}")
     open("#{bot}/manifest.json", "w") do |f|
-      f.write(manifest)
+      f.write(manifest.to_json)
     end
+
+    api.create_bot(bot, manifest)
+
+    # TODO handle errors
+
     puts "Created new bot template at #{bot}!"
   end
 
@@ -134,11 +143,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
     end
 
     File.open(archive_path) do |file|
-      params = {
-        "bot[archive]" => file,
-        "bot[manifest]" => manifest
-      }
-      api.post_bot(params)
+      api.update_code(bot, file)
     end
   end
 
@@ -155,6 +160,11 @@ class Turbot::Command::Bots < Turbot::Command::Base
     scraper_path    = shift_argument || scraper_file(Dir.pwd)
     validate_arguments!
     config = parsed_manifest(Dir.pwd)
+
+    %w(bot_id data_type identifying_fields files).each do |key|
+      error("Manifest is missing #{key}") unless config.has_key?(key)
+    end
+
     type = config["data_type"]
 
     schema = get_schema(type)
@@ -166,7 +176,6 @@ class Turbot::Command::Bots < Turbot::Command::Base
     count = 0
 
     run_scraper_each_line("#{scraper_path} #{bot}") do |line|
-      errors = ""
       errors = JSON::Validator.fully_validate(
         schema,
         line,
@@ -175,6 +184,11 @@ class Turbot::Command::Bots < Turbot::Command::Base
       if !errors.empty?
         error("LINE WITH ERROR: #{line}\n\nERRORS: #{errors}")
       end
+
+      if JSON.parse(line).slice(*config['identifying_fields']).blank?
+        error("LINE WITH ERROR: #{line}\n\nERRORS: No value provided for identifying fields")
+      end
+
       count += 1
     end
     puts "Validated #{count} records successfully!"
@@ -232,27 +246,25 @@ class Turbot::Command::Bots < Turbot::Command::Base
     scraper_path    = shift_argument || scraper_file(Dir.pwd)
     validate_arguments!
 
-    bots = api.get_bots
-    raise "You have not pushed your bot" unless bots.include?(bot)
-
     batch = []
     count = 0
+    config = parsed_manifest(Dir.pwd)
     puts "Sending to angler... "
     result = ""
     run_scraper_each_line("#{scraper_path} #{bot}") do |line|
       batch << JSON.parse(line)
       spinner(count)
       if count % 20 == 0
-        result = api.send_drafts_to_angler(bot, batch.to_json)
+        result = api.update_draft_data(bot, config, batch.to_json)
         batch = []
       end
       count += 1
     end
     if !batch.empty?
-      result = api.send_drafts_to_angler(bot, batch.to_json)
+      result = api.update_draft_data(bot, config, batch.to_json)
     end
     puts "Sent #{count} records."
-    puts "View your records at #{JSON.parse(result)['url']}"
+    puts "View your records at #{result['url']}"
   end
 
   private

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/turbot/command/bots_spec.rb

@@ -4,7 +4,13 @@ require "turbot/command/bots"
 describe Turbot::Command::Bots do
   describe "validate" do
     before do
-      Turbot::Command::Bots.any_instance.stub(:parsed_manifest).and_return('data_type' => 'dummy')
+      config = {
+        'bot_id' => 'dummy bot',
+        'data_type' => 'dummy',
+        'identifying_fields' => ['name'],
+        'files' => 'scraper.rb',
+      }
+      Turbot::Command::Bots.any_instance.stub(:parsed_manifest).and_return(config)
     end
 
     context "for data_type with schema" do
@@ -36,6 +42,19 @@ describe Turbot::Command::Bots do
         stdout.should == ""
         stderr.should include 'ERRORS'
       end
+
+      context "for bot that doesn't output identifying fields" do
+        it "says bot is invalid" do
+          Turbot::Command::Bots.any_instance.
+            stub(:run_scraper_each_line).
+            and_yield({title: 'One'}.to_json)
+
+          stderr, stdout = execute("bots:validate")
+
+          stdout.should == ""
+          stderr.should include 'No value provided for identifying fields'
+        end
+      end
     end
 
     context "for data_type without schema" do
@@ -50,5 +69,21 @@ describe Turbot::Command::Bots do
         stderr.should include 'No schema found'
       end
     end
+
+    context "for bot with manifest missing some required fields" do
+      it "says bot is invalid" do
+        config = {
+          'bot_id' => 'dummy bot',
+          'identifying_fields' => ['name'],
+          'files' => 'scraper.rb',
+        }
+        Turbot::Command::Bots.any_instance.stub(:parsed_manifest).and_return(config)
+
+        stderr, stdout = execute("bots:validate")
+
+        stdout.should == ""
+        stderr.should include 'Manifest is missing data_type'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: turbot-api
   requirement: !ruby/object:Gem::Requirement
@@ -197,3 +211,4 @@ signing_key:
 specification_version: 4
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
+has_rdoc: