Partial fix for issue #26: Remove Ruby18 dependency where possible.

Most of the bundle is compatible with greater ruby versions, except the 'Open Package' command. That will be addressed in another commit.
syscrusher · Apr 10, 2016 · dd5f608 · dd5f608
1 parent ea01788
commit dd5f608
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/Commands/Build.tmCommand b/Commands/Build.tmCommand
@@ -7,7 +7,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::go "build", :verb =&gt; "Building"</string>

diff --git a/Commands/Complete.tmCommand b/Commands/Complete.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>nop</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "open3"
 

diff --git a/Commands/Documentation for Word : Selection.tmCommand b/Commands/Documentation for Word : Selection.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::godoc

diff --git a/Commands/Imports.tmCommand b/Commands/Imports.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::goimports

diff --git a/Commands/Install.tmCommand b/Commands/Install.tmCommand
@@ -7,7 +7,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::go "install", :verb =&gt; "Installing"</string>

diff --git a/Commands/Lint.tmCommand b/Commands/Lint.tmCommand
@@ -5,7 +5,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveActiveFile</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::golint

diff --git a/Commands/Open Package.tmCommand b/Commands/Open Package.tmCommand
@@ -27,8 +27,8 @@ def go_path
     lcal, root = [], []
     env.scan(/^GO(PATH|ROOT)=&quot;(.*)&quot;/) do |key,value|
       case key
-      when &apos;PATH&apos;: lcal = value.split(&apos;:&apos;).map { |dir| &quot;#{dir}/src&quot; }
-      when &apos;ROOT&apos;: root = value.split(&apos;:&apos;).map { |dir| &quot;#{dir}/src/pkg&quot; }
+      when &apos;PATH&apos;; lcal = value.split(&apos;:&apos;).map { |dir| &quot;#{dir}/src&quot; }
+      when &apos;ROOT&apos;; root = value.split(&apos;:&apos;).map { |dir| &quot;#{dir}/src/pkg&quot; }
       end
     end
     [ lcal, root ].flatten

diff --git a/Commands/Run.tmCommand b/Commands/Run.tmCommand
@@ -7,7 +7,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::go "run", :verb =&gt; "Running"

diff --git a/Commands/Test.tmCommand b/Commands/Test.tmCommand
@@ -7,7 +7,7 @@
 	<key>beforeRunningCommand</key>
 	<string>saveModifiedFiles</string>
 	<key>command</key>
-	<string>#!/usr/bin/env ruby18
+	<string>#!/usr/bin/env ruby
 
 require "#{ENV['TM_BUNDLE_SUPPORT']}/gomate"
 Go::go "test", :verb =&gt; "Testing"

diff --git a/Support/gomate.rb b/Support/gomate.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby18
+#!/usr/bin/env ruby
 
 require "#{ENV['TM_SUPPORT_PATH']}/lib/escape"
 require "#{ENV['TM_SUPPORT_PATH']}/lib/exit_codes"