pkg-config 1.0.6 → 1.0.7

data/NEWS

@@ -1,5 +1,9 @@
 = NEWS
 
+== 1.0.7 - 2010/09/30
+
+* suppress warnings on Ruby 1.9.
+
 == 1.0.6 - 2010/09/23
 
 * add PKGConfig.libs_only_L.

data/lib/pkg-config.rb

@@ -27,18 +27,7 @@ class PackageConfig
   class << self
     @native_pkg_config = nil
     def native_pkg_config
-      return @native_pkg_config if @native_pkg_config
-      pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
-      pkg_config = Pathname.new(pkg_config)
-      unless pkg_config.absolute?
-        found_pkg_config = search_pkg_config_from_path(pkg_config)
-        pkg_config = found_pkg_config if found_pkg_config
-      end
-      unless pkg_config.absolute?
-        found_pkg_config = search_pkg_config_by_dln_find_exe(pkg_config)
-        pkg_config = found_pkg_config if found_pkg_config
-      end
-      @native_pkg_config = pkg_config
+      @native_pkg_config ||= guess_native_pkg_config
     end
 
     @custom_override_variables = nil
@@ -52,6 +41,20 @@ class PackageConfig
     end
 
     private
+    def guess_native_pkg_config
+      pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
+      pkg_config = Pathname.new(pkg_config)
+      unless pkg_config.absolute?
+        found_pkg_config = search_pkg_config_from_path(pkg_config)
+        pkg_config = found_pkg_config if found_pkg_config
+      end
+      unless pkg_config.absolute?
+        found_pkg_config = search_pkg_config_by_dln_find_exe(pkg_config)
+        pkg_config = found_pkg_config if found_pkg_config
+      end
+      pkg_config
+    end
+
     def search_pkg_config_from_path(pkg_config)
       (ENV["PATH"] || "").split(SEPARATOR).each do |path|
         try_pkg_config = Pathname(path) + pkg_config
@@ -225,7 +228,7 @@ class PackageConfig
     [path_flags, other_flags]
   end
 
-  IDENTIFIER_RE = /[\w\d_.]+/
+  IDENTIFIER_RE = /[a-zA-Z\d_\.]+/
   def parse_pc
     raise ".pc for #{@name} doesn't exist." unless exist?
     @variables = {}
@@ -287,7 +290,7 @@ class PackageConfig
 end
 
 module PKGConfig
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 
   @@paths = []
   @@override_variables = {}

data/test/run-test.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$VERBOSE = true
+
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 test_unit_dir = File.join(base_dir, "test-unit", "lib")
 lib_dir = File.join(base_dir, "lib")

data/test/test_pkg_config.rb

@@ -65,9 +65,9 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_requires_private
-    assert_equal(["freetype2", "fontconfig", "libpng12",
+    assert_equal(["pixman-1", "freetype2", "fontconfig", "libpng12",
                   "xcb", "xcb-render", "xcb-renderutil",
-                  "xrender", "x11", "pixman-1"],
+                  "xrender", "x11"],
                  @cairo.requires_private)
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-config
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,41 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +09:00
+date: 2010-09-30 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 31
         segments: 
         - 2
-        - 0
         - 4
-        version: 2.0.4
+        - 0
+        version: 2.4.0
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id002
 description: A pkg-cofnig implementation by Ruby
 email: 
 - kou@cozmixng.org