Update pl branch with textmate/master

Commands/@variable ||= memoized.tmCommand

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>#!/usr/bin/env ruby18
+
+line_number = ENV['TM_LINE_NUMBER'].to_i - 1
+# line = STDIN.lines.to_a[line_number-1]
+# method_name = $1 if line =~ /def (?:self\.)?([a-z\d_]+)/i
+
+method_name = nil
+lines = STDIN.lines.to_a[0..line_number-1].reverse
+line = lines.find {|l| l =~ /\bdef (?:self\.)?([a-zA-Z\d_]+)/}
+method_name = $1 if line
+
+ivar_name = (method_name != 'initialize' &amp;&amp; method_name) || 'instance_variable'
+assignment = method_name == 'initialize' ? '=' : '${2:||}='
+
+print "@${1:#{ivar_name}} #{assignment} "
+print '${3:$1}' unless ENV['TM_CURRENT_WORD']
+</string>
+	<key>input</key>
+	<string>document</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>name</key>
+	<string>@variable</string>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>snippet</string>
+	<key>outputLocation</key>
+	<string>atCaret</string>
+	<key>scope</key>
+	<string>source.ruby</string>
+	<key>tabTrigger</key>
+	<string>@</string>
+	<key>uuid</key>
+	<string>20ACDEEE-1F1D-4CFB-8B66-940E902693EF</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>

Commands/Check ERB Syntax.plist

@@ -6,11 +6,24 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18
+require "shellwords"
 require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
+
 puts "Using " + `"${TM_RUBY:=ruby}" -e'puts "ruby-" + RUBY_VERSION.to_s'`.chomp + " / " + `"${TM_ERB:=erb}" --version 2&gt;&amp;1`.chomp
-result = `"${TM_ERB:=erb}" -T - -x | "${TM_RUBY:=ruby}" -c 2&gt;&amp;1`
-puts result
-TextMate.go_to :line =&gt; $1 if result =~ /-:(\d+):/</string>
+puts result = `"${TM_ERB:=erb}" -T - -x | "${TM_RUBY:=ruby}" -c 2&gt;&amp;1`
+
+if result =~ /-:(\d+):(.*)/
+  TextMate.go_to :line =&gt; $1
+  `"$TM_MATE" -c warning`
+  result.each_line do |line|
+    if line =~ /-:(\d+):(.*)/
+      `"$TM_MATE" --set-mark warning:#{Shellwords.escape($2)} --line #{$1}`
+    end
+  end
+else
+  `"$TM_MATE" -c warning`
+end
+    </string>
 	<key>input</key>
 	<string>document</string>
 	<key>inputFormat</key>

Commands/Check Ruby Syntax.plist

@@ -6,11 +6,23 @@
 	<string>nop</string>
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18
+require "shellwords"
 require ENV['TM_SUPPORT_PATH'] + '/lib/textmate'
+
 puts `"${TM_RUBY:=ruby}" -e'puts "Using ruby-" + RUBY_VERSION.to_s'`
-result = `"${TM_RUBY:=ruby}" -wc 2&gt;&amp;1`
-puts result
-TextMate.go_to :line =&gt; $1 if result =~ /-:(\d+):/
+puts result = `"${TM_RUBY:=ruby}" -wc 2&gt;&amp;1`
+
+if result =~ /-:(\d+):(.*)/
+  TextMate.go_to :line =&gt; $1
+  `"$TM_MATE" -c warning`
+  result.each_line do |line|
+    if line =~ /-:(\d+):(.*)/
+      `"$TM_MATE" --set-mark warning:#{Shellwords.escape($2)} --line #{$1}`
+    end
+  end
+else
+  `"$TM_MATE" -c warning`
+end
 </string>
 	<key>input</key>
 	<string>document</string>

Commands/Convert Ruby hash to 1_9 syntax.tmCommand

@@ -7,10 +7,19 @@
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18
 
-print case str = STDIN.read
-  when /=&gt;/;                 str.gsub(/:(\w+)[\s]+=&gt;[\s]+/, '\1: ')
-  when /(\w+):/;             str.gsub(/(\w+):(\s*(?:"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\w+\([^)]*\)|[^,]+))/, ":\\1 =&gt;\\2")
-  else;                      str
+def toggle_ruby_hash_syntax(str)
+  case str
+  when /\=&gt;/
+    str.gsub!(/:(\w+)\s*=&gt;\s*/, '\1: ')
+  when /(\w+):/
+    str.gsub!(/(\w+):(\s*(?:"(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\w+\([^)]*\)|[^,]+))/, ":\\1 =&gt;\\2")
+  else
+    str
+  end
+end
+
+while str = $stdin.gets
+  print toggle_ruby_hash_syntax(str)
 end
 </string>
 	<key>fallbackInput</key>

Commands/Help.tmCommand

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>#!/bin/bash
+
+. "$TM_SUPPORT_PATH/lib/webpreview.sh"
+
+html_header "Ruby Bundle Help" "Ruby"
+"$TM_SUPPORT_PATH/lib/markdown_to_help.rb" \
+  "$TM_BUNDLE_SUPPORT/help/help.markdown"
+html_footer</string>
+	<key>input</key>
+	<string>none</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>name</key>
+	<string>Help</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>535AF150-5613-44DB-AB41-EBB934A5865F</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>

Commands/Lookup in Documentation (10.9).tmCommand → Commands/Lookup in Documentation (Modern).tmCommand

@@ -23,7 +23,7 @@ echo "<meta content='0;URL=file://$("${TM_BUNDLE_SUPPORT}/bin/ri_lookup" "${T
 	<key>outputLocation</key>
 	<string>newWindow</string>
 	<key>scope</key>
-	<string>source.ruby &amp; attr.os-version.10.9</string>
+	<string>source.ruby</string>
 	<key>semanticClass</key>
 	<string>lookup.define.ruby</string>
 	<key>uuid</key>

Commands/Lookup in Documentation.plist

@@ -26,7 +26,7 @@
 	<key>outputLocation</key>
 	<string>toolTip</string>
 	<key>scope</key>
-	<string>source.ruby</string>
+	<string>source.ruby &amp; attr.os-version.10.6, source.ruby &amp; attr.os-version.10.7, source.ruby &amp; attr.os-version.10.8</string>
 	<key>semanticClass</key>
 	<string>lookup.define.ruby</string>
 	<key>uuid</key>

Commands/Reformat Document.tmCommand

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>saveModifiedFiles</string>
+	<key>command</key>
+	<string>#!usr/bin/env ruby18
+
+# -- Imports -------------------------------------------------------------------
+
+require ENV['TM_BUNDLE_SUPPORT'] + '/lib/rubocop'
+
+# -- Main ----------------------------------------------------------------------
+
+RuboCop.reformat
+</string>
+	<key>input</key>
+	<string>document</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>keyEquivalent</key>
+	<string>^H</string>
+	<key>name</key>
+	<string>Reformat Document</string>
+	<key>outputCaret</key>
+	<string>heuristic</string>
+	<key>outputFormat</key>
+	<string>text</string>
+	<key>outputLocation</key>
+	<string>discard</string>
+	<key>requiredCommands</key>
+	<array>
+		<dict>
+			<key>command</key>
+			<string>rubocop</string>
+			<key>moreInfoURL</key>
+			<string>http://batsov.com/rubocop/</string>
+			<key>locations</key>
+			<array>
+				<string>/usr/local/bin/rubocop</string>
+				<string>$HOME/.rbenv/shims/rubocop</string>
+				<string>$HOME/.rvm/scripts/rvm</string>
+			</array>
+		</dict>
+	</array>
+	<key>scope</key>
+	<string>source.ruby</string>
+	<key>uuid</key>
+	<string>64BB4EE2-2803-410C-B140-EA545A13F250</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>

Commands/Run Script in Terminal.tmCommand

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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>#!/bin/bash
+[[ -z "$TM_FILEPATH" ]] &amp;&amp; TM_TMPFILE=$(mktemp -t rubyInTerm)
+: "${TM_FILEPATH:=$TM_TMPFILE}"; cat &gt;"$TM_FILEPATH"
+
+# run script using either Terminal.app or iTerm.app
+# if iTerm is open or if TM_TERMINAL is set to iTerm then use iTerm
+# otherwise default to Terminal.app since that is standard.
+TP=${TM_TERMINAL:=Terminal}
+TPY=${TM_RUBY:=ruby}
+
+esc () {
+STR="$1" ruby18 &lt;&lt;"RUBY"
+   str = ENV['STR']
+   str = str.gsub(/'/, "'\\\\''")
+   str = str.gsub(/[\\"]/, '\\\\\\0')
+   print "'#{str}'"
+RUBY
+}
+
+iTerm_running () {
+    ruby &lt;&lt;"RUBY"
+        all = `ps -U "$USER" -o ucomm`
+        split = all.split("\n")
+        if split.find { |cmd| 'iTerm' == cmd.strip }
+            STDOUT.write 0
+        else
+            STDOUT.write 1
+        end
+RUBY
+}
+
+if [ "$TP" == iTerm ] || [ $(iTerm_running) == 0 ]; then
+    osascript &lt;&lt;END
+        tell application "iTerm"
+            activate
+            tell the current terminal            
+                tell (launch session "TextMate")
+                    write text "clear; cd $(esc "${TM_DIRECTORY}"); $(esc "${TPY}") $(esc "${TM_FILEPATH}"); rm -f $(esc "${TM_TMPFILE}")"
+                end tell
+            end tell
+        end tell
+END
+else
+    osascript &lt;&lt;- APPLESCRIPT
+    	tell app "Terminal"
+    	    launch
+    	    activate
+    	    do script "clear; cd $(esc "${TM_DIRECTORY}"); $(esc "${TPY}") $(esc "${TM_FILEPATH}"); rm -f $(esc "${TM_TMPFILE}")"
+    	    set position of first window to { 100, 100 }
+    	end tell
+APPLESCRIPT
+fi
+</string>
+	<key>input</key>
+	<string>document</string>
+	<key>inputFormat</key>
+	<string>text</string>
+	<key>keyEquivalent</key>
+	<string>^@R</string>
+	<key>name</key>
+	<string>Run in Terminal</string>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>text</string>
+	<key>outputLocation</key>
+	<string>discard</string>
+	<key>scope</key>
+	<string>source.ruby</string>
+	<key>uuid</key>
+	<string>4444CB9A-8345-4116-8349-C359ADDA390C</string>
+	<key>version</key>
+	<integer>2</integer>
+</dict>
+</plist>

Commands/Toggle String:Symbol.tmCommand

@@ -9,12 +9,24 @@
 	<key>command</key>
 	<string>#!/usr/bin/env ruby18
 
-print case str = STDIN.read
-  # Handle standard quotes
-  when /\A["'](\w+)["']\z/ then ":" + $1
-  when /\A:(\w+)\z/ then '"' + $1 + '"'
-  # Default case
-  else str
+require ENV['TM_SUPPORT_PATH'] + '/lib/exit_codes'
+
+def toggle_string_symbol(str)
+  case str
+  # "string" =&gt; :symbol
+  when /("|')(\w+)\1/
+    str.gsub!(/("|')(\w+)\1/, ':\2')
+  # :symbol =&gt; "string"
+  when /:(\w+)/
+    str.gsub!(/:(\w+)/, '"\1"')
+  # initial case (no changes)
+  else
+    str
+  end
+end
+
+while str = $stdin.gets
+  print toggle_string_symbol(str)
 end
 </string>
 	<key>fallbackInput</key>
@@ -28,7 +40,7 @@ end
 	<key>output</key>
 	<string>replaceSelectedText</string>
 	<key>scope</key>
-	<string>source.ruby string.quoted, source.ruby constant.other.symbol.ruby</string>
+	<string>source.ruby string.quoted, source.ruby constant.other.symbol, source.ruby constant.other.symbol.hashkey.ruby</string>
 	<key>uuid</key>
 	<string>B297E4B8-A8FF-49CE-B9C4-6D4911724D43</string>
 </dict>

Preferences/Folding.tmPreferences

@@ -11,7 +11,7 @@
 		<key>foldingStartMarker</key>
 		<string>(?x)^
 	    (\s*+
-	        (module|class|def(?!.*\bend\s*$)
+	        (module|class|(private\s+)?def(?!.*\bend\s*$)
 	        |unless|if
 	        |case
 	        |begin

Preferences/Miscellaneous.plist

@@ -9,7 +9,7 @@
 	<key>settings</key>
 	<dict>
 		<key>decreaseIndentPattern</key>
-		<string>^\s*([}\]](,?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)</string>
+		<string>^\s*([}\]]([,)]?\s*(#|$)|\.[a-zA-Z_]\w*\b)|(end|rescue|ensure|else|elsif|when)\b)</string>
 		<key>increaseIndentPattern</key>
 		<string>(?x)^
     (\s*

Preferences/Symbol List: Class.tmPreferences

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>name</key>
+	<string>Symbol List: Class</string>
+	<key>scope</key>
+	<string>meta.class.ruby</string>
+	<key>settings</key>
+	<dict>
+		<key>showInSymbolList</key>
+		<true/>
+		<key>symbolTransformation</key>
+		<string>s/^\s*class\s+//</string>
+	</dict>
+	<key>uuid</key>
+	<string>64AFA1C0-BDC7-42DE-B3B5-C597538975E9</string>
+</dict>
+</plist>