Merge pull request #58 from heroku/app-run-fixes

app.run fixes

lib/hatchet/app.rb

@@ -108,8 +108,12 @@ def add_database(plan_name = 'heroku-postgresql:dev', match_val = "HEROKU_POSTGR
     # but programatically and with more control
     def run(cmd_type, command = nil, options = {}, &block)
       command        = cmd_type.to_s if command.nil?
-      heroku_options = (options.delete(:heroku) || {}).map {|k,v| "--#{k.to_s.shellescape}=#{v.to_s.shellescape}"}.join(" ")
-      heroku_command = "heroku run #{command.to_s.shellescape} -a #{name} #{ heroku_options }"
+      heroku_options = (options.delete(:heroku) || {}).map do |k,v|
+        arg = "--#{k.to_s.shellescape}"
+        arg << "=#{v.to_s.shellescape}" unless v.nil?
+        arg
+      end.join(" ")
+      heroku_command = "heroku run -a #{name} #{heroku_options} --exit-code -- #{command}"
       bundle_exec do
         if block_given?
           ReplRunner.new(cmd_type, heroku_command, options).run(&block)

test/hatchet/app_test.rb

@@ -62,4 +62,12 @@ def app.push_with_retry!; end # Don't actually deploy
       end
     end
   end
+
+  def test_run
+    app = Hatchet::GitApp.new("default_ruby")
+    app.deploy do
+      assert_match /ls: cannot access 'foo bar #baz': No such file or directory\s+Gemfile/, app.run("ls -a Gemfile 'foo bar #baz'")
+      assert (0 != $?.exitstatus) # $? is from the app.run use of backticks
+    end
+  end
 end