Permalink
Browse files

Don't use TM_RUBY for running Rake tasks

This still supports using `TM_RAKE` to set the version of rake to use when running tasks.
  • Loading branch information...
1 parent 5ac7da9 commit 08aafafe9215796b377b4b005f20c9933fdaeb5a @infininight infininight committed Sep 24, 2013
Showing with 16 additions and 7 deletions.
  1. +15 −6 Commands/Run Rake Task.tmCommand
  2. +1 −1 Support/RakeMate/rake_mate.rb
@@ -1,27 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>beforeRunningCommand</key>
<string>nop</string>
<key>command</key>
- <string>export RUBYLIB="$TM_BUNDLE_SUPPORT/RakeMate${RUBYLIB:+:$RUBYLIB}"
-export TM_RUBY=$(which "${TM_RUBY:-ruby}")
+ <string>#!/usr/bin/env bash
+
+export RUBYLIB="$TM_BUNDLE_SUPPORT/RakeMate${RUBYLIB:+:$RUBYLIB}"
export TM_RAKE=$(which "${TM_RAKE:-rake}")
-"${TM_RUBY}" -- "$TM_BUNDLE_SUPPORT/RakeMate/rake_mate.rb"
+"/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby" -- "$TM_BUNDLE_SUPPORT/RakeMate/rake_mate.rb"
</string>
<key>input</key>
<string>none</string>
+ <key>inputFormat</key>
+ <string>text</string>
<key>keyEquivalent</key>
<string>^R</string>
<key>name</key>
<string>Run Rake Task</string>
- <key>output</key>
- <string>showAsHTML</string>
+ <key>outputCaret</key>
+ <string>afterOutput</string>
+ <key>outputFormat</key>
+ <string>html</string>
+ <key>outputLocation</key>
+ <string>newWindow</string>
<key>scope</key>
<string>source.ruby</string>
<key>uuid</key>
<string>569C9822-8C41-4907-94C7-1A8A0031B66D</string>
+ <key>version</key>
+ <integer>2</integer>
</dict>
</plist>
View
2 Support/RakeMate/rake_mate.rb 100644 → 100755
@@ -23,7 +23,7 @@ def html_error(error)
html_header("RakeMate", "Rake")
puts <<-HTML
-<pre>RakeMate v#{RAKEMATE_VERSION} running on Ruby v#{RUBY_VERSION} (#{ENV["TM_RUBY"].strip})
+<pre>RakeMate v#{RAKEMATE_VERSION}
&gt;&gt;&gt; #{RAKEFILE_DIR}/Rakefile
HTML

0 comments on commit 08aafaf

Please sign in to comment.