require v4

lib/heroku/cli.rb

@@ -20,7 +20,8 @@ def self.start(*args)
     $stdout.sync = true if $stdout.isatty
     Heroku::Updater.warn_if_updating
     command = args.shift.strip rescue "help"
-    Heroku::JSPlugin.try_takeover(command, args) if Heroku::JSPlugin.setup?
+    Heroku::JSPlugin.setup
+    Heroku::JSPlugin.try_takeover(command, args)
     require 'heroku/command'
     Heroku::Git.check_git_version
     Heroku::Command.load

lib/heroku/command/plugins.rb

@@ -66,7 +66,7 @@ def uninstall
         action("Uninstalling #{plugin.name}") do
           plugin.uninstall
         end
-      elsif Heroku::JSPlugin.setup?
+      else
         Heroku::JSPlugin.uninstall(plugin.name)
       end
     end

lib/heroku/command/update.rb

@@ -17,9 +17,7 @@ class Heroku::Command::Update < Heroku::Command::Base
   def index
     validate_arguments!
     update_from_url(false)
-    if Heroku::JSPlugin.setup?
-      Heroku::JSPlugin.update
-    end
+    Heroku::JSPlugin.update
   end
 
   # update:beta

lib/heroku/command/version.rb

@@ -18,7 +18,7 @@ def index
     validate_arguments!
 
     display(Heroku.user_agent)
-    display(Heroku::JSPlugin.version) if Heroku::JSPlugin.setup?
+    display(Heroku::JSPlugin.version)
 
     Heroku::Command::Plugins.new.index
   end

lib/heroku/jsplugin.rb

@@ -3,10 +3,6 @@
 class Heroku::JSPlugin
   extend Heroku::Helpers
 
-  def self.setup?
-    File.exists? bin
-  end
-
   def self.try_takeover(command, args)
     topic, cmd = command.split(':', 2)
     if cmd
@@ -19,7 +15,6 @@ def self.try_takeover(command, args)
   end
 
   def self.load!
-    return unless setup?
     this = self
     topics.each do |topic|
       Heroku::Command.register_namespace(
@@ -52,7 +47,6 @@ def initialize(args, opts)
   end
 
   def self.plugins
-    return [] unless setup?
     @plugins ||= `"#{bin}" plugins`.lines.map do |line|
       name, version = line.split
       { :name => name, :version => version }
@@ -80,12 +74,10 @@ def self.commands
   end
 
   def self.commands_info
-    copy_ca_cert rescue nil # TODO: remove this once most of the users have the cacert setup
     @commands_info ||= json_decode(`"#{bin}" commands --json`)
   end
 
   def self.install(name, opts={})
-    self.setup
     system "\"#{bin}\" plugins:install #{name}" if opts[:force] || !self.is_plugin_installed?(name)
     error "error installing plugin #{name}" if $? != 0
   end
@@ -112,6 +104,7 @@ def self.bin
 
   def self.setup
     return if File.exist? bin
+    require 'excon'
     $stderr.print "Installing Heroku Toolbelt v4..."
     FileUtils.mkdir_p File.dirname(bin)
     copy_ca_cert
@@ -125,7 +118,7 @@ def self.setup
       File.delete bin
       raise 'SHA mismatch for heroku-cli'
     end
-    $stderr.puts " done"
+    $stderr.puts " done.\nFor more information on Toolbelt v4: https://github.com/heroku/heroku-cli"
   end
 
   def self.copy_ca_cert

spec/heroku/command/keys_spec.rb

@@ -26,7 +26,6 @@ module Heroku::Command
       it "adds a key from a specified keyfile path" do
         # This is because the JSPlugin makes a call to File.exists
         # Not pretty, but will always work and should be temporary
-        allow(Heroku::JSPlugin).to receive(:setup?).and_return(false)
         expect(File).to receive(:exists?).with('.git').and_return(false)
         expect(File).to receive(:exists?).with('/my/key.pub').and_return(true)
         expect(File).to receive(:read).with('/my/key.pub').and_return(KEY)

spec/heroku/command/version_spec.rb

@@ -9,6 +9,7 @@ module Heroku::Command
       expect(stderr).to eq("")
       expect(stdout).to eq <<-STDOUT
 #{Heroku.user_agent}
+heroku-cli/4.0.0-4f2c5c5 (amd64-darwin) go1.5
 You have no installed plugins.
 STDOUT
     end

spec/heroku/command_spec.rb

@@ -198,6 +198,7 @@ class Heroku::Command::Test::Multiple; end
     it "displays the version if --version is used" do
       expect(heroku("--version")).to eq <<-STDOUT
 #{Heroku.user_agent}
+heroku-cli/4.0.0-4f2c5c5 (amd64-darwin) go1.5
 You have no installed plugins.
 STDOUT
     end

spec/spec_helper.rb

@@ -240,6 +240,16 @@ module Heroku::Rollbar
   def self.error(e); end
 end
 
+require "heroku/jsplugin"
+class Heroku::JSPlugin
+  def self.topics; [] end
+  def self.commands; [] end
+  def self.setup; end
+  def self.run; end
+  def self.plugins; [] end
+  def self.version; 'heroku-cli/4.0.0-4f2c5c5 (amd64-darwin) go1.5' end
+end
+
 require "support/display_message_matcher"
 require "support/organizations_mock_helper"
 require "support/addons_helper"