glib2 3.3.2 → 3.3.3

data/lib/gnome2/rake/windows-binary-download-task.rb

@@ -1,183 +1,16 @@
-# Copyright(C) 2010-2015 Ruby-GNOME2 Project.
+# Copyright(C) 2010-2019 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 
-require 'open-uri'
-require 'rubygems'
-require 'mechanize'
-
 module GNOME2
   module Rake
     class WindowsBinaryDownloadTask
-      include ::Rake::DSL
-
       URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
       def initialize(package)
         @package = package
       end
 
       def define
-        namespace :windows do
-          namespace :downloader do
-            task :before
-
-            download_tasks = []
-            namespace :download do
-              directory dist_dir.to_s
-              task :prepare => [dist_dir.to_s]
-
-              packages.each do |package|
-                desc "download #{package}"
-                task package => [:prepare] do
-                  download_package(package)
-                end
-                download_tasks << package
-              end
-
-              dependencies.each do |dependency|
-                name, version = dependency
-                desc "download #{name}"
-                task name => [:prepare] do
-                  download_dependency(dependency)
-                end
-                download_tasks << name
-              end
-            end
-
-            download_tasks = download_tasks.collect do |task|
-              "windows:downloader:download:#{task}"
-            end
-            desc "download Windows binaries into #{dist_dir}"
-            task :download => download_tasks
-
-            task :after
-          end
-          desc "download Windows binaries"
-          task :download => ["windows:downloader:before",
-                             "windows:downloader:download",
-                             "windows:downloader:after"]
-        end
-      end
-
-      private
-      def dist_dir
-        @package.windows.absolute_binary_dir
-      end
-
-      def packages
-        @package.windows.packages
-      end
-
-      def dependencies
-        @package.windows.dependencies
-      end
-
-      def build_architecture_suffix
-        @package.windows.build_architecture_suffix
-      end
-
-      def download_package(package)
-        suffix = build_architecture_suffix
-        version_page_url = "#{URL_BASE}/#{suffix}/#{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}
-          else
-            [-1]
-          end
-        end.last
-
-        escaped_package = Regexp.escape(package)
-        latest_version_page = latest_version_link.click
-        latest_version = latest_version_page.links.collect do |link|
-          case link.href
-          when /#{escaped_package}_([\d\.\-]+)_#{suffix}\.zip\z/,
-               /#{escaped_package}-([\d\.\-]+)-#{suffix}\.zip\z/, # old
-               /#{escaped_package}-([\d\.\-]+)\.zip\z/ # old
-            version = $1
-            normalized_version = version.split(/[\.\-]/).collect do |component|
-              component.to_i
-            end
-            [normalized_version, version]
-          else
-            [[-1], nil]
-          end
-        end.sort_by do |normalized_version, version|
-          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|
-          case link.href
-          when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/,
-               /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-#{suffix}\.zip\z/, # old
-               /#{escaped_package}(?:-dev)?-#{escaped_latest_version}\.zip\z/ # old
-            click_zip_link(link)
-          end
-        end
-      end
-
-      def download_dependency(dependency)
-        suffix = build_architecture_suffix
-        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|
-          case link.href
-          when /\A#{escaped_dependency}_(#{dependency_version_re})_#{suffix}\.zip\z/
-            version = $1
-            [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
-          else
-            [[-1], nil]
-          end
-        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|
-          case link.href
-          when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/
-            click_zip_link(link)
-          end
-        end
-      end
-
-      private
-      def agent
-        @agent ||= Mechanize.new
-      end
-
-      def click_zip_link(link)
-        zip = link.click
-        Dir.chdir(dist_dir) do
-          open(zip.filename, "wb") do |file|
-            file.print(zip.body)
-          end
-          system("unzip", "-o", zip.filename)
-          Dir.glob("lib/pkgconfig/*.pc") do |pc_path|
-            pc = File.read(pc_path)
-            pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{dist_dir}"}
-            File.open(pc_path, "w") do |pc_file|
-              pc_file.print(pc)
-            end
-          end
-        end
       end
     end
   end

data/lib/mkmf-gnome2.rb

@@ -134,18 +134,23 @@ def find_gem_spec(package)
   end
 end
 
-def setup_homebrew_libffi
-  platform = NativePackageInstaller::Platform.detect
-  return unless platform.is_a?(NativePackageInstaller::Platform::Homebrew)
-
-  libffi_prefix = `brew --prefix libffi`.chomp
-  PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
+def setup_homebrew
+  checking_for(checking_message("Homebrew")) do
+    platform = NativePackageInstaller::Platform.detect
+    if platform.is_a?(NativePackageInstaller::Platform::Homebrew)
+      libffi_prefix = `brew --prefix libffi`.chomp
+      PKGConfig.add_path("#{libffi_prefix}/lib/pkgconfig")
+      true
+    else
+      false
+    end
+  end
 end
 
+setup_homebrew
+
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
-  setup_homebrew_libffi if target_name == "gobject-introspection"
-
   gem_spec = find_gem_spec(target_name)
   if gem_spec
     target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
@@ -456,9 +461,6 @@ def required_pkg_config_package(package_info, native_package_info=nil)
   else
     required_package_info = [package_info]
   end
-  if required_package_info[0] == "gobject-introspection-1.0"
-    setup_homebrew_libffi
-  end
   return true if PKGConfig.have_package(*required_package_info)
 
   native_package_info ||= {}

data/test/test-file-utils.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2019  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -13,10 +13,14 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 
+
 class TestGLibFileUtils < Test::Unit::TestCase
   include GLibTestUtils
 
+  def normalize_space(string)
+    string.gsub("\u{00A0}", " ")
+  end
+
   sub_test_case "#format_size_for_display" do
     def setup
       only_glib_version(2, 16, 0)
@@ -50,26 +54,30 @@ class TestGLibFileUtils < Test::Unit::TestCase
     end
 
     def test_kb
-      assert_equal("1.0 kB", GLib.format_size(1000))
+      assert_equal("1.0 kB",
+                   normalize_space(GLib.format_size(1000)))
     end
 
     def test_mb
-      assert_equal("1.0 MB", GLib.format_size(1000 * 1000))
+      assert_equal("1.0 MB",
+                   normalize_space(GLib.format_size(1000 * 1000)))
     end
 
     def test_gb
-      assert_equal("1.0 GB", GLib.format_size(1000 * 1000 * 1000))
+      assert_equal("1.0 GB",
+                   normalize_space(GLib.format_size(1000 * 1000 * 1000)))
     end
 
     def test_over_guint32_value
       guint32_max = 2 ** 32 - 1
-      assert_equal("4.3 GB", GLib.format_size(guint32_max + 1))
+      assert_equal("4.3 GB",
+                   normalize_space(GLib.format_size(guint32_max + 1)))
     end
 
     sub_test_case "flags" do
       sub_test_case ":iec_units" do
         def format_size(size)
-          GLib.format_size(size, :flags => :iec_units)
+          normalize_space(GLib.format_size(size, :flags => :iec_units))
         end
 
         def test_kib

data/test/test-spawn.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2019  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require 'rbconfig'
+require "rbconfig"
 
 class TestGLibSpawn < Test::Unit::TestCase
   include GLibTestUtils
@@ -41,8 +41,19 @@ class TestGLibSpawn < Test::Unit::TestCase
                        RbConfig::CONFIG['RUBY_INSTALL_NAME'] +
                          RbConfig::CONFIG['EXEEXT'])
     end
-    pid = GLib::Spawn.async(Dir.pwd, [ruby, '-e', 'exit 1 unless ENV.empty?'], [], GLib::Spawn::DO_NOT_REAP_CHILD)
+    test_env_name = "RUBY_GLIB2_TEST"
+    ENV[test_env_name] = "yes"
+    pid = GLib::Spawn.async(Dir.pwd,
+                            [
+                              ruby,
+                              "-e",
+                              "exit(!ENV.key?(#{test_env_name.dump}))",
+                            ],
+                            [],
+                            GLib::Spawn::DO_NOT_REAP_CHILD)
     _, status = *Process.waitpid2(pid)
-    assert status.success?
+    assert do
+      status.success?
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: native-package-installer
   requirement: !ruby/object:Gem::Requirement