gio2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1b49447c242ba47052b1fcf2ff92f16a82d812
-  data.tar.gz: f83dffc72977699d8f34d749f5ca3d0b5f5e428e
+  metadata.gz: 727400ca8d8c8c2c18b815f816c2c69fe45a3cd3
+  data.tar.gz: cdb9a6bb8247a2b3866c19d0483b4ae995513e86
 SHA512:
-  metadata.gz: 2e91ea02be00af8102869e4b8694b1530185e819928d8933d7a72ae03506d045d4ae5464eaba9f95aed48f33c04e72fe48ecd891a570939d756ccb710c9f134b
-  data.tar.gz: 042324ae0b827749db43109a86e4f91e6c2ba2f52237078e117a80bb4f0772899954c7257ff9b78711c1d1e9397b42d32fb1b3dee8d6743e22996b1e8d599385
+  metadata.gz: d19b437f8e328986b04df2ee253878bfcd321161aae010b80b11cf45f5525a6b6c0a1ca9875ff6186ada0793d62302f9b65c91fe49d4d0ee3d7170af2e1e8f94
+  data.tar.gz: c66b4183f0486484032ff78b62bb71d7aa7e461aedc8d686252ddf2028dab856db36df1e0c05eb91c68447ae207ab585e23ea6fdd2821426a9f55a3461af5ee5

data/Rakefile

@@ -1,14 +1,31 @@
 # -*- ruby -*-
+#
+# Copyright (C) 2011-2013  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
+# 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
 
 $LOAD_PATH.unshift("./../glib2/lib")
-require 'gnome2-raketask'
+require "gnome2/rake/package-task"
 
-package = GNOME2Package.new do |_package|
-  _package.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  _package.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
-  _package.dependency.gem.runtime = ["glib2"]
-  _package.win32.packages = []
-  _package.win32.dependencies = []
+package_task = GNOME2::Rake::PackageTask.new do |package|
+  package.summary = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  package.description = "Ruby/GIO2 is a Ruby binding of gio-2.x."
+  package.dependency.gem.runtime = ["glib2", "gobject-introspection"]
+  package.windows.packages = []
+  package.windows.dependencies = []
+  package.windows.build_dependencies = ["glib2", "gobject-introspection"]
+  package.windows.gobject_introspection_dependencies = ["glib2"]
 end
-package.define_tasks
-
+package_task.define

data/ext/gio2/extconf.rb

@@ -1,19 +1,33 @@
-=begin
-extconf.rb for Ruby/GIO extention library
-=end
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014  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
+# 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
 
-require 'pathname'
+require "pathname"
 
 base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
-top_dir = base_dir.parent.expand_path
+top_dir = base_dir.parent
 top_build_dir = Pathname(".").parent.parent.parent.expand_path
 
-mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
+mkmf_gnome2_dir = top_dir + "glib2" + "lib"
 version_suffix = ""
 unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)(?:\.\d+)?\z/ =~ base_dir.basename.to_s
+  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
     version_suffix = $1
-    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
+    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + "lib"
   end
 end
 
@@ -22,40 +36,36 @@ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
 module_name = "gio2"
 package_id = "gio-2.0"
 
-begin
-  require 'mkmf-gnome2'
-rescue LoadError
-  require 'rubygems'
-  gem 'glib2'
-  require 'mkmf-gnome2'
-end
-
-ruby_header = 'ruby.h'
-have_func 'rb_exec_recursive', ruby_header
-have_func 'rb_errinfo', ruby_header
+require "mkmf-gnome2"
 
-["glib2"].each do |package|
+["glib2", "gobject-introspection"].each do |package|
   directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
+  build_base_path = "#{directory}/tmp/#{RUBY_PLATFORM}"
+  package_library_name = package.gsub(/-/, "_")
+  build_dir = "#{build_base_path}/#{package_library_name}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",
                      top_dir.to_s,
                      :top_build_dir => top_build_dir.to_s,
                      :target_build_dir => build_dir)
 end
 
-win32 = setup_win32(module_name, base_dir)
+setup_win32(module_name, base_dir)
 
-defines = '-DRUBY_GIO2_COMPILATION'
+unless required_pkg_config_package(package_id,
+                                   :debian => "libglib2.0-dev",
+                                   :redhat => "glib2-devel",
+                                   :homebrew => "glib",
+                                   :macports => "glib2")
+  exit(false)
+end
 
-PKGConfig.have_package(package_id) or exit 1
-unless win32
-  PKGConfig.have_package('gio-unix-2.0') and defines += ' -DHAVE_GIO_UNIX'
+unless PKGConfig.have_package("gobject-introspection-1.0")
+  exit(false)
 end
-PKGConfig.have_package('gobject-2.0') or exit 1
 
 create_pkg_config_file("Ruby/GIO2", package_id)
 
-$defs << defines
+$defs << "-DRUBY_GIO2_COMPILATION"
 create_makefile(module_name)
 
 pkg_config_dir = with_config("pkg-config-dir")

data/ext/gio2/rb-gio2-pollable-source.c

@@ -0,0 +1,59 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2014  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
+ *  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
+ */
+
+#include "rb-gio2.h"
+
+#define RG_TARGET_NAMESPACE mPollableSource
+
+#define _SELF(self) ((GSource *)RVAL2BOXED(self, G_TYPE_SOURCE))
+
+static gboolean
+source_func(GObject *pollable_stream, gpointer user_data)
+{
+    VALUE callback = (VALUE)user_data;
+    ID id_call;
+    id_call = rb_intern("call");
+    return RVAL2CBOOL(rb_funcall(callback, id_call,
+                                 1, GOBJ2RVAL(pollable_stream)));
+}
+
+static VALUE
+rg_set_callback(VALUE self)
+{
+    VALUE callback;
+
+    callback = rb_block_proc();
+    G_RELATIVE(self, callback);
+    g_source_set_callback(_SELF(self),
+                          (GSourceFunc)source_func,
+                          (gpointer)callback,
+                          (GDestroyNotify)NULL);
+    return self;
+}
+
+void
+rb_gio2_init_pollable_source (VALUE mGio)
+{
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_define_module_under(mGio, "PollableSource");
+
+    RG_DEF_METHOD(set_callback, 0);
+}

data/ext/gio2/{rbgiofilteroutputstream.c → rb-gio2.c}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2014  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
@@ -19,10 +18,15 @@
  *  MA  02110-1301  USA
  */
 
-#include "rbgio2private.h"
+#include "rb-gio2.h"
+
+#define RG_TARGET_NAMESPACE rb_mGio
 
 void
-Init_gfilteroutputstream(VALUE mGio)
+Init_gio2 (void)
 {
-        (void)G_DEF_CLASS(G_TYPE_FILTER_OUTPUT_STREAM, "FilterOutputStream", mGio);
+    VALUE RG_TARGET_NAMESPACE;
+
+    RG_TARGET_NAMESPACE = rb_define_module("Gio");
+    rb_gio2_init_pollable_source(RG_TARGET_NAMESPACE);
 }

data/ext/gio2/{gio2.c → rb-gio2.h}

@@ -1,7 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2008-2009  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2014  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
@@ -19,13 +18,9 @@
  *  MA  02110-1301  USA
  */
 
-#include "rbgio2private.h"
+#include <gio/gio.h>
 
-void Init_gio2(void);
+#include <rb-gobject-introspection.h>
 
-void
-Init_gio2(void)
-{
-    Init_util();
-    Init_gio();
-}
+extern void Init_gio2 (void);
+G_GNUC_INTERNAL extern void rb_gio2_init_pollable_source (VALUE rb_mGio);

data/extconf.rb

@@ -1,9 +1,25 @@
 #!/usr/bin/env ruby
+#
+# Copyright (C) 2014  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
+# 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
 
-require 'pathname'
-require 'mkmf'
-require 'rbconfig'
-require 'fileutils'
+require "pathname"
+require "mkmf"
+require "rbconfig"
+require "fileutils"
 
 package = "gio2"
 
@@ -24,7 +40,7 @@ create_makefile(package)
 FileUtils.mv("Makefile", "Makefile.lib")
 
 File.open("Makefile", "w") do |makefile|
-  makefile.puts(<<-EOM)
+  makefile.puts(<<-MAKEFILE)
 all:
 	(cd ext/#{package} && $(MAKE))
 	$(MAKE) -f Makefile.lib
@@ -45,5 +61,5 @@ distclean:
 	(cd ext/#{package} && $(MAKE) distclean)
 	$(MAKE) -f Makefile.lib distclean
 	@rm -f Makefile.lib
-EOM
+  MAKEFILE
 end

data/lib/gio2.rb

@@ -1,161 +1,56 @@
-require 'glib2'
+# Copyright (C) 2013-2014  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
+# 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
+
+require "gobject-introspection"
+require "glib2"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
-begin
-  major, minor, _ = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/gio2.so"
-rescue LoadError
-  require "gio2.so"
-end
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
 require "gio2/deprecated"
+require "gio2/loader"
 
-class Gio::DataInputStream
-  include Enumerable
-
-  def each
-    while line = read_line
-      yield line
-    end
-  end
-
-  alias each_line each
-
-  def each_async(io_priority = GLib::PRIORITY_DEFAULT, cancellable = nil, &block)
-    each_async_loop io_priority, cancellable, block
-    self
-  end
-
-  alias each_line_async each_async
-
-private
-
-  def each_async_loop(io_priority, cancellable, block)
-    # TODO: Should we really pass in the object?  I mean, how often is that
-    # useful?  We can always get it with result.source_object as well.
-    read_line_async io_priority, cancellable do |result|
-      if line = read_line_finish(result)
-        block.call line
-        each_async_loop io_priority, cancellable, block
-      end
-    end
-  end
-
-  # TODO: Add #each_byte?
-end
-
-if Gio.const_defined? :DesktopAppInfo
-  class Gio::DesktopAppInfo
-    class << self
-      def desktop_env=(desktop_env)
-        set_desktop_env desktop_env
-        desktop_env
-      end
-    end
-  end
-end
-
-module Gio::File
-  include Enumerable
-
-  def eql?(other)
-    self === other and self == other
-  end
-
-  alias each enumerate_children
-
-  def each_async(num_files, attributes = nil, flags = nil,
-                 io_priority = GLib::PRIORITY_DEFAULT, cancellable = nil,
-                 &block)
-    enumerate_children_async attributes, flags, io_priority, cancellable do |result|
-      enumerate_children_finish(result).each_async num_files, io_priority, cancellable, &block
-    end
-    self
-  end
-end
-
-class Gio::FileEnumerator
-  include Enumerable
+module Gio
+  LOG_DOMAIN = "Gio"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-  def each(cancellable = nil)
-    return self.enum_for unless block_given?
-    while file = next_file(cancellable)
-      yield file
-    end
-    close
-    self
-  end
-
-  # TODO: Return Enumerator unless block_given?
-  def each_async(num_files, io_priority = GLib::PRIORITY_DEFAULT, cancellable = nil, &block)
-    each_async_loop num_files, io_priority, cancellable, block
+  class Error < StandardError
   end
 
-private
-
-  def each_async_loop(num_files, io_priority, cancellable, block)
-    next_files_async num_files, io_priority, cancellable do |result|
-      files = next_files_finish(result)
-      files.each do |file|
-        block.call file
-      end
-      if files.length > 0
-        each_async_loop num_files, io_priority, cancellable, block
+  class << self
+    def const_missing(name)
+      init
+      if const_defined?(name)
+        const_get(name)
       else
-        close
+        super
       end
     end
-  end
-end
 
-class Gio::FileInfo
-  def directory?
-    file_type == Gio::File::Type::DIRECTORY
-  end
-end
-
-module Gio::Icon
-  def eql?(other)
-    self === other and self == other
-  end
-end
-
-class Gio::InputStream
-  def pending=(pending)
-    pending ? set_pending : clear_pending
-  end
-end
-
-class Gio::Resolver
-  class << self
-    def default=(default)
-      set_default default
-      default
-    end
-  end
-end
-
-module Gio::SocketConnectable
-  include Enumerable
-
-  def each(cancellable = nil)
-    enumerator = enumerate
-    while address = enumerator.next(cancellable)
-      yield address
-    end
-  end
-end
-
-class Gio::UnixFDList
-  include Enumerable
-
-  def each
-    i = 0
-    while i < length
-      yield self[i]
+    def init
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
+      loader = Loader.new(self)
+      loader.load("Gio")
     end
   end
 end