launchy 2.5.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d9c66ec0c8dcc2892bc46267fe37f7f1c82d14dad78d62c8adbd869a0d8a0f
-  data.tar.gz: ecf5f8096d6f3ef2a4d9118b18086eba83ed62f50362c1964938faba8d53d624
+  metadata.gz: 9d637a77afa69826953a3226c55fc20334c6fa90e268912bcf9a208bc9b448e2
+  data.tar.gz: 2f5ff5e1401319e3a97655848f4f61b9bb33e786cd1b22b76aa20a7729e0b885
 SHA512:
-  metadata.gz: 4abd13c2b9c600a9e2a50d07a2a8bfbe6ae21de1972063520669f558b5b7f3eca6dc5e4a2de63d1a19c6dcdeb43a53bddc22da210556a2a6c64ba263afed92ec
-  data.tar.gz: 53feae60f4355edcddaa16497c5606f35eaccabd81d21f35d91ac3188314affd43f722970fe4c31249a89fbfadf7afc74579ee7d97f4740f1d339b0007a577e5
+  metadata.gz: bb02ca4bd30a8394ca2a6c8e86518eb4f403d5b56c574f7730d1581a19ca686c94a001c641a09620b799b620f9d8e6be54ad39c27bb980e67268d01f68d8eae1
+  data.tar.gz: ba3bc128ef33d39c87b50e187ca71e0f39a2382cdf3513122ec1a108b71a55d2e2a8e0f81f138a27b8c9b1f74b8df183fe0b626d9718236efb3cb6a653fd1e62

data/HISTORY.md

@@ -1,4 +1,11 @@
 # Launchy Changelog
+## Version 3.0.0 - 2024-03-03
+* Remove unused `deprecated.rb` file - <https://github.com/copiousfreetime/launchy/issues/148>
+* Update supported ruby versin to be 3.x
+* use the `:application` parameter - <https://github.com/copiousfreetime/launchy/issues/121>
+* adjust the semaphore configuration to allow better caching
+* replace the homegrown process runner with [`childprocess`](https://rubygems.org/gems/childprocess)
+
 ## Version 2.5.2 - 2022-12-27
 * Update Addressable - <https://github.com/copiousfreetime/launchy/pull/145> - JamieKDonnelly
 * Fix deprecated usage of `Object#=~` - <https://github.com/copiousfreetime/launchy/pull/138> - marcrohloff

data/Manifest.txt

@@ -10,16 +10,14 @@ 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
 lib/launchy/detect.rb
 lib/launchy/detect/host_os.rb
 lib/launchy/detect/host_os_family.rb
 lib/launchy/detect/nix_desktop_environment.rb
-lib/launchy/detect/ruby_engine.rb
-lib/launchy/detect/runner.rb
 lib/launchy/error.rb
 lib/launchy/os_family.rb
+lib/launchy/runner.rb
 lib/launchy/version.rb
 spec/application_spec.rb
 spec/applications/browser_spec.rb
@@ -27,8 +25,6 @@ spec/cli_spec.rb
 spec/detect/host_os_family_spec.rb
 spec/detect/host_os_spec.rb
 spec/detect/nix_desktop_environment_spec.rb
-spec/detect/ruby_engine_spec.rb
-spec/detect/runner_spec.rb
 spec/launchy_spec.rb
 spec/mock_application.rb
 spec/spec_helper.rb

data/README.md

@@ -92,7 +92,6 @@ At the moment, the only available options are:
     :debug        Turn on debugging output
     :application  Explicitly state what application class is going to be used
     :host_os      Explicitly state what host operating system to pretend to be
-    :ruby_engine  Explicitly state what ruby engine to pretend to be under
     :dry_run      Do nothing and print the command that would be executed on $stdout
 
 If `Launchy.open` is invoked with a block, then no exception will be thrown, and
@@ -110,41 +109,6 @@ exception that was raised.
       puts "Attempted to open #{uri} and failed because #{exception}"
     end
 
-## UPGRADING from versions before 2.0.0
-
-The previously published version of Launchy before the 2.0.0 series was 0.4.0.
-There have been so many changes, and a mistaken tag at 1.0.0, that I have
-decided to bump all the way to 2.x.y.
-
-I have attempted to keep backward compatibility with the previous examples. The
-previous API examples of:
-
-    Launchy::Browser.run("https://www.ruby-lang.org/")
-
-and
-
-    Launchy::Browser.new.visit("https://www.ruby-lang.org/")
-
-will still work, and you will get a deprecation notice, along with the line
-of code you should probably update. For example, this is what would print out
-in the github gem if it was updated to use 2.0.x but not use the supported API.
-
-    % gh home
-    WARNING: You made a call to a deprecated Launchy API. This call should be changed to 'Launchy.open( uri )'
-    WARNING: I think I was able to find the location that needs to be fixed. Please go look at:
-    WARNING:
-    WARNING: /Users/jeremy/.rvm/gems/ruby-1.8.7-p334/gems/github-0.6.2/lib/commands/helpers.rb:275:in `open'
-    WARNING: helper :open do |url|
-    WARNING:   has_launchy? proc {
-    WARNING:     Launchy::Browser.new.visit url
-    WARNING:   }
-    WARNING: end
-    WARNING:
-    WARNING: If this is not the case, please file a bug. Please file a bug at https://github.com/copiousfreetime/launchy/issues/new
-
-These deprecation notices will go away with version 3.0 and the only available
-API will be the documented one.
-
 ## ISC LICENSE
 
 https://opensource.org/licenses/isc-license.txt

data/Rakefile

@@ -8,11 +8,13 @@ This.homepage = "https://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
   spec.add_dependency( 'addressable', '~> 2.8')
+  spec.add_dependency( 'childprocess', '~> 5.0')
 
   spec.add_development_dependency( 'rake'     , '~> 13.0')
-  spec.add_development_dependency( 'minitest' , '~> 5.15' )
-  spec.add_development_dependency( 'rdoc'     , '~> 6.4' )
-  spec.add_development_dependency( 'simplecov', '~> 0.21' )
+  spec.add_development_dependency( 'minitest' , '~> 5.21' )
+  spec.add_development_dependency( 'minitest-junit' , '~> 1.0' )
+  spec.add_development_dependency( 'rdoc'     , '~> 6.6' )
+  spec.add_development_dependency( 'simplecov', '~> 0.22' )
 
   spec.licenses = ['ISC']
 

data/lib/launchy/application.rb

@@ -24,8 +24,18 @@ module Launchy
         raise ApplicationNotFoundError, "No application found to handle '#{uri}'"
       end
 
+      # Find the application with the given name
       #
+      # returns the Class that has the given name
+      def for_name( name )
+        klass = find_child( :has_name?, name )
+        return klass if klass
+        raise ApplicationNotFoundError, "No application found named '#{name}'"
+      end
+
       # Find the given executable in the available paths
+      #
+      # returns the path to the executable or nil if not found
       def find_executable( bin, *paths )
         paths = Launchy.path.split( File::PATH_SEPARATOR ) if paths.empty?
         paths.each do |path|
@@ -38,16 +48,21 @@ module Launchy
         Launchy.log "#{self.name} : Unable to find `#{bin}' in #{paths.join(", ")}"
         return nil
       end
+
+      # Does this class have the given name-like string?
+      #
+      # returns true if the class has the given name
+      def has_name?( qname )
+        qname.to_s.downcase == self.name.split("::").last.downcase
+      end
     end
 
     attr_reader :host_os_family
-    attr_reader :ruby_engine
     attr_reader :runner
 
     def initialize
       @host_os_family = Launchy::Detect::HostOsFamily.detect
-      @ruby_engine    = Launchy::Detect::RubyEngine.detect
-      @runner         = Launchy::Detect::Runner.detect
+      @runner         = Launchy::Runner.new
     end
 
     def find_executable( bin, *paths )

data/lib/launchy/cli.rb

@@ -15,7 +15,7 @@ module Launchy
         op.separator ""
         op.separator "Launch Options:"
 
-        op.on( "-a", "--application APPLICATION", 
+        op.on( "-a", "--application APPLICATION",
                "Explicitly specify the application class to use in the launch") do |app|
           @options[:application] = app
         end
@@ -25,11 +25,6 @@ module Launchy
           @options[:debug] = true
         end
 
-        op.on( "-e", "--engine RUBY_ENGINE",
-               "Force launchy to behave as if it was on a particular ruby engine.") do |e|
-          @options[:ruby_engine] = e
-        end
-
         op.on( "-n", "--dry-run", "Don't launchy, print the command to be executed on stdout" ) do |x|
           @options[:dry_run] = true
         end

data/lib/launchy/detect/host_os.rb

@@ -20,7 +20,7 @@ module Launchy::Detect
     end
 
     def default_host_os
-      ::RbConfig::CONFIG['host_os']
+      ::RbConfig::CONFIG['host_os'].downcase
     end
 
     def override_host_os

data/lib/launchy/detect/host_os_family.rb

@@ -42,7 +42,7 @@ module Launchy::Detect
     #
     class Windows < HostOsFamily
       def self.matching_regex
-        /(mingw|mswin|windows)/i
+        /(mingw|mswin|msys|windows)/i
       end
       def app_list( app ) app.windows_app_list; end
     end
@@ -56,7 +56,7 @@ module Launchy::Detect
 
     class Nix < HostOsFamily
       def self.matching_regex
-        /(linux|bsd|aix|solaris)/i
+        /(linux|bsd|aix|solaris|sunos|dragonfly)/i
       end
       def app_list( app ) app.nix_app_list; end
     end

data/lib/launchy/detect.rb

@@ -5,6 +5,4 @@ end
 
 require 'launchy/detect/host_os'
 require 'launchy/detect/host_os_family'
-require 'launchy/detect/ruby_engine'
 require 'launchy/detect/nix_desktop_environment'
-require 'launchy/detect/runner'

data/lib/launchy/runner.rb

@@ -0,0 +1,46 @@
+require 'childprocess'
+module Launchy
+  class Runner
+    def run( cmd, *args )
+      raise Launchy::CommandNotFoundError, "No command found to run with args '#{args.join(' ')}'. If this is unexpected, #{Launchy.bug_report_message}" unless cmd
+      if Launchy.dry_run? then
+        $stdout.puts dry_run( cmd, *args )
+      else
+        wet_run( cmd, *args )
+      end
+    end
+
+    def wet_run( cmd, *args )
+      argv = [ cmd, *args ].flatten
+      Launchy.log "ChildProcess: argv => #{argv.inspect}"
+      process = ChildProcess.build( *argv )
+
+      process.io.inherit!
+      process.leader = true
+      process.detach = true
+      process.start
+    end
+
+    def dry_run( cmd, *args )
+      shell_commands(cmd, args).join(" ")
+    end
+
+    # cut it down to just the shell commands that will be passed to exec or
+    # posix_spawn. The cmd argument is split according to shell rules and the
+    # args are not escaped because the whole set is passed to system as *args
+    # and in that case system shell escaping rules are not done.
+    #
+    def shell_commands( cmd, args )
+      cmdline = [ cmd.to_s.shellsplit ]
+      cmdline << args.flatten.collect{ |a| a.to_s }
+      return commandline_normalize( cmdline )
+    end
+
+    def commandline_normalize( cmdline )
+      c = cmdline.flatten!
+      c = c.find_all { |a| (not a.nil?) and ( a.size > 0 ) }
+      Launchy.log "commandline_normalized => #{c.join(' ')}"
+      return c
+    end
+  end
+end

data/lib/launchy/version.rb

@@ -1,5 +1,5 @@
 module Launchy
-  VERSION = "2.5.2"
+  VERSION = "3.0.0"
 
   module Version
 

data/lib/launchy.rb

@@ -1,4 +1,6 @@
 require 'addressable/uri'
+require 'shellwords'
+require 'stringio'
 
 #
 # The entry point into Launchy. This is the sole supported public API.
@@ -11,7 +13,6 @@ require 'addressable/uri'
 #   :application  Explicitly state what application class is going to be used.
 #                 This must be a child class of Launchy::Application
 #   :host_os      Explicitly state what host operating system to pretend to be
-#   :ruby_engine  Explicitly state what ruby engine to pretend to be under
 #   :dry_run      Do nothing and print the command that would be executed on $stdout
 #
 # Other options may be used, and those will be passed directly to the
@@ -26,7 +27,14 @@ module Launchy
     def open(uri_s, options = {}, &error_block )
       leftover = extract_global_options( options )
       uri = string_to_uri( uri_s )
-      app = app_for_uri( uri )
+      if name = options[:application] then
+        app = app_for_name( name )
+      end
+
+      if app.nil? then
+        app = app_for_uri( uri )
+      end
+
       app.new.open( uri, leftover )
     rescue Launchy::Error => le
       raise le
@@ -34,7 +42,7 @@ module Launchy
       msg = "Failure in opening uri #{uri_s.inspect} with options #{options.inspect}: #{e}"
       raise Launchy::Error, msg
     ensure
-      if $! and block_given? then
+      if $! && block_given? then
         yield $!
         return # explicitly swallow the errors
       end
@@ -44,6 +52,12 @@ module Launchy
       Launchy::Application.handling( uri )
     end
 
+    def app_for_name( name )
+      Launchy::Application.for_name( name )
+    rescue Launchy::ApplicationNotFoundError
+      nil
+    end
+
     def app_for_uri_string( s )
       app_for_uri( string_to_uri( s ) )
     end
@@ -64,7 +78,6 @@ module Launchy
       Launchy.debug       = false
       Launchy.application = nil
       Launchy.host_os     = nil
-      Launchy.ruby_engine = nil
       Launchy.dry_run     = false
       Launchy.path        = ENV['PATH']
     end
@@ -74,7 +87,6 @@ module Launchy
       Launchy.debug        = leftover.delete( :debug       ) || ENV['LAUNCHY_DEBUG']
       Launchy.application  = leftover.delete( :application ) || ENV['LAUNCHY_APPLICATION']
       Launchy.host_os      = leftover.delete( :host_os     ) || ENV['LAUNCHY_HOST_OS']
-      Launchy.ruby_engine  = leftover.delete( :ruby_engine ) || ENV['LAUNCHY_RUBY_ENGINE']
       Launchy.dry_run      = leftover.delete( :dry_run     ) || ENV['LAUNCHY_DRY_RUN']
     end
 
@@ -104,14 +116,6 @@ module Launchy
       @host_os || ENV['LAUNCHY_HOST_OS']
     end
 
-    def ruby_engine=( ruby_engine )
-      @ruby_engine = ruby_engine
-    end
-
-    def ruby_engine
-      @ruby_engine || ENV['LAUNCHY_RUBY_ENGINE']
-    end
-
     def dry_run=( dry_run )
       @dry_run = to_bool( dry_run )
     end
@@ -160,4 +164,4 @@ require 'launchy/descendant_tracker'
 require 'launchy/error'
 require 'launchy/application'
 require 'launchy/detect'
-require 'launchy/deprecated'
+require 'launchy/runner'

data/spec/cli_spec.rb

@@ -59,7 +59,6 @@ describe Launchy::Cli do
 
   {
     '--application' => [ :application, 'Browser'],
-    '--engine'      => [ :ruby_engine, 'rbx'],
     '--host-os'     => [ :host_os,     'cygwin'] }.each_pair do |opt, val|
     it "the commandline option #{opt} sets the program option #{val[0]}" do
       argv = [ opt, val[1], "https://github.com/copiousfreetime/launchy" ]

data/spec/launchy_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'pathname'
+require 'mock_application'
 
 describe Launchy do
 
@@ -66,15 +67,19 @@ describe Launchy do
     _(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'
-  end
-
   it "raises an exception if no scheme is found for the given uri" do
     _(lambda { Launchy.open( @invalid_url ) }).must_raise Launchy::ApplicationNotFoundError
   end
 
+  it "raises an exepction if the browser failed to launch" do
+    skip("because headless CI") if ENV["CI"] == "true"
+    caught = nil
+    Launchy.open( @invalid_url, application: "browser") do |exception|
+      caught = exception
+    end
+    _(caught).must_be_kind_of Launchy::Error
+  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 )
@@ -86,7 +91,13 @@ describe Launchy do
   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 'start launchy /b ' + uri
+  end
+
+  it "opens a data url with a forced browser application" do
+    uri = "data:text/html,hello%20world"
+    Launchy.open( uri, :dry_run => true, :application => "browser" )
+    _($stdout.string.strip).must_match(/open/) # /usr/bin/open or xdg-open
   end
 
   it "calls the block if instead of raising an exception if there is an error" do
@@ -104,6 +115,11 @@ describe Launchy do
     _(lambda { Launchy.open( @invalid_url ) { raise StandardError, "KABOOM!" } }).must_raise StandardError
   end
 
+  it "can force a specific application to be used" do
+    result = Launchy.open( "http://example.com", :application => "mockapplication" )
+    _(result).must_equal "MockApplication opened http://example.com"
+  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 )
@@ -116,4 +132,11 @@ describe Launchy do
     app = Launchy.app_for_uri_string( path )
     _(app).must_equal( Launchy::Application::Browser )
   end
+
+  [ "BROWSER", "bRoWsEr", "browser", "Browser" ].each do |x|
+    it "can find the browser by name #{x}" do
+      app = Launchy.app_for_name( x )
+    _(app).must_equal( Launchy::Application::Browser )
+    end
+  end
 end

data/spec/mock_application.rb

@@ -6,4 +6,8 @@ class MockApplication < Launchy::Application
   def self.handles?( uri )
     schemes.include?( uri.scheme )
   end
+
+  def open( uri, options = {} )
+    return "MockApplication opened #{uri}"
+  end
 end

data/spec/spec_helper.rb

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

data/tasks/default.rake

@@ -36,11 +36,13 @@ task :develop => "develop:default"
 # Minitest - standard TestTask
 #------------------------------------------------------------------------------
 begin
-  require 'rake/testtask'
-  Rake::TestTask.new( :test ) do |t|
-    t.ruby_opts    = %w[ -w ]
-    t.libs         = %w[ lib spec test ]
-    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
+  require 'minitest/test_task'
+  Minitest::TestTask.create( :test) do |t|
+    t.libs << "lib"
+    t.libs << "spec"
+    t.libs << "test"
+    t.warning = true
+    t.test_globs = "{test,spec}/**/{test_*,*_spec}.rb"
   end
 
   task :test_requirements
@@ -143,14 +145,20 @@ namespace :fixme do
   end
 
   def local_fixme_files
-    This.manifest.select { |p| p =~ %r|^tasks/| }
+    local_files = This.manifest.select { |p| p =~ %r|^tasks/| }
+    local_files.concat( Dir.glob( ".semaphore/*" ) )
   end
 
   def outdated_fixme_files
     local_fixme_files.select do |local|
       upstream     = fixme_project_path( local )
-      upstream.exist? &&
-        ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
+      if upstream.exist? then
+        if File.exist?( local ) then
+          ( Digest::SHA256.file( local ) != Digest::SHA256.file( upstream ) )
+        else
+          true
+        end
+      end
     end
   end
 
@@ -159,7 +167,7 @@ namespace :fixme do
   end
 
   desc "See if the fixme tools are outdated"
-  task :outdated => :release_check do
+  task :outdated do
     if fixme_up_to_date? then
       puts "Fixme files are up to date."
     else
@@ -170,7 +178,7 @@ namespace :fixme do
   end
 
   desc "Update outdated fixme files"
-  task :update => :release_check do
+  task :update do
     if fixme_up_to_date? then
       puts "Fixme files are already up to date."
     else
@@ -201,7 +209,7 @@ task :gemspec do
 end
 
 # .rbc files from ruby 2.0
-CLOBBER << FileList["**/*.rbc"]
+CLOBBER << "**/*.rbc"
 
 # The standard gem packaging task, everyone has it.
 require 'rubygems/package_task'
@@ -224,7 +232,7 @@ end
 # 7) pus the gem
 #------------------------------------------------------------------------------
 task :release_check do
-  unless `git branch` =~ /^\* main$/
+  unless `git branch` =~ /^\* main/
     abort "You must be on the main branch to release!"
   end
   unless `git status` =~ /^nothing to commit/m

data/tasks/this.rb

@@ -25,10 +25,10 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store)/,
+    @exclude_from_manifest = Regexp.union(/\.(git|DS_Store|semaphore)/,
                                           /^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)/,
                                           /^[^\/]+\.gemspec/,
-                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history)$/,
+                                          /\.(swp|jar|bundle|so|rvmrc|travis.yml|byebug_history|fossa.yml|ruby-version)$/,
                                           /~$/)
     @gemspecs              = Hash.new
     yield self if block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: launchy
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '5.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.21'
+- !ruby/object:Gem::Dependency
+  name: minitest-junit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 description: Launchy is helper class for launching cross-platform applications in
   a fire and forget manner. There are application concepts (browser, email client,
   etc) that are common across all platforms, and they may be launched differently
@@ -107,16 +135,14 @@ files:
 - lib/launchy/applications/browser.rb
 - lib/launchy/argv.rb
 - lib/launchy/cli.rb
-- lib/launchy/deprecated.rb
 - lib/launchy/descendant_tracker.rb
 - lib/launchy/detect.rb
 - lib/launchy/detect/host_os.rb
 - lib/launchy/detect/host_os_family.rb
 - lib/launchy/detect/nix_desktop_environment.rb
-- lib/launchy/detect/ruby_engine.rb
-- lib/launchy/detect/runner.rb
 - lib/launchy/error.rb
 - lib/launchy/os_family.rb
+- lib/launchy/runner.rb
 - lib/launchy/version.rb
 - spec/application_spec.rb
 - spec/applications/browser_spec.rb
@@ -124,8 +150,6 @@ files:
 - spec/detect/host_os_family_spec.rb
 - spec/detect/host_os_spec.rb
 - spec/detect/nix_desktop_environment_spec.rb
-- spec/detect/ruby_engine_spec.rb
-- spec/detect/runner_spec.rb
 - spec/launchy_spec.rb
 - spec/mock_application.rb
 - spec/spec_helper.rb
@@ -160,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Launchy is helper class for launching cross-platform applications in a fire
@@ -172,8 +196,6 @@ test_files:
 - spec/detect/host_os_family_spec.rb
 - spec/detect/host_os_spec.rb
 - spec/detect/nix_desktop_environment_spec.rb
-- spec/detect/ruby_engine_spec.rb
-- spec/detect/runner_spec.rb
 - spec/launchy_spec.rb
 - spec/mock_application.rb
 - spec/spec_helper.rb

data/lib/launchy/deprecated.rb

@@ -1,52 +0,0 @@
-module Launchy
-  #
-  # This class is deprecated and will be removed 
-  #
-  class Browser
-    def self.run( *args )
-      Browser.new.visit( args[0] )
-    end
-
-    def visit( url )
-      _warn "You made a call to a deprecated Launchy API. This call should be changed to 'Launchy.open( uri )'"
-      report_caller_context( caller )
-
-      ::Launchy.open( url )
-    end
-
-    private
-
-    def find_caller_context( stack )
-      caller_file = stack.find do |line|
-        not line.index( __FILE__ )
-      end
-      if caller_file then
-        caller_fname, caller_line, _ = caller_file.split(":")
-        if File.readable?( caller_fname ) then
-          caller_lines = IO.readlines( caller_fname )
-          context = [ caller_file ]
-          context << caller_lines[(caller_line.to_i)-3, 5] 
-          return context.flatten
-        end
-      end
-      return []
-    end
-
-    def report_caller_context( stack )
-      context = find_caller_context( stack )
-      if context.size > 0 then
-        _warn "I think I was able to find the location that needs to be fixed. Please go look at:"
-        _warn
-        context.each do |line|
-          _warn line.rstrip
-        end
-        _warn
-        _warn "If this is not the case, please file a bug. #{Launchy.bug_report_message}"
-      end
-    end
-
-    def _warn( msg = "" )
-      warn "WARNING: #{msg}"
-    end
-  end
-end

data/lib/launchy/detect/ruby_engine.rb

@@ -1,78 +0,0 @@
-module Launchy::Detect
-  class RubyEngine
-    class NotFoundError < Launchy::Error; end
-
-    extend ::Launchy::DescendantTracker
-
-    # Detect the current ruby engine.
-    #
-    # If the current ruby engine cannot be detected, the return
-    # RubyEngine::Unknown
-    def self.detect( ruby_engine = RubyEngine.new )
-      found = find_child( :is_current_engine?, ruby_engine.to_s )
-      return found if found
-      raise NotFoundError, "#{ruby_engine_error_message( ruby_engine )} #{Launchy.bug_report_message}"
-    end
-
-    def self.ruby_engine_error_message( ruby_engine )
-      msg = "Unkonwn RUBY_ENGINE "
-      if ruby_engine then
-        msg += " '#{ruby_engine}'."
-      elsif defined?( RUBY_ENGINE ) then
-        msg += " '#{RUBY_ENGINE}'."
-      else
-        msg = "RUBY_ENGINE not defined for #{RUBY_DESCRIPTION}."
-      end
-      return msg
-    end
-
-    def self.is_current_engine?( ruby_engine )
-      return ruby_engine == self.engine_name
-    end
-
-    def self.mri?()     self == Mri;     end
-    def self.jruby?()   self == Jruby;   end
-    def self.rbx?()     self == Rbx;     end
-    def self.macruby?() self == MacRuby; end
-
-    attr_reader :ruby_engine
-    alias to_s ruby_engine
-    def initialize( ruby_engine = Launchy.ruby_engine )
-      if ruby_engine then
-        @ruby_engine = ruby_engine
-      else
-        @ruby_engine = defined?( RUBY_ENGINE ) ? RUBY_ENGINE : "ruby"
-      end
-    end
-
-
-    #-------------------------------
-    # The list of known ruby engines
-    #-------------------------------
-
-    #
-    # This is the ruby engine if the RUBY_ENGINE constant is not defined
-    class Mri < RubyEngine
-      def self.engine_name() "ruby"; end
-      def self.is_current_engine?( ruby_engine )
-        if ruby_engine then
-          super( ruby_engine )
-        else
-          return true if not Launchy.ruby_engine and not defined?( RUBY_ENGINE )
-        end
-      end
-    end
-
-    class Jruby < RubyEngine
-      def self.engine_name() "jruby"; end
-    end
-
-    class Rbx < RubyEngine
-      def self.engine_name() "rbx"; end
-    end
-
-    class MacRuby < RubyEngine
-      def self.engine_name() "macruby"; end
-    end
-  end
-end

data/lib/launchy/detect/runner.rb

@@ -1,152 +0,0 @@
-require 'shellwords'
-require 'stringio'
-
-module Launchy::Detect
-  class Runner
-    class NotFoundError < Launchy::Error; end
-
-    extend ::Launchy::DescendantTracker
-
-    # Detect the current command runner
-    #
-    # This will return an instance of the Runner to be used to do the
-    # application launching.
-    #
-    # If a runner cannot be detected then raise Runner::NotFoundError
-    #
-    # The runner rules are, in order:
-    #
-    # 1) If you are on windows, you use the Windows Runner no matter what
-    # 2) If you are using the jruby engine, use the Jruby Runner. Unless rule
-    #    (1) took effect
-    # 3) Use Forkable (barring rules (1) and (2))
-    def self.detect
-      host_os_family = Launchy::Detect::HostOsFamily.detect
-      ruby_engine    = Launchy::Detect::RubyEngine.detect
-
-      return Windows.new if host_os_family.windows?
-      if ruby_engine.jruby? then
-        return Jruby.new
-      end
-      return Forkable.new
-    end
-
-    #
-    # cut it down to just the shell commands that will be passed to exec or
-    # posix_spawn. The cmd argument is split according to shell rules and the
-    # args are not escaped because they whole set is passed to system as *args
-    # and in that case system shell escaping rules are not done.
-    #
-    def shell_commands( cmd, args )
-      cmdline = [ cmd.to_s.shellsplit ]
-      cmdline << args.flatten.collect{ |a| a.to_s }
-      return commandline_normalize( cmdline )
-    end
-
-    def commandline_normalize( cmdline )
-      c = cmdline.flatten!
-      c = c.find_all { |a| (not a.nil?) and ( a.size > 0 ) }
-      Launchy.log "commandline_normalized => #{c.join(' ')}"
-      return c
-    end
-
-    def dry_run( cmd, *args )
-      shell_commands(cmd, args).join(" ")
-    end
-
-    def run( cmd, *args )
-      raise Launchy::CommandNotFoundError, "No command found to run with args '#{args.join(' ')}'. If this is unexpected, #{Launchy.bug_report_message}" unless cmd
-      if Launchy.dry_run? then
-        $stdout.puts dry_run( cmd, *args )
-      else
-        wet_run( cmd, *args )
-      end
-    end
-
-
-    #---------------------------------------
-    # The list of known runners
-    #---------------------------------------
-
-    class Windows < Runner
-
-      def all_args( cmd, *args )
-        args = [ 'cmd', '/c', *shell_commands( cmd, *args ) ]
-        Launchy.log "Windows: all_args => #{args.inspect}"
-        return args
-      end
-
-      def dry_run( cmd, *args )
-        all_args( cmd, *args ).join(" ")
-      end
-
-      # 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 )
-        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
-
-      def wet_run( cmd, *args )
-        system( *all_args( cmd, *args ) )
-      end
-    end
-
-    class Jruby < Runner
-      def wet_run( cmd, *args )
-        child_pid = spawn( *shell_commands( cmd, *args ) )
-        Process.detach( child_pid )
-      end
-    end
-
-    class Forkable < Runner
-      attr_reader   :child_pid
-
-      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_or_raise( cmd, *args )
-          exit!
-        end
-        Process.detach( @child_pid )
-      end
-
-      private
-
-      # attaching to a StringIO instead of reopening so we don't loose the
-      # STDERR, needed for exec_or_raise.
-      def close_file_descriptors
-        $stdin.reopen( "/dev/null")
-
-        @saved_stdout = $stdout
-        @saved_stderr = $stderr
-
-        $stdout       = StringIO.new
-        $stderr       = StringIO.new
-      end
-
-      def exec_or_raise( cmd, *args )
-        exec( *shell_commands( cmd, *args ))
-      rescue Exception => e
-        $stderr = @saved_stderr
-        $stdout = @saved_stdout
-        raise e
-      end
-    end
-  end
-end

data/spec/detect/ruby_engine_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Launchy::Detect::RubyEngine do
-
-  before do
-    Launchy.reset_global_options
-  end
-
-  after do
-    Launchy.reset_global_options
-  end
-
-  %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
-    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
-    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
-  end
-
-  { 'rbx'     => :rbx?,
-    'ruby'    => :mri?,
-    '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
-    end
- end
-end

data/spec/detect/runner_spec.rb

@@ -1,103 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-
-describe Launchy::Detect::Runner do
-  before do
-    Launchy.reset_global_options
-    @test_url = "http://example.com/?foo=bar&baz=wibble"
-  end
-
-  after do
-    Launchy.reset_global_options
-  end
-
-  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
-  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
-  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
-  end
-
-  # On anything that has fork, use Forkable
-  %w[ linux darwin cygwin ].each do |host_os|
-    %w[ ruby rbx macruby ].each do |engine_name|
-      it "engine '#{engine_name}' on OS '#{host_os}' uses runner Forkable" 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
-      end
-    end
-  end
-
-
-  # Jruby always uses the Jruby runner except on Windows
-  { 'mingw'  => Launchy::Detect::Runner::Windows,
-    'linux'  => Launchy::Detect::Runner::Jruby,
-    'darwin' => Launchy::Detect::Runner::Jruby,
-    'cygwin' => Launchy::Detect::Runner::Jruby, }.each_pair do |host_os, runner|
-    it "engine 'jruby' on OS '#{host_os}' uses runner #{runner.name}" do
-      Launchy.host_os = host_os
-      Launchy.ruby_engine = 'jruby'
-      engine = Launchy::Detect::Runner.detect
-      _(engine).must_be_instance_of runner
-    end
-  end
-
-  # If you are on windows, no matter what engine, you use the windows runner
-  %w[ ruby rbx jruby macruby ].each do |engine_name|
-    it "uses a Windows runner when the engine is '#{engine_name}'" do
-      Launchy.host_os = "mingw"
-      Launchy.ruby_engine = engine_name
-      e = Launchy::Detect::Runner.detect
-      _(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'
-  end
-
-  %w[ & | ( ) < > ^ ].each do |reserved_char|
-    it "Windows escapes '#{reserved_char}' in urls" do
-      win = Launchy::Detect::Runner::Windows.new
-      parts = [ 'http://example.com/?foo=bar', 'baz=wibble' ]
-      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 ]
-
-      cmd = win.dry_run( "not-really", [ 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'
-  end
-
-  it "does not escape %38 items in urls" do
-    l = Launchy::Detect::Runner::Forkable.new
-    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 = "https://ja.wikipedia.org/wiki/あ"
-    l = Launchy::Detect::Runner::Forkable.new
-    cmd = l.dry_run( "not-really", [ url ] )
-    _(cmd).must_equal( "not-really #{url}" )
-  end
-end