glib2 0.90.5 → 0.90.6

data/lib/gnome2-win32-binary-downloader.rb

@@ -23,11 +23,13 @@ class GNOME2Win32BinaryDownloader
 
   URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
   def initialize(options={})
-    @output_dir = options[:output_dir] || File.join("vendor", "local")
+    output_dir = options[:output_dir] || File.join("vendor", "local")
+    @output_dir = File.expand_path(output_dir)
   end
 
   def download_package(package)
-    version_page = agent.get("#{URL_BASE}/#{package}")
+    version_page_url = "#{URL_BASE}/#{package}"
+    version_page = agent.get(version_page_url)
     latest_version_link = version_page.links.sort_by do |link|
       if /\A(\d+\.\d+)\/\z/ =~ link.href
         $1.split(/\./).collect {|component| component.to_i}
@@ -36,11 +38,18 @@ class GNOME2Win32BinaryDownloader
       end
     end.last
 
+    escaped_package = Regexp.escape(package)
     latest_version_page = latest_version_link.click
     latest_version = latest_version_page.links.collect do |link|
-      if /_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+      case link.href
+      when /#{escaped_package}_([\d\.\-]+)_win32\.zip\z/,
+           /#{escaped_package}-([\d\.\-]+)-win32\.zip\z/, # old
+           /#{escaped_package}-([\d\.\-]+)\.zip\z/ # old
         version = $1
-        [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
+        normalized_version = version.split(/[\.\-]/).collect do |component|
+          component.to_i
+        end
+        [normalized_version, version]
       else
         [[-1], nil]
       end
@@ -48,17 +57,33 @@ class GNOME2Win32BinaryDownloader
       normalized_version
     end.last[1]
 
+    if latest_version.nil?
+      raise "can't find package: <#{package}>:<#{version_page_url}>"
+    end
+    escaped_latest_version = Regexp.escape(latest_version)
     latest_version_page.links.each do |link|
-      if /_#{Regexp.escape(latest_version)}_win32\.zip\z/ =~ link.href
+      case link.href
+      when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_win32\.zip\z/,
+           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-win32\.zip\z/, # old
+           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}\.zip\z/ # old
         click_zip_link(link)
       end
     end
   end
 
   def download_dependency(dependency)
-    dependencies_page = agent.get("#{URL_BASE}/dependencies")
+    dependency_version = "any"
+    dependency_version_re = /[\d\.\-]+/
+    if dependency.is_a?(Array)
+      dependency, dependency_version = dependency
+      dependency_version_re = /#{Regexp.escape(dependency_version)}/
+    end
+    escaped_dependency = Regexp.escape(dependency)
+    dependencies_url = "#{URL_BASE}/dependencies"
+    dependencies_page = agent.get(dependencies_url)
     latest_version = dependencies_page.links.collect do |link|
-      if /\A#{Regexp.escape(dependency)}_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+      case link.href
+      when /\A#{escaped_dependency}_(#{dependency_version_re})_win32\.zip\z/
         version = $1
         [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
       else
@@ -67,8 +92,16 @@ class GNOME2Win32BinaryDownloader
     end.sort_by do |normalized_version, version|
       normalized_version
     end.last[1]
+
+    if latest_version.nil?
+      message = "can't find dependency package: " +
+        "<#{dependency}>(#{dependency_version}):<#{dependencies_url}>"
+      raise message
+    end
+    escaped_latest_version = Regexp.escape(latest_version)
     dependencies_page.links.each do |link|
-      if /\A#{Regexp.escape(dependency)}(?:-dev)?_#{Regexp.escape(latest_version)}_win32.zip/ =~ link.href
+      case link.href
+      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_win32.zip/
         click_zip_link(link)
       end
     end
@@ -86,7 +119,14 @@ class GNOME2Win32BinaryDownloader
       open(zip.filename, "wb") do |file|
         file.print(zip.body)
       end
-      system("unzip '#{zip.filename}'")
+      system("unzip", "-o", zip.filename)
+      Dir.glob("lib/pkgconfig/*.pc") do |pc_path|
+        pc = File.read(pc_path)
+        pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{@output_dir}"}
+        File.open(pc_path, "w") do |pc_file|
+          pc_file.print(pc)
+        end
+      end
     end
   end
 end

data/lib/mkmf-gnome2.rb

@@ -9,6 +9,7 @@
 # license of Ruby-GNOME2.
 #
 
+require 'English'
 require 'mkmf'
 begin
   require 'pkg-config'
@@ -58,10 +59,11 @@ def setup_win32(target_name, base_dir=nil)
       base_dir ||= Pathname($0).dirname.parent.parent.expand_path
       base_dir = Pathname(base_dir) if base_dir.is_a?(String)
       binary_base_dir = base_dir + "vendor" + "local"
-      $CFLAGS += " -I#{binary_base_dir}/include"
-      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
-      PKGConfig.add_path(pkg_config_dir.to_s)
-      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+      if binary_base_dir.exist?
+        $CFLAGS += " -I#{binary_base_dir}/include"
+        pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+        PKGConfig.add_path(pkg_config_dir.to_s)
+      end
       true
     else
       false
@@ -69,7 +71,7 @@ def setup_win32(target_name, base_dir=nil)
   end
 end
 
-#add_depend_package("glib2", "glib/src", "/...../ruby-gnome2")
+#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
   [top_srcdir, $configure_args['--topdir']].each do |topdir|
     topdir = File.expand_path(topdir)
@@ -93,12 +95,23 @@ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
     next unless File.exist?(target_build_dir_full_path)
     $INCFLAGS = "-I#{target_build_dir_full_path} #{$INCFLAGS}"
 
-    if /cygwin|mingw/ =~ RUBY_PLATFORM
-      $libs << " -lruby-#{target_name}"
-      $LDFLAGS << " -L#{target_build_dir_full_path}"
-    elsif /mswin32/ =~ RUBY_PLATFORM
-      $DLDFLAGS << " /libpath:#{target_build_dir_full_path}"
-      $libs << " libruby-#{target_name}.lib"
+    case RUBY_PLATFORM
+    when /cygwin|mingw|mswin32/
+      case RUBY_PLATFORM
+      when /cygwin|mingw/
+        $LDFLAGS << " -L#{target_build_dir_full_path}"
+        $libs << " -lruby-#{target_name}"
+      when /mswin32/
+        $DLDFLAGS << " /libpath:#{target_build_dir_full_path}"
+        $libs << " libruby-#{target_name}.lib"
+      end
+      target_base_dir = Pathname.new(target_source_dir_full_path).parent.parent
+      target_binary_base_dir = target_base_dir + "vendor" + "local"
+      if target_binary_base_dir.exist?
+        $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
+        target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
+        PKGConfig.add_path(target_pkg_config_dir.to_s)
+      end
     end
   end
 end
@@ -239,8 +252,17 @@ end
 # This is used for the library which doesn't support version info.
 def make_version_header(app_name, pkgname, dir = "src")
   version = PKGConfig.modversion(pkgname).split(/\./)
+  version = "2.0b7".split(/\./)
   (0..2).each do |v|
     version[v] = "0" unless version[v]
+    if /\A(\d+)/ =~ version[v]
+      number = $1
+      tag = $POSTMATCH
+      unless tag.empty?
+        version[v] = number
+        version[3] = tag
+      end
+    end
   end
   filename = "rb#{app_name.downcase}version.h"
 
@@ -251,6 +273,12 @@ def make_version_header(app_name, pkgname, dir = "src")
   FileUtils.mkdir_p(dir)
   out = File.open(File.join(dir, filename), "w")
 
+  version_definitions = []
+  ["MAJOR", "MINOR", "MICRO", "TAG"].each_with_index do |type, i|
+    _version = version[i]
+    next if _version.nil?
+    version_definitions << "#define #{app_name}_#{type}_VERSION (#{_version})"
+  end
   out.print %Q[/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /************************************************
 
@@ -263,9 +291,7 @@ def make_version_header(app_name, pkgname, dir = "src")
 #ifndef __RB#{app_name}_VERSION_H__
 #define __RB#{app_name}_VERSION_H__
 
-#define #{app_name}_MAJOR_VERSION (#{version[0]})
-#define #{app_name}_MINOR_VERSION (#{version[1]})
-#define #{app_name}_MICRO_VERSION (#{version[2]})
+#{version_definitions.join("\n")}
 
 #define #{app_name}_CHECK_VERSION(major,minor,micro)    \\
     (#{app_name}_MAJOR_VERSION > (major) || \\
@@ -320,48 +346,34 @@ def glib_mkenums(prefix, files, g_type_prefix, include_files, options={})
 end
 
 def check_cairo(options={})
-  return false unless PKGConfig.have_package('cairo')
-
   rcairo_source_dir = options[:rcairo_source_dir]
   if rcairo_source_dir and !File.exist?(rcairo_source_dir)
     rcairo_source_dir = nil
   end
-  $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" if rcairo_source_dir
-  have_rb_cairo_h = have_header('rb_cairo.h')
-  unless have_rb_cairo_h
+  if rcairo_source_dir.nil?
     begin
       require 'rubygems'
-      rcairo_gem = Gem.cache.find_name("cairo").sort_by do |gem|
-        gem.version
-      end.last
-      if rcairo_gem
-        rcairo_source_dir = rcairo_gem.full_gem_path
-        rb_cairo_h_dir = File.join(rcairo_source_dir, "ext", "cairo")
-        $CFLAGS += " -I#{rb_cairo_h_dir} "
-        have_rb_cairo_h = have_header('rb_cairo.h')
-      else
-        require "cairo"
-        rcairo_source_dir = File.dirname($".grep(/cairo\.(?!rb\z)\w+\z/).first)
-        rb_cairo_h_dir = rcairo_source_dir
-        $CFLAGS += " -I#{rcairo_h_dir} "
-        have_rb_cairo_h = have_header('rb_cairo.h')
+      cairo_gem_spec = Gem.source_index.find_name("cairo").last
+      if cairo_gem_spec
+        rcairo_source_dir = cairo_gem_spec.full_gem_path
       end
     rescue LoadError
     end
   end
+  return false if rcairo_source_dir.nil?
 
-  if have_rb_cairo_h
-    if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
-      options = {}
-      build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
-      if File.exist?(File.join(rcairo_source_dir, build_dir))
-        options[:target_build_dir] = build_dir
-      end
-      add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
-      $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
+  if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
+    options = {}
+    build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
+    if File.exist?(File.join(rcairo_source_dir, build_dir))
+      options[:target_build_dir] = build_dir
     end
+    add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
+    $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
   end
-  have_rb_cairo_h
+
+  $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo"
+  PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
 end
 
 add_include_path = Proc.new do |dir_variable|

data/test-unit/History.txt

@@ -1,3 +1,8 @@
+=== 2.1.2 / 2010-11-25
+
+* 1 enhanchement
+  * support auto runner prepare hook.
+
 === 2.1.1 / 2010-07-29
 
 * 1 bug fix

data/test-unit/html/index.html

@@ -78,7 +78,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-latest">test-unit: The latest release</h3>
 	<p>
-	  2.1.1 is the latest release. It had been released at 2010-07-29.
+	  2.1.2 is the latest release. It had been released at 2010-11-25.
         </p>
 	<h3 id="test-unit-install">test-unit: Install</h3>
         <p>
@@ -112,7 +112,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-notify-latest">test-unit-notify: The latest release</h3>
 	<p>
-	  0.0.1 is the latest release. It had been released at 2010-07-17.
+	  0.1.0 is the latest release. It had been released at 2010-11-25.
         </p>
 	<h3 id="test-unit-notify-install">test-unit-notify: Install</h3>
         <p>

data/test-unit/html/index.html.ja

@@ -91,7 +91,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-latest">test-unit最新リリース</h3>
 	<p>
-	  2010-07-29にリリースされた2.1.1が最新リリースです。
+	  2010-11-25にリリースされた2.1.2が最新リリースです。
         </p>
 	<h3 id="test-unit-install">test-unitのインストール</h3>
         <p>
@@ -133,7 +133,7 @@ require "test/unit"</pre>
         </p>
 	<h3 id="test-unit-notify-latest">test-unit-notify最新リリース</h3>
 	<p>
-	  2010-07-17にリリースされた0.0.1が最新リリースです。
+	  2010-11-25にリリースされた0.1.0が最新リリースです。
         </p>
 	<h3 id="test-unit-notify-install">test-unit-notifyのインストール</h3>
         <p>

data/test-unit/lib/test/unit/assertions.rb

@@ -579,6 +579,7 @@ EOT
                             "The arguments must respond to to_f; " +
                             "the #{name} did not")
         end
+        delta = delta.to_f
         assert_operator(delta, :>=, 0.0, "The delta should not be negative")
       end
 
@@ -597,12 +598,16 @@ EOT
         if normalized_actual < normalized_expected - normalized_delta
           relation_format = "<<?> < <?>-<?>(?) <= <?>+<?>(?)>"
           relation_arguments = [actual_float,
-                                expected_float, delta, expected_float - delta,
-                                expected_float, delta, expected_float + delta]
+                                expected_float, delta,
+                                normalized_expected - normalized_delta,
+                                expected_float, delta,
+                                normalized_expected + normalized_delta]
         elsif normalized_expected - normalized_delta < normalized_actual
           relation_format = "<<?>-<?>(?) <= <?>+<?>(?) < <?>>"
-          relation_arguments = [expected_float, delta, expected_float - delta,
-                                expected_float, delta, expected_float + delta,
+          relation_arguments = [expected_float, delta,
+                                normalized_expected - normalized_delta,
+                                expected_float, delta,
+                                normalized_expected + normalized_delta,
                                 actual_float]
         end
 

data/test-unit/lib/test/unit/autorunner.rb

@@ -7,6 +7,7 @@ module Test
       RUNNERS = {}
       COLLECTORS = {}
       ADDITIONAL_OPTIONS = []
+      PREPARE_HOOKS = []
 
       class << self
         def register_runner(id, runner_builder=Proc.new)
@@ -43,15 +44,20 @@ module Test
         def setup_option(option_builder=Proc.new)
           ADDITIONAL_OPTIONS << option_builder
         end
+
+        def prepare(hook=Proc.new)
+          PREPARE_HOOKS << hook
+        end
       end
 
       def self.run(force_standalone=false, default_dir=nil, argv=ARGV, &block)
         r = new(force_standalone || standalone?, &block)
         r.base = default_dir
+        r.prepare
         r.process_args(argv)
         r.run
       end
-      
+
       def self.standalone?
         return false unless("-e" == $0)
         ObjectSpace.each_object(Class) do |klass|
@@ -123,6 +129,12 @@ module Test
         yield(self) if block_given?
       end
 
+      def prepare
+        PREPARE_HOOKS.each do |handler|
+          handler.call(self)
+        end
+      end
+
       def process_args(args = ARGV)
         begin
           args.unshift(*@default_arguments)

data/test-unit/lib/test/unit/testsuite.rb

@@ -27,6 +27,7 @@ module Test
         @name = name
         @tests = []
         @test_case = test_case
+        @n_tests = 0
       end
 
       # Runs the tests and/or suites contained in this
@@ -34,7 +35,8 @@ module Test
       def run(result, &progress_block)
         yield(STARTED, name)
         run_startup(result)
-        @tests.each do |test|
+        while test = @tests.shift
+          @n_tests += test.size
           test.run(result, &progress_block)
         end
         run_shutdown(result)
@@ -55,7 +57,7 @@ module Test
       # i.e. if the suite contains other suites, it counts the
       # tests within those suites, not the suites themselves.
       def size
-        total_size = 0
+        total_size = @n_tests
         @tests.each { |test| total_size += test.size }
         total_size
       end

data/test-unit/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.1.2'
+    VERSION = '2.1.3'
   end
 end

data/test-unit/test/test-testcase.rb

@@ -284,8 +284,15 @@ module Test
       def test_startup_shutdown
         called = []
         test_case = Class.new(TestCase) do
-          @@called = called
           class << self
+            def called
+              @@called
+            end
+
+            def called=(called)
+              @@called = called
+            end
+
             def startup
               @@called << :startup
             end
@@ -294,13 +301,14 @@ module Test
               @@called << :shutdown
             end
           end
+          self.called = called
 
           def setup
-            @@called << :setup
+            self.class.called << :setup
           end
 
           def teardown
-            @@called << :teardown
+            self.class.called << :teardown
           end
 
           def test1