Fix help and plugins (#2052)

CHANGELOG

@@ -1,3 +1,7 @@
+3.99.1 2017-3-17
+====================
+Fix help and listing plugins
+
 3.99.0 2017-03-13
 =================
 Add deprecation message

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku (3.99.0)
+    heroku (3.99.1)
       heroku-api (= 0.4.2)
       launchy (= 2.4.3)
       multi_json (= 1.11.2)

lib/heroku/cli.rb

@@ -26,7 +26,7 @@ def self.start(*args)
     command = args.shift.strip rescue "help"
     Heroku::Analytics.skip_analytics # just sets the config for the analytics
     Heroku::JSPlugin.setup
-    Heroku::JSPlugin.try_takeover(command, args)
+    Heroku::JSPlugin.try_takeover(command)
     require 'heroku/command'
     Heroku::Git.check_git_version
     Heroku::Command.load

lib/heroku/command/plugins.rb

@@ -26,6 +26,7 @@ def index
         styled_header("Installed Plugins")
         styled_array(plugins)
       end
+      ::Heroku::JSPlugin.list
     end
 
     # plugins:install NAME
@@ -149,7 +150,7 @@ def commands
       type_and_percentage = counts.keys.sort.map{|type| {:type => type, :count => counts[type]}}
 
       if options[:csv]
-        csv_str = CSV.generate do |csv| 
+        csv_str = CSV.generate do |csv|
           csv << header
           sorted_cmd.each {|cmd| csv << attrs.map{|attr| cmd[attr]}}
 
@@ -174,7 +175,7 @@ def command_to_hash(type, cmd, command)
     end
 
     def command_list_to_hash(commands, type)
-      commands.inject({}) do |h, command| 
+      commands.inject({}) do |h, command|
         cmd = command['command'] ? "#{command['topic']}:#{command['command']}" : command['topic']
         h[cmd] = command_to_hash(type, cmd, command)
         if command['default']

lib/heroku/jsplugin.rb

@@ -12,9 +12,13 @@
 class Heroku::JSPlugin
   extend Heroku::Helpers
 
-  def self.try_takeover(command, args)
+  def self.list
+    system "\"#{bin}\" plugins"
+  end
+
+  def self.try_takeover(command)
     return if ALWAYS_RUBY_COMMANDS.include?(command)
-    run(ARGV[0], nil, ARGV[1..-1])
+    run((ARGV[0] || "help"), nil, ARGV[1..-1])
   end
 
   def self.install(name, opts={})

lib/heroku/version.rb

@@ -1,3 +1,3 @@
 module Heroku
-  VERSION = "3.99.0"
+  VERSION = "3.99.1"
 end

spec/heroku/jsplugin_spec.rb

@@ -34,5 +34,69 @@ module Heroku
         allow(ENV).to receive(:[]).and_call_original
       end
     end
+
+    context '.try_takeover' do
+      context 'global help' do
+        it 'displays via $ heroku' do
+          cmd = ['help'] # 'help' via cli.js:26
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('help', nil, [])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+
+        it 'displays via $ heroku help' do
+          cmd = ['help']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('help', nil, [])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+
+        it 'displays via $ heroku --help' do
+          cmd = ['--help']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('--help', nil, [])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+      end
+
+      context 'topic help' do
+        it 'displays via $ heroku help plugins' do
+          cmd = ['help', 'plugins']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('help', nil, ['plugins'])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+
+        it 'displays via $ heroku --help plugins' do
+          cmd = ['--help', 'plugins']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('--help', nil, ['plugins'])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+      end
+
+      context 'help help' do
+        it 'displays via $ heroku help help' do
+          cmd = ['help', 'help']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('help', nil, ['help'])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+
+        it 'displays via $ heroku --help help' do
+          cmd = ['--help', 'help']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('--help', nil, ['help'])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+
+        it 'displays via $ heroku help --help' do
+          cmd = ['help', '--help']
+          stub_argv(cmd)
+          expect(Heroku::JSPlugin).to receive(:run).with('help', nil, ['--help'])
+          Heroku::JSPlugin.try_takeover(cmd[0])
+        end
+      end
+    end
   end
 end

spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 if (Heroku::Helpers.running_on_windows?)
   $stdin = File.new("nul")
-else 
+else
   $stdin = File.new("/dev/null")
 end
 
@@ -255,7 +255,7 @@ class Heroku::JSPlugin
   def self.topics; [] end
   def self.commands; [] end
   def self.setup; end
-  def self.run; end
+  def self.run (t=nil, c=nil, a=nil); end
   def self.plugins; [] end
   def self.version; 'heroku-cli/4.0.0-4f2c5c5 (amd64-darwin) go1.5' end
 end
@@ -271,3 +271,6 @@ def self.version; 'heroku-cli/4.0.0-4f2c5c5 (amd64-darwin) go1.5' end
   config.after { RR.reset }
 end
 
+def stub_argv cmd
+  allow(ARGV).to receive(:[]) { |i| cmd[i] }
+end