pkg-config 1.0.2 → 1.0.3

data/NEWS

@@ -1,5 +1,10 @@
 = NEWS
 
+== 1.0.3 - 2010/09/07
+
+* add path and override_variable customize API.
+* support description.
+
 == 1.0.2 - 2010/09/02
 
 * fix packaing miss.

data/Rakefile

@@ -48,3 +48,8 @@ project = Hoe.spec('pkg-config') do |project|
   project.changes = news.read.split(/^== .*$/)[1].strip
   project.description = "A pkg-cofnig implementation by Ruby"
 end
+
+desc "tag the current veresion"
+task :tag do
+  sh("git", "tag", "-a", version.to_s, "-m", "release #{version}!!!")
+end

data/lib/pkg-config.rb

@@ -23,14 +23,17 @@ require 'pathname'
 
 class PackageConfig
   attr_accessor :msvc_syntax
-  def initialize(name, path=nil, msvc_syntax=false)
+  def initialize(name, options={})
     @name = name
-    @path = path || ENV["PKG_CONFIG_PATH"]
+    @options = options
+    @path = @options[:path] || ENV["PKG_CONFIG_PATH"]
     @path = [@path, guess_default_path].compact.join(separator)
-    @msvc_syntax = msvc_syntax
+    @msvc_syntax = @options[:msvc_syntax]
     @variables = @declarations = nil
     override_variables = with_config("override-variables", "")
     @override_variables = parse_override_variables(override_variables)
+    default_override_variables = @options[:override_variables] || {}
+    @override_variables = default_override_variables.merge(@override_variables)
   end
 
   def exist?
@@ -73,6 +76,10 @@ class PackageConfig
     declaration("Version")
   end
 
+  def description
+    declaration("Description")
+  end
+
   def variable(name)
     parse_pc if @variables.nil?
     expand_value(@override_variables[name] || @variables[name])
@@ -93,12 +100,12 @@ class PackageConfig
   end
 
   def separator
-    File.expand_path(".").index(":") ? ";" : ":"
+    File::PATH_SEPARATOR
   end
 
   def collect_cflags
     all_cflags = (requires_private + requires.reverse).collect do |package|
-      self.class.new(package, @path, @msvc_syntax).cflags
+      self.class.new(package, @options).cflags
     end
     all_cflags = [declaration("Cflags")] + all_cflags
     all_cflags = all_cflags.join(" ").gsub(/-I /, '-I').split.uniq
@@ -116,7 +123,7 @@ class PackageConfig
 
   def collect_libs
     all_libs = requires.collect do |package|
-      self.class.new(package, @path, @msvc_syntax).libs
+      self.class.new(package, @options).libs
     end
     all_libs = [declaration("Libs")] + all_libs
     all_libs = all_libs.join(" ").gsub(/-([Ll]) /, '\1').split.uniq
@@ -251,15 +258,29 @@ class PackageConfig
 end
 
 module PKGConfig
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
+
+  @@path = nil
+  @@override_variables = {}
 
   module_function
+  def add_path(path)
+    @@path = [path, @@path || ''].join(File::PATH_SEPARATOR)
+  end
+
+  def set_override_variable(key, value)
+    @@override_variables[key] = value
+  end
+
   def msvc?
     /mswin32/.match(RUBY_PLATFORM) and /^cl\b/.match(Config::CONFIG['CC'])
   end
 
   def package_config(package)
-    PackageConfig.new(package, nil, msvc?)
+    PackageConfig.new(package,
+                      :path => @@path,
+                      :msvc_syntax => msvc?,
+                      :override_variables => @@override_variables)
   end
 
   def exist?(pkg)
@@ -286,6 +307,10 @@ module PKGConfig
     package_config(pkg).version
   end
 
+  def description(pkg)
+    package_config(pkg).description
+  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}

metadata

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