pkg-config 1.1.2 → 1.1.3

data/lib/pkg-config.rb

@@ -88,7 +88,7 @@ class PackageConfig
         extern "const char *dln_find_exe(const char *, const char *)"
       end
       path = dln.dln_find_exe(pkg_config.to_s, nil)
-      if path.size.zero?
+      if path.nil? or path.size.zero?
         nil
       else
         Pathname(path.to_s)
@@ -316,7 +316,7 @@ class PackageConfig
 end
 
 module PKGConfig
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 
   @@paths = []
   @@override_variables = {}
@@ -331,7 +331,7 @@ module PKGConfig
   end
 
   def msvc?
-    /mswin32/.match(RUBY_PLATFORM) and /^cl\b/.match(Config::CONFIG['CC'])
+    /mswin32/.match(RUBY_PLATFORM) and /^cl\b/.match(RbConfig::CONFIG['CC'])
   end
 
   def package_config(package)

data/test/test_pkg_config.rb

@@ -17,13 +17,11 @@ class PkgConfigTest < Test::Unit::TestCase
   end
 
   def test_cflags
-    omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
     assert_pkg_config("cairo", ["--cflags"], @cairo.cflags)
     assert_pkg_config("cairo-png", ["--cflags"], @cairo_png.cflags)
   end
 
   def test_cflags_only_I
-    omit("this is known bug in 1.1.2") if PKGConfig::VERSION == "1.1.2"
     assert_pkg_config("cairo", ["--cflags-only-I"], @cairo.cflags_only_I)
     assert_pkg_config("cairo-png", ["--cflags-only-I"], @cairo_png.cflags_only_I)
   end
@@ -46,7 +44,7 @@ class PkgConfigTest < Test::Unit::TestCase
 
     @cairo_png.msvc_syntax = true
     result = pkg_config("cairo-png", "--libs-only-l")
-    msvc_result = result.gsub(/-l(cairo|png12)\b/, '\1.lib')
+    msvc_result = result.gsub(/-l(cairo|png[0-9]+)\b/, '\1.lib')
     assert_not_equal(msvc_result, result)
     assert_equal(msvc_result, @cairo_png.libs_only_l)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-config
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -89,8 +89,8 @@ files:
 - lib/pkg-config.rb
 - setup.rb
 - README.rdoc
-- test/test_pkg_config.rb
 - test/run-test.rb
+- test/test_pkg_config.rb
 homepage: http://github.com/rcairo/pkg-config
 licenses: 
 - LGPLv2+
@@ -120,10 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cairo
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A pkg-config implementation for Ruby
 test_files: 
-- test/test_pkg_config.rb
 - test/run-test.rb
+- test/test_pkg_config.rb