turbot 0.0.12 → 0.0.13

data/lib/turbot/command/bots.rb

@@ -96,32 +96,52 @@ class Turbot::Command::Bots < Turbot::Command::Base
     validate_arguments!
     language = options[:language] || "ruby"
     puts "Generating #{language} code..."
-    FileUtils.mkdir(bot)
-    case language
-    when "ruby"
-      scraper = "scraper.rb"
-    when "python"
-      scraper = "scraper.py"
-    end
     manifest_template = File.expand_path("../../../../templates/manifest.json", __FILE__)
-    scraper_template = File.expand_path("../../../../templates/#{scraper}", __FILE__)
+    scraper_template = File.expand_path("../../../../templates/#{language}", __FILE__)
     license_template = File.expand_path("../../../../templates/LICENSE.txt", __FILE__)
-    manifest = JSON.parse(open(manifest_template).read.sub(/{{bot_id}}/, bot))
+    manifest = open(manifest_template).read.sub("{{bot_id}}", bot)
+    scraper_name = case language
+      when "ruby"
+        "scraper.rb"
+      when "python"
+        "scraper.py"
+      end
+
+    manifest = manifest.sub("{{scraper_name}}", scraper_name)
+
+    # Language-specific stuff
+    FileUtils.cp_r(scraper_template, bot)
 
-    FileUtils.cp(scraper_template, "#{bot}/#{scraper}")
+    # Same for all languages
     FileUtils.cp(license_template, "#{bot}/LICENSE.txt")
     open("#{bot}/manifest.json", "w") do |f|
-      f.write(manifest.to_json)
+      f.write(JSON.pretty_generate(JSON.parse(manifest)))
     end
 
     api.create_bot(bot, manifest)
 
-    # TODO handle errors
-
     puts "Created new bot template at #{bot}!"
   end
 
 
+  # bots:register
+  #
+  # Register a bot with turbot. Must be run from a folder containing scraper and manifest.json
+
+  # $ turbot bots:register
+  # Registered my_amazing_bot!
+
+  def register
+    working_dir = Dir.pwd
+    manifest = parsed_manifest(working_dir)
+    response = api.create_bot(bot, manifest)
+    if response.is_a? Turbot::API::FailureResponse
+      error(response.message)
+    else
+      puts "Registered #{bot}!"
+    end
+  end
+
   # bots:push
   #
   # Push bot code to the turbot server. Must be run from a local bot checkout.

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/templates/manifest.json

@@ -2,6 +2,6 @@
  "bot_id": "{{bot_id}}",
  "data_type": "primary data",
  "identifying_fields": ["number"],
- "files": ["scraper.rb"],
+ "files": ["{{scraper_name}}"],
  "description": "This is a simple bot"
 }

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
+  prerelease: 
 platform: ruby
 authors:
 - Turbot
@@ -13,6 +14,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: turbot-api
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,22 +183,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/subsidiary-relationship-schema.json
 - spec/helper/legacy_help.rb
 - spec/helper/pg_dump_restore_spec.rb
 - spec/schemas/dummy_schema.json
@@ -215,29 +216,45 @@ 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: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTNkNDBiMWQ4NWRhMWYwODQ2MjhlMmU5NjdlMzFlYzQ2NTczZWQwNA==
-  data.tar.gz: !binary |-
-    MDNmZjVkZjczY2QyNGVhOGEzZmYwMTliN2FmY2U4OWY5YzZmNTExMA==
-SHA512:
-  metadata.gz: !binary |-
-    ZWZjYWI1OTkwMDk5NTgyZjFiNjYzYzEzODRiMTZhNWFlODE0MDMyY2JkNjRj
-    Y2ExNzJjNjg1NDUzZTM5YjY2OWY4MjhkZjVhMWZiNGEyMmRjYjJhNmMwMDQz
-    MDE4MjgyNjk2YjU4ZTRiZDZkNGVkN2I1MDhjN2JkYTNkZjFlOWQ=
-  data.tar.gz: !binary |-
-    MmNlODkxZDE4NmQ0YzNhYjYzNDdjYjNlNWVhOTIzNjI3ZTIzNmRmNTgyOTAx
-    M2ZiYmI1YmMzOThhMmUwZWQ1ZmZjNGFhNmM2MWRiMDhkYzk1ZTM5ODcxMTJk
-    NDFkYjgxZjhhMmIwZGVjYmFlZDYwNmE0MjZkZjA1MDVkZTMzNDY=