native-package-installer 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa12c4733223ecb4697821c92e0eaba5112bbfae5a555bfd1c3210d056f5395
-  data.tar.gz: ba2f24290c5a26fe092925136dd29965f9cc8bd803e9c18ad28343b01928f0ab
+  metadata.gz: 19dbe539e67e615403c379579a487662f8a499e80a43655b71318c564cd41c32
+  data.tar.gz: 26896ad5978fe06d6ac3330b52b354a1afd7f892a00d2306ba1d5e01df972949
 SHA512:
-  metadata.gz: 39a5ed187c1f0a687216ccdc18035c9e7ff9f13a963e788831d17c4d9667227cb8aa6e51d3948f08d10f4331c872879e9b8288bca86ea5331abe5e050458279a
-  data.tar.gz: 502a728e427413d0e41f747bad0b6ab4bd4ae0c4ab1578db3ac8c4daa86feaf893446aaaa29b1e6d529572795a3084d4300e375b00ed96bdc41dafc51ec14b69
+  metadata.gz: 5d9d33138bdfacba49aa33656a58c0b18cf0a961d1f3af83b8f147c40a1d307f8960755a4cd030955ecfa1f7a5cfc218393517821afa3a5969436801c008945a
+  data.tar.gz: 8b146df8007452ca25c470f31140df2326270815fb4195ee167c52b32305dc9906044d425063cd4f1ab86d9d9207f1065165a9ed4949934c03d83d7de944bb53

data/doc/text/news.md

@@ -1,5 +1,36 @@
 # News
 
+## 1.1.4 - 2022-03-17
+
+### Improvements
+
+  * Added support for Amazon Linux.
+    [GitHub#14][Reported by docusend1]
+
+  * Renamed the key for Red Hat Enterprise Linux based system such as
+    AlmaLinux and CentOS to `:rhel` from `:redhat`. `:redhat` still
+    can be used to keep backward compatibility.
+
+### Thanks
+
+  * docusend1
+
+## 1.1.3 - 2022-01-18
+
+### Fixes
+
+  * Fixed wrong package install on Windows.
+
+## 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/{test/run-test.rb → lib/native-package-installer/platform/amazon-linux.rb}

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-#
-# Copyright (C) 2013  Ruby-GNOME Project Team
+# Copyright (C) 2022  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,9 +13,27 @@
 # 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/>.
 
-$VERBOSE = true
+require_relative "red-hat-enterprise-linux"
+
+class NativePackageInstaller
+  module Platform
+    class AmazonLinux < RedHatEnterpriseLinux
+      Platform.register(self)
+
+      class << self
+        def current_platform?
+          os_release = OSRelease.new
+          os_release.id == "amzn"
+        end
+      end
 
-require "test-unit"
-require "test/unit/rr"
+      def package(spec)
+        spec[:amazon_linux] || super
+      end
 
-exit(Test::Unit::AutoRunner.run(true))
+      def install_command
+        "yum install -y"
+      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,12 +20,13 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          File.exist?("/etc/fedora-release")
+          os_release = OSRelease.new
+          os_release.id == "fedora"
         end
       end
 
       def package(spec)
-        spec[:fedora] || spec[:redhat]
+        spec[:fedora] || spec[:rhel] || spec[:redhat]
       end
 
       def install_command

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 → red-hat-enterprise-linux.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
@@ -15,17 +15,18 @@
 
 class NativePackageInstaller
   module Platform
-    class RedHat
+    class RedHatEnterpriseLinux
       Platform.register(self)
 
       class << self
         def current_platform?
-          File.exist?("/etc/redhat-release")
+          os_release = OSRelease.new
+          os_release.id_like.include?("rhel")
         end
       end
 
       def package(spec)
-        spec[:redhat]
+        spec[:rhel] || spec[:redhat]
       end
 
       def install_command

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,12 +20,13 @@ class NativePackageInstaller
 
       class << self
         def current_platform?
-          File.exist?("/etc/SuSE-release")
+          os_release = OSRelease.new
+          os_release.id_like.include?("suse")
         end
       end
 
       def package(spec)
-        spec[:suse] || spec[:fedora] || spec[:redhat]
+        spec[:suse] || spec[:fedora] || spec[:rhel] || spec[:redhat]
       end
 
       def install_command

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-2022  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,45 @@ 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"
+# macOS
+require_relative "platform/macports"
 
-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_relative "platform/homebrew"
 
-require "native-package-installer/platform/homebrew"
 
-require "native-package-installer/platform/macports"
+# FreeBSD
+require_relative "platform/freebsd"
 
-require "native-package-installer/platform/unknown"
+
+# 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/red-hat-enterprise-linux"
+require_relative "platform/amazon-linux"
+require_relative "platform/fedora"
+
+require_relative "platform/suse"
+
+
+# Windows
+require_relative "platform/msys2"
+
+
+# Fallback
+require_relative "platform/unknown"

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

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2021  Ruby-GNOME Project Team
+# Copyright (C) 2013-2022  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
@@ -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.4"
 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

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: native-package-installer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit-rr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2022-03-16 00:00:00.000000000 Z
+dependencies: []
 description: |-
   Users need to install native packages to install an extension library
   that depends on native packages. It bores users because users need to
@@ -73,8 +31,10 @@ 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/amazon-linux.rb
 - lib/native-package-installer/platform/arch-linux.rb
 - lib/native-package-installer/platform/debian.rb
 - lib/native-package-installer/platform/fedora.rb
@@ -83,13 +43,11 @@ files:
 - lib/native-package-installer/platform/macports.rb
 - lib/native-package-installer/platform/msys2.rb
 - lib/native-package-installer/platform/pld-linux.rb
-- lib/native-package-installer/platform/redhat.rb
+- lib/native-package-installer/platform/red-hat-enterprise-linux.rb
 - lib/native-package-installer/platform/suse.rb
 - lib/native-package-installer/platform/ubuntu.rb
 - lib/native-package-installer/platform/unknown.rb
 - lib/native-package-installer/version.rb
-- test/run-test.rb
-- test/test-executable-finder.rb
 homepage: https://github.com/ruby-gnome/native-package-installer
 licenses:
 - LGPL-3+
@@ -109,10 +67,8 @@ 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"
-test_files:
-- test/run-test.rb
-- test/test-executable-finder.rb
+test_files: []

data/test/test-executable-finder.rb

@@ -1,90 +0,0 @@
-# Copyright (C) 2013  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/>.
-
-require "fileutils"
-
-require "native-package-installer/executable-finder"
-
-class ExecutableFinderTest < Test::Unit::TestCase
-  def setup
-    @original_path = ENV["PATH"]
-    setup_base_dir
-    setup_path
-  end
-
-  def setup_base_dir
-    @base_dir = File.join(File.dirname(__FILE__), "tmp")
-    FileUtils.rm_rf(@base_dir)
-    FileUtils.mkdir_p(@base_dir)
-  end
-
-  def teardown_base_dir
-    FileUtils.rm_rf(@base_dir)
-  end
-
-  def setup_path
-    paths = [
-      File.join(@base_dir, "nonexistent"),
-      File.join(@base_dir, "bin"),
-      File.join(@base_dir, "sbin"),
-    ]
-    ENV["PATH"] = paths.join(File::PATH_SEPARATOR)
-  end
-
-  def teardown
-    teardown_base_dir
-    ENV["PATH"] = @original_path
-  end
-
-  private
-  def create_finder(basename)
-    NativePackageInstaller::ExecutableFinder.new(basename)
-  end
-
-  class TestFind < self
-    def test_found
-      finder = create_finder("ls")
-      ls = File.join(@base_dir, "bin", "ls")
-      stub(File).stat(ls) do
-        stat = stub(Object.new)
-        stat.file? {true}
-        stat.executable? {true}
-        stat
-      end
-      stub(File).stat.with_any_args do
-        raise Errno::ENOENT
-      end
-      assert_equal(ls, finder.find)
-    end
-  end
-
-  class TestExist < self
-    def test_true
-      finder = create_finder("ls")
-      stub(finder).find do
-        File.join(@base_dir, "bin", "ls")
-      end
-      assert_true(finder.exist?)
-    end
-
-    def test_false
-      finder = create_finder("ls")
-      stub(finder).find do
-        nil
-      end
-      assert_false(finder.exist?)
-    end
-  end
-end