rakelib/lib/config/pkgman/macosx.rb in wxruby3-0.9.7 vs rakelib/lib/config/pkgman/macosx.rb in wxruby3-0.9.8

@@ -16,11 +16,11 @@
 
         class << self
 
           def install(pkgs)
             # do we need to install anything?
-            if !pkgs.empty?
+            unless pkgs.empty?
               # can we install XCode commandline tools?
               unless no_autoinstall? || !pkgs.include?('xcode') || has_sudo? || is_root?
                 STDERR.puts 'ERROR: Cannot check for or install required packages. Please install sudo or run as root and try again.'
                 exit(1)
               end
@@ -48,129 +48,68 @@
             end
           end
 
           private
 
+          def pkgman
+            @pkgman ||= WXRuby3.config.sysinfo.os.pkgman
+          end
+
           def do_install(pkgs)
             rc = true
             # first see if we need to install XCode commandline tools
             if pkgs.include?('xcode')
               pkgs.delete('xcode')
-              rc = run('xcode-select --install')
+              rc = auth_run('xcode-select --install')
             end
-            # now check if we need any other packages (which need Homebrew or MacPorts)
+            # now check if we need any other packages
             if rc && !pkgs.empty?
-              # Has Ruby been installed through MacPorts?
-              if has_macports? &&
-                    (ruby_info = expand('port -q installed installed').strip.split("\n").find { |ln| ln.strip =~ /\Aruby\d+\s/ })
+              if pkgman.macports?
 
                 # this is really crap; with MacPorts we need to install swig-ruby instead of simply swig
                 # which for whatever nonsensical reason will pull in another (older) Ruby version (probably 2.3 or such)
                 # although SWIG's Ruby support is version agnostic and has no binary bindings
                 if pkgs.include?('swig')
                   pkgs.delete('swig')
                   pkgs << 'swig-ruby'
                 end
-                # in case MacPorts was installed with root privileges this install would also have to be run
-                # with root privileges (otherwise it would fail early on with access problems) so we can
-                # just run without sudo as we either have root privileges for root-installed MacPorts or
-                # we're running without root privileges for user-installed MacPorts
-                pkgs.each { |pkg| rc &&= sh("port install #{pkg}") }
 
-              # or are we running without root privileges and have Homebrew installed?
-              # (Ruby may be installed using Homebrew itself or using a Ruby version manager like RVM)
-              elsif !is_root? && has_homebrew?
-
-                pkgs.each { |pkg| rc &&= sh("brew install #{pkg}") }
-
-              # or do we have MacPorts (running either privileged or not) and
-              # a Ruby installed using a Ruby version manager.
-              elsif has_macports?
-
-                # same crap as above
-                if pkgs.include?('swig')
-                  pkgs.delete('swig')
-                  pkgs << 'swig-ruby'
-                end
-                # in case MacPorts was installed with root privileges this install would also have to be run
-                # with root privileges (otherwise it would fail early on with access problems) so we can
-                # just run without sudo as we either have root privileges for root-installed MacPorts or
-                # we're running without root privileges for user-installed MacPorts
-                pkgs.each { |pkg| rc &&= sh("port install #{pkg}") }
-
-              else
-                if has_homebrew? || is_root?
-                  $stderr.puts <<~__ERROR_TXT
-                    ERROR: Unsupported Ruby installation. wxRuby3 can only be installed for Ruby with root privileges
-                           in case Ruby was installed with MacPorts. Homebrew should not be run with root privileges.
-                      
-                    Re-install a supported Ruby setup and try again.
-                    __ERROR_TXT
-                else
-                  $stderr.puts <<~__ERROR_TXT
-                    ERROR: Unsupported Ruby installation. wxRuby3 requires either a MacPorts installed Ruby version 
-                           or a non-privileged Ruby installation and have Homebrew installed.
-                      
-                    Install either Homebrew or MacPorts and try again.
-                    __ERROR_TXT
-                end
-                exit(1)
               end
+
+              # actually install packages
+              pkgs.each { |pkg| rc &&= run(pkgman.make_install_command(pkg)); break unless rc }
             end
             rc
           end
 
-          def builds_wxwidgets?
-            Config.get_config('with-wxwin') && Config.get_cfg_string('wxwin').empty?
-          end
-
           def no_autoinstall?
             Config.get_config('autoinstall') == false
           end
 
           def wants_autoinstall?
             WXRuby3.config.wants_autoinstall?
           end
 
           def has_sudo?
-            system('command -v sudo > /dev/null')
+            WXRuby3.config.sysinfo.os.has_sudo?
           end
 
           def is_root?
-            if @is_root.nil?
-              @is_root = (`id -u 2>/dev/null`.chomp == '0')
-            end
-            @is_root
+            WXRuby3.config.sysinfo.os.is_root?
           end
 
-          def has_macports?
-            if @has_macports.nil?
-              @has_macports = system('command -v port>/dev/null')
-            end
-          end
-
-          def has_homebrew?
-            if @has_homebrew.nil?
-              @has_homebrew = system('command -v brew>/dev/null')
-            end
-          end
-
-          def run(cmd)
+          def auth_run(cmd)
             $stdout.print "Running #{cmd}..."
             rc = WXRuby3.config.sh("#{is_root? ? '' : 'sudo '}#{cmd}")
-            $stderr.puts (rc ? 'done!' : 'FAILED!')
+            $stderr.puts(rc ? 'done!' : 'FAILED!')
             rc
           end
 
-          def sh(*cmd, title: nil)
+          def run(*cmd, title: nil)
             $stdout.print(title ? title : "Running #{cmd}...")
             rc = WXRuby3.config.sh(*cmd)
-            $stderr.puts (rc ? 'done!' : 'FAILED!')
+            $stderr.puts(rc ? 'done!' : 'FAILED!')
             rc
-          end
-
-          def expand(cmd)
-            WXRuby3.config.expand(cmd)
           end
 
         end
 
       end