turbot 0.0.21 → 0.0.22

data/lib/turbot/auth.rb

@@ -40,7 +40,7 @@ class Turbot::Auth
     end
 
     def default_host
-      "http://turbot"
+      "http://turbot.opencorporates.com"
     end
 
     def git_host

data/lib/turbot/command/bots.rb

@@ -92,14 +92,12 @@ class Turbot::Command::Bots < Turbot::Command::Base
   # Created new bot template at my_amazing_bot!
 
   def generate
-    puts "running generate"
     response = api.show_bot(bot)
     if response.is_a? Turbot::API::SuccessResponse
       error("There's already a bot called #{bot}")
     end
     validate_arguments!
     language = options[:language] || "ruby"
-    puts "Generating #{language} code..."
     manifest_template = File.expand_path("../../../../templates/manifest.json", __FILE__)
     scraper_template = File.expand_path("../../../../templates/#{language}", __FILE__)
     license_template = File.expand_path("../../../../templates/LICENSE.txt", __FILE__)
@@ -149,7 +147,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
   # Push bot code to the turbot server. Must be run from a local bot checkout.
   #
   # $ turbot bots:push
-  # Creating example... done
+  # Your bot has been pushed to Turbot and will be reviewed for inclusion as soon as we can. THANKYOU!
 
   def push
     validate_arguments!
@@ -169,6 +167,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
     File.open(archive_path) do |file|
       api.update_code(bot, file)
     end
+    puts "Your bot has been pushed to Turbot and will be reviewed for inclusion as soon as we can. THANKYOU!"
   end
 
   alias_command "push", "bots:push"
@@ -180,7 +179,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
   # $ heroku bots:validate
   # Validating example... done
 
-  def validate
+  def validate(opts={})
     scraper_path    = shift_argument || scraper_file(Dir.pwd)
     validate_arguments!
     config = parsed_manifest(Dir.pwd)
@@ -208,14 +207,14 @@ class Turbot::Command::Bots < Turbot::Command::Base
       if !errors.empty?
         error("LINE WITH ERROR: #{line}\n\nERRORS: #{errors}")
       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")
       end
 
       count += 1
     end
-    puts "Validated #{count} records successfully!"
+    puts "Validated #{count} records successfully!" if !opts[:dump]
   end
 
   # bots:dump
@@ -227,14 +226,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
   # {'foo2': 'bar2'}
 
   def dump
-    # This will need to be language-aware, eventually
-    scraper_path    = shift_argument || scraper_file(Dir.pwd)
-    validate_arguments!
-    count = 0
-    run_scraper_each_line("#{scraper_path} #{bot}") do |line|
-      puts line
-      count += 1
-    end
+    validate(:dump => true)
   end
 
   # bots:single
@@ -263,9 +255,9 @@ class Turbot::Command::Bots < Turbot::Command::Base
 
   # bots:preview
   #
-  # Send bot data to Angler for remote previewing / sharing
+  # Send bot data to Turbot for remote previewing / sharing
   #
-  # Sending example to Angler... done
+  # Sending example to turbot... done
   def preview
     scraper_path    = shift_argument || scraper_file(Dir.pwd)
     validate_arguments!
@@ -273,7 +265,7 @@ class Turbot::Command::Bots < Turbot::Command::Base
     batch = []
     count = 0
     config = parsed_manifest(Dir.pwd)
-    puts "Sending to angler... "
+    puts "Sending to turbot... "
 
     api.destroy_draft_data(bot)
 

data/lib/turbot/command/status.rb

@@ -18,9 +18,8 @@ class Turbot::Command::Status < Turbot::Command::Base
   def index
     validate_arguments!
 
-    turbot_status_host = ENV['TURBOT_STATUS_HOST'] || "status.turbot.com"
     require('excon')
-    status = json_decode(Excon.get("https://#{turbot_status_host}/api/v3/current-status.json", :nonblock => false).body)
+    status = json_decode(Excon.get("http://turbot.opencorporates.com/current-status.json", :nonblock => false).body)
 
     styled_header("Turbot Status")
 

data/lib/turbot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors: