launchy 2.0.4 → 2.0.5

data/HISTORY

@@ -1,4 +1,8 @@
 = Launchy Changlog
+== Version 2.0.5 - 2011-07-24
+
+* Fix the case where $BROWSER is set and no *nix desktop was found (copiousfreetime/launchy#33)
+
 == Version 2.0.4 - 2011-07-23
 
 * Fix windows 'start' commandline (copiousfreetime/launchy#5)

data/lib/launchy/applications/browser.rb

@@ -25,10 +25,11 @@ class Launchy::Application
     end
 
     def nix_app_list
-      nix_de = Launchy::Detect::NixDesktopEnvironment.detect
       app_list = %w[ xdg-open ]
-      app_list << nix_de.browser
-      app_list << nix_de.fallback_browsers
+      if nix_de = Launchy::Detect::NixDesktopEnvironment.detect then
+        app_list << nix_de.browser
+        app_list << nix_de.fallback_browsers
+      end
       app_list.flatten!
       app_list.delete_if { |b| b.nil? || (b.strip.size == 0) }
       app_list.collect { |bin| find_executable( bin ) }.find_all { |x| not x.nil? }

data/lib/launchy/detect/nix_desktop_environment.rb

@@ -14,8 +14,8 @@ module Launchy::Detect
     # NixDekstopEnvironment::Unknown
     def self.detect
       found = find_child( :is_current_desktop_environment? )
-      return found if found
-      raise NotFoundError, "Current Desktop environment not found. #{Launchy.bug_report_message}"
+      Launchy.log("Current Desktop environment not flound. #{Launchy.bug_report_message}") unless found
+      return found
     end
 
     def self.fallback_browsers

data/lib/launchy/version.rb

@@ -1,5 +1,5 @@
 module Launchy
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 
   module Version
 

data/spec/applications/browser_spec.rb

@@ -40,5 +40,15 @@ describe Launchy::Application::Browser do
     uri = Addressable::URI.parse( __FILE__ )
     Launchy::Application::Browser.handles?( uri ).must_equal true
   end
+
+  it "handles the case where $BROWSER is set and no *nix desktop environment is found" do
+    ENV.delete( "KDE_FULL_SESSION" )
+    ENV.delete( "GNOME_DESKTOP_SESSION_ID" )
+    ENV['BROWSER'] = "do-this-instead"
+    Launchy.host_os = 'linux'
+    browser = Launchy::Application::Browser.new
+    browser.browser_cmdline.must_equal "do-this-instead"
+  end
+
 end
 

data/spec/detect/nix_desktop_environment_spec.rb

@@ -23,10 +23,11 @@ describe Launchy::Detect::NixDesktopEnvironment do
    end
 
 
-  it "raises an error if it cannot determine the *nix desktop environment" do
+  it "returns nil if it cannot determine the *nix desktop environment" do
     Launchy.host_os = "linux"
     ENV.delete( "KDE_FULL_SESSION" )
     ENV.delete( "GNOME_DESKTOP_SESSION_ID" )
-    lambda { Launchy::Detect::NixDesktopEnvironment.detect }.must_raise Launchy::Detect::NixDesktopEnvironment::NotFoundError
+    Launchy::Detect::NixDesktopEnvironment.detect.must_equal( nil )
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: launchy
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-23 00:00:00 -06:00
+date: 2011-07-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency