launchy 2.1.0 → 2.2.0

data/lib/launchy/cli.rb

@@ -57,14 +57,10 @@ module Launchy
     end
 
     def parse( argv, env )
-      begin
-        parser.parse!( argv )
-        return true
-      rescue ::OptionParser::ParseError => pe
-        $stderr.puts "#{parser.program_name}: #{pe}"
-        $stderr.puts "Try `#{parser.program_name} --help for more information."
-        return false
-      end
+      parser.parse!( argv )
+      return true
+    rescue ::OptionParser::ParseError => pe
+      error_output( pe )
     end
 
     def good_run( argv, env )
@@ -74,6 +70,18 @@ module Launchy
       else
         return false
       end
+    rescue StandardError => e
+      error_output( e )
+    end
+
+    def error_output( error )
+      $stderr.puts "ERROR: #{error}"
+      Launchy.log "ERROR: #{error}"
+      error.backtrace.each do |bt|
+        Launchy.log bt
+      end
+      $stderr.puts "Try `#{parser.program_name} --help' for more information."
+      return false
     end
 
     def run( argv = ARGV, env = ENV )

data/lib/launchy/descendant_tracker.rb

@@ -40,7 +40,7 @@ module Launchy
     # and passing all the rest of the parameters to that method in 
     # each child
     def find_child( method, *args )
-      klass = children.find do |child|
+      children.find do |child|
         Launchy.log "Checking if class #{child} is the one for #{method}(#{args.join(', ')})}"
         child.send( method, *args )
       end

data/lib/launchy/detect/host_os.rb

@@ -5,6 +5,7 @@ module Launchy::Detect
 
     attr_reader :host_os
     alias to_s host_os
+    alias to_str host_os
 
     def initialize( host_os = nil )
       @host_os = host_os

data/lib/launchy/detect/nix_desktop_environment.rb

@@ -2,7 +2,7 @@ module Launchy::Detect
   #
   # Detect the current desktop environment for *nix machines
   # Currently this is Linux centric. The detection is based upon the detection
-  # used by xdg-open from http://portland.freedesktop.org/wiki/XdgUtils
+  # used by xdg-open from http://portland.freedesktop.org/
   class NixDesktopEnvironment
     class NotFoundError < Launchy::Error; end
 
@@ -49,7 +49,7 @@ module Launchy::Detect
     class Xfce < NixDesktopEnvironment
       def self.is_current_desktop_environment?
         if Launchy::Application.find_executable( 'xprop' ) then
-          %x[ xprop -root _DT_SAVE_MODE | grep ' = \"xfce\"$' ].strip.size > 0
+          %x[ xprop -root _DT_SAVE_MODE].include?("xfce")
         else
           false
         end
@@ -59,6 +59,16 @@ module Launchy::Detect
         'exo-open'
       end
     end
+
+    class Fluxbox < NixDesktopEnvironment
+      def self.is_current_desktop_environment?
+        ENV['DESKTOP_SESSION'] == 'fluxbox'
+      end
+
+      def self.browser
+        'xdg-open'
+      end
+    end
   end
 end
 

data/lib/launchy/detect/runner.rb

@@ -25,7 +25,6 @@ module Launchy::Detect
 
       return Windows.new if host_os_family.windows?
       if ruby_engine.jruby? then
-        require 'spoon'
         return Jruby.new
       end
       return Forkable.new
@@ -95,6 +94,7 @@ module Launchy::Detect
 
     class Jruby < Runner
       def wet_run( cmd, *args )
+        require 'spoon'
         Spoon.spawnp( *shell_commands( cmd, *args ) )
       end
     end
@@ -102,11 +102,21 @@ module Launchy::Detect
     class Forkable < Runner
       def wet_run( cmd, *args )
         child_pid = fork do
+          close_file_descriptors unless Launchy.debug?
+          Launchy.log("wet_run: before exec in child process")
           exec( *shell_commands( cmd, *args ))
           exit!
         end
         Process.detach( child_pid )
       end
+
+      def close_file_descriptors
+        [$stdin, $stdout, $stderr].each do |io|
+          io.reopen( "/dev/null", "r+" )
+        end
+      end
+
+      private :close_file_descriptors
     end
   end
 end

data/lib/launchy/error.rb

@@ -2,4 +2,5 @@ module Launchy
   class Error < ::StandardError; end
   class ApplicationNotFoundError < Error; end
   class CommandNotFoundError < Error; end
+  class ArgumentError < Error; end
 end

data/lib/launchy/version.rb

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

data/spec/cli_spec.rb

@@ -53,7 +53,7 @@ describe Launchy::Cli do
 
   it "prints the command on stdout when using --dry-run" do
    argv = %w[ --debug --dry-run http://github.com/copiousfreetime/launchy ]
-   rc = Launchy::Cli.new.good_run( argv, {} )
+   Launchy::Cli.new.good_run( argv, {} )
    $stdout.string.must_match %r[github.com]
   end
 

data/spec/detect/nix_desktop_environment_spec.rb

@@ -22,6 +22,14 @@ 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 )

data/spec/detect/runner_spec.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'spec_helper'
 
 describe Launchy::Detect::Runner do

data/spec/launchy_spec.rb

@@ -50,9 +50,14 @@ describe Launchy do
     Launchy.ruby_engine.must_equal 'myruby'
   end
 
-  it "prints an error on stderr when no scheme is found for the given uri" do
-    Launchy.open( "blah://something/invalid" )
-    $stderr.string.must_match( /Failure in opening/ )
+  it "raises an exception if no scheme is found for the given uri" do
+    lambda { Launchy.open( "blah://something/invalid" ) }.must_raise Launchy::ApplicationNotFoundError
   end
 
+  [ 'www.example.com', 'www.example.com/foo/bar' ].each do |x|
+    it "picks a Browser for #{x}" do
+      app = Launchy.app_for_uri_string( x )
+      app.must_equal( Launchy::Application::Browser )
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,9 @@
+if RUBY_VERSION >= '1.9.2' then
+  require 'simplecov'
+  puts "Using coverage!"
+  SimpleCov.start if ENV['COVERAGE']
+end
+
 gem 'minitest'
 require 'launchy'
 require 'stringio'

data/tasks/default.rake

@@ -0,0 +1,213 @@
+# vim: syntax=ruby
+require 'rake/clean'
+#------------------------------------------------------------------------------
+# 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,
+# then run 'rake develop:using_bundler'
+#------------------------------------------------------------------------------
+namespace :develop do
+
+  # Install all the development and runtime dependencies of this gem using the
+  # gemspec.
+  task :default do
+    require 'rubygems/dependency_installer'
+    installer = Gem::DependencyInstaller.new
+
+    This.set_coverage_gem
+
+    puts "Installing gem depedencies needed for development"
+    This.platform_gemspec.dependencies.each do |dep|
+      if dep.matching_specs.empty? then
+        puts "Installing : #{dep}"
+        installer.install dep
+      else
+        puts "Skipping   : #{dep} -> already installed #{dep.matching_specs.first.full_name}"
+      end
+    end
+    puts "\n\nNow run 'rake test'"
+  end
+
+  # Create a Gemfile that just references the gemspec
+  file 'Gemfile' => :gemspec do
+    File.open( "Gemfile", "w+" ) do |f|
+      f.puts 'source :rubygems'
+      f.puts 'gemspec'
+    end
+  end
+
+  desc "Create a bundler Gemfile"
+  task :using_bundler => 'Gemfile' do
+    puts "Now you can 'bundle'"
+  end
+
+  # Gemfiles are build artifacts
+  CLOBBER << FileList['Gemfile*']
+end
+desc "Boostrap development"
+task :develop => "develop:default"
+
+#------------------------------------------------------------------------------
+# Minitest - standard TestTask
+#------------------------------------------------------------------------------
+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"
+  end
+  task :default => :test
+rescue LoadError
+  This.task_warning( 'test' )
+end
+
+#------------------------------------------------------------------------------
+# RDoc - standard rdoc rake task, although we must make sure to use a more
+#        recent version of rdoc since it is the one that has 'tomdoc' markup
+#------------------------------------------------------------------------------
+begin
+  gem 'rdoc' # otherwise we get the wrong task from stdlib
+  require 'rdoc/task'
+  RDoc::Task.new do |t|
+    t.markup   = 'tomdoc'
+    t.rdoc_dir = 'doc'
+    t.main     = 'README.rdoc'
+    t.title    = "#{This.name} #{This.version}"
+    t.rdoc_files.include( '*.rdoc', 'lib/**/*.rb' )
+  end
+rescue LoadError => le
+  This.task_warning( 'rdoc' )
+end
+
+#------------------------------------------------------------------------------
+# Coverage - optional code coverage, rcov for 1.8 and simplecov for 1.9, so
+#            for the moment only rcov is listed.
+#------------------------------------------------------------------------------
+if RUBY_VERSION < "1.9.0"
+  begin
+   require 'rcov/rcovtask'
+   Rcov::RcovTask.new( 'coverage' ) do |t|
+     t.libs      << 'spec'
+     t.pattern   = 'spec/**/*_spec.rb'
+     t.verbose   = true
+     t.rcov_opts << "-x ^/"           # remove all the global files
+     t.rcov_opts << "--sort coverage" # so we see the worst files at the top
+   end
+  rescue LoadError
+   This.task_warning( 'rcov' )
+  end
+else
+  begin
+    require 'simplecov'
+    desc 'Run tests with code coverage'
+    task :coverage do
+      ENV['COVERAGE'] = 'true'
+      Rake::Task[:test].execute
+    end
+    CLOBBER << FileList["coverage"]
+  rescue LoadError
+    This.task_warning( 'simplecov' )
+  end
+end
+
+#------------------------------------------------------------------------------
+# Manifest - We want an explicit list of thos files that are to be packaged in
+#            the gem. Most of this is from Hoe.
+#------------------------------------------------------------------------------
+namespace 'manifest' do
+  desc "Check the manifest"
+  task :check => :clean do
+    files = FileList["**/*", ".*"].exclude( This.exclude_from_manifest ).to_a.sort
+    files = files.select{ |f| File.file?( f ) }
+
+    tmp = "Manifest.tmp"
+    File.open( tmp, 'w' ) do |f|
+      f.puts files.join("\n")
+    end
+
+    begin
+      sh "diff -du Manifest.txt #{tmp}"
+    ensure
+      rm tmp
+    end
+    puts "Manifest looks good"
+  end
+
+  desc "Generate the manifest"
+  task :generate => :clean do
+    files = %x[ git ls-files ].split("\n").sort
+    files.reject! { |f| f =~ This.exclude_from_manifest }
+    File.open( "Manifest.txt", "w" ) do |f|
+      f.puts files.join("\n")
+    end
+  end
+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__ )
+
+    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
+
+#------------------------------------------------------------------------------
+# Gem Specification
+#------------------------------------------------------------------------------
+# Really this is only here to support those who use bundler
+desc "Build the #{This.name}.gemspec file"
+task :gemspec do
+  File.open( This.gemspec_file, "wb+" ) do |f|
+    f.write This.platform_gemspec.to_ruby
+  end
+end
+
+# the gemspec is also a dev artifact and should not be kept around.
+CLOBBER << This.gemspec_file
+
+# The standard gem packaging task, everyone has it.
+require 'rubygems/package_task'
+Gem::PackageTask.new( This.platform_gemspec ) do
+  # nothing
+end
+
+#------------------------------------------------------------------------------
+# Release - the steps we go through to do a final release, this is pulled from
+#           a compbination of mojombo's rakegem, hoe and hoe-git
+#
+# 1) make sure we are on the master branch
+# 2) make sure there are no uncommitted items
+# 3) check the manifest and make sure all looks good
+# 4) build the gem
+# 5) do an empty commit to have the commit message of the version
+# 6) tag that commit as the version
+# 7) push master
+# 8) push the tag
+# 7) pus the gem
+#------------------------------------------------------------------------------
+task :release_check do
+  unless `git branch` =~ /^\* master$/
+    abort "You must be on the master branch to release!"
+  end
+  unless `git status` =~ /^nothing to commit/m
+    abort "Nope, sorry, you have unfinished business"
+  end
+end
+
+desc "Create tag v#{This.version}, build and push #{This.platform_gemspec.full_name} to rubygems.org"
+task :release => [ :release_check, 'manifest:check', :gem ] do
+  sh "git commit --allow-empty -a -m 'Release #{This.version}'"
+  sh "git tag -a -m 'v#{This.version}' v#{This.version}"
+  sh "git push origin master"
+  sh "git push origin v#{This.version}"
+  sh "gem push pkg/#{This.platform_gemspec.full_name}.gem"
+end

data/tasks/this.rb

@@ -0,0 +1,202 @@
+require 'pathname'
+
+# Public: A Class containing all the metadata and utilities needed to manage a
+# ruby project.
+class ThisProject
+  # The name of this project
+  attr_accessor :name
+
+  # The author's name
+  attr_accessor :author
+
+  # The email address of the author(s)
+  attr_accessor :email
+
+  # The homepage of this project
+  attr_accessor :homepage 
+
+  # The regex of files to exclude from the manifest
+  attr_accessor :exclude_from_manifest
+
+  # The hash of Gem::Specifications keyed' by platform
+  attr_accessor :gemspecs
+
+  # Public: Initialize ThisProject
+  #
+  # Yields self
+  def initialize(&block)
+    @exclude_from_manifest = %r/tmp$|\.(git|DS_Store)|^(doc|coverage|pkg)|Gemfile*|\.gemspec$|\.swp$|\.jar|\.rvmrc$|~$/
+    @gemspecs              = Hash.new
+    yield self if block_given?
+  end
+
+  # Public: return the version of ThisProject
+  #
+  # Search the ruby files in the project looking for the one that has the
+  # version string in it. This does not eval any code in the project, it parses
+  # the source code looking for the string.
+  #
+  # Returns a String version
+  def version
+    [ "lib/#{ name }.rb", "lib/#{ name }/version.rb" ].each do |v|
+      path = project_path( v )
+      line = path.read[/^\s*VERSION\s*=\s*.*/]
+      if line then
+        return line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+      end
+    end
+  end
+
+  # Internal: Return a section of an RDoc file with the given section name
+  #
+  # path         - the relative path in the project of the file to parse
+  # section_name - the section out of the file from which to parse data
+  #
+  # Retuns the text of the section as an array of paragrphs.
+  def section_of( file, section_name )
+    re    = /^=+ (.*)$/
+    sectional = project_path( file )
+    parts = sectional.read.split( re )[1..-1]
+    parts.map! { |p| p.strip }
+
+    sections = Hash.new
+    Hash[*parts].each do |k,v|
+      sections[k] = v.split("\n\n")
+    end
+    return sections[section_name]
+  end
+
+  # Internal: print out a warning about the give task
+  def task_warning( task )
+    warn "WARNING: '#{task}' tasks are not defined. Please run 'rake develop'"
+  end
+
+  # Internal: Return the full path to the file that is relative to the project
+  # root.
+  #
+  # path - the relative path of the file from the project root
+  #
+  # Returns the Pathname of the file
+  def project_path( relative_path )
+    project_root.join( relative_path )
+  end
+
+  # Internal: The absolute path of this file
+  #
+  # Returns the Pathname of this file.
+  def this_file_path
+    Pathname.new( __FILE__ ).expand_path
+  end
+
+  # Internal: The root directory of this project
+  #
+  # This is defined as being the directory that is in the path of this project
+  # that has the first Rakefile
+  #
+  # Returns the Pathname of the directory
+  def project_root
+    this_file_path.ascend do |p|
+      rakefile = p.join( 'Rakefile' )
+      return p if rakefile.exist?
+    end
+  end
+
+  # Internal: Returns the contents of the Manifest.txt file as an array
+  #
+  # Returns an Array of strings
+  def manifest
+    manifest_file = project_path( "Manifest.txt" )
+    abort "You need a Manifest.txt" unless manifest_file.readable?
+    manifest_file.readlines.map { |l| l.strip }
+  end
+
+  # Internal: Returns the gemspace associated with the current ruby platform
+  def platform_gemspec
+    gemspecs[platform]
+  end
+
+  def core_gemspec
+    Gem::Specification.new do |spec|
+      spec.name        = name
+      spec.version     = version
+      spec.author      = author
+      spec.email       = email
+      spec.homepage    = homepage
+
+      spec.summary     = summary
+      spec.description = description
+
+      spec.files       = manifest
+      spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
+      spec.test_files  = spec.files.grep(/^spec/)
+
+      spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc)$/)
+      spec.rdoc_options = [ "--main"  , 'README.rdoc',
+                            "--markup", "tomdoc" ]
+    end
+  end
+
+  # Internal: Return the gemspec for the ruby platform
+  def ruby_gemspec( core = core_gemspec, &block )
+    yielding_gemspec( 'ruby', core, &block )
+  end
+
+  # Internal: Return the gemspec for the jruby platform
+  def java_gemspec( core = core_gemspec, &block )
+    yielding_gemspec( 'java', core, &block )
+  end
+
+  # Internal: give an initial spec and a key, create a new gemspec based off of
+  # it.
+  #
+  # This will force the new gemspecs 'platform' to be that of the key, since the
+  # only reason you would have multiple gemspecs at this point is to deal with
+  # different platforms.
+  def yielding_gemspec( key, core )
+    spec = gemspecs[key] ||= core.dup
+    spec.platform = key
+    yield spec if block_given?
+    return spec
+  end
+
+  # Internal: Set the recovery gem development dependency
+  #
+  # These are dynamically set since they cannot be hard coded as there is 
+  # no way to ship them correctly in the gemspec
+  #
+  # Returns nothing.
+  def set_coverage_gem
+    if RUBY_VERSION < "1.9.0"
+      platform_gemspec.add_development_dependency( 'rcov', '~> 1.0.0' )
+    else
+      platform_gemspec.add_development_dependency( 'simplecov', '~> 0.7.1' )
+    end
+  end
+
+  # Internal: Return the platform of ThisProject at the current moment in time.
+  def platform
+    (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
+  end
+
+  # Internal: Return the DESCRIPTION section of the README.rdoc file
+  def description_section
+    section_of( 'README.rdoc', 'DESCRIPTION')
+  end
+ 
+ # Internal: Return the summary text from the README 
+  def summary
+    description_section.first
+  end
+
+  # Internal: Return the full description text from the READEM
+  def description
+    description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
+  end
+
+  # Internal: The path to the gemspec file
+  def gemspec_file
+    project_path( "#{ name }.gemspec" )
+  end
+end
+
+This = ThisProject.new