Merge pull request ddollar#515 from rasky/fix_run_unknown_options

Do not parse options after "run" argument, to avoid conflicts.

lib/foreman/cli.rb

@@ -74,6 +74,7 @@ def check
   desc "run COMMAND [ARGS...]", "Run a command using your application's environment"
 
   method_option :env, :type => :string, :aliases => "-e", :desc => "Specify an environment file to load, defaults to .env"
+  stop_on_unknown_option! :run
 
   def run(*args)
     load_environment!

spec/foreman/cli_spec.rb

@@ -76,8 +76,12 @@
       expect(forked_foreman("run echo 1")).to eq("1\n")
     end
 
+    it "doesn't parse options for the command" do
+      expect(forked_foreman("run grep -e FOO #{resource_path(".env")}")).to eq("FOO=bar\n")
+    end
+
     it "includes the environment" do
-      expect(forked_foreman("run #{resource_path("bin/env FOO")} -e #{resource_path(".env")}")).to eq("bar\n")
+      expect(forked_foreman("run -e #{resource_path(".env")} #{resource_path("bin/env FOO")}")).to eq("bar\n")
     end
 
     it "can run a command from the Procfile" do