launchy 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f9c18d9b5afe8a29abfbdfb770545f3616ee1ec2547d60762e14604fd5c2e6
-  data.tar.gz: e84671dd85e089af53899b7ee595450536522bf5f00bf88d61a775a70dfc0647
+  metadata.gz: 9d637a77afa69826953a3226c55fc20334c6fa90e268912bcf9a208bc9b448e2
+  data.tar.gz: 2f5ff5e1401319e3a97655848f4f61b9bb33e786cd1b22b76aa20a7729e0b885
 SHA512:
-  metadata.gz: ffb4ab18f93e33bbedfe05f3506574dc7163974bcaca7057d46eae15c1a3a7369d6031cf4779769e873c33bcfb16808e0e2dddfa4477fc72c469549b68ec5685
-  data.tar.gz: f43067afd034ea8b145a3b183ccd5ed3c4cfff4c2524233310112fdbb39e69fb7d1493f4b0816a58e7297dde8ef4efd783dec699ff262317dfe27b959b9d3943
+  metadata.gz: bb02ca4bd30a8394ca2a6c8e86518eb4f403d5b56c574f7730d1581a19ca686c94a001c641a09620b799b620f9d8e6be54ad39c27bb980e67268d01f68d8eae1
+  data.tar.gz: ba3bc128ef33d39c87b50e187ca71e0f39a2382cdf3513122ec1a108b71a55d2e2a8e0f81f138a27b8c9b1f74b8df183fe0b626d9718236efb3cb6a653fd1e62

data/CONTRIBUTING.md

@@ -51,6 +51,7 @@ easiest way to contribute.
 * [Daniel Farina](https://github.com/fdr)
 * [Jack Turnbull](https://github.com/jackturnbull)
 * [Jeremy Moritz](https://github.com/jeremymoritz)
+* [Jamie Donnelly](https://github.com/JamieKDonnelly)
 
 [GitHub Account]: https://github.com/signup/free "GitHub Signup"
 [GitHub Issues]:  https://github.com/copiousfreetime/launchy/issues "Launchy Issues"

data/HISTORY.md

@@ -1,4 +1,15 @@
 # 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
+* Move to sempahore for matrix builds and macos tests
 
 ## Version 2.5.0 - 2020-02-27
 * Update depedencies
@@ -21,12 +32,12 @@
 * Abstract out the argv of the commandline - <https://github.com/copiousfreetime/launchy/issues/71>
 
 ## Version 2.4.0 - 2013-11-12
-* Support `Launchy.open( url, :debug => true )` - <http://github.com/copiousfreetime/launchy/issues/63> - schmich
-* Fix inconsistencies in `debug?` and `dry_run?` methods - <http://github.com/copiousfreetime/launchy/issues/63> - schmich
-* Fix detection of missing *nix desktops - <http://github.com/copiousfreetime/launchy/issues/70>
-* Fix running tests in bare Linux environment - <http://github.com/copiousfreetime/launchy/issues/67> - gioele
-* Fix mistaking windows drive as uri schema - <http://github.com/copiousfreetime/launchy/issues/65>
-* Attempt fixing windows `start` command oddities, again - <http://github.com/copiousfreetime/launchy/issues/62>
+* Support `Launchy.open( url, :debug => true )` - <https://github.com/copiousfreetime/launchy/issues/63> - schmich
+* Fix inconsistencies in `debug?` and `dry_run?` methods - <https://github.com/copiousfreetime/launchy/issues/63> - schmich
+* Fix detection of missing *nix desktops - <https://github.com/copiousfreetime/launchy/issues/70>
+* Fix running tests in bare Linux environment - <https://github.com/copiousfreetime/launchy/issues/67> - gioele
+* Fix mistaking windows drive as uri schema - <https://github.com/copiousfreetime/launchy/issues/65>
+* Attempt fixing windows `start` command oddities, again - <https://github.com/copiousfreetime/launchy/issues/62>
 
 ## Version 2.3.0 - 2013-04-11
 
@@ -34,39 +45,39 @@
 
 ## Version 2.2.0 - 2013-02-06
 
-* Change XFCE detection to not depend on grep <http://github.com/copiousfreetime/launchy/issues/52> - bogdan
-* Suppress forked process output <http://github.com/copiousfreetime/launchy/issues/51>
-* Display help/usage if no url is given <http://github.com/copiousfreetime/launchy/issues/54>
-* Detect the fluxbox environment <http://github.com/copiousfreetime/launchy/issues/53>
-* Automatically detect `http` url's if they are missing the `http://` <http://github.com/copiousfreetime/launchy/issues/55>
+* Change XFCE detection to not depend on grep <https://github.com/copiousfreetime/launchy/issues/52> - bogdan
+* Suppress forked process output <https://github.com/copiousfreetime/launchy/issues/51>
+* Display help/usage if no url is given <https://github.com/copiousfreetime/launchy/issues/54>
+* Detect the fluxbox environment <https://github.com/copiousfreetime/launchy/issues/53>
+* Automatically detect `http` url's if they are missing the `http://` <https://github.com/copiousfreetime/launchy/issues/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 <http://github.com/copiousfreetime/launchy/issues/45>
+* Fix where HostOS would fail to convert to string on JRuby in 1.9 mode <https://github.com/copiousfreetime/launchy/issues/45>
 
 ## Version 2.1.1 - 2012-07-28
 
-* Update addressable runtime dependency <http://github.com/copiousfreetime/launchy/issues/47>
+* Update addressable runtime dependency <https://github.com/copiousfreetime/launchy/issues/47>
 * Bring minitest and ffi development dependencies up to date
 
 ## Version 2.1.0 - 2012-03-18
 
-* Fix raising exception when no browser program found <http://github.com/copiousfreetime/launchy/issues/42>
+* Fix raising exception when no browser program found <https://github.com/copiousfreetime/launchy/issues/42>
 * Add `LAUNCHY_DRY_RUN` environment variable (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 <http://github.com/copiousfreetime/launchy/issues/33>
+* Fix the case where `$BROWSER` is set and no *nix desktop was found <https://github.com/copiousfreetime/launchy/issues/33>
 
 ## Version 2.0.4 - 2011-07-23
 
-* Fix windows `start` commandline <http://github.com/copiousfreetime/launchy/issues/5>
-* Add capability to open local files with no file: scheme present <http://github.com/copiousfreetime/launchy/issues/29>
-* Added `rake how_to_contribute` task <http://github.com/copiousfreetime/launchy/issues/30>
-* Make better decisions on when to do shell escaping <http://github.com/copiousfreetime/launchy/issues/31>
-* Switch to Addressable::URI so UTF-8 urls may be parsed. <http://github.com/copiousfreetime/launchy/issues/32>
+* Fix windows `start` commandline <https://github.com/copiousfreetime/launchy/issues/5>
+* Add capability to open local files with no file: scheme present <https://github.com/copiousfreetime/launchy/issues/29>
+* Added `rake how_to_contribute` task <https://github.com/copiousfreetime/launchy/issues/30>
+* Make better decisions on when to do shell escaping <https://github.com/copiousfreetime/launchy/issues/31>
+* Switch to Addressable::URI so UTF-8 urls may be parsed. <https://github.com/copiousfreetime/launchy/issues/32>
 
 ## Version 2.0.3 - 2011-07-17
 

data/LICENSE

@@ -1,4 +1,4 @@
-ISC LICENSE - http://opensource.org/licenses/isc-license.txt
+ISC LICENSE - https://opensource.org/licenses/isc-license.txt
 
 Copyright (c) 2007-2020 Jeremy Hinegardner
 

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

@@ -1,7 +1,6 @@
 # launchy
 
-[![Build Status](https://travis-ci.org/copiousfreetime/launchy.svg?branch=master)](https://travis-ci.org/copiousfreetime/launchy)
-
+[![Build Status](https://copiousfreetime.semaphoreci.com/badges/launchy/branches/main.svg)](https://copiousfreetime.semaphoreci.com/projects/launchy)
 
 * [Homepage](https://github.com/copiousfreetime/launchy)
 * [Github Project](https://github.com/copiousfreetime/launchy)
@@ -27,14 +26,14 @@ testing environment, or via its API.
 
 ### Commandline
 
-    % launchy http://www.ruby-lang.org/
+    % launchy https://www.ruby-lang.org/
 
 There are additional command line options, use `launchy --help` to see them.
 
 ### Using the `BROWSER` environment variable
 
 Launchy has a predefined set of common browsers on each platform that it
-attempts to use, and of course it is not exhaustive. As a fallbabck you can make
+attempts to use, and of course it is not exhaustive. As a fallback you can make
 use of the somewhat standard `BROWSER` environment variable.
 
 `BROWSER` works in a similar same way to `PATH`. It is a colon (`:`) separated
@@ -43,10 +42,10 @@ you are attempting to open will be substituted there.
 
 As an example if you set `BROWSER=/usr/local/bin/firefox-bin -new-tab
 '%s':/usr/local/bin/google-chrome-stable` and you call
-`Launchy.open("http://www.ruby-lang.org/")` then Launchy will try, in order:
+`Launchy.open("https://www.ruby-lang.org/")` then Launchy will try, in order:
 
-* `/usr/local/bin/firefox-bin -new-tab 'http://www.ruby-lang.org'`
-* `/usr/local/bin/google-chrome-stable http://www.ruby-lang.org`
+* `/usr/local/bin/firefox-bin -new-tab 'https://www.ruby-lang.org'`
+* `/usr/local/bin/google-chrome-stable https://www.ruby-lang.org`
 
 Additional links on the use of `BROWSER` as an environment variable.
 
@@ -83,7 +82,7 @@ in integration tests. For example:
 
 ### Public API
 
-In the vein of [Semantic Versioning](http://semver.org), this is the sole
+In the vein of [Semantic Versioning](https://semver.org), this is the sole
 supported public API.
 
     Launchy.open( uri, options = {} ) { |exception| }
@@ -93,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
@@ -102,53 +100,18 @@ exception that was raised.
 
 ### An example of using the public API:
 
-    Launchy.open( "http://www.ruby-lang.org" )
+    Launchy.open( "https://www.ruby-lang.org" )
 
 ### An example of using the public API and using the error block:
 
-    uri = "http://www.ruby-lang.org"
+    uri = "https://www.ruby-lang.org"
     Launchy.open( uri ) do |exception|
       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("http://www.ruby-lang.org/")
-
-and
-
-    Launchy::Browser.new.visit("http://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
 
-http://opensource.org/licenses/isc-license.txt
+https://opensource.org/licenses/isc-license.txt
 
 Copyright (c) 2007-2020 Jeremy Hinegardner
 

data/Rakefile

@@ -4,15 +4,17 @@ 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.homepage = "https://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
-  spec.add_dependency( 'addressable', '~> 2.7')
+  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.14' )
-  spec.add_development_dependency( 'rdoc'     , '~> 6.2' )
-  spec.add_development_dependency( 'simplecov', '~> 0.18' )
+  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/applications/browser.rb

@@ -64,12 +64,12 @@ class Launchy::Application
     end
 
     def cmd_and_args( uri, options = {} )
-      cmd = browser_cmdline
+      cmd = browser_cmdline.to_s
       args = [ uri.to_s ]
       if cmd =~ /%s/ then
         cmd.gsub!( /%s/, args.shift )
       end
-      return [cmd, args]
+      [cmd, args]
     end
 
     # final assembly of the command and do %s substitution 

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.0"
+  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/applications/browser_spec.rb

@@ -13,22 +13,17 @@ describe Launchy::Application::Browser do
     ENV.delete( 'BROWSER' )
   end
 
-  { 'windows' => 'start "launchy" /b' ,
-    'darwin'  => [ '/usr/bin/open', '/bin/open' ], # because running tests on linux
-    'cygwin'  => 'cmd /C start "launchy" /b',
-    'linux'   => [nil, "xdg-open"], # because running tests on linux
-  }.each  do |host_os, expected|
-    it "when host_os is '#{host_os}' the appropriate 'app_list' method is called" do
+  { 'windows' => 'windows_app_list',
+    'darwin'  => 'darwin_app_list',
+    'cygwin'  => 'cygwin_app_list',
+    'linux'   => 'nix_app_list',
+  }.each  do |host_os, called_method|
+    it "when host_os is '#{host_os}' the '#{called_method}' method is called" do
       Launchy.host_os = host_os
       browser = Launchy::Application::Browser.new
-
-      item = browser.app_list.first
-      item = item.to_s if item.kind_of?(::Launchy::Argv)
-      case expected
-      when Array
-        _(expected).must_include item
-      when String
-        _(item).must_equal expected
+      browser.stub(called_method, [:called_me]) do
+        item = browser.app_list.first
+        _(item).must_equal :called_me
       end
     end
   end

data/spec/cli_spec.rb

@@ -45,29 +45,28 @@ describe Launchy::Cli do
 
   it "leaves the url on argv after parsing" do
     l = Launchy::Cli.new
-    argv = %w[ --debug --dry-run http://github.com/copiousfreetime/launchy ]
+    argv = %w[ --debug --dry-run https://github.com/copiousfreetime/launchy ]
     l.parse( argv , {} )
     _(argv.size).must_equal 1
-    _(argv[0]).must_equal "http://github.com/copiousfreetime/launchy" 
+    _(argv[0]).must_equal "https://github.com/copiousfreetime/launchy" 
   end
 
   it "prints the command on stdout when using --dry-run" do
-   argv = %w[ --debug --dry-run http://github.com/copiousfreetime/launchy ]
+   argv = %w[ --debug --dry-run https://github.com/copiousfreetime/launchy ]
    Launchy::Cli.new.good_run( argv, {} )
    _($stdout.string).must_match %r[github.com]
   end
 
   {
     '--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], "http://github.com/copiousfreetime/launchy" ]
+      argv = [ opt, val[1], "https://github.com/copiousfreetime/launchy" ]
       l = Launchy::Cli.new
       rc = l.parse( argv, {} )
       _(rc).must_equal true
       _(argv.size).must_equal 1
-      _(argv[0]).must_equal "http://github.com/copiousfreetime/launchy"
+      _(argv[0]).must_equal "https://github.com/copiousfreetime/launchy"
       _(l.options[val[0]]).must_equal val[1]
     end
   end