turbot 0.0.4 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjg2ZWE5YWQwNzE5OTExODQ3OTUwZmM2MmY2ODZhNzQ2NmYzNDY1Nw==
+    OTQzMWUxY2MwYjQzYTZlYjhlMDIxZDRjYjk4MTU0NjI1MzFmYTYwMw==
   data.tar.gz: !binary |-
-    M2RmNGVlMWU2YzY2MjM0N2NhZjk1MDIyMGMxOWMyNWE4NGY2OGE1Yg==
+    YThhNWFlNTA3ZDFhMTVlYmUwYTk5MDQyNmE2MGM3ZDU0ODVkOGZlNw==
 SHA512:
   metadata.gz: !binary |-
-    OWU1YTE0YmJhNDZlODMwY2ZlMWU0N2I5NWQyYTYwNTQwYzdiYThhYzA2M2Iz
-    Y2RiNDgyNGY4MjY5MmY1MjRmYWNhNmMyZDYxYzI5NmFiNjBiYjJjYmZlMzg5
-    YmVkOGJhZmJkOTI3MzhlNzhiNWNjZGYyZmNhZDc1OGVmNzg4MTQ=
+    MGUyZmVlNGRlNzExZjdkOTk2NDdiM2Q3YWY2OWY3NGFjYWVjN2RlNTVlY2Fj
+    YjhkN2FjNzkzZDliODljZmE1ZDhjNDRlMWFiNGQ4M2NkYWFhMjlhODI4Yzcy
+    N2IzZjU4NDk3YWQxYjU5ZTRjZGQ4ZWFjNTVlMDlmMDAyYWE0MGY=
   data.tar.gz: !binary |-
-    MTc1Y2RlZGE3N2Y0OGM1ZTkzNDNhNGMwYzRjYzQxN2NiNjk1YzQzM2NjNzBj
-    ZjU2OTlmOTUyNmFkODc1Y2E0ZDA1MmM4M2NjN2NkZjI2ZmY5NDI1ZDkzMzI3
-    MTIzY2ZkMGYyNjM3ZDE0Nzk3MjJiZjYwOGZjYzY5Y2ZlODdlY2U=
+    N2NhNjVlMGMzMjgzNTQ3YTU2YTAyYTdlNGNmOTNlMzNhODZjZmU5ODY4MDE1
+    ZWRlMjk4M2ViYmUxNmEzZjRmNWE3YTQyMDM0ZDZjNGNlZmY1ZThhMzgyZDgx
+    ZDQ4YTEzMGRjY2ZiMjQzMDEyODZkMmU1MzEwMTI5NDcxNGI5MGU=

data/lib/turbot/command.rb

@@ -230,8 +230,6 @@ module Turbot
         run "login"
         retry
       end
-    rescue Turbot::API::Errors::VerificationRequired, RestClient::PaymentRequired => e
-      retry if Turbot::Helpers.confirm_billing
     rescue Turbot::API::Errors::NotFound => e
       error extract_error(e.response.body) {
         e.response.body =~ /^([\w\s]+ not found).?$/ ? $1 : "Resource not found"
@@ -252,6 +250,9 @@ module Turbot
         arguments << '--confirm' << bot
         retry
       end
+    rescue RestClient::PaymentRequired => e
+      # We've repurposed a 402 as a general error
+      error extract_error(e.http_body)
     rescue Turbot::API::Errors::Timeout, RestClient::RequestTimeout
       error "API request timed out. Please try again, or contact support@turbot.com if this issue persists."
     rescue Turbot::API::Errors::ErrorWithResponse => e

data/lib/turbot/command/bots.rb

@@ -24,10 +24,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
   #
   def index
     validate_arguments!
-    bots = api.list_bots
+    bots = api.list_bots.data
     unless bots.empty?
       styled_header("Bots")
-      styled_array(bots.map{|bot| bot['bot_id']})
+      styled_array(bots.map{|bot| bot[:bot_id]})
     else
       display("You have no bots.")
     end
@@ -92,7 +92,6 @@ 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} code..."
@@ -105,18 +104,25 @@ 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__)
+    license_template = File.expand_path("../../../../templates/LICENSE.txt", __FILE__)
     manifest = JSON.parse(open(manifest_template).read.sub(/{{bot_id}}/, bot))
 
     FileUtils.cp(scraper_template, "#{bot}/#{scraper}")
+    FileUtils.cp(license_template, "#{bot}/LICENSE.txt")
     open("#{bot}/manifest.json", "w") do |f|
       f.write(manifest.to_json)
     end
 
-    api.create_bot(bot, manifest)
+    response = api.create_bot(bot, manifest)
 
-    # TODO handle errors
-
-    puts "Created new bot template at #{bot}!"
+    case response
+    when Turbot::API::SuccessResponse
+      display("Created new bot template at #{bot}!")
+    when Turbot::API::FailureResponse
+      display('Could not create new bot')
+      display(response.message)
+      FileUtils.rm_r(bot)
+    end
   end
 
 
@@ -142,9 +148,17 @@ class Turbot::Command::Bots < Turbot::Command::Base
       manifest['files'].each { |f| zipfile.add(f, File.join(working_dir,f)) }
     end
 
-    File.open(archive_path) do |file|
+    response = File.open(archive_path) do |file|
       api.update_code(bot, file)
     end
+
+    case response
+    when Turbot::API::SuccessResponse
+      display('Successfully pushed bot code')
+    when Turbot::API::FailureResponse
+      display('Failed to push bot code')
+      display(response.message)
+    end
   end
 
   alias_command "push", "bots:push"
@@ -255,16 +269,16 @@ class Turbot::Command::Bots < Turbot::Command::Base
       batch << JSON.parse(line)
       spinner(count)
       if count % 20 == 0
-        result = api.update_draft_data(bot, config, batch.to_json)
+        result = api.update_draft_data(bot, config, batch.to_json).data
         batch = []
       end
       count += 1
     end
     if !batch.empty?
-      result = api.update_draft_data(bot, config, batch.to_json)
+      result = api.update_draft_data(bot, config, batch.to_json).data
     end
     puts "Sent #{count} records."
-    puts "View your records at #{result['url']}"
+    puts "View your records at #{result[:url]}"
   end
 
   private
@@ -324,7 +338,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
   end
 
   def scraper_file(dir)
-    Dir.glob("scraper*").first
+    Dir.glob("scraper*").reject{|n| !n.match(/(rb|py)$/)}.first
   end
 
   def manifest_path
@@ -333,6 +347,6 @@ class Turbot::Command::Bots < Turbot::Command::Base
 
   def get_schema(type)
     hyphenated_name = type.to_s.gsub("_", "-").gsub(" ", "-")
-    schema = File.expand_path("../../../../schema/schemas/#{hyphenated_name}-schema.json", __FILE__)
+    File.expand_path("../../../../schema/schemas/#{hyphenated_name}-schema.json", __FILE__)
   end
 end

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/templates/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) <date> <your name here>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -98,16 +98,16 @@ dependencies:
   name: turbot-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,7 @@ files:
 - spec/turbot/helpers_spec.rb
 - spec/turbot/plugin_spec.rb
 - spec/turbot/updater_spec.rb
+- templates/LICENSE.txt
 - templates/manifest.json
 - templates/scraper.py
 - templates/scraper.rb