gio2 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 727400ca8d8c8c2c18b815f816c2c69fe45a3cd3
-  data.tar.gz: cdb9a6bb8247a2b3866c19d0483b4ae995513e86
+  metadata.gz: 5b28792d8ada22c3b23c22e0ee4239dee5d33331
+  data.tar.gz: 851605208084c3406574c44e56bb7ef3782e04ca
 SHA512:
-  metadata.gz: d19b437f8e328986b04df2ee253878bfcd321161aae010b80b11cf45f5525a6b6c0a1ca9875ff6186ada0793d62302f9b65c91fe49d4d0ee3d7170af2e1e8f94
-  data.tar.gz: c66b4183f0486484032ff78b62bb71d7aa7e461aedc8d686252ddf2028dab856db36df1e0c05eb91c68447ae207ab585e23ea6fdd2821426a9f55a3461af5ee5
+  metadata.gz: b555a9f5c08dbca58cf4598f4626ead8314c5787c17017b415f425e212397cb0bb1db6f7cdd89a0afe48796e855931ad0d33967dfbe145ffd77cf1f971668fb3
+  data.tar.gz: 986fd2010e21e726402b839d822efb4112d18b8d3ca231a636257d6bbda46afdb53060e2935b3245277838e11f4c6efe50b3f85551ab66b273a424ed14af2d1e

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: ruby
 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: []
@@ -46,20 +46,20 @@ 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/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
@@ -67,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
@@ -92,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.