launchy 2.5.0 → 3.0.0

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'
@@ -213,19 +221,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"
@@ -236,7 +244,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

@@ -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?
@@ -146,7 +146,7 @@ class ThisProject
       spec.rdoc_options = [ "--main"  , 'README.md',
                             "--markup", "tomdoc" ]
 
-      spec.required_ruby_version = '>= 2.4.0'
+      spec.required_ruby_version = '>= 2.3.0'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: launchy
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeremy Hinegardner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        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.14'
+        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.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        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
@@ -133,7 +157,7 @@ files:
 - spec/version_spec.rb
 - tasks/default.rake
 - tasks/this.rb
-homepage: http://github.com/copiousfreetime/launchy
+homepage: https://github.com/copiousfreetime/launchy
 licenses:
 - ISC
 metadata:
@@ -141,7 +165,7 @@ metadata:
   changelog_uri: https://github.com/copiousfreetime/launchy/blob/master/README.md
   homepage_uri: https://github.com/copiousfreetime/launchy
   source_code_uri: https://github.com/copiousfreetime/launchy
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -153,15 +177,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Launchy is helper class for launching cross-platform applications in a fire
   and forget manner.
@@ -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