Prioritise displaying help above running Puppet. Load the bundled rum…

…p if available

bin/rump

@@ -1,18 +1,28 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'rump'
-rescue LoadError
-  $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-  require 'rump'
-end
+require 'pathname'
 
+# Show the man page
 if ARGV.any? {|arg| arg =~ /help|--help|-h/}
   root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
   command = "man #{root + 'man' + 'rump.1'}"
   exec(command)
 end
 
+# If we are running from the root of a Rump/Puppet repo, load the bundled rump.
+rump_binstub = Pathname.new(Dir.pwd) + 'bin' + 'rump'
+if rump_binstub.exist?
+  load rump_binstub
+end
+
+# Otherwise, load rump from a gem as per usual.
+begin
+  require 'rump'
+rescue LoadError
+  $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+  require 'rump'
+end
+
 command   = ARGV.first
 arguments = ARGV[1..-1]