gio2 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0746c69a296006601f79942a1d468055e77bc38c
-  data.tar.gz: d654b3f11305b94f94b1dc0346aa6b53f7c0ac72
+  metadata.gz: c5f4fa74522fa8a2d1d9cb66e4e6b96ff1cfcc8e
+  data.tar.gz: 864f78682541e5ff863ba5cd7f5524d248cb9123
 SHA512:
-  metadata.gz: c7b9dfec88a8ec99d58c126f2482d142c54309a49de450ba07b040090c0abfbef0cab1026095b0bbcd349e6eb288e400e23f5e641308858a57f9ca854d7f3bd2
-  data.tar.gz: 29bb5369887ed27bf38ab351f2ff8eac3f7756cb5cea95ee275325f65dfd0c1441aa9cd36b9fc6ce6078acc70034e6894e9c937e090bdb2e60e600b2d107c9ba
+  metadata.gz: 2319d05d568e55c3eb05bd0c504cfd0c8e771e67f8662c6dfced2b82e10cb1c82b76dfa4eb8e36cac59dc59c8dcb53b6f4069018abceb4835881fd23db3d3e41
+  data.tar.gz: e97ac54b60dfc3f947cbd79f4d1a1490af89ab1ef11b6d310f3ca515b7fbce501d835c184a18f31e6e52e97578e1b18fc1c32cf316168e5b91c9d20576c15a05

data/ext/gio2/depend

@@ -0,0 +1,6 @@
+install: install-pc
+install-pc:
+	if test -n "$(pkgconfigdir)"; then			\
+	  $(MAKEDIRS) $(pkgconfigdir);				\
+	  $(INSTALL_DATA) ruby-gio2.pc $(pkgconfigdir);		\
+	fi

data/lib/gio2/input-stream.rb

@@ -23,17 +23,26 @@ module Gio
         buffer_size = 8192
         buffer = " ".force_encoding("ASCII-8BIT") * buffer_size
         loop do
-          read_bytes = read_raw(buffer, buffer.bytesize)
+          read_bytes = read_raw_compatible(buffer)
           all << buffer.byteslice(0, read_bytes)
           break if read_bytes != buffer_size
         end
         all
       else
         buffer = " " * size
-        read_bytes = read_raw(buffer, buffer.bytesize)
+        read_bytes = read_raw_compatible(buffer)
         buffer.replace(buffer.byteslice(0, read_bytes))
         buffer
       end
     end
+
+    private
+    def read_raw_compatible(buffer)
+      if (GLib::VERSION <=> [2, 36, 0]) >= 0
+        read_raw(buffer)
+      else
+        read_raw(buffer, buffer.bytesize)
+      end
+    end
   end
 end

data/lib/gio2/loader.rb

@@ -52,7 +52,6 @@ module Gio
       require "gio2/resources"
       require "gio2/inet-address"
       require "gio2/input-stream"
-      require "gio2/output-stream"
       require "gio2/pollable-input-stream"
       require "gio2/pollable-output-stream"
     end

data/lib/gio2/pollable-input-stream.rb

@@ -32,7 +32,7 @@ module Gio
         buffer = " ".force_encoding("ASCII-8BIT") * buffer_size
         loop do
           begin
-            read_bytes = read_nonblocking_raw(buffer, buffer.bytesize)
+            read_bytes = read_nonblocking_raw_compatible(buffer)
           rescue IOError::WouldBlock
             break
           end
@@ -42,10 +42,19 @@ module Gio
         all
       else
         buffer = " " * size
-        read_bytes = read_nonblocking_raw(buffer, buffer.bytesize)
+        read_bytes = read_nonblocking_raw_compatible(buffer)
         buffer.replace(buffer.byteslice(0, read_bytes))
         buffer
       end
     end
+
+    private
+    def read_nonblocking_raw_compatible(buffer)
+      if (GLib::VERSION <=> [2, 42, 0]) >= 0
+        read_nonblocking_raw(buffer)
+      else
+        read_nonblocking_raw(buffer, buffer.bytesize)
+      end
+    end
   end
 end

data/lib/gio2/pollable-output-stream.rb

@@ -23,10 +23,5 @@ module Gio
       source.set_callback(&block)
       source
     end
-
-    alias_method :write_nonblocking_raw, :write_nonblocking
-    def write_nonblocking(data)
-      write_nonblocking_raw(data, data.bytesize)
-    end
   end
 end

data/test/gio2-test-utils.rb

@@ -18,4 +18,5 @@ require "test-unit"
 require "test/unit/notify"
 
 require "gio2-test-utils/fixture"
+require "gio2-test-utils/omissions"
 require "gio2-test-utils/socket-client"

data/{lib/gio2/output-stream.rb → test/gio2-test-utils/omissions.rb}

@@ -14,11 +14,10 @@
 # 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
-  class OutputStream
-    alias_method :write_raw, :write
-    def write(data)
-      write_raw(data, data.bytesize)
+module GioTestUtils
+  module Omissions
+    def omit_on_os_x
+      omit("Skip this test on OS X") if RUBY_PLATFORM =~ /darwin/
     end
   end
 end

data/test/test-content-type.rb

@@ -15,6 +15,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestContentType < Test::Unit::TestCase
+  include GioTestUtils::Omissions
+
   def setup
     @content_type = Gio::ContentType.new("image/jpeg")
   end
@@ -25,6 +27,7 @@ class TestContentType < Test::Unit::TestCase
   end
 
   def test_guess
+    omit_on_os_x
     assert_equal(["audio/mpeg", false],
                  Gio::ContentType.guess("filename.mp3"))
   end

data/test/test-file.rb

@@ -16,9 +16,11 @@
 
 class TestFile < Test::Unit::TestCase
   include GioTestUtils::Fixture
+  include GioTestUtils::Omissions
 
   class TestContentType < self
     def test_guess_content_type
+      omit_on_os_x
       path = fixture_path("content-type", "x-content", "unix-software")
       dir = Gio::File.path(path)
       assert_equal(["x-content/unix-software"],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gio2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: x86-mingw32
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glib2
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 description: Ruby/GIO2 is a Ruby binding of gio-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -45,20 +45,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- ext/gio2/depend
+- ext/gio2/extconf.rb
+- ext/gio2/rb-gio2-pollable-source.c
+- ext/gio2/rb-gio2.c
+- ext/gio2/rb-gio2.h
 - extconf.rb
+- lib/2.0/gio2.so
 - lib/gio2.rb
 - lib/gio2/deprecated.rb
 - lib/gio2/inet-address.rb
 - lib/gio2/input-stream.rb
 - lib/gio2/loader.rb
-- lib/gio2/output-stream.rb
 - lib/gio2/pollable-input-stream.rb
 - lib/gio2/pollable-output-stream.rb
 - lib/gio2/resources.rb
-- ext/gio2/extconf.rb
-- ext/gio2/rb-gio2-pollable-source.c
-- ext/gio2/rb-gio2.c
-- ext/gio2/rb-gio2.h
 - test/fixture/content-type/x-content/unix-software/autorun.sh
 - test/fixture/resource/Rakefile
 - test/fixture/resource/logo.png
@@ -66,6 +67,7 @@ files:
 - test/fixture/resource/ruby-gio2.gresource.xml
 - test/gio2-test-utils.rb
 - test/gio2-test-utils/fixture.rb
+- test/gio2-test-utils/omissions.rb
 - test/gio2-test-utils/socket-client.rb
 - test/run-test.rb
 - test/test-buffered-input-stream.rb
@@ -81,9 +83,6 @@ files:
 - test/test-pollable-input-stream.rb
 - test/test-pollable-output-stream.rb
 - test/test-resources.rb
-- lib/1.9/gio2.so
-- lib/2.0/gio2.so
-- lib/2.1/gio2.so
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
 - LGPLv2.1 or later
@@ -94,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby/GIO2 is a Ruby binding of gio-2.x.