Merge pull request #429 from rails/grosser/help

make help more accessible

Author: grosser

lib/spring/client.rb

@@ -14,12 +14,14 @@ module Spring
   module Client
     COMMANDS = {
       "help"      => Client::Help,
+      "-h"        => Client::Help,
+      "--help"    => Client::Help,
       "binstub"   => Client::Binstub,
       "stop"      => Client::Stop,
       "status"    => Client::Status,
       "rails"     => Client::Rails,
       "-v"        => Client::Version,
-      "--version" => Client::Version
+      "--version" => Client::Version,
     }
 
     def self.run(args)

lib/spring/test/acceptance_test.rb

@@ -84,6 +84,14 @@ def without_gem(name)
 
       test "help message when called without arguments" do
         assert_success "bin/spring", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert app.spring_env.server_running?
+      end
+
+      test "shows help" do
+        assert_success "bin/spring help", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert_success "bin/spring -h", stdout: 'Usage: spring COMMAND [ARGS]'
+        assert_success "bin/spring --help", stdout: 'Usage: spring COMMAND [ARGS]'
+        refute app.spring_env.server_running?
       end
 
       test "test changes are picked up" do