pkg-config 1.0.3 → 1.0.4

data/NEWS

@@ -1,5 +1,9 @@
 = NEWS
 
+== 1.0.4 - 2010/09/23
+
+* add PKGConfig.variable.
+
 == 1.0.3 - 2010/09/07
 
 * add path and override_variable customize API.

data/Rakefile

@@ -52,4 +52,5 @@ end
 desc "tag the current veresion"
 task :tag do
   sh("git", "tag", "-a", version.to_s, "-m", "release #{version}!!!")
+  sh("git", "push", "--tags")
 end

data/lib/pkg-config.rb

@@ -22,12 +22,16 @@ require 'English'
 require 'pathname'
 
 class PackageConfig
+  SEPARATOR = File::PATH_SEPARATOR
+
+  attr_reader :paths
   attr_accessor :msvc_syntax
   def initialize(name, options={})
     @name = name
     @options = options
-    @path = @options[:path] || ENV["PKG_CONFIG_PATH"]
-    @path = [@path, guess_default_path].compact.join(separator)
+    path = @options[:path] || ENV["PKG_CONFIG_PATH"]
+    @paths = [path, guess_default_path].compact.join(SEPARATOR).split(SEPARATOR)
+    @paths.unshift(@options[:paths] || [])
     @msvc_syntax = @options[:msvc_syntax]
     @variables = @declarations = nil
     override_variables = with_config("override-variables", "")
@@ -92,17 +96,13 @@ class PackageConfig
 
   private
   def pc
-    @path.split(separator).each do |path|
+    @paths.each do |path|
       pc_name = File.join(path, "#{@name}.pc")
       return pc_name if File.exist?(pc_name)
     end
     return nil
   end
 
-  def separator
-    File::PATH_SEPARATOR
-  end
-
   def collect_cflags
     all_cflags = (requires_private + requires.reverse).collect do |package|
       self.class.new(package, @options).cflags
@@ -188,7 +188,7 @@ class PackageConfig
   end
 
   def search_pkg_config_from_path(pkg_config)
-    (ENV["PATH"] || "").split(separator).each do |path|
+    (ENV["PATH"] || "").split(SEPARATOR).each do |path|
       try_pkg_config = Pathname(path) + pkg_config
       return try_pkg_config if try_pkg_config.exist?
     end
@@ -235,9 +235,9 @@ class PackageConfig
                     "/usr/lib64/pkgconfig",
                     "/usr/lib/pkgconfig",
                     "/usr/X11/lib/pkgconfig/",
-                    "/usr/share/pkgconfig"].join(separator)
+                    "/usr/share/pkgconfig"].join(SEPARATOR)
     libdir = ENV["PKG_CONFIG_LIBDIR"]
-    default_path = [libdir, default_path].join(separator) if libdir
+    default_path = [libdir, default_path].join(SEPARATOR) if libdir
 
     pkg_config = with_config("pkg-config", ENV["PKG_CONFIG"] || "pkg-config")
     pkg_config = Pathname.new(pkg_config)
@@ -253,19 +253,19 @@ class PackageConfig
     return default_path unless pkg_config.absolute?
     [(pkg_config.parent.parent + "lib" + "pkgconfig").to_s,
      (pkg_config.parent.parent + "libdata" + "pkgconfig").to_s,
-     default_path].join(separator)
+     default_path].join(SEPARATOR)
   end
 end
 
 module PKGConfig
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 
-  @@path = nil
+  @@paths = []
   @@override_variables = {}
 
   module_function
   def add_path(path)
-    @@path = [path, @@path || ''].join(File::PATH_SEPARATOR)
+    @@paths << path
   end
 
   def set_override_variable(key, value)
@@ -278,9 +278,9 @@ module PKGConfig
 
   def package_config(package)
     PackageConfig.new(package,
-                      :path => @@path,
                       :msvc_syntax => msvc?,
-                      :override_variables => @@override_variables)
+                      :override_variables => @@override_variables,
+                      :paths => @@paths)
   end
 
   def exist?(pkg)
@@ -311,6 +311,10 @@ module PKGConfig
     package_config(pkg).description
   end
 
+  def variable(pkg, name)
+    package_config(pkg).variable(name)
+  end
+
   def check_version?(pkg, major = 0, minor = 0, micro = 0)
     return false unless exist?(pkg)
     ver = modversion(pkg).split(".").collect{|item| item.to_i}

data/test/run-test.rb

@@ -2,24 +2,17 @@
 
 base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 test_unit_dir = File.join(base_dir, "test-unit", "lib")
-ext_dir = File.join(base_dir, "ext", "cairo")
 lib_dir = File.join(base_dir, "lib")
 test_dir = File.join(base_dir, "test")
 
-if system("which make > /dev/null")
-  system("cd #{base_dir.dump} && make > /dev/null") or exit(1)
-end
-
 $LOAD_PATH.unshift(test_unit_dir)
 
 require 'test/unit'
 
 $LOAD_PATH.unshift(base_dir)
-$LOAD_PATH.unshift(ext_dir)
 $LOAD_PATH.unshift(lib_dir)
 
 $LOAD_PATH.unshift(test_dir)
-require 'cairo-test-utils'
 
 Dir.glob("test/**/test_*.rb") do |file|
   require file.sub(/\.rb$/, '')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pkg-config
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +09:00
+date: 2010-09-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency