launchy 2.1.2-java → 2.2.0-java

data/CONTRIBUTING.md

@@ -0,0 +1,52 @@
+# Hi there!
+
+I see you are interested in contributing. That is wonderful. I love
+contributions.
+
+I guarantee that there are bugs in this software. And I guarantee that there is
+a feature you want that is not in here yet. As such, any and all bugs reports
+are gratefully accepted, bugfixes even more so. Helping out with bugs is the
+easiest way to contribute.
+
+
+## The Quick Version
+
+* Have a [GitHub Account][].
+* Search the [GitHub Issues][] and see if your issue already present. If so
+  add your comments, :thumbsup:, etc.
+* Issue not there? Not a problem, open up a [new issue][].
+    * **Bug reports** please be as detailed as possible. Include:
+        * full ruby engine and version: `ruby -e 'puts RUBY_DESCRIPTION'`
+        * operating system and version
+        * version of launchy `ruby -rubygems -Ilib -e "require 'launchy'; puts Launchy::VERSION"`
+        * as much detail about the bug as possible so I can replicate it. Feel free
+          to link in a [gist][]
+    * **New Feature**
+        * What the new feature should do.
+        * What benefit the new feature brings to the project.
+* Fork the [repo][].
+* Create a new branch for your issue: `git checkout -b issue/my-issue`
+* Lovingly craft your contribution:
+    * `rake develop` to get started, or if you prefer bundler `rake develop:using_bundler && bundle`.
+    * `rake test` to run tests
+* Make sure that `rake test` passes. It's important, I said it twice.
+* Add yourself to the contributors section below.
+* Submit your [pull request][].
+
+# Contributors
+
+* [Jeremy Hinegardner][https://github.com/copiousfreetime]
+* [Mike Farmer][https://github.com/mikefarmer]
+* [Suraj N. Kurapati][https://github.com/sunaku]
+* [Postmodern][https://github.com/postmodern]
+* [Stephen Judkins][https://github.com/stephenjudkins]
+* [Mariusz Pietrzyk][https://github.com/wijet]
+* [Bogdan Gusiev][https://github.com/bogdan]
+* [Miquel Rodríguez Telep][https://github.com/mrtorrent]j
+
+[GitHub Account]: https://github.com/signup/free "GitHub Signup"
+[GitHub Issues]:  https://github.com/copiousfreetime/launchy/issues "Launchy Issues"
+[new issue]:      https://github.com/copiousfreetime/launchy/issues/new "New Launchy Issue"
+[gist]:           https://gist.github.com/ "New Gist"
+[repo]:           https://github.com/copiousfreetime/launchy "Launchy Repo"
+[pull request]:   https://help.github.com/articles/using-pull-requests "Using Pull Requests"

data/HISTORY.rdoc

@@ -1,4 +1,13 @@
 = Launchy Changlog
+== Version 2.2.0 - 2013-02-06
+
+* Change XFCE detection to not depend on grep (copiousfreetime/launchy#52 - thanks bogdan)
+* Suppress forked process output (copiousfreetime/launchy#51)
+* Display help/usage if no url is given (copiousfreetime/launchy#54)
+* Detect the fluxbox environment (copiousfreetime/launchy#53)
+* Automatically detect 'http' url's if they are missing the 'http://' (copiousfreetime/launchy#55)
+* Update to latest project management rake tasks
+
 == Version 2.1.2 - 2012-08-06
 
 * Fix where HostOS would fail to convert to string on JRuby in 1.9 mode (copiousfreetime/launchy#45)
@@ -14,7 +23,6 @@
 * Add LAUNCHY_DRY_RUN environment variable (thanks Mariusz Pietrzyk / wijet)
 * Update dependencies
 
-
 == Version 2.0.5 - 2011-07-24
 
 * Fix the case where $BROWSER is set and no *nix desktop was found (copiousfreetime/launchy#33)

data/LICENSE

@@ -1,6 +1,6 @@
 ISC LICENSE - http://opensource.org/licenses/isc-license.txt
 
-Copyright (c) 2007-2011 Jeremy Hinegardner
+Copyright (c) 2007-2013 Jeremy Hinegardner
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Manifest.txt

@@ -1,7 +1,7 @@
+CONTRIBUTING.md
 HISTORY.rdoc
 LICENSE
 Manifest.txt
-NOTES
 README.rdoc
 Rakefile
 bin/launchy
@@ -33,3 +33,5 @@ spec/mock_application.rb
 spec/spec_helper.rb
 spec/tattle-host-os.yaml
 spec/version_spec.rb
+tasks/default.rake
+tasks/this.rb

data/README.rdoc

@@ -83,7 +83,7 @@ in the github gem if it was updated to use 2.0.x but not use the supported API.
 
 http://opensource.org/licenses/isc-license.txt
 
-Copyright (c) 2007-2011 Jeremy Hinegardner
+Copyright (c) 2007-2013 Jeremy Hinegardner
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -1,298 +1,21 @@
 # vim: syntax=ruby
+load 'tasks/this.rb'
 
 This.name     = "launchy"
 This.author   = "Jeremy Hinegardner"
 This.email    = "jeremy@copiousfreetime.org"
 This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
-This.version  = Util.version
 
-#------------------------------------------------------------------------------
-# 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
+This.ruby_gemspec do |spec|
+  spec.add_dependency( 'addressable', '~> 2.3')
 
-  # Install all the development and runtime dependencies of this gem using the
-  # gemspec.
-  task :default do
-    require 'rubygems/dependency_installer'
-    installer = Gem::DependencyInstaller.new
-
-    puts "Installing gem depedencies needed for development"
-    Util.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
-  Util.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
-  Util.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.
-#------------------------------------------------------------------------------
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new 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
-  $stderr.puts "rcov task is not defined, please 'gem install rcov'"
-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
-
-#------------------------------------------------------------------------------
-# Gem Specification
-#------------------------------------------------------------------------------
-This.gemspec = Hash.new
-This.gemspec['ruby'] = Gem::Specification.new do |spec|
-  spec.name        = This.name
-  spec.version     = This.version
-  spec.author      = This.author
-  spec.email       = This.email
-  spec.homepage    = This.homepage
-
-  spec.summary     = This.summary
-  spec.description = This.description
-
-  spec.files       = This.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', ]
-
-  # The Runtime Dependencies
-  spec.add_runtime_dependency( 'addressable', '~> 2.3' )
-
-  # The Development Dependencies
-  spec.add_development_dependency( 'rake'     , '~> 0.9.2.2')
-  spec.add_development_dependency( 'minitest' , '~> 3.3.0' )
+  spec.add_development_dependency( 'rake'     , '~> 10.0.3')
+  spec.add_development_dependency( 'minitest' , '~> 4.5.0' )
   spec.add_development_dependency( 'rdoc'     , '~> 3.12'   )
-  spec.add_development_dependency( 'spoon'    , '~> 0.0.1'  )
-  spec.add_development_dependency( 'ffi'      , '~> 1.1.1'  )
-
 end
 
-#----------------------------------------------
-# JRuby spec has a few more runtime dependencies
-#----------------------------------------------
-jruby_gemspec = This.gemspec['ruby'].dup
-jruby_gemspec.add_runtime_dependency( 'spoon', '~> 0.0.1' )
-jruby_gemspec.add_runtime_dependency( 'ffi'  , '~> 1.1.1' )
-jruby_gemspec.platform = 'java'
-This.gemspec['java']  = jruby_gemspec
-
-
-# The name of the gemspec file on disk
-This.gemspec_file = "#{This.name}.gemspec"
-
-# 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 Util.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( Util.platform_gemspec ) do
-  # nothing
+This.java_gemspec( This.ruby_gemspec ) do |spec|
+  spec.add_dependency( 'spoon', '~> 0.0.1' )
 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 #{Util.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/#{Util.platform_gemspec.full_name}.gem"
-end
-
-#------------------------------------------------------------------------------
-# Rakefile Support - This is all the guts and utility methods that are
-#                    necessary to support the above tasks.
-#
-# Lots of Credit for this Rakefile goes to:
-#
-#   Ara T. Howard       - see the Rakefile in all of his projects -
-#                          https://github.com/ahoward/
-#   Tom Preston Werner  - his Rakegem project https://github.com/mojombo/rakegem
-#   Seattle.rb          - Hoe - cuz it has relly good stuff in there
-#------------------------------------------------------------------------------
-BEGIN {
-
-  require 'ostruct'
-  require 'rake/clean'
-  require 'rubygems' unless defined? Gem
-
-  module Util
-    def self.version
-      [ "lib/#{ This.name }.rb", "lib/#{ This.name }/version.rb" ].each do |v|
-        line = File.read( v )[/^\s*VERSION\s*=\s*.*/]
-        if line then
-          return line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-        end
-      end
-    end
-
-    # Partition an rdoc file into sections and return the text of the section
-    # as an array of paragraphs
-    def self.section_of( file, section_name )
-      re    = /^=+ (.*)$/
-      parts = File.read( file ).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
-
-    def self.task_warning( task )
-      warn "WARNING: '#{task}' tasks are not defined. Please run 'rake develop'"
-    end
-
-    def self.read_manifest
-      abort "You need a Manifest.txt" unless File.readable?( "Manifest.txt" )
-      File.readlines( "Manifest.txt" ).map { |l| l.strip }
-    end
-
-    def self.platform_gemspec
-      This.gemspec[This.platform]
-    end
-  end
-
-  # Hold all the metadata about this project
-  This = OpenStruct.new
-  This.platform = (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
-
-  desc = Util.section_of( 'README.rdoc', 'DESCRIPTION')
-  This.summary     = desc.first
-  This.description = desc.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
-
-
-  This.exclude_from_manifest = %r/tmp$|\.(git|DS_Store)|^(doc|coverage|pkg)|\.gemspec$|\.swp$|\.jar|\.rvmrc$|~$/
-  This.manifest = Util.read_manifest
-
-}
+load 'tasks/default.rake'

data/lib/launchy.rb

@@ -20,22 +20,33 @@ module Launchy
 
   class << self
     #
-    # Convenience method to launch an item
+    # Launch an application for the given uri string
     #
-    def open(uri, options = {} )
-      begin
-        extract_global_options( options )
-        uri = Addressable::URI.parse(  uri )
-        app = Launchy::Application.handling( uri )
-        app.new.open( uri, options )
-      rescue Exception => e
-        msg = "Failure in opening #{uri} with options #{options.inspect}: #{e}"
-        Launchy.log "#{self.name} : #{msg}"
-        e.backtrace.each do |bt|
-          Launchy.log bt
-        end
-        $stderr.puts msg
-      end
+    def open(uri_s, options = {} )
+      extract_global_options( options )
+      uri = string_to_uri( uri_s )
+      app = app_for_uri( uri )
+      app.new.open( uri, options )
+    rescue Launchy::Error => le
+      raise le
+    rescue Exception => e
+      msg = "Failure in opening uri #{uri_s.inspect} with options #{options.inspect}: #{e}"
+      raise Launchy::Error, msg
+    end
+
+    def app_for_uri( uri )
+      Launchy::Application.handling( uri )
+    end
+
+    def app_for_uri_string( s )
+      app_for_uri(  string_to_uri( s ) )
+    end
+
+    def string_to_uri( s )
+      uri = Addressable::URI.parse( s )
+      uri = Addressable::URI.heuristic_parse( s ) unless uri.scheme
+      raise Launchy::ArgumentError, "Invalid URI given: #{s.inspect}" unless uri
+      return uri
     end
 
     def reset_global_options