utilrb 1.4.0 → 1.5.0

data/Rakefile

@@ -1,9 +1,8 @@
 require 'rake'
 require './lib/utilrb/common'
+require './lib/utilrb/rake_common'
 
-begin
-    require 'hoe'
-
+Utilrb::Rake.hoe do
     hoe_spec = Hoe.spec 'utilrb' do
         developer "Sylvain Joyeux", "sylvain.joyeux@m4x.org"
         extra_deps <<
@@ -19,12 +18,6 @@ begin
     hoe_spec.spec.extensions << 'ext/extconf.rb'
     Rake.clear_tasks(/^default$/)
     Rake.clear_tasks(/publish_docs/)
-
-rescue Exception => e
-    if e.message !~ /\.rubyforge/
-        STDERR.puts "WARN: cannot load the Hoe gem, or Hoe fails. Publishing tasks are disabled"
-        STDERR.puts "WARN: error message is: #{e.message}"
-    end
 end
 
 task :default => :setup
@@ -39,15 +32,6 @@ task :setup do
     FileUtils.ln_sf "../ext/utilrb_ext.so", "lib/utilrb_ext.so"
 end
 
-task 'publish_docs' => 'redocs' do
-    if !system('./update_github')
-        raise "cannot update the gh-pages branch for GitHub"
-    end
-    if !system('git', 'push', 'github', '+gh-pages')
-        raise "cannot push the documentation"
-    end
-end
-
 task :clean do
     puts "Cleaning extension in ext/"
     FileUtils.rm_f "lib/utilrb_ext.so"

data/lib/utilrb/common.rb

@@ -1,6 +1,6 @@
 module Utilrb
     unless defined? Utilrb::VERSION
-	VERSION = "1.4.0"
+	VERSION = "1.5.0"
         RUBY_IS_19  = (RUBY_VERSION >= "1.9.2")
         RUBY_IS_191 = (RUBY_VERSION >= "1.9") && (RUBY_VERSION < "1.9.2")
     end

data/lib/utilrb/kernel/load_dsl_file.rb

@@ -170,7 +170,7 @@ module Kernel
 
             # Check if the user defined new constants by using class K and/or
             # mod Mod
-            if !Utilrb::RUBY_IS_191
+            if !Utilrb::RUBY_IS_191 && !new_constants
                 new_constants = Kernel.constants
             end
 

data/lib/utilrb/logger/forward.rb

@@ -14,6 +14,14 @@ class Logger
                 def #{level}(*args, &proc); logger.#{level}(*args, &proc) end
             EOF
         end
+
+        def log_nest(size, level = nil, &block)
+            logger.nest(size, level, &block)
+        end
+
+        def log_pp(level, object, *first_line_format)
+            logger.log_pp(level, object, *first_line_format)
+        end
     end
 end
 

data/lib/utilrb/logger/hierarchy.rb

@@ -1,7 +1,11 @@
 require 'facets/module/spacename'
 require 'facets/kernel/constant'
+require 'utilrb/object/singleton_class'
+require 'utilrb/logger/forward'
+
 class Logger
     # Define a hierarchy of loggers mapped to the module hierarchy.
+    #
     # It defines the #logger accessor which either returns the logger
     # attribute of the module, if one is defined, or its parent logger
     # attribute.
@@ -21,23 +25,50 @@ class Logger
     module Hierarchy
         attr_writer :logger
 
+        def self.included(obj)
+            if obj.singleton_class.ancestors.include?(Logger::Forward)
+                obj.send(:include, Logger::Forward)
+            end
+        end
+
+        def self.extended(obj)
+            if obj.kind_of?(Module)
+                parent_module = constant(obj.spacename)
+                if (parent_module.singleton_class.ancestors.include?(Logger::Forward))
+                    obj.send(:extend, Logger::Forward)
+                end
+            end
+        end
+
         def has_own_logger?
             defined?(@logger) && @logger
         end
 
-        def make_own_logger(new_level = nil)
+        def make_own_logger(new_progname = nil, new_level = nil)
             if !has_own_logger?
                 @logger = self.logger.dup
             end
+            if new_progname
+                @logger.progname = new_progname
+            end
             if new_level
                 @logger.level = new_level
             end
             @logger
         end
 
+        def reset_own_logger
+            @logger = nil
+        end
+
         def logger
-            return @logger if defined?(@logger) && @logger
-	    @logger =
+            if defined?(@logger) && @logger
+                return @logger 
+            elsif defined?(@default_logger) && @default_logger
+                return @default_logger
+            end
+
+	    @default_logger ||=
                 if kind_of?(Module)
                     constant(self.spacename).logger
                 else

data/lib/utilrb/pkgconfig.rb

@@ -109,11 +109,23 @@ module Utilrb
             end
         end
 
+        # Exception raised when a request pkg-config file is not found
 	class NotFound < RuntimeError
+            # The name of the pkg-config package
 	    attr_reader :name
+
 	    def initialize(name); @name = name end
 	end
 
+        # Exception raised when invalid data is found in a pkg-config file
+        class Invalid < RuntimeError
+            # The name of the pkg-config package
+	    attr_reader :name
+
+	    def initialize(name); @name = name end
+        end
+
+
         attr_reader :file
         attr_reader :path
 	
@@ -192,10 +204,29 @@ module Utilrb
 
             raw_variables = Hash.new
             raw_fields    = Hash.new
-            file.each do |line|
+
+            running_line = nil
+            @file = file.map do |line|
                 line.gsub! /\s*#.*$/, ''
+                line = line.strip
                 next if line.empty?
 
+                value = line.gsub(/\\$/, '')
+                if running_line
+                    running_line << " " << value
+                end
+
+                if line =~ /\\$/
+                    running_line ||= value
+                elsif running_line
+                    running_line = nil
+                else
+                    value
+                end
+            end.compact
+
+
+            file.each do |line|
                 case line
                 when /^(#{VAR_NAME_RX})\s*=(.*)/
                     raw_variables[$1] = $2.strip
@@ -292,13 +323,21 @@ module Utilrb
         # Returns the list of include directories listed in the Cflags: section
         # of the pkgconfig file
         def include_dirs
-            Shellwords.shellsplit(cflags_only_I).map { |v| v[2..-1] }
+            result = Shellwords.shellsplit(cflags_only_I).map { |v| v[2..-1] }
+            if result.any?(&:empty?)
+                raise Invalid, "empty include directory (-I without argument) found in pkg-config package #{name}"
+            end
+            result
         end
 
         # Returns the list of library directories listed in the Libs: section
         # of the pkgconfig file
         def library_dirs
-            Shellwords.shellsplit(libs_only_L).map { |v| v[2..-1] }
+            result = Shellwords.shellsplit(libs_only_L).map { |v| v[2..-1] }
+            if result.any?(&:empty?)
+                raise Invalid, "empty link directory (-L without argument) found in pkg-config package #{name}"
+            end
+            result
         end
 
 	ACTIONS = %w{cflags cflags-only-I cflags-only-other 
@@ -374,6 +413,16 @@ module Utilrb
             result
         end
 
+        def self.available_package_names
+            result = []
+            each_pkgconfig_directory do |dir|
+                Dir.glob(File.join(dir, "*.pc")) do |path|
+                    result << File.basename(path, ".pc")
+                end
+            end
+            result
+        end
+
         # Returns true if there is a package with this name
         def self.has_package?(name)
             !find_all_package_files(name).empty?
@@ -385,7 +434,6 @@ module Utilrb
             seen = Set.new
             each_pkgconfig_directory do |dir|
                 Dir.glob(File.join(dir, '*.pc')) do |file|
-                    puts file
                     pkg_name = File.basename(file, ".pc")
                     next if seen.include?(pkg_name)
                     next if regex && pkg_name !~ regex

data/test/test_hash.rb

@@ -26,5 +26,13 @@ class TC_Hash < Test::Unit::TestCase
 	values = $1.split(", ")
 	assert_equal(["1 => 2", "2 => 3", "3 => ..."].to_set, values.to_set)
     end
+
+    def test_map_value
+        base = { 'a' => 1, 'b' => 2 }
+        result = base.map_value { |k, v| v += 1 }
+
+        assert_equal({ 'a' => 1, 'b' => 2 }, base)
+        assert_equal({ 'a' => 2, 'b' => 3 }, result)
+    end
 end
 

data/test/test_logger.rb

@@ -0,0 +1,55 @@
+require 'test_config'
+require 'utilrb/logger'
+
+class TC_Logger < Test::Unit::TestCase
+    module Root
+        extend Logger::Root('TC_Logger', Logger::INFO)
+
+        module Child
+            extend Logger::Hierarchy
+        end
+    end
+
+    def teardown
+        Root::Child.reset_own_logger
+    end
+
+    def test_logger_root
+        assert Root.respond_to?(:logger)
+        assert Root.logger
+        assert_equal Logger::INFO, Root.logger.level
+        assert_equal 'TC_Logger', Root.logger.progname
+
+        assert Root.respond_to?(:warn)
+    end
+
+    def test_logger_hierarchy
+        child = Root::Child
+        assert child.respond_to?(:logger)
+        assert child.logger
+        assert_same Root.logger, child.logger
+        assert child.respond_to?(:warn)
+    end
+
+    def test_logger_hierarch_make_own
+        child = Root::Child
+        assert_same Root.logger, child.logger
+
+        child.make_own_logger('child', Logger::DEBUG)
+        assert_not_same Root.logger, child.logger
+        assert_equal "child", child.logger.progname
+        assert_equal Logger::DEBUG, child.logger.level
+        assert_equal "TC_Logger", Root.logger.progname
+        assert_equal Logger::INFO, Root.logger.level
+
+        assert child.has_own_logger?
+    end
+
+    def test_logger_hierarch_reset_own
+        child = Root::Child
+        child.make_own_logger('child', Logger::DEBUG)
+        assert_not_same Root.logger, child.logger
+        child.reset_own_logger
+        test_logger_hierarchy
+    end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utilrb
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
+  - 5
   - 0
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 Z
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facets
@@ -69,14 +69,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 27
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id004
 description: |-
@@ -198,6 +197,8 @@ files:
 - test/test_time.rb
 - test/test_unbound_method.rb
 - test/test_weakref.rb
+- test/test_logger.rb
+- .gemtest
 homepage: http://utilrb.rubyforge.org
 licenses: []
 
@@ -228,26 +229,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: utilrb
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Yet another Ruby toolkit
 test_files: 
+- test/test_kernel.rb
 - test/test_unbound_method.rb
 - test/test_hash.rb
-- test/test_misc.rb
 - test/test_exception.rb
-- test/test_kernel.rb
-- test/test_gc.rb
-- test/test_proc.rb
-- test/test_time.rb
-- test/test_pkgconfig.rb
-- test/test_weakref.rb
-- test/test_object.rb
-- test/test_enumerable.rb
 - test/test_config.rb
-- test/test_dir.rb
-- test/test_array.rb
+- test/test_time.rb
+- test/test_logger.rb
 - test/test_module.rb
 - test/test_objectstats.rb
+- test/test_enumerable.rb
+- test/test_gc.rb
+- test/test_misc.rb
+- test/test_object.rb
+- test/test_array.rb
+- test/test_dir.rb
+- test/test_weakref.rb
+- test/test_proc.rb
 - test/test_set.rb
+- test/test_pkgconfig.rb