native-package-installer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6787655da3e53dd28304ac2a6e41f0bac54615d0
-  data.tar.gz: 42101e7d1d488adc27ea597c38cf533d9ac3b06f
+  metadata.gz: b6e3c5da042003709458a9887de63c2168ebd7f5
+  data.tar.gz: fe1f9f8e3ca5ae08564d39532407ef04e89e5658
 SHA512:
-  metadata.gz: 7da03fb0cf1988b3af75b1ddc042c5d1fd7d160e2992d78623c7cbc1801d0b84533e2be4c86305abde20bf1640ea7cb6529083b40ed16700689d1fba45cf0f5d
-  data.tar.gz: 317ecbb09eb80d8e14ad25b342142404c448871dbc185e44d97b47dd6be999b8fe2bf262f54d37ca800519bf66bcf873cc90ef6216a8a5734b475f69d18dbf24
+  metadata.gz: e32b604008cb25c60a6e90dc4af8947bc17bcf35c4a6e0af52275187c1ecbf6cb0c2db4f8584cc616e6f6e07906df0a0ebe145d8d83a4519110141d6febf1e55
+  data.tar.gz: ee23905ddab477cd13347f652cb0bb1ad2d51daa9fe4cf9dbd4993d51327dd35057775d4c059ccfcd3d76419353ce10ed6ed8059b8084a8a3e39277ceb79f4c3

data/doc/text/news.md

@@ -1,5 +1,22 @@
 # News
 
+## 1.0.2 - 2017-05-29
+
+### Improvements
+
+  * Supported DNF on Fedora.
+    [GitHub#3][Reported by Vít Ondruch]
+
+  * Supported MSYS2.
+
+### Fixes
+
+  * Fixed broken messages.
+
+### Thanks
+
+  * Vít Ondruch
+
 ## 1.0.1 - 2017-05-03
 
 ### Improvements

data/lib/native-package-installer.rb

@@ -33,8 +33,6 @@ class NativePackageInstaller
   end
 
   def install
-    return true if windows?
-
     package = @platform.package(@spec)
     return false if package.nil?
 
@@ -79,13 +77,13 @@ class NativePackageInstaller
     unless succeeded
       if failed_to_get_super_user_priviledge
         error_message = <<-MESSAGE
-{package_name}' native package is required.
-n the following command as super user to install required native package:
-\# #{install_command}
+'#{package_name}' native package is required.
+Run the following command as super user to install required native package:
+  \# #{install_command}
         MESSAGE
       else
         error_message = <<-MESSAGE
-iled to run '#{install_command}'.
+Failed to run '#{install_command}'.
         MESSAGE
       end
     end
@@ -100,10 +98,6 @@ iled to run '#{install_command}'.
   end
 
   private
-  def windows?
-    /mswin|mingw|cygwin/ === RUBY_PLATFORM
-  end
-
   def super_user?
     Process.uid.zero?
   end

data/lib/native-package-installer/executable-finder.rb

@@ -29,6 +29,7 @@ class NativePackageInstaller
 
     def initialize(basename)
       @basename = basename
+      @appended_paths = []
     end
 
     def find
@@ -50,14 +51,19 @@ class NativePackageInstaller
       not find.nil?
     end
 
+    def append_path(path)
+      @appended_paths << path
+    end
+
     private
     def paths
       path_env = ENV["PATH"]
       if path_env
-        path_env.split(File::PATH_SEPARATOR)
+        base_paths = path_env.split(File::PATH_SEPARATOR)
       else
-        ["/usr/local/bin", "/usr/bin", "/bin"]
+        base_paths = ["/usr/local/bin", "/usr/bin", "/bin"]
       end
+      base_paths + @appended_paths
     end
 
     def detect_extensions

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

@@ -42,4 +42,5 @@ require "native-package-installer/platform/alt-linux"
 require "native-package-installer/platform/arch-linux"
 require "native-package-installer/platform/homebrew"
 require "native-package-installer/platform/macports"
+require "native-package-installer/platform/msys2"
 require "native-package-installer/platform/unknown"

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

@@ -13,11 +13,9 @@
 # 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/redhat"
-
 class NativePackageInstaller
   module Platform
-    class Fedora < RedHat
+    class Fedora
       Platform.register(self)
 
       class << self
@@ -27,7 +25,15 @@ class NativePackageInstaller
       end
 
       def package(spec)
-        spec[:fedora] || super
+        spec[:fedora] || spec[:rehat]
+      end
+
+      def install_command
+        "dnf install -y"
+      end
+
+      def need_super_user_priviledge?
+        true
       end
     end
   end

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

@@ -0,0 +1,70 @@
+# Copyright (C) 2017  Ruby-GNOME2 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
+  module Platform
+    class MSYS2
+      Platform.register(self)
+
+      class << self
+        def current_platform?
+          return false if package_prefix.nil?
+          not pacman_path.nil?
+        end
+
+        def pacman_path
+          finder = ExecutableFinder.new("pacman")
+          case RUBY_PLATFORM
+          when "x86-mingw32"
+            Dir.glob("c:/msys{64,32,*}/usr/bin") do |bin|
+              finder.append_path(bin)
+            end
+          when "x64-mingw32"
+            Dir.glob("c:/msys{64,*}/usr/bin") do |bin|
+              finder.append_path(bin)
+            end
+          end
+          finder.find
+        end
+
+        def package_prefix
+          case RUBY_PLATFORM
+          when "x86-mingw32"
+            "mingw-w64-i686-"
+          when "x64-mingw32"
+            "mingw-w64-x86_64-"
+          else
+            nil
+          end
+        end
+      end
+
+      def package(spec)
+        base_name = spec[:msys2]
+        return nil if base_name.nil?
+
+        "#{self.class.package_prefix}#{base_name}"
+      end
+
+      def install_command
+        "#{self.class.pacman_path} -S --noconfirm"
+      end
+
+      def need_super_user_priviledge?
+        false
+      end
+    end
+  end
+end

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

@@ -28,7 +28,6 @@ class NativePackageInstaller
         spec[:redhat]
       end
 
-
       def install_command
         "yum install -y"
       end

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.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: native-package-installer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - lib/native-package-installer/platform/freebsd.rb
 - lib/native-package-installer/platform/homebrew.rb
 - lib/native-package-installer/platform/macports.rb
+- lib/native-package-installer/platform/msys2.rb
 - lib/native-package-installer/platform/redhat.rb
 - lib/native-package-installer/platform/suse.rb
 - lib/native-package-installer/platform/unknown.rb