gio2 3.3.7 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 627f7ff7ad178e595c190636229afdc0a52f85692992196173f2eab8c059f0b2
-  data.tar.gz: d40bf44ac0c79e5b501cadf70a5975c332a0760225a21757d68c711eb8d88f1c
+  metadata.gz: 75fe99fb019058b4123b68e7e842775045cfef99abe481183159eec5358f647c
+  data.tar.gz: 44df8cb622524ab801addebcb4326274358db3b7fb08f5aa8c71683591764598
 SHA512:
-  metadata.gz: 1700e512a0f34c301e9282bc22db9353405191158b9928b1c3877643348ac486eeb7403cf793221e52566eb614fabc8bae45998b1402277d4d0d3bbc791c9544
-  data.tar.gz: 07254f585c4e8def7eb027505ac6a7ead2278e1107ce09213b43e985fc6edcd66444c3e4bee733f83dd0f9a9d0a479e9e960dc35e82ce4a173b9ea045f548624
+  metadata.gz: 60a1d62c7aa9a6ccc11538fd10c276df8560abb8857ed18c31ac4587b6999a9915f2ea19a16f25aec7ee90fc53d641f34b1a33195f2577b8200a49bb03aee54c
+  data.tar.gz: 31aeab7572e86ae2dd0345106c4717000c6bf29a3968437cb1ae4c4875c8374aca05874ae360fb89c40a9d97d31de8e0617d242e923031a0bc3cb3bad95a9ef3

data/ext/gio2/extconf.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "gio2"
 package_id = "gio-2.0"
 
-require "mkmf-gnome2"
+require "mkmf-gnome"
 
 ["glib2", "gobject-introspection"].each do |package|
   directory = "#{package}#{version_suffix}"
@@ -52,7 +52,7 @@ end
 unless required_pkg_config_package(package_id,
                                    :alt_linux => "libgio-devel",
                                    :debian => "libglib2.0-dev",
-                                   :redhat => "glib2-devel",
+                                   :redhat => "pkgconfig(#{package_id})",
                                    :arch_linux => "glib2",
                                    :homebrew => "glib",
                                    :macports => "glib2")

data/gio2.gemspec

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2018  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.description   =
     "Ruby/GIO2 provide Ruby binding to a VFS API and useful APIs " +
     "for desktop applications (such as networking and D-Bus support)."
-  s.author        = "The Ruby-GNOME2 Project Team"
+  s.author        = "The Ruby-GNOME Project Team"
   s.email         = "ruby-gnome2-devel-en@lists.sourceforge.net"
   s.homepage      = "https://ruby-gnome2.osdn.jp/"
   s.licenses      = ["LGPL-2.1+"]

data/lib/gio2/icon.rb

@@ -0,0 +1,24 @@
+# Copyright (C) 2019  Ruby-GNOME Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# 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
+
+module Gio
+  module Icon
+    def eql?(other)
+      other.is_a?(self.class) and
+        hash == other.hash
+    end
+  end
+end

data/lib/gio2/input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@ module Gio
         buffer_size = 8192
         buffer = " ".force_encoding("ASCII-8BIT") * buffer_size
         loop do
-          _, read_bytes = read_all_raw_compatible(buffer)
+          read_bytes = read_all_raw_compatible(buffer)
           all << buffer.byteslice(0, read_bytes)
           break if read_bytes != buffer_size
         end
@@ -52,25 +52,33 @@ module Gio
     alias_method :read_all_raw, :read_all
     def read_all(size)
       buffer = " " * size
-      _, read_bytes = read_all_raw_compatible(buffer)
+      read_bytes = read_all_raw_compatible(buffer)
       buffer.replace(buffer.byteslice(0, read_bytes))
       buffer
     end
 
     private
     def read_raw_compatible(buffer)
-      if (GLib::VERSION <=> [2, 36, 0]) >= 0
+      if (GLib::VERSION <=> [2, 62, 0]) >= 0
+        read_bytes, _buffer = read_raw(buffer)
+        read_bytes
+      elsif (GLib::VERSION <=> [2, 36, 0]) >= 0
         read_raw(buffer)
       else
-        read_raw(buffer, buffer.bytesize)
+        read_bytes = read_raw(buffer, buffer.bytesize)
       end
     end
 
     def read_all_raw_compatible(buffer)
-      if (GLib::VERSION <=> [2, 36, 0]) >= 0
-        read_all_raw(buffer)
+      if (GLib::VERSION <=> [2, 62, 0]) >= 0
+        _success, _buffer, read_bytes = read_all_raw(buffer)
+        read_bytes
+      elsif (GLib::VERSION <=> [2, 36, 0]) >= 0
+        _success, read_bytes = read_all_raw(buffer)
+        read_bytes
       else
-        read_all_raw(buffer, buffer.bytesize)
+        _success, read_bytes = read_all_raw(buffer, buffer.bytesize)
+        read_bytes
       end
     end
   end

data/lib/gio2/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2019  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -51,6 +51,7 @@ module Gio
       require "gio2/application-command-line"
       require "gio2/content-type"
       require "gio2/file"
+      require "gio2/icon"
       require "gio2/inet-address"
       require "gio2/input-stream"
       require "gio2/menu-item"
@@ -113,7 +114,7 @@ module Gio
       when /\Adbus_/
         name = rubyish_method_name(info, :prefix => "dbus_")
         define_singleton_method(@dbus_module, name, info)
-      when /\Afile_/
+      when /\A{file,icon}_/
         # Ignore because they are defined by load_interface_info
       else
         super
@@ -171,6 +172,17 @@ module Gio
       end
     end
 
+    def load_function_info_singleton_method(info, klass, method_name)
+      case "#{klass.name}##{method_name}"
+      when "Gio::Icon#hash"
+        define_method(info, klass, method_name)
+      when "Gio::Icon#new_for_string"
+        super(info, klass, "find")
+      else
+        super
+      end
+    end
+
     def rubyish_class_name(info)
       case info.name
       when /Enum\z/

data/test/gio2-test-utils/fixture.rb

@@ -17,8 +17,7 @@
 module GioTestUtils
   module Fixture
     def fixture_path(*components)
-      base_dir = File.join(File.dirname(__FILE__), "..", "fixture")
-      File.expand_path(File.join(base_dir, *components))
+      File.expand_path(File.join("test", "fixture", *components))
     end
   end
 end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013-2016  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,12 +16,16 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
-ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
+require "fileutils"
 
-glib_base = File.join(ruby_gnome2_base, "glib2")
-gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
-gio2_base = File.join(ruby_gnome2_base, "gio2")
+build_dir = File.expand_path(".")
+
+ruby_gnome_base = File.join(__dir__, "..", "..")
+ruby_gnome_base = File.expand_path(ruby_gnome_base)
+
+glib_base = File.join(ruby_gnome_base, "glib2")
+gobject_introspection_base = File.join(ruby_gnome_base, "gobject-introspection")
+gio2_base = File.join(ruby_gnome_base, "gio2")
 
 modules = [
   [glib_base, "glib2"],
@@ -38,11 +42,17 @@ modules.each do |target, module_name|
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
-fixture_dir = File.join(gio2_base, "test", "fixture")
-Dir.chdir(fixture_dir) do
+source_fixture_dir = File.join(gio2_base, "test", "fixture")
+build_fixture_dir = File.join(build_dir, "test", "fixture")
+unless source_fixture_dir == build_fixture_dir
+  FileUtils.rm_rf(build_fixture_dir)
+  FileUtils.mkdir_p(File.dirname(build_fixture_dir))
+  FileUtils.cp_r(source_fixture_dir, build_fixture_dir)
+end
+Dir.chdir(build_fixture_dir) do
   system("rake") or exit(false)
 end
-ENV["GSETTINGS_SCHEMA_DIR"] = File.join(fixture_dir, "schema", "default")
+ENV["GSETTINGS_SCHEMA_DIR"] = File.join(build_fixture_dir, "schema", "default")
 
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"

data/test/test-icon.rb

@@ -0,0 +1,49 @@
+# Copyright (C) 2019  Ruby-GNOME Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# 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 TestIcon < Test::Unit::TestCase
+  include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
+
+  sub_test_case(".find") do
+    def test_found
+      assert_equal(Gio::ThemedIcon.new("open"),
+                   Gio::Icon.find("open"))
+    end
+
+    def test_not_found
+      Gio::Icon.find("nonexistent")
+    end
+  end
+
+  sub_test_case(".hash") do
+    def test_use_as_key
+      hash = {Gio::Icon => true}
+      assert do
+        hash[Gio::Icon]
+      end
+    end
+  end
+
+  sub_test_case("#hash") do
+    def test_use_as_key
+      hash = {Gio::Icon.find("open") => true}
+      assert do
+        hash[Gio::Icon.find("open")]
+      end
+    end
+  end
+end

data/test/test-input-stream.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2019  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -56,9 +56,9 @@ class TestInputStream < Test::Unit::TestCase
       input = nil
       read_data = Gio::BufferedInputStream.open(@stream) do |i|
         input = i
-        _data = input.read(4)
+        data = input.read(4)
         input.close
-        _data
+        data
       end
       assert_equal([@data[0, 4], true],
                    [read_data, input.closed?])

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.4.2
 platform: ruby
 authors:
-- The Ruby-GNOME2 Project Team
+- The Ruby-GNOME Project Team
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
@@ -15,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.7
+        version: 3.4.2
 description: Ruby/GIO2 provide Ruby binding to a VFS API and useful APIs for desktop
   applications (such as networking and D-Bus support).
 email: ruby-gnome2-devel-en@lists.sourceforge.net
@@ -49,6 +50,7 @@ files:
 - lib/gio2/content-type.rb
 - lib/gio2/deprecated.rb
 - lib/gio2/file.rb
+- lib/gio2/icon.rb
 - lib/gio2/inet-address.rb
 - lib/gio2/input-stream.rb
 - lib/gio2/loader.rb
@@ -81,6 +83,7 @@ files:
 - test/test-file-enumerator.rb
 - test/test-file-monitor.rb
 - test/test-file.rb
+- test/test-icon.rb
 - test/test-inet-address.rb
 - test/test-input-stream.rb
 - test/test-memory-input-stream.rb
@@ -115,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.0.pre1
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.