launchy 2.4.3 → 2.5.2

data/spec/detect/nix_desktop_environment_spec.rb

@@ -10,27 +10,18 @@ describe Launchy::Detect::NixDesktopEnvironment do
     Launchy.reset_global_options
   end
 
-  it "can detect the desktop environment of a KDE machine using ENV['KDE_FULL_SESSION']" do
-    ENV.delete( "KDE_FULL_SESSION" )
-    ENV["KDE_FULL_SESSION"] = "launchy-test"
-    kde = Launchy::Detect::NixDesktopEnvironment::Kde
-    nix_env = Launchy::Detect::NixDesktopEnvironment.detect
-    nix_env.must_equal( kde )
-    nix_env.browser.must_equal( kde.browser )
-    ENV.delete( 'KDE_FULL_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 )
+    _(Launchy::Detect::NixDesktopEnvironment::Xfce.is_current_desktop_environment?).must_equal( false )
   end
 
   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.path = %w[ / /tmp ].join(File::PATH_SEPARATOR)
     not_found = Launchy::Detect::NixDesktopEnvironment.detect
-    not_found.must_equal( Launchy::Detect::NixDesktopEnvironment::NotFound )
-    not_found.browser.must_equal( Launchy::Argv.new )
+    _(not_found).must_equal( Launchy::Detect::NixDesktopEnvironment::NotFound )
+    _(not_found.browser).must_equal( Launchy::Argv.new )
   end
 end

data/spec/detect/ruby_engine_spec.rb

@@ -12,18 +12,18 @@ describe Launchy::Detect::RubyEngine do
 
   %w[ ruby jruby rbx macruby ].each do |ruby|
     it "detects the #{ruby} RUBY_ENGINE" do
-      Launchy::Detect::RubyEngine.detect( ruby ).ancestors.must_include Launchy::Detect::RubyEngine
+      _(Launchy::Detect::RubyEngine.detect( ruby ).ancestors).must_include Launchy::Detect::RubyEngine
     end
   end
 
   it "uses the global ruby_engine overrides" do
     ENV['LAUNCHY_RUBY_ENGINE'] = "rbx"
-    Launchy::Detect::RubyEngine.detect.must_equal Launchy::Detect::RubyEngine::Rbx
+    _(Launchy::Detect::RubyEngine.detect).must_equal Launchy::Detect::RubyEngine::Rbx
     ENV.delete('LAUNCHY_RUBY_ENGINE')
   end
 
   it "does not find a ruby engine of 'foo'" do
-    lambda { Launchy::Detect::RubyEngine.detect( 'foo' ) }.must_raise Launchy::Detect::RubyEngine::NotFoundError
+    _(lambda { Launchy::Detect::RubyEngine.detect( 'foo' ) }).must_raise Launchy::Detect::RubyEngine::NotFoundError
   end
 
   { 'rbx'     => :rbx?,
@@ -31,7 +31,7 @@ describe Launchy::Detect::RubyEngine do
     'macruby' => :macruby?,
     'jruby'   => :jruby? }.each_pair do |engine, method|
     it "#{method} returns true for #{engine} " do
-      Launchy::Detect::RubyEngine.detect( engine ).send( method ).must_equal true
+      _(Launchy::Detect::RubyEngine.detect( engine ).send( method )).must_equal true
     end
  end
 end

data/spec/detect/runner_spec.rb

@@ -13,17 +13,17 @@ describe Launchy::Detect::Runner do
 
   it "raises an error when there is an unknown host os" do
     Launchy.host_os = "foo"
-    lambda{ Launchy::Detect::Runner.detect }.must_raise Launchy::Detect::HostOsFamily::NotFoundError
+    _(lambda{ Launchy::Detect::Runner.detect }).must_raise Launchy::Detect::HostOsFamily::NotFoundError
   end
 
   it "raises an error when there is an unknown ruby engine" do
     Launchy.ruby_engine = "wibble"
-    lambda{ Launchy::Detect::Runner.detect }.must_raise Launchy::Detect::RubyEngine::NotFoundError
+    _(lambda{ Launchy::Detect::Runner.detect }).must_raise Launchy::Detect::RubyEngine::NotFoundError
   end
 
   it "raises and error when there is no command found" do
     runner = Launchy::Detect::Runner.detect
-    lambda{ runner.run( nil, *%w[ arg1 arg2 arg 3] ) }.must_raise Launchy::CommandNotFoundError
+    _(lambda{ runner.run( nil, *%w[ arg1 arg2 arg 3] ) }).must_raise Launchy::CommandNotFoundError
   end
 
   # On anything that has fork, use Forkable
@@ -33,7 +33,7 @@ describe Launchy::Detect::Runner do
         Launchy.host_os = host_os
         Launchy.ruby_engine = engine_name
         engine = Launchy::Detect::Runner.detect
-        engine.must_be_instance_of Launchy::Detect::Runner::Forkable
+        _(engine).must_be_instance_of Launchy::Detect::Runner::Forkable
       end
     end
   end
@@ -48,7 +48,7 @@ describe Launchy::Detect::Runner do
       Launchy.host_os = host_os
       Launchy.ruby_engine = 'jruby'
       engine = Launchy::Detect::Runner.detect
-      engine.must_be_instance_of runner
+      _(engine).must_be_instance_of runner
     end
   end
 
@@ -58,14 +58,14 @@ describe Launchy::Detect::Runner do
       Launchy.host_os = "mingw"
       Launchy.ruby_engine = engine_name
       e = Launchy::Detect::Runner.detect
-      e.must_be_instance_of Launchy::Detect::Runner::Windows
+      _(e).must_be_instance_of Launchy::Detect::Runner::Windows
     end
   end
 
   it "Windows launches use the 'cmd' command" do
     win = Launchy::Detect::Runner::Windows.new
     cmd = win.dry_run( "not-really", [ "http://example.com" ] )
-    cmd.must_equal 'cmd /c not-really http://example.com'
+    _(cmd).must_equal 'cmd /c not-really http://example.com'
   end
 
   %w[ & | ( ) < > ^ ].each do |reserved_char|
@@ -75,29 +75,29 @@ describe Launchy::Detect::Runner do
       url = parts.join( reserved_char )
       output_url = parts.join( "^#{reserved_char}" )
 
-      win.all_args( "not-really", [ url ] ).must_equal [ 'cmd', '/c', 'not-really', output_url ]
+      _(win.all_args( "not-really", [ url ] )).must_equal [ 'cmd', '/c', 'not-really', output_url ]
 
       cmd = win.dry_run( "not-really", [ url ] )
-      cmd.must_equal "cmd /c not-really #{output_url}"
+      _(cmd).must_equal "cmd /c not-really #{output_url}"
     end
   end
 
   it "Jruby doesnot escapes '&' in urls" do
     jruby = Launchy::Detect::Runner::Jruby.new
     cmd = jruby.dry_run( "not-really", [ @test_url ])
-    cmd.must_equal 'not-really http://example.com/?foo=bar&baz=wibble'
+    _(cmd).must_equal 'not-really http://example.com/?foo=bar&baz=wibble'
   end
 
   it "does not escape %38 items in urls" do
     l = Launchy::Detect::Runner::Forkable.new
-    cmd = l.dry_run( "not-really", [ "http://ja.wikipedia.org/wiki/%E3%81%82" ] )
-    cmd.must_equal( 'not-really http://ja.wikipedia.org/wiki/%E3%81%82'  )
+    cmd = l.dry_run( "not-really", [ "https://ja.wikipedia.org/wiki/%E3%81%82" ] )
+    _(cmd).must_equal( 'not-really https://ja.wikipedia.org/wiki/%E3%81%82'  )
   end
 
   it "can launch a utf8 url" do
-    url = "http://ja.wikipedia.org/wiki/あ"
+    url = "https://ja.wikipedia.org/wiki/あ"
     l = Launchy::Detect::Runner::Forkable.new
     cmd = l.dry_run( "not-really", [ url ] )
-    cmd.must_equal( "not-really #{url}" )
+    _(cmd).must_equal( "not-really #{url}" )
   end
 end

data/spec/launchy_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'pathname'
 
 describe Launchy do
 
@@ -22,7 +23,7 @@ describe Launchy do
     old_stderr = $stderr
     $stderr = StringIO.new
     Launchy.log "This is a test log message"
-    $stderr.string.strip.must_equal "LAUNCHY_DEBUG: This is a test log message"
+    _($stderr.string.strip).must_equal "LAUNCHY_DEBUG: This is a test log message"
     $stderr = old_stderr
     ENV["LAUNCHY_DEBUG"] = nil
   end
@@ -30,81 +31,89 @@ describe Launchy 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
+    _(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.debug?).must_equal true
     Launchy.extract_global_options( { :debug => true } )
-    Launchy.debug?.must_equal 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.dry_run?).must_equal true
     Launchy.extract_global_options( { :dry_run => true } )
-    Launchy.dry_run?.must_equal true
+    _(Launchy.dry_run?).must_equal true
   end
 
   it "has the global option :application" do
     Launchy.extract_global_options(  { :application => "wibble" } )
-    Launchy.application.must_equal 'wibble'
+    _(Launchy.application).must_equal 'wibble'
   end
 
   it "has the global option :host_os" do
     Launchy.extract_global_options(  { :host_os => "my-special-os-v2" } )
-    Launchy.host_os.must_equal 'my-special-os-v2'
+    _(Launchy.host_os).must_equal 'my-special-os-v2'
   end
 
   it "has the global option :ruby_engine" do
     Launchy.extract_global_options(  { :ruby_engine => "myruby" } )
-    Launchy.ruby_engine.must_equal 'myruby'
+    _(Launchy.ruby_engine).must_equal 'myruby'
   end
 
   it "raises an exception if no scheme is found for the given uri" do
-    lambda { Launchy.open( @invalid_url ) }.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}"
+    parts = $stdout.string.strip.split
+    _(parts.size).must_be :>, 1
+    _(parts.last).must_equal 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
+    _($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}"
+    _($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}'"
+    _($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
+    _(lambda { Launchy.open( @invalid_url ) { raise StandardError, "KABOOM!" } }).must_raise StandardError
   end
 
   [ '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 )
+      _(app).must_equal( Launchy::Application::Browser )
     end
   end
+
+  it "can use a Pathname as the URI" do
+    path = Pathname.new( Dir.pwd )
+    app = Launchy.app_for_uri_string( path )
+    _(app).must_equal( Launchy::Application::Browser )
+  end
 end

data/spec/version_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe 'Launchy::VERSION' do
   it "should have a #.#.# format" do
-    Launchy::VERSION.must_match( /\d+\.\d+\.\d+/ )
-    Launchy::Version.to_s.must_match( /\d+\.\d+\.\d+/ )
+    _(Launchy::VERSION).must_match( /\d+\.\d+\.\d+/ )
+    _(Launchy::Version.to_s).must_match( /\d+\.\d+\.\d+/ )
     Launchy::Version.to_a.each do |n|
-      n.to_i.must_be :>=, 0
+      _(n.to_i).must_be :>=, 0
     end
   end
 end

data/tasks/default.rake

@@ -10,41 +10,26 @@ namespace :develop do
 
   # Install all the development and runtime dependencies of this gem using the
   # gemspec.
-  task :default do
+  task :default => 'Gemfile' 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 "Installing bundler..."
+    installer.install 'bundler'
+    sh 'bundle install'
     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 "https://rubygems.org/"'
+      f.puts "# DO NOT EDIT - This file is automatically generated"
+      f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
+      f.puts 'source "https://rubygems.org"'
       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"
+desc "Bootstrap development"
 task :develop => "develop:default"
 
 #------------------------------------------------------------------------------
@@ -53,7 +38,7 @@ task :develop => "develop:default"
 begin
   require 'rake/testtask'
   Rake::TestTask.new( :test ) do |t|
-    t.ruby_opts    = %w[ -w -rubygems ]
+    t.ruby_opts    = %w[ -w ]
     t.libs         = %w[ lib spec test ]
     t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
   end
@@ -88,31 +73,16 @@ 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' )
+begin
+  require 'simplecov'
+  desc 'Run tests with code coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task[:test].execute
   end
+  CLOBBER << 'coverage' if File.directory?( 'coverage' )
+rescue LoadError
+  This.task_warning( 'simplecov' )
 end
 
 #------------------------------------------------------------------------------
@@ -177,9 +147,10 @@ namespace :fixme do
   end
 
   def outdated_fixme_files
-    local_fixme_files.reject do |local|
+    local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      Digest::SHA256.file( local ) == Digest::SHA256.file( upstream )
+      upstream.exist? &&
+        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
     end
   end
 
@@ -223,13 +194,12 @@ task :fixme => "fixme:default"
 desc "Build the #{This.name}.gemspec file"
 task :gemspec do
   File.open( This.gemspec_file, "wb+" ) do |f|
+    f.puts "# DO NOT EDIT - This file is automatically generated"
+    f.puts "# Make changes to Manifest.txt and/or Rakefile and regenerate"
     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.to_s
-
 # .rbc files from ruby 2.0
 CLOBBER << FileList["**/*.rbc"]
 
@@ -243,19 +213,19 @@ 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
+# 1) make sure we are on the main 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
+# 7) push main
 # 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!"
+  unless `git branch` =~ /^\* main$/
+    abort "You must be on the main branch to release!"
   end
   unless `git status` =~ /^nothing to commit/m
     abort "Nope, sorry, you have unfinished business"
@@ -266,7 +236,7 @@ desc "Create tag v#{This.version}, build and push #{This.platform_gemspec.full_n
 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 main"
   sh "git push origin v#{This.version}"
   sh "gem push pkg/#{This.platform_gemspec.full_name}.gem"
 end

data/tasks/this.rb

@@ -13,7 +13,7 @@ class ThisProject
   attr_accessor :email
 
   # The homepage of this project
-  attr_accessor :homepage 
+  attr_accessor :homepage
 
   # The regex of files to exclude from the manifest
   attr_accessor :exclude_from_manifest
@@ -25,7 +25,11 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+                                          /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
+                                          /^[^\/]+\.gemspec/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history)$/,
+                                          /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?
   end
@@ -119,7 +123,7 @@ class ThisProject
 
   # Internal: Returns the gemspace associated with the current ruby platform
   def platform_gemspec
-    gemspecs[platform]
+    gemspecs.fetch(platform) { This.ruby_gemspec }
   end
 
   def core_gemspec
@@ -132,6 +136,7 @@ class ThisProject
 
       spec.summary     = summary
       spec.description = description
+      spec.license     = license
 
       spec.files       = manifest
       spec.executables = spec.files.grep(/^bin/) { |f| File.basename(f) }
@@ -140,6 +145,8 @@ class ThisProject
       spec.extra_rdoc_files += spec.files.grep(/(txt|rdoc|md)$/)
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
+
+      spec.required_ruby_version = '>= 2.3.0'
     end
   end
 
@@ -166,20 +173,6 @@ class ThisProject
     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.8' )
-    end
-  end
-
   # Internal: Return the platform of ThisProject at the current moment in time.
   def platform
     (RUBY_PLATFORM == "java") ? 'java' : Gem::Platform::RUBY
@@ -189,17 +182,23 @@ class ThisProject
   def description_section
     section_of( 'README.md', 'DESCRIPTION')
   end
- 
- # Internal: Return the summary text from the README 
+
+  # Internal: Return the summary text from the README
   def summary
     description_section.first
   end
 
-  # Internal: Return the full description text from the READEM
+  # Internal: Return the full description text from the README
   def description
     description_section.join(" ").tr("\n", ' ').gsub(/[{}]/,'').gsub(/\[[^\]]+\]/,'') # strip rdoc
   end
 
+  def license
+    license_file = project_path("LICENSE")
+    line = license_file.readlines.first
+    line.split(/\s+/).first
+  end
+
   # Internal: The path to the gemspec file
   def gemspec_file
     project_path( "#{ name }.gemspec" )