From f58514cee184d664cab21d9702880b4fd5781f76 Mon Sep 17 00:00:00 2001 From: Jay Levitt Date: Mon, 23 Jul 2012 15:20:03 -0400 Subject: [PATCH 1/2] fix deprecation warning requiring rake/rdoctask --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index ed35586..7cbdc11 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' begin require 'jeweler' From 0aa962ac037c2b0662e507936838e6b39a5143be Mon Sep 17 00:00:00 2001 From: Jay Levitt Date: Mon, 23 Jul 2012 15:20:28 -0400 Subject: [PATCH 2/2] accept QWANDRY_EDITOR variable to allow no-wait mode for subl, mate, etc --- lib/qwandry/launcher.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/qwandry/launcher.rb b/lib/qwandry/launcher.rb index 1956ecc..743e940 100644 --- a/lib/qwandry/launcher.rb +++ b/lib/qwandry/launcher.rb @@ -25,10 +25,10 @@ module Qwandry # Launches a Package or path represented by a String. Unless `editor` will # check against the environment by default. def launch(package, editor=nil) - editor ||= @editor || ENV['VISUAL'] || ENV['EDITOR'] + editor ||= @editor || ENV['QWANDRY_EDITOR'] || ENV['VISUAL'] || ENV['EDITOR'] if (!editor) || (editor =~ /^\s*$/) # if the editor is not set, or is blank, exit with a message: - puts "Please either set EDITOR or pass in an editor to use" + puts "Please set QWANDRY_EDITOR, VISUAL or EDITOR, or pass in an editor to use" exit 1 end