pkg-config 1.3.9 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026c6c256fc6bb3656cfcde885adcc911f26987d1ac26d48d87f724ebc4045a2
-  data.tar.gz: 95cbb634f8f37a2dd5d6ef3b644a45f810c8ef99d834e9281402e50ce5233dde
+  metadata.gz: 58f40c4efe4e315db21fe3ce7c7e259d4224d1734972cf461296ccc02f8c66db
+  data.tar.gz: 31e2395b16ace3ccc5aeed7dd6882496345fc9a3d23eb49082b4875f78face11
 SHA512:
-  metadata.gz: 64c6915207090a91ca6d24e4de7c34fb368d3c32c901e8b56c06c2fc0e275742658e05b29ee7477124cf4038eb6f8269abbf7712f1a538dfc9155d4976d7b048
-  data.tar.gz: 5ff7d590b763b9b5c114887ec5ee32f311bdfad06da4c8e696bb1f129906b2f511a018d3508ce71dd69b1ff9bbc217fc596d7a2d0a9efaf1a0814d4ead86bb32
+  metadata.gz: 61e27036ff20e04388cab0f72f0a035bfd830aff868df6a1fd25bb68a885709c858ef0acce9b829b7924e307e8c768692e4e589c5c06efc3d7d866902900917a
+  data.tar.gz: 83747ac073b00b669671e64255a039190e947b1ad0c52770677d85d3ae6624968cd2ee975d0fcfdac1e31341bf2748a7bbe430d0a9502312248478e2249206e7

data/NEWS

@@ -1,5 +1,49 @@
 = NEWS
 
+== 1.4.4 - 2020-09-23
+
+=== Fixes
+
+  * Fixed a bug that NoMethodError instead of
+    PackageConfig::NotFoundError is raised.
+    [Fixed by kojix2][GitHub#21]
+
+=== Thanks
+
+  * kojix2
+
+== 1.4.3 - 2020-09-15
+
+=== Improvements
+
+  * Changed to use PackageConfig::NotFoundError instead of RuntimeError
+    for exception on no .pc is found.
+
+== 1.4.2 - 2020-08-10
+
+=== Improvements
+
+  * Added support for detecting pkgconfig path on RubyInstaller
+    without "ridk exec".
+
+== 1.4.1 - 2020-02-10
+
+=== Improvements
+
+  * Added support for cycled depended .pc such as freetype2.pc and
+    harfbuzz.pc on PLD Linux.
+    [Reported by Jakub Bogusz]
+
+=== Thanks
+
+  * Jakub Bogusz
+
+== 1.4.0 - 2019-10-24
+
+=== Improvements
+
+  * Improved Homebrew detection.
+
 == 1.3.9 - 2019-09-28
 
 === Improvements

data/README.rdoc

@@ -8,17 +8,13 @@ pkg-config
 
 A pkg-config implementation by Ruby.
 
-== Dependencies
-
-* ruby >= 1.8 (1.9.2 is also supported!)
-
 == Install
 
   # gem install pkg-config
 
 == Documents
 
-* TODO
+* https://rubydoc.info/gems/pkg-config
 
 == Source
 
@@ -27,7 +23,7 @@ http://github.com/ruby-gnome/pkg-config
 
 == Copyright
 
-Copyright 2008-2019 Kouhei Sutou <kou@clear-code.com>
+Copyright 2008-2020 Kouhei Sutou <kou@clear-code.com>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
@@ -45,10 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 See LGPL-2.1 file for details.
 
-== Mailing list
-
-TODO
-
 == Thanks
 
 * Funky Bibimbap

data/lib/pkg-config.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2008-2020  Sutou Kouhei <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,17 +15,22 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 begin
-  require "pkg-config/version"
+  require_relative "pkg-config/version"
 rescue LoadError
 end
 
+require "English"
+require "pathname"
 require "rbconfig"
-
-require 'shellwords'
-require 'English'
-require 'pathname'
+require "shellwords"
 
 class PackageConfig
+  class Error < StandardError
+  end
+
+  class NotFoundError < Error
+  end
+
   SEPARATOR = File::PATH_SEPARATOR
 
   class << self
@@ -122,6 +127,7 @@ class PackageConfig
     def compute_native_pkg_config_prefix
       pkg_config = native_pkg_config
       return nil unless pkg_config.absolute?
+      return nil unless pkg_config.exist?
 
       pkg_config_prefix = pkg_config.parent.parent
       if File::ALT_SEPARATOR
@@ -248,13 +254,15 @@ class PackageConfig
     @path_position
   end
 
-  def collect_requires(&block)
+  def collect_requires(processed_packages={}, &block)
     packages = []
     targets = yield(self)
     targets.each do |name|
+      next if processed_packages.key?(name)
       package = self.class.new(name, @options)
+      processed_packages[name] = package
       packages << package
-      packages.concat(package.collect_requires(&block))
+      packages.concat(package.collect_requires(processed_packages, &block))
     end
     packages_without_self = packages.reject do |package|
       package.name == @name
@@ -357,7 +365,7 @@ class PackageConfig
     all_flags = {}
     flags = []
     in_option = false
-    libs_command_line.gsub(/-([Ll]) /, '\1').split.each do |arg|
+    libs_command_line.gsub(/-([Ll]) /, "\\1").split.each do |arg|
       if in_option
         flags << arg
         in_option = false
@@ -378,12 +386,12 @@ class PackageConfig
 
   IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
-    raise ".pc for #{@name} doesn't exist." unless exist?
+    raise NotFoundError, ".pc doesn't exist: <#{@name}>" unless exist?
     @variables = {}
     @declarations = {}
     File.open(pc_path) do |input|
       input.each_line do |line|
-        line = line.gsub(/#.*/, '').strip
+        line = line.gsub(/#.*/, "").strip
         next if line.empty?
         case line
         when /^(#{IDENTIFIER_RE})=/
@@ -397,7 +405,7 @@ class PackageConfig
 
   def parse_requires(requires)
     return [] if requires.nil?
-    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, '')
+    requires_without_version = requires.gsub(/[<>]?=\s*[\d.a-zA-Z_-]+\s*/, "")
     requires_without_version.split(/[,\s]+/)
   end
 
@@ -437,6 +445,11 @@ class PackageConfig
       "/opt/X11/lib/pkgconfig",
       "/usr/share/pkgconfig",
     ]
+    if Object.const_defined?(:RubyInstaller)
+      mingw_bin_path = RubyInstaller::Runtime.msys2_installation.mingw_bin_path
+      mingw_pkgconfig_path = Pathname.new(mingw_bin_path) + "../lib/pkgconfig"
+      default_paths.unshift(mingw_pkgconfig_path.cleanpath.to_s)
+    end
     libdir = ENV["PKG_CONFIG_LIBDIR"]
     default_paths.unshift(libdir) if libdir
 
@@ -465,14 +478,13 @@ class PackageConfig
           homebrew_repository_candidates << pkg_config_prefix + "Homebrew"
           homebrew_repository_candidates << pkg_config_prefix
         end
-      else
-        brew = self.class.__send__(:search_executable_from_path, "brew")
-        if brew
-          homebrew_repository = `brew --repository`.chomp
-          homebrew_repository_candidates << Pathname(homebrew_repository)
-        end
       end
-      homebrew_repository_candidates.each do |candidate|
+      brew = self.class.__send__(:search_executable_from_path, "brew")
+      if brew
+        homebrew_repository = `brew --repository`.chomp
+        homebrew_repository_candidates << Pathname(homebrew_repository)
+      end
+      homebrew_repository_candidates.uniq.each do |candidate|
         path = candidate + "Library/Homebrew/os/mac/pkgconfig/#{mac_os_version}"
         paths << path.to_s if path.exist?
       end
@@ -514,7 +526,7 @@ module PKGConfig
   end
 
   def msvc?
-    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG['CC'])
+    /mswin/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG["CC"])
   end
 
   def package_config(package)
@@ -589,18 +601,18 @@ module PKGConfig
       dldflags = libs(pkg)
       dldflags = (Shellwords.shellwords(dldflags) -
                   Shellwords.shellwords(libraries))
-      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(' ')
-      $libs   += ' ' + libraries
+      dldflags = dldflags.map {|s| /\s/ =~ s ? "\"#{s}\"" : s }.join(" ")
+      $libs   += " " + libraries
       if /mswin/ =~ RUBY_PLATFORM
-        $DLDFLAGS += ' ' + dldflags
+        $DLDFLAGS += " " + dldflags
       else
-        $LDFLAGS += ' ' + dldflags
+        $LDFLAGS += " " + dldflags
       end
-      $CFLAGS += ' ' + cflags_only_other(pkg)
+      $CFLAGS += " " + cflags_only_other(pkg)
       if defined?($CXXFLAGS)
-        $CXXFLAGS += ' ' + cflags_only_other(pkg)
+        $CXXFLAGS += " " + cflags_only_other(pkg)
       end
-      $INCFLAGS += ' ' + cflags_only_I(pkg)
+      $INCFLAGS += " " + cflags_only_I(pkg)
     end
     enough_version
   end

data/lib/pkg-config/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Kouhei Sutou <kou@cozmixng.org>
+# Copyright 2012-2020  Sutou Kouhei <kou@cozmixng.org>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PKGConfig
-  VERSION = "1.3.9"
+  VERSION = "1.4.4"
 end

data/test/run-test.rb

@@ -6,9 +6,6 @@ base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
-ENV["BUNDLE_GEMFILE"] ||= File.join(base_dir, "Gemfile")
-require "bundler/setup"
-
 require 'test-unit'
 
 $LOAD_PATH.unshift(lib_dir)

data/test/{test_pkg_config.rb → test-pkg-config.rb}

@@ -17,10 +17,10 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_exist?
-    assert(system('pkg-config --exists cairo'))
+    assert(system("pkg-config --exists cairo"))
     assert(@cairo.exist?)
 
-    assert(system('pkg-config --exists cairo-png'))
+    assert(system("pkg-config --exists cairo-png"))
     assert(@cairo_png.exist?)
   end
 
@@ -94,7 +94,7 @@ class PkgConfigTest < Test::Unit::TestCase
     @cairo.msvc_syntax = true
     result = pkg_config("cairo", "--libs")
     msvc_result = result.gsub(/-lcairo\b/, "cairo.lib")
-    msvc_result = msvc_result.gsub(/-L/, '/libpath:')
+    msvc_result = msvc_result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo.libs)
   end
@@ -107,7 +107,7 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_l_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-l")
-    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, '\1.lib')
+    msvc_result = result.gsub(/-l(cairo|png[0-9]+|z)\b/, "\\1.lib")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo_png.libs_only_l)
   end
@@ -120,7 +120,7 @@ class PkgConfigTest < Test::Unit::TestCase
   def test_libs_only_L_msvc
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-L")
-    msvc_result = result.gsub(/-L/, '/libpath:')
+    msvc_result = result.gsub(/-L/, "/libpath:")
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo_png.libs_only_L)
   end
@@ -164,10 +164,17 @@ class PkgConfigTest < Test::Unit::TestCase
     end
   end
 
+  def test_not_found
+    message = ".pc doesn't exist: <nonexistent>"
+    assert_raise(PackageConfig::NotFoundError.new(message)) do
+      PKGConfig.modversion("nonexistent")
+    end
+  end
+
   private
   def pkg_config(package, *args)
     args.unshift("--define-variable=libdir=#{@custom_libdir}")
-    args = args.collect {|arg| arg.dump}.join(' ')
+    args = args.collect {|arg| arg.dump}.join(" ")
     `pkg-config #{args} #{package}`.strip
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.4
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -68,7 +68,7 @@ files:
 - lib/pkg-config.rb
 - lib/pkg-config/version.rb
 - test/run-test.rb
-- test/test_pkg_config.rb
+- test/test-pkg-config.rb
 homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
@@ -89,11 +89,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files:
 - test/run-test.rb
-- test/test_pkg_config.rb
+- test/test-pkg-config.rb