launchy 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWUzNmEyNDA5NGVkMjUyYjU2MDVmMzQxY2FkMDJhZjQxNzMwYmE4OA==
+    ZTBlZTMzMGZlMDNmM2Y5MDk3MzVmZWMzNjIwMGI5MjdiYWE1NmVlNA==
   data.tar.gz: !binary |-
-    MmUxYmRlODUyNDhhZmRlY2U2MWY1NTc5ZThlMDdkYTkwYjYzYTE3MQ==
+    MWQ0Mjc2MzA2Mjg4MDNhNzY5YjQ1M2RjZTNhNTlhYTJkZDM3MzZhYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTlkMzhjYThhMjYzMGNkZTVkMDNlZmU0MDU0N2RkNDc0NzlmNzMwNDEwMzY4
-    NTg3MDc0ZDEyMDRlMTZjYzcxZjkyNTY4N2MwZmNkZDhiZWVkNjA0Zjk1YzUw
-    MjNmZGM1ZjAxM2Y5ODg2NGE0NTUwMDk3ODg2ZjAzODBkOWJjN2M=
+    NzBmYTIwODEzYzMyNGZhMjY3Y2E1YzU4NWE1MTkxMTA4Nzg0ZWE1MzhlZTRh
+    NDhhYjdhNzQ5NDY0YzgzMjIwZGZiMWEyZTRjNGE0NjkyM2FmMGUyMmUyN2Jh
+    NDQ0NDVmNmE1N2U1ZTQ3MmY3YmEyYjM4OWYxMjYxNDQyMzU5OTk=
   data.tar.gz: !binary |-
-    NDQ5YWMzNTRhYmJjZTNmNTU2OGNjN2UyMzBjMTcxMTllNmUwMGY0ZDRjZTA3
-    NTEzM2NiZjJmMGZlZTYwMjZlYmIzNjRiMDRiMmI5MTMzZmI0MDZiYjIxNTQ1
-    OTMwMmRlMTA1MDRiZjczOGQyMTMzNjIxYjNiYjQ4NzZlMzNlMzc=
+    OTA3NTI4MTE1NGVjZmFlMDJjOWJjOWYzYjgxYWUxNzA2M2NiNDU1YzI3NWM1
+    N2MzYzFkNjdhMmVlZjE4ZjA0YTg0MDAxODQ4NjQwODZhODliODAwM2I3Mjhl
+    MDg5NWI5MzBhNGNhNGQ2NTRkZGY2ZDlhOGFlZWI1MzFiYWVkNDY=

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Launchy Changelog
 
+## Version 2.4.1 - 2013-11-26
+* Abstract out the argv of the commandline - <https://github.com/copiousfreetime/launchy/issues/71>
+
 ## Version 2.4.0 - 2013-11-12
 * Support `Launchy.open( url, :debug => true )` - <http://github.com/copiousfreetime/launchy/issues/63> - schmich
 * Fix inconsistencies in `debug?` and `dry_run?` methods - <http://github.com/copiousfreetime/launchy/issues/63> - schmich

data/Manifest.txt

@@ -8,6 +8,7 @@ bin/launchy
 lib/launchy.rb
 lib/launchy/application.rb
 lib/launchy/applications/browser.rb
+lib/launchy/argv.rb
 lib/launchy/cli.rb
 lib/launchy/deprecated.rb
 lib/launchy/descendant_tracker.rb

data/lib/launchy.rb

@@ -143,6 +143,7 @@ module Launchy
 end
 
 require 'launchy/version'
+require 'launchy/argv'
 require 'launchy/cli'
 require 'launchy/descendant_tracker'
 require 'launchy/error'

data/lib/launchy/applications/browser.rb

@@ -28,9 +28,7 @@ class Launchy::Application
     def nix_app_list
       nix_de = Launchy::Detect::NixDesktopEnvironment.detect
       list   = nix_de.browsers
-
-      list.delete_if { |b| b.nil? || (b.strip.size == 0) }
-      list.collect { |bin| find_executable( bin ) }.find_all { |x| not x.nil? }
+      list.find_all { |argv| argv.valid? }
     end
 
     # use a call back mechanism to get the right app_list that is decided by the 

data/lib/launchy/argv.rb

@@ -0,0 +1,36 @@
+module Launchy
+  class Argv
+    attr_reader :argv
+    def initialize( *args )
+      @argv = args.flatten
+    end
+
+    def to_s
+      @argv.join(' ')
+    end
+
+    def to_str
+      to_s
+    end
+
+    def [](idx)
+      @argv[idx]
+    end
+
+    def valid?
+      (not blank?) && executable?
+    end
+
+    def blank?
+      @argv.empty? || (@argv.first.strip.size == 0)
+    end
+
+    def executable?
+      ::Launchy::Application.find_executable( @argv.first )
+    end
+
+    def ==( other )
+      @argv == other.argv
+    end
+  end
+end

data/lib/launchy/detect/nix_desktop_environment.rb

@@ -19,7 +19,7 @@ module Launchy::Detect
     end
 
     def self.fallback_browsers
-      %w[ firefox seamonkey opera mozilla netscape galeon ]
+      %w[ firefox seamonkey opera mozilla netscape galeon ].map { |x| ::Launchy::Argv.new( x ) }
     end
 
     def self.browsers
@@ -36,7 +36,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'kfmclient'
+        ::Launchy::Argv.new( %w[ kvmclient openURL ] )
       end
     end
 
@@ -46,7 +46,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'gnome-open'
+        ::Launchy::Argv.new( 'gnome-open' )
       end
     end
 
@@ -60,7 +60,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'exo-open'
+        ::Launchy::Argv.new( 'exo-open' )
       end
     end
 
@@ -71,7 +71,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'xdg-open'
+        ::Launchy::Argv.new( 'xdg-open' )
       end
     end
 
@@ -82,7 +82,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        []
+        ::Launchy::Argv.new
       end
     end
 

data/lib/launchy/version.rb

@@ -1,5 +1,5 @@
 module Launchy
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
   module Version
 

data/spec/detect/nix_desktop_environment_spec.rb

@@ -14,6 +14,8 @@ describe Launchy::Detect::NixDesktopEnvironment do
   { "KDE_FULL_SESSION"         => Launchy::Detect::NixDesktopEnvironment::Kde,
     "GNOME_DESKTOP_SESSION_ID" => Launchy::Detect::NixDesktopEnvironment::Gnome }.each_pair do |k,v|
     it "can detect the desktop environment of a *nix machine using ENV[#{k}]" do
+      ENV.delete( "KDE_FULL_SESSION" )
+      ENV.delete( "GNOME_DESKTOP_SESSION_ID" )
       ENV[k] = "launchy-test"
       nix_env = Launchy::Detect::NixDesktopEnvironment.detect
       nix_env.must_equal( v )
@@ -33,6 +35,6 @@ describe Launchy::Detect::NixDesktopEnvironment do
     ENV.delete( "GNOME_DESKTOP_SESSION_ID" )
     not_found = Launchy::Detect::NixDesktopEnvironment.detect
     not_found.must_equal( Launchy::Detect::NixDesktopEnvironment::NotFound )
-    not_found.browser.must_equal( [] )
+    not_found.browser.must_equal( Launchy::Argv.new )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: launchy
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -91,6 +91,7 @@ files:
 - lib/launchy.rb
 - lib/launchy/application.rb
 - lib/launchy/applications/browser.rb
+- lib/launchy/argv.rb
 - lib/launchy/cli.rb
 - lib/launchy/deprecated.rb
 - lib/launchy/descendant_tracker.rb
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Launchy is helper class for launching cross-platform applications in a fire