pkg-config 1.4.0 → 1.6.5

data/test/{run-test.rb → run.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

@@ -0,0 +1,347 @@
+require "mkmf"
+require "tempfile"
+
+require "pkg-config"
+
+class PkgConfigTest < Test::Unit::TestCase
+  def find_program(name)
+    exeext = RbConfig::CONFIG["EXEEXT"]
+    ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+      program = File.join(path, name)
+      return name if File.exist?(program)
+      return name if File.exist?("#{program}.#{exeext}")
+    end
+    nil
+  end
+
+  def setup
+    @pkgconf = find_program("pkgconf") || "pkg-config"
+    @custom_libdir = "/tmp/local/lib"
+    options = {:override_variables => {"libdir" => @custom_libdir}}
+    @glib = PackageConfig.new("glib-2.0", options)
+  end
+
+  def only_pkg_config_version(major, minor)
+    pkg_config_version = `#{@pkgconf} --version`.chomp
+    current_major, current_minor = pkg_config_version.split(".").collect(&:to_i)
+    return if ([major, minor] <=> [current_major, current_minor]) <= 0
+    omit("Require #{@pkgconf} #{pkg_config_version} or later")
+  end
+
+  def test_exist?
+    assert(system("#{@pkgconf} --exists glib-2.0"))
+  end
+
+  def test_cflags
+    omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
+    assert_pkg_config("glib-2.0", ["--cflags"], @glib.cflags)
+  end
+
+  def test_cflags_only_I
+    omit("Fragile on macOS") if RUBY_PLATFORM.include?("darwin")
+    assert_pkg_config("glib-2.0", ["--cflags-only-I"], @glib.cflags_only_I)
+  end
+
+  def split_lib_flags(libs_command_line)
+    @glib.__send__(:split_lib_flags, libs_command_line)
+  end
+
+  def test_split_libs
+    assert_equal([
+                   "-L/usr/local/Cellar/gtk+3/3.24.10/lib",
+                   "-L/usr/local/Cellar/pango/1.44.3/lib",
+                   "-L/usr/local/Cellar/harfbuzz/2.5.3/lib",
+                   "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib",
+                   "-L/usr/local/Cellar/cairo/1.16.0_2/lib",
+                   "-L/usr/local/Cellar/glib/2.60.6/lib",
+                   "-L/usr/local/opt/gettext/lib",
+                   "-lgdk-3",
+                   "-framework", "Cocoa",
+                   "-framework", "Carbon",
+                   "-framework", "CoreGraphics",
+                   "-lpangocairo-1.0",
+                   "-lpango-1.0",
+                   "-lharfbuzz",
+                   "-lgdk_pixbuf-2.0",
+                   "-lcairo-gobject",
+                   "-lcairo",
+                   "-lgobject-2.0",
+                   "-lglib-2.0",
+                   "-lintl"
+                 ],
+                 split_lib_flags("-L/usr/local/Cellar/gtk+3/3.24.10/lib " +
+                                 "-L/usr/local/Cellar/pango/1.44.3/lib " +
+                                 "-L/usr/local/Cellar/harfbuzz/2.5.3/lib " +
+                                 "-L/usr/local/Cellar/gdk-pixbuf/2.38.1_1/lib " +
+                                 "-L/usr/local/Cellar/cairo/1.16.0_2/lib " +
+                                 "-L/usr/local/Cellar/glib/2.60.6/lib " +
+                                 "-L/usr/local/opt/gettext/lib " +
+                                 "-lgdk-3 " +
+                                 "-framework Cocoa " +
+                                 "-framework Carbon " +
+                                 "-framework CoreGraphics " +
+                                 "-lpangocairo-1.0 " +
+                                 "-lpango-1.0 " +
+                                 "-lharfbuzz " +
+                                 "-lgdk_pixbuf-2.0 " +
+                                 "-lcairo-gobject " +
+                                 "-lcairo " +
+                                 "-lgobject-2.0 " +
+                                 "-lglib-2.0 " +
+                                 "-lintl"))
+  end
+
+  def test_libs
+    assert_pkg_config("glib-2.0", ["--libs"], @glib.libs)
+  end
+
+  def test_libs_msvc
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs")
+    msvc_result = result.gsub(/-l(glib-2\.0|intl)\b/, "\\1.lib")
+    msvc_result = msvc_result.gsub(/-L/, "/libpath:")
+    assert_not_equal(msvc_result, result)
+    assert_equal(msvc_result, @glib.libs)
+  end
+
+  def test_libs_only_l
+    assert_pkg_config("glib-2.0", ["--libs-only-l"], @glib.libs_only_l)
+  end
+
+  def test_libs_only_l_msvc
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs-only-l")
+    msvc_result = result.gsub(/-l(glib-2\.0|intl)\b/, "\\1.lib")
+    assert_not_equal(msvc_result, result)
+    assert_equal(msvc_result, @glib.libs_only_l)
+  end
+
+  def test_libs_only_L
+    assert_pkg_config("glib-2.0", ["--libs-only-L"], @glib.libs_only_L)
+  end
+
+  def test_libs_only_L_msvc
+    @glib.msvc_syntax = true
+    result = pkg_config("glib-2.0", "--libs-only-L")
+    msvc_result = result.gsub(/-L/, "/libpath:")
+    assert_not_equal(msvc_result, result)
+    assert_equal(msvc_result, @glib.libs_only_L)
+  end
+
+  def test_requires
+    assert_equal([], @glib.requires)
+  end
+
+  def test_requires_private
+    requires_private = pkg_config("glib-2.0", "--print-requires-private")
+    expected_requires = requires_private.split(/\n/).collect do |require|
+      require.split(/\s/, 2)[0]
+    end
+    assert_equal(expected_requires,
+                 @glib.requires_private)
+  end
+
+  def test_version
+    assert_pkg_config("glib-2.0", ["--modversion"], @glib.version)
+  end
+
+  def test_parse_override_variables
+    assert_override_variables({}, nil)
+    assert_override_variables({"prefix" => "c:\\\\gtk-dev"},
+                              "prefix=c:\\\\gtk-dev")
+    assert_override_variables({
+                                "prefix" => "c:\\\\gtk-dev",
+                                "includdir" => "d:\\\\gtk\\include"
+                              },
+                              ["prefix=c:\\\\gtk-dev",
+                               "includdir=d:\\\\gtk\\include"].join(","))
+  end
+
+  def test_override_variables
+    overridden_prefix = "c:\\\\gtk-dev"
+    original_prefix = @glib.variable("prefix")
+    assert_not_equal(overridden_prefix, original_prefix)
+    with_override_variables("prefix=#{overridden_prefix}") do
+      glib = PackageConfig.new("glib-2.0")
+      assert_equal(overridden_prefix, glib.variable("prefix"))
+    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(" ")
+    normalize_pkg_config_result(`#{@pkgconf} #{args} #{package}`.strip)
+  end
+
+  def normalize_pkg_config_result(result)
+    case RUBY_PLATFORM
+    when /mingw/
+      result = result.gsub(/\/bin\/..\//, "/")
+      if result.include?(" -mms-bitfields ")
+        # Reorder -mms-bitfields (non path flag)
+        result = result.gsub(" -mms-bitfields ", " ")
+        result = "-mms-bitfields #{result}"
+      end
+      result
+    else
+      result
+    end
+  end
+
+  def assert_pkg_config(package, pkg_config_args, actual)
+    result = pkg_config(package, *pkg_config_args)
+    result = nil if result.empty?
+    assert_equal(result, actual)
+  end
+
+  def assert_override_variables(expected, override_variables)
+    with_override_variables(override_variables) do
+      glib = PackageConfig.new("glib-2.0")
+      assert_equal(expected, glib.instance_variable_get("@override_variables"))
+    end
+  end
+
+  def with_override_variables(override_variables)
+    if override_variables.nil?
+      args = {}
+    else
+      args = {"--with-override-variables" => override_variables}
+    end
+    PackageConfig.clear_configure_args_cache
+    configure_args(args) do
+      yield
+    end
+  end
+
+  def configure_args(args)
+    original_configure_args = $configure_args
+    $configure_args = $configure_args.merge(args)
+    yield
+  ensure
+    $configure_args = original_configure_args
+  end
+
+  sub_test_case("#parse_pc") do
+    def parse_pc(content)
+      Tempfile.create(["pkg-config", ".pc"]) do |file|
+        file.puts(content)
+        file.close
+        package_config = PackageConfig.new(file.path)
+        package_config.__send__(:parse_pc)
+        [
+          package_config.instance_variable_get(:@variables),
+          package_config.instance_variable_get(:@declarations),
+        ]
+      end
+    end
+
+    def test_continuous_line
+      assert_equal([
+                     {
+                       "prefix" => "/usr/local",
+                       "libdir" => "/usr/local/lib",
+                       "includedir" => "/usr/local/include",
+                     },
+                     {
+                       "Name" => "my-package",
+                       "Description" => "This is my package",
+                       "Version" => "1.0.0",
+                       "Requires" => "glib-2.0 >= 2.72 gobject-2.0 >= 2.72",
+                       "Requires.private" => "gio-2.0 >= 2.72 " +
+                                             "                  cairo",
+                       "Libs" => "-L${libdir} -lmy-package",
+                       "Cflags" => "-I${includedir}/my-package",
+                     },
+                   ],
+                   parse_pc(<<-PC))
+prefix=/usr/local
+libdir=/usr/local/lib
+includedir=/usr/local/include
+
+Name: my-package
+Description: This is my package
+Version: 1.0.0
+Requires: glib-2.0 >= 2.72 gobject-2.0 >= 2.72
+Requires.private: gio-2.0 >= 2.72 \
+                  cairo
+
+Libs: -L${libdir} -lmy-package
+Cflags: -I${includedir}/my-package
+      PC
+    end
+  end
+
+  sub_test_case("#parse_requires") do
+    def parse_requires(requires)
+      @glib.__send__(:parse_requires, requires)
+    end
+
+    def test_broken_version
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi >= fribidi_required_dep"))
+    end
+
+    def test_greater_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi >= 1.0"))
+    end
+
+    def test_greater_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi > 1.0"))
+    end
+
+    def test_less_than_or_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi <= 1.0"))
+    end
+
+    def test_less_than
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi < 1.0"))
+    end
+
+    def test_equals_to
+      assert_equal(["fribidi"],
+                   parse_requires("fribidi = 1.0"))
+    end
+  end
+
+  sub_test_case("#merge_back_cflags") do
+    def merge_back_cflags(cflags)
+      @glib.__send__(:merge_back_cflags, cflags)
+    end
+
+    def test_d
+      assert_equal(["-DFOO"],
+                   merge_back_cflags(["-DFOO", "-DFOO"]))
+    end
+
+    def test_w
+      assert_equal(["-Wno-unknown-warning-option"],
+                   merge_back_cflags(["-Wno-unknown-warning-option",
+                                      "-Wno-unknown-warning-option"]))
+    end
+
+    def test_wa_wl_wp
+      assert_equal(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                    "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"],
+                   merge_back_cflags(["-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO",
+                                      "-Wa,--noexecstack", "-Wl,--as-needed", "-Wp,-DFOO"]))
+    end
+
+    def test_mixed
+      assert_equal(["-Wl,--as-needed", "-DFOO", "-Wall", "-Wl,--as-needed"],
+                   merge_back_cflags(["-DFOO", "-Wall", "-Wl,--as-needed",
+                                      "-DFOO", "-Wall", "-Wl,--as-needed"]))
+    end
+  end
+end

metadata

@@ -1,57 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkg-config
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.5
 platform: ruby
 authors:
-- Kouhei Sutou
-autorequire: 
+- Sutou Kouhei
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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: 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'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: pkg-config can be used in your extconf.rb to properly detect need libraries
   for compiling Ruby native extensions
 email:
@@ -62,19 +19,17 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LGPL-2.1
-- NEWS
+- NEWS.md
 - README.rdoc
 - Rakefile
 - lib/pkg-config.rb
-- lib/pkg-config/version.rb
-- test/run-test.rb
-- test/test_pkg_config.rb
+- test/run.rb
+- test/test-pkg-config.rb
 homepage: https://github.com/ruby-gnome/pkg-config
 licenses:
 - LGPLv2+
 metadata:
-  msys2_mingw_dependencies: pkg-config
-post_install_message: 
+  msys2_mingw_dependencies: pkgconf
 rdoc_options: []
 require_paths:
 - lib
@@ -89,11 +44,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A pkg-config implementation for Ruby
 test_files:
-- test/run-test.rb
-- test/test_pkg_config.rb
+- test/run.rb
+- test/test-pkg-config.rb