Merge branch 'master' of git://github.com/cwninja/open_gem

blowmage · Apr 23, 2010 · ecd41cf · ecd41cf
2 parents 34f921e + af04d84
commit ecd41cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,5 +1,9 @@
 OpenGem
 ========
+1.5
+---
+* Respect the VISIAL environment variable above EDITOR.
+
 ...
 ---
 * Updating to use GemCutter to host gems now...

diff --git a/VERSION.yml b/VERSION.yml
@@ -1,4 +1,4 @@
 --- 
-:minor: 4
+:minor: 5
 :patch: 0
 :major: 1
diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb
@@ -33,9 +33,9 @@ def get_path(name)
   end
 
   def open_gem(path)
-    editor = options[:command] || ENV['GEM_OPEN_EDITOR'] || ENV['EDITOR']
+    editor = options[:command] || ENV['GEM_OPEN_EDITOR'] || ENV['VISUAL'] || ENV['EDITOR']
     if !editor
-      say "Either set $EDITOR, or use -c <command_name>"
+      say "Either set $GEM_OPEN_EDITOR, $VISUAL, $EDITOR, or use -c <command_name>"
     else
       command_parts = Shellwords.shellwords(editor)
       command_parts << path