Merge pull request #117 from mainameiz/modify-load-path-only-if-requi…

…re-option-is-used Add current dir to LOAD_PATH only when --require option is used
zendesk · Apr 2, 2019 · a6201ef · a6201ef
2 parents 0653d6c + eedb6ba
commit a6201ef
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Add current directory to `$LOAD_PATH` only when `--require` option is used (#117).
+
 ## racecar v0.5.0
 
 * Add support for manually sending heartbeats with `heartbeat` (#105).

diff --git a/exe/racecar b/exe/racecar
@@ -3,8 +3,6 @@
 require "racecar"
 require "racecar/cli"
 
-$LOAD_PATH.unshift(Dir.pwd)
-
 begin
   Racecar::Cli.main(ARGV)
 rescue SignalException => e

diff --git a/lib/racecar/cli.rb b/lib/racecar/cli.rb
@@ -94,10 +94,14 @@ def daemonize!
     end
 
     def build_parser
+      load_path_modified = false
+
       OptionParser.new do |opts|
         opts.banner = "Usage: racecar MyConsumer [options]"
 
         opts.on("-r", "--require STRING", "Require a library before starting the consumer") do |lib|
+          $LOAD_PATH.unshift(Dir.pwd) unless load_path_modified
+          load_path_modified = true
           require lib
         end