launchy 2.2.0-java → 2.4.2-java

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/cli.rb

@@ -22,7 +22,7 @@ module Launchy
 
         op.on( "-d", "--debug", 
                "Force debug. Output lots of information.") do |d|
-          @options[:debug] = 'true'
+          @options[:debug] = true
         end
 
         op.on( "-e", "--engine RUBY_ENGINE",
@@ -65,13 +65,11 @@ module Launchy
 
     def good_run( argv, env )
       if parse( argv, env ) then
-        Launchy.open( argv.shift, options )
+        Launchy.open( argv.shift, options ) { |e| error_output( e ) }
         return true
       else
         return false
       end
-    rescue StandardError => e
-      error_output( e )
     end
 
     def error_output( error )

data/lib/launchy/descendant_tracker.rb

@@ -30,7 +30,7 @@ module Launchy
     #
     def children
       unless defined? @children
-        @children = Set.new
+        @children = Array.new
       end
       return @children
     end

data/lib/launchy/detect/nix_desktop_environment.rb

@@ -19,7 +19,11 @@ 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
+      [ browser, fallback_browsers ].flatten
     end
 
     #---------------------------------------
@@ -32,7 +36,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'kfmclient'
+        ::Launchy::Argv.new( %w[ kfmclient openURL ] )
       end
     end
 
@@ -42,7 +46,7 @@ module Launchy::Detect
       end
 
       def self.browser
-        'gnome-open'
+        ::Launchy::Argv.new( 'gnome-open' )
       end
     end
 
@@ -56,19 +60,32 @@ module Launchy::Detect
       end
 
       def self.browser
-        'exo-open'
+        ::Launchy::Argv.new( 'exo-open' )
+      end
+    end
+
+    # Fall back environment as the last case
+    class Xdg < NixDesktopEnvironment
+      def self.is_current_desktop_environment?
+        Launchy::Application.find_executable( browser )
+      end
+
+      def self.browser
+        ::Launchy::Argv.new( 'xdg-open' )
       end
     end
 
-    class Fluxbox < NixDesktopEnvironment
+    # The one that is found when all else fails. And this must be declared last
+    class NotFound < NixDesktopEnvironment
       def self.is_current_desktop_environment?
-        ENV['DESKTOP_SESSION'] == 'fluxbox'
+        true
       end
 
       def self.browser
-        'xdg-open'
+        ::Launchy::Argv.new
       end
     end
+
   end
 end
 

data/lib/launchy/detect/runner.rb

@@ -37,7 +37,7 @@ module Launchy::Detect
     # and in that case system shell escaping rules are not done.
     #
     def shell_commands( cmd, args )
-      cmdline = [ cmd.shellsplit ]
+      cmdline = [ cmd.to_s.shellsplit ]
       cmdline << args.flatten.collect{ |a| a.to_s }
       return commandline_normalize( cmdline )
     end
@@ -81,8 +81,21 @@ module Launchy::Detect
 
       # escape the reserved shell characters in windows command shell
       # http://technet.microsoft.com/en-us/library/cc723564.aspx
+      #
+      # Also make sure that the item after 'start' is guaranteed to be quoted.
+      # https://github.com/copiousfreetime/launchy/issues/62
       def shell_commands( cmd, *args )
-        cmdline = [ cmd.shellsplit ]
+        parts = cmd.shellsplit
+
+        if start_idx = parts.index('start') then
+          title_idx = start_idx + 1
+          title     = parts[title_idx]
+          title     = title.sub(/^/,'"') unless title[0] == '"'
+          title     = title.sub(/$/,'"') unless title[-1] == '"'
+          parts[title_idx] = title
+        end
+
+        cmdline = [ parts ]
         cmdline << args.flatten.collect { |a| a.to_s.gsub(/([&|()<>^])/, "^\\1") }
         return commandline_normalize( cmdline )
       end

data/lib/launchy/version.rb

@@ -1,5 +1,5 @@
 module Launchy
-  VERSION = "2.2.0"
+  VERSION = "2.4.2"
 
   module Version
 

data/spec/application_spec.rb

@@ -30,8 +30,8 @@ describe Launchy::Application do
     lambda { Launchy::Application.handling( uri ) }.must_raise( Launchy::ApplicationNotFoundError )
   end
 
-  it "can find open or curl" do
-    found = %w[ open curl ].any? do |app|
+  it "can find open or curl or xdg-open" do
+    found = %w[ open curl xdg-open ].any? do |app|
       Launchy::Application.find_executable( app )
     end
     found.must_equal true

data/spec/applications/browser_spec.rb

@@ -10,11 +10,12 @@ describe Launchy::Application::Browser do
   after do
     Launchy.reset_global_options
     ENV.delete( 'KDE_FULL_SESSION' )
+    ENV.delete( 'BROWSER' )
   end
 
-  { 'windows' => 'start /b' ,
+  { 'windows' => 'start "launchy" /b' ,
     'darwin'  => '/usr/bin/open',
-    'cygwin'  => 'cmd /C start /b',
+    'cygwin'  => 'cmd /C start "launchy" /b',
 
     # when running these tests on a linux box, this test will fail
     'linux'   => nil                 }.each  do |host_os, cmdline|

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 )
@@ -22,24 +24,17 @@ describe Launchy::Detect::NixDesktopEnvironment do
     end
    end
 
-  it "detects the fluxbox desktop environment" do
-    ENV['DESKTOP_SESSION'] = 'fluxbox'
-    fluxbox_env = Launchy::Detect::NixDesktopEnvironment.detect
-    fluxbox_env.must_equal( Launchy::Detect::NixDesktopEnvironment::Fluxbox )
-    fluxbox_env.browser.must_equal( Launchy::Detect::NixDesktopEnvironment::Fluxbox.browser )
-    ENV.delete( 'DESKTOP_SESSION' )
-  end
-
   it "returns false for XFCE if xprop is not found" do
     Launchy.host_os = "linux"
     Launchy::Detect::NixDesktopEnvironment::Xfce.is_current_desktop_environment?.must_equal( false )
   end
 
-  it "returns nil if it cannot determine the *nix desktop environment" do
+  it "returns NotFound if it cannot determine the *nix desktop environment" do
     Launchy.host_os = "linux"
     ENV.delete( "KDE_FULL_SESSION" )
     ENV.delete( "GNOME_DESKTOP_SESSION_ID" )
-    Launchy::Detect::NixDesktopEnvironment.detect.must_equal( nil )
+    not_found = Launchy::Detect::NixDesktopEnvironment.detect
+    not_found.must_equal( Launchy::Detect::NixDesktopEnvironment::NotFound )
+    not_found.browser.must_equal( Launchy::Argv.new )
   end
-
 end

data/spec/launchy_spec.rb

@@ -6,11 +6,15 @@ describe Launchy do
     Launchy.reset_global_options
     @stderr  = $stderr
     $stderr = StringIO.new
+    @stdout = $stdout
+    $stdout = StringIO.new
+    @invalid_url = 'blah://example.com/invalid'
   end
 
   after do
     Launchy.reset_global_options
     $stderr = @stderr
+    $stdout = @stdout
   end
 
   it "logs to stderr when LAUNCHY_DEBUG environment variable is set" do
@@ -23,16 +27,32 @@ describe Launchy do
     ENV["LAUNCHY_DEBUG"] = nil
   end
 
-  it "sets the global option :dry_run to value of LAUNCHY_DRY_RUN environment variable" do
+  it "sets the global option :dry_run to true if LAUNCHY_DRY_RUN environment variable is 'true'" do
     ENV['LAUNCHY_DRY_RUN'] = 'true'
     Launchy.extract_global_options({})
-    Launchy.dry_run?.must_equal 'true'
+    Launchy.dry_run?.must_equal true
     ENV['LAUNCHY_DRY_RUN'] = nil
   end
 
+  it "sets the global option :debug to true if LAUNCHY_DEBUG environment variable is 'true'" do
+    ENV['LAUNCHY_DEBUG'] = 'true'
+    Launchy.extract_global_options({})
+    Launchy.debug?.must_equal true
+    ENV['LAUNCHY_DEBUG'] = nil
+  end
+
   it "has the global option :debug" do
     Launchy.extract_global_options( { :debug => 'true' } )
     Launchy.debug?.must_equal true
+    Launchy.extract_global_options( { :debug => true } )
+    Launchy.debug?.must_equal true
+  end
+
+  it "has the global option :dry_run" do
+    Launchy.extract_global_options( { :dry_run => 'true' } )
+    Launchy.dry_run?.must_equal true
+    Launchy.extract_global_options( { :dry_run => true } )
+    Launchy.dry_run?.must_equal true
   end
 
   it "has the global option :application" do
@@ -51,10 +71,37 @@ describe Launchy do
   end
 
   it "raises an exception if no scheme is found for the given uri" do
-    lambda { Launchy.open( "blah://something/invalid" ) }.must_raise Launchy::ApplicationNotFoundError
+    lambda { Launchy.open( @invalid_url ) }.must_raise Launchy::ApplicationNotFoundError
+  end
+
+  it "asssumes we open a local file if we have an exception if we have an invalid scheme and a valid path" do
+    uri = "blah://example.com/#{__FILE__}"
+    Launchy.open( uri , :dry_run => true )
+    $stdout.string.strip.must_equal "/usr/bin/open #{uri}"
+  end
+
+  it "opens a local file if we have a drive letter and a valid path on windows" do
+    uri = "C:#{__FILE__}"
+    Launchy.open( uri, :dry_run => true, :host_os => 'windows'  )
+    $stdout.string.strip.must_equal 'cmd /c start "launchy" /b ' + uri
+  end
+
+  it "calls the block if instead of raising an exception if there is an error" do
+    Launchy.open( @invalid_url ) { $stderr.puts "oops had an error opening #{@invalid_url}" }
+    $stderr.string.strip.must_equal "oops had an error opening #{@invalid_url}"
+  end
+
+  it "calls the block with the values passed to launchy and the error" do
+    options = { :dry_run => true }
+    Launchy.open( @invalid_url, :dry_run => true ) { |e| $stderr.puts "had an error opening #{@invalid_url} with options #{options}: #{e}" }
+    $stderr.string.strip.must_equal "had an error opening #{@invalid_url} with options #{options}: No application found to handle '#{@invalid_url}'"
+  end
+
+  it "raises the error in the called block" do
+    lambda { Launchy.open( @invalid_url ) { raise StandardError, "KABOOM!" } }.must_raise StandardError
   end
 
-  [ 'www.example.com', 'www.example.com/foo/bar' ].each do |x|
+  [ 'www.example.com', 'www.example.com/foo/bar', "C:#{__FILE__}" ].each do |x|
     it "picks a Browser for #{x}" do
       app = Launchy.app_for_uri_string( x )
       app.must_equal( Launchy::Application::Browser )

data/tasks/default.rake

@@ -1,5 +1,6 @@
 # vim: syntax=ruby
 require 'rake/clean'
+require 'digest'
 #------------------------------------------------------------------------------
 # If you want to Develop on this project just run 'rake develop' and you'll
 # have all you need to get going. If you want to use bundler for development,
@@ -11,7 +12,7 @@ namespace :develop do
   # gemspec.
   task :default do
     require 'rubygems/dependency_installer'
-    installer = Gem::DependencyInstaller.new
+    installer = ::Gem::DependencyInstaller.new
 
     This.set_coverage_gem
 
@@ -30,7 +31,7 @@ namespace :develop do
   # Create a Gemfile that just references the gemspec
   file 'Gemfile' => :gemspec do
     File.open( "Gemfile", "w+" ) do |f|
-      f.puts 'source :rubygems'
+      f.puts 'source "https://rubygems.org/"'
       f.puts 'gemspec'
     end
   end
@@ -53,9 +54,12 @@ begin
   require 'rake/testtask'
   Rake::TestTask.new( :test ) do |t|
     t.ruby_opts    = %w[ -w -rubygems ]
-    t.libs         = %w[ lib spec ]
-    t.pattern      = "spec/**/*_spec.rb"
+    t.libs         = %w[ lib spec test ]
+    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
   end
+
+  task :test_requirements
+  task :test => :test_requirements
   task :default => :test
 rescue LoadError
   This.task_warning( 'test' )
@@ -71,11 +75,12 @@ begin
   RDoc::Task.new do |t|
     t.markup   = 'tomdoc'
     t.rdoc_dir = 'doc'
-    t.main     = 'README.rdoc'
+    t.main     = 'README.md'
     t.title    = "#{This.name} #{This.version}"
-    t.rdoc_files.include( '*.rdoc', 'lib/**/*.rb' )
+    t.rdoc_files.include( FileList['*.{rdoc,md,txt}'], FileList['ext/**/*.c'],
+                          FileList['lib/**/*.rb'] )
   end
-rescue LoadError => le
+rescue StandardError, LoadError
   This.task_warning( 'rdoc' )
 end
 
@@ -146,19 +151,70 @@ end
 #------------------------------------------------------------------------------
 # Fixme - look for fixmes and report them
 #------------------------------------------------------------------------------
-desc "Look for fixmes and report them"
-task :fixme => 'manifest:check' do
-  This.manifest.each do |file|
-    next if file == File.basename( __FILE__ )
+namespace :fixme do
+  task :default => 'manifest:check' do
+    This.manifest.each do |file|
+      next if file == __FILE__
+      next unless file =~ %r/(txt|rb|md|rdoc|css|html|xml|css)\Z/
+      puts "FIXME: Rename #{file}" if file =~ /fixme/i
+      IO.readlines( file ).each_with_index do |line, idx|
+        prefix = "FIXME: #{file}:#{idx+1}".ljust(42)
+        puts "#{prefix} => #{line.strip}" if line =~ /fixme/i
+      end
+    end
+  end
+
+  def fixme_project_root
+    This.project_path( '../fixme' )
+  end
+
+  def fixme_project_path( subtree )
+    fixme_project_root.join( subtree )
+  end
+
+  def local_fixme_files
+    This.manifest.select { |p| p =~ %r|^tasks/| }
+  end
 
-    puts "FIXME: Rename #{file}" if file =~ /fixme/i
+  def outdated_fixme_files
+    local_fixme_files.reject do |local|
+      upstream     = fixme_project_path( local )
+      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+    end
+  end
+
+  def fixme_up_to_date?
+    outdated_fixme_files.empty?
+  end
 
-    IO.readlines( file ).each_with_index do |line, idx|
-      prefix = "FIXME: #{file}:#{idx+1}".ljust(42)
-      puts "#{prefix} => #{line.strip}" if line =~ /fixme/i
+  desc "See if the fixme tools are outdated"
+  task :outdated => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are up to date."
+    else
+      outdated_fixme_files.each do |f|
+        puts "#{f} is outdated"
+      end
+    end
+  end
+
+  desc "Update outdated fixme files"
+  task :update => :release_check do
+    if fixme_up_to_date? then
+      puts "Fixme files are already up to date."
+    else
+      puts "Updating fixme files:"
+      outdated_fixme_files.each do |local|
+        upstream = fixme_project_path( local )
+        puts "  * #{local}"
+        FileUtils.cp( upstream, local )
+      end
+      puts "Use your git commands as appropriate."
     end
   end
 end
+desc "Look for fixmes and report them"
+task :fixme => "fixme:default"
 
 #------------------------------------------------------------------------------
 # Gem Specification
@@ -172,11 +228,14 @@ task :gemspec do
 end
 
 # the gemspec is also a dev artifact and should not be kept around.
-CLOBBER << This.gemspec_file
+CLOBBER << This.gemspec_file.to_s
+
+# .rbc files from ruby 2.0
+CLOBBER << FileList["**/*.rbc"]
 
 # The standard gem packaging task, everyone has it.
 require 'rubygems/package_task'
-Gem::PackageTask.new( This.platform_gemspec ) do
+::Gem::PackageTask.new( This.platform_gemspec ) do
   # nothing
 end