native-package-installer 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa12c4733223ecb4697821c92e0eaba5112bbfae5a555bfd1c3210d056f5395
-  data.tar.gz: ba2f24290c5a26fe092925136dd29965f9cc8bd803e9c18ad28343b01928f0ab
+  metadata.gz: f81b6a31d687db3d8f2b8a18e81b1a5fcd89531561940774c31b115e2068d4ee
+  data.tar.gz: 3f015fe58c1046a6db4adae8ca89487f136e2155ac3de47efe142fdd6b02c58f
 SHA512:
-  metadata.gz: 39a5ed187c1f0a687216ccdc18035c9e7ff9f13a963e788831d17c4d9667227cb8aa6e51d3948f08d10f4331c872879e9b8288bca86ea5331abe5e050458279a
-  data.tar.gz: 502a728e427413d0e41f747bad0b6ab4bd4ae0c4ab1578db3ac8c4daa86feaf893446aaaa29b1e6d529572795a3084d4300e375b00ed96bdc41dafc51ec14b69
+  metadata.gz: e6ce52d9eb449fe1ec2a98a83d6e719eb9e301e00122dc676e18871c5d00660c1c5331dc9dfa5903eabebecef4fe891e60479b1893f96f95f50a4f9d992f2510
+  data.tar.gz: feaa63f0b76edeea500b41ec03d442122763f63b7abbf8aa05cb47f614d301eb9eccbc36584568e86e60d3c294eb4e945aa97949515d0134f3d19f43ea95ba7f

data/doc/text/news.md

@@ -1,5 +1,15 @@
 # News
 
+## 1.1.2 - 2022-01-18
+
+### Improvements
+
+  * Changed priority for Homebrew on Linux. System package manager is preferred.
+
+  * Improved OpenSuSE detection.
+
+  * Added support for Ruby 3.1 based RubyInstaller.
+
 ## 1.1.1 - 2021-01-17
 
 ### Improvements

data/lib/native-package-installer/os-release.rb

@@ -0,0 +1,55 @@
+# Copyright (C) 2021  Ruby-GNOME Project Team
+#
+# This library is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+class NativePackageInstaller
+  class OSRelease
+    include Enumerable
+
+    def initialize
+      parse
+    end
+
+    def each(&block)
+      @variables.each(&block)
+    end
+
+    def [](key)
+      @variables[key]
+    end
+
+    def id
+      self["ID"]
+    end
+
+    def id_like
+      (self["ID_LIKE"] || "").split(/ /)
+    end
+
+    private
+    def parse
+      @variables = {}
+      path = "/etc/os-release"
+      return unless File.exist?(path)
+      File.foreach(path) do |line|
+        key, value = line.strip.split("=", 2)
+        next if value.nil?
+        if value.start_with?("\"") and value.end_with?("\"")
+          value = value[1..-2]
+        end
+        @variables[key] = value
+      end
+    end
+  end
+end

data/lib/native-package-installer/platform/alt-linux.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -13,22 +13,29 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "native-package-installer/platform/debian"
-
 class NativePackageInstaller
   module Platform
-    class ALTLinux < Debian
+    class ALTLinux
       Platform.register(self)
 
       class << self
         def current_platform?
-          File.exist?("/etc/altlinux-release")
+          os_release = OSRelease.new
+          os_release.id == "altlinux"
         end
       end
 
       def package(spec)
         spec[:alt_linux]
       end
+
+      def install_command
+        "apt-get install -V -y"
+      end
+
+      def need_super_user_priviledge?
+        true
+      end
     end
   end
 end

data/lib/native-package-installer/platform/debian.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2019  Ruby-GNOME Project Team
+# Copyright (C) 2013-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -20,16 +20,14 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          return false unless File.exist?("/etc/os-release")
-          File.readlines("/etc/os-release").each do |line|
-            case line.chomp
-            when "ID=debian"
-              return true
-            when "ID=raspbian"
-              return true
-            end
+          os_release = OSRelease.new
+          case os_release.id
+          when "debian", "raspbian"
+            return true
+          else
+            return true if os_release.id_like.include?("debian")
           end
-          return false
+          false
         end
       end
 
@@ -38,7 +36,7 @@ class NativePackageInstaller
       end
 
       def install_command
-        "apt install -V -y"
+        "apt-get install -V -y"
       end
 
       def need_super_user_priviledge?

data/lib/native-package-installer/platform/fedora.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME Project Team
+# Copyright (C) 2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,8 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          File.exist?("/etc/fedora-release")
+          os_release = OSRelease.new
+          os_release.id == "fedora"
         end
       end
 

data/lib/native-package-installer/platform/msys2.rb

@@ -31,7 +31,7 @@ class NativePackageInstaller
             Dir.glob("c:/msys{64,32,*}/usr/bin") do |bin|
               finder.append_path(bin)
             end
-          when "x64-mingw32"
+          when "x64-mingw32", "x64-mingw-ucrt"
             Dir.glob("c:/msys{64,*}/usr/bin") do |bin|
               finder.append_path(bin)
             end
@@ -45,6 +45,8 @@ class NativePackageInstaller
             "mingw-w64-i686-"
           when "x64-mingw32"
             "mingw-w64-x86_64-"
+          when "x64-mingw-ucrt"
+            "mingw-w64-ucrt-x86_64-"
           else
             nil
           end

data/lib/native-package-installer/platform/redhat.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  Ruby-GNOME Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,8 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          File.exist?("/etc/redhat-release")
+          os_release = OSRelease.new
+          os_release.id_like.include?("rhel")
         end
       end
 

data/lib/native-package-installer/platform/suse.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,8 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          File.exist?("/etc/SuSE-release")
+          os_release = OSRelease.new
+          os_release.id_like.include?("suse")
         end
       end
 

data/lib/native-package-installer/platform/ubuntu.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2019  Ruby-GNOME Project Team
+# Copyright (C) 2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "native-package-installer/platform/debian"
+require_relative "debian"
 
 class NativePackageInstaller
   module Platform
@@ -22,10 +22,14 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          return false unless File.exist?("/etc/lsb-release")
-          File.readlines("/etc/lsb-release").any? do |line|
-            line.chomp == "DISTRIB_ID=Ubuntu"
+          os_release = OSRelease.new
+          case os_release.id
+          when "ubuntu"
+            return true
+          else
+            return true if os_release.id_like.include?("ubuntu")
           end
+          false
         end
       end
 

data/lib/native-package-installer/platform.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  Ruby-GNOME Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -23,31 +23,44 @@ class NativePackageInstaller
       end
 
       def detect
-        platform_class = PLATFORM_CLASSES.find do |platform_class|
-          platform_class.current_platform?
+        PLATFORM_CLASSES.reverse_each do |platform_class|
+          return platform_class.new if platform_class.current_platform?
         end
-        platform_class ||= Unknown
-        platform_class.new
+        Unknown.new
       end
     end
   end
 end
 
-require "native-package-installer/platform/msys2"
 
-require "native-package-installer/platform/freebsd"
+# Windows
+require_relative "platform/msys2"
 
-require "native-package-installer/platform/alt-linux"
-require "native-package-installer/platform/arch-linux"
-require "native-package-installer/platform/debian"
-require "native-package-installer/platform/fedora"
-require "native-package-installer/platform/pld-linux"
-require "native-package-installer/platform/redhat"
-require "native-package-installer/platform/suse"
-require "native-package-installer/platform/ubuntu"
 
-require "native-package-installer/platform/homebrew"
+# macOS
+require_relative "platform/macports"
 
-require "native-package-installer/platform/macports"
+require_relative "platform/homebrew"
 
-require "native-package-installer/platform/unknown"
+
+# FreeBSD
+require_relative "platform/freebsd"
+
+
+# Linux
+require_relative "platform/arch-linux"
+
+require_relative "platform/debian"
+require_relative "platform/ubuntu"
+require_relative "platform/alt-linux"
+
+require_relative "platform/pld-linux"
+
+require_relative "platform/redhat"
+require_relative "platform/fedora"
+
+require_relative "platform/suse"
+
+
+# Fallback
+require_relative "platform/unknown"

data/lib/native-package-installer/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class NativePackageInstaller
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/native-package-installer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Ruby-GNOME Project Team
+# Copyright (C) 2017-2021  Ruby-GNOME Project Team
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -15,10 +15,12 @@
 
 require "shellwords"
 
-require "native-package-installer/version"
+require_relative "native-package-installer/version"
 
-require "native-package-installer/executable-finder"
-require "native-package-installer/platform"
+require_relative "native-package-installer/executable-finder"
+require_relative "native-package-installer/os-release"
+
+require_relative "native-package-installer/platform"
 
 class NativePackageInstaller
   class << self

data/test/run-test.rb

@@ -20,4 +20,10 @@ $VERBOSE = true
 require "test-unit"
 require "test/unit/rr"
 
-exit(Test::Unit::AutoRunner.run(true))
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+lib_dir = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+$LOAD_PATH.unshift(lib_dir)
+
+exit(Test::Unit::AutoRunner.run(true, test_dir))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: native-package-installer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - doc/text/news.md
 - lib/native-package-installer.rb
 - lib/native-package-installer/executable-finder.rb
+- lib/native-package-installer/os-release.rb
 - lib/native-package-installer/platform.rb
 - lib/native-package-installer/platform/alt-linux.rb
 - lib/native-package-installer/platform/arch-linux.rb
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: native-package-installer helps to install native packages on "gem install"