glib2 1.1.3 → 1.1.4

data/ext/glib2/extconf.rb

@@ -16,7 +16,13 @@ require 'mkmf-gnome2'
 
 setup_win32(module_name, base_dir)
 
-PKGConfig.have_package(package_id) or exit 1
+unless required_pkg_config_package(package_id,
+                                   :debian => "libglib2.0-dev",
+                                   :redhat => "glib2-devel",
+                                   :homebrew => "glib",
+                                   :macports => "glib2")
+  exit(false)
+end
 PKGConfig.have_package('gthread-2.0')
 
 have_header("unistd.h")

data/ext/glib2/glib2.def

@@ -128,5 +128,6 @@ EXPORTS
 	rbglib_num_to_int64
 	rbglib_int64_to_num
 
+	g_source_get_type
 	g_connect_flags_get_type
 	g_poll_fd_get_type

data/ext/glib2/rbglib.c

@@ -1109,6 +1109,7 @@ union       GDoubleIEEE754;
     Init_glib_source();
     Init_glib_main_context();
     Init_glib_poll_fd();
+    Init_glib_io_constants();
     Init_glib_io_channel();
     Init_glib_io_channelerror();
     Init_glib_io_channel_win32_socket();

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 3
+#define RBGLIB_MICRO_VERSION 4
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib2conversions.h

@@ -44,8 +44,8 @@
 #define RVAL2GVALUE(o)                     ((GValue*)RVAL2BOXED(o, G_TYPE_VALUE))
 #define GVALUE2RVAL(o)                     (BOXED2RVAL(o, G_TYPE_VALUE))
 
-#define RVAL2GIOCONDITION(o)               (RVAL2GENUM(o, G_TYPE_IO_CONDITION))
-#define GIOCONDITION2RVAL(o)               (GENUM2RVAL(o, G_TYPE_IO_CONDITION))
+#define RVAL2GIOCONDITION(o)               (RVAL2GFLAGS(o, G_TYPE_IO_CONDITION))
+#define GIOCONDITION2RVAL(o)               (GFLAGS2RVAL(o, G_TYPE_IO_CONDITION))
 #define RVAL2GNORMALIZEMODE(o)             (RVAL2GENUM(o, G_TYPE_NORMALIZE_MODE))
 #define GNORMALIZEMODE2RVAL(o)             (GENUM2RVAL(o, G_TYPE_NORMALIZE_MODE))
 

data/ext/glib2/rbglib_io_constants.c

@@ -0,0 +1,30 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011-2012  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 "rbgprivate.h"
+
+void
+Init_glib_io_constants(void)
+{
+    VALUE RG_TARGET_NAMESPACE = mGLib;
+
+    /* GIOCondition */
+    G_DEF_CLASS(G_TYPE_IO_CONDITION, "IOCondition", RG_TARGET_NAMESPACE);
+}

data/ext/glib2/rbglib_iochannel.c

@@ -799,12 +799,9 @@ Init_glib_io_channel(void)
     rb_define_const(RG_TARGET_NAMESPACE, "STATUS_AGAIN", INT2NUM(G_IO_STATUS_AGAIN));
 
     /* GIOCondition */
-    rb_define_const(RG_TARGET_NAMESPACE, "IN", INT2NUM(G_IO_IN));
-    rb_define_const(RG_TARGET_NAMESPACE, "OUT", INT2NUM(G_IO_OUT));
-    rb_define_const(RG_TARGET_NAMESPACE, "PRI", INT2NUM(G_IO_PRI));
-    rb_define_const(RG_TARGET_NAMESPACE, "ERR", INT2NUM(G_IO_ERR));
-    rb_define_const(RG_TARGET_NAMESPACE, "HUP", INT2NUM(G_IO_HUP));
-    rb_define_const(RG_TARGET_NAMESPACE, "NVAL", INT2NUM(G_IO_NVAL));
+    /* Deprecated. Just for bacakward compatibility. Use
+     * GLib::IOCondition::* instead. */
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, G_TYPE_IO_CONDITION, "G_IO_");
 
     /* GIOFlags */
     rb_define_const(RG_TARGET_NAMESPACE, "FLAG_APPEND", INT2NUM(G_IO_FLAG_APPEND));

data/ext/glib2/rbglib_source.c

@@ -54,9 +54,12 @@ GSource*    g_source_new                    (GSourceFuncs *source_funcs,
 */
 
 static VALUE
-rg_attach(VALUE self, VALUE context)
+rg_attach(int argc, VALUE *argv, VALUE self)
 {
-    return UINT2NUM(g_source_attach(_SELF(self), 
+    VALUE context;
+
+    rb_scan_args(argc, argv, "01", &context);
+    return UINT2NUM(g_source_attach(_SELF(self),
                                     RVAL2BOXED(context, G_TYPE_MAIN_CONTEXT)));
 }
 
@@ -168,7 +171,7 @@ Init_glib_source(void)
 
     id_call = rb_intern("call");
 
-    RG_DEF_METHOD(attach, 1);
+    RG_DEF_METHOD(attach, -1);
 #if GLIB_CHECK_VERSION(2,12,0)
     RG_DEF_METHOD_P(destroyed, 0);
 #endif

data/ext/glib2/rbgprivate.h

@@ -131,6 +131,7 @@ G_GNUC_INTERNAL void Init_glib_main_loop(void);
 G_GNUC_INTERNAL void Init_glib_main_context(void);
 G_GNUC_INTERNAL void Init_glib_source(void);
 G_GNUC_INTERNAL void Init_glib_poll_fd(void);
+G_GNUC_INTERNAL void Init_glib_io_constants(void);
 G_GNUC_INTERNAL void Init_glib_io_channel(void);
 G_GNUC_INTERNAL void Init_glib_io_channelerror(void);
 G_GNUC_INTERNAL void Init_glib_io_channel_win32_socket(void);

data/lib/glib-mkenums.rb

@@ -21,7 +21,7 @@ module GLib
       @EnumName = name
       @g_type_prefix = g_type_prefix
       @constants = []
-      @enum_name = @EnumName.sub(/^[A-Z]/){|v| v.downcase}.gsub(/[A-Z]+/){|v| "_" + v.downcase}.sub(/(^_|_$)/, "")
+      @enum_name = to_snail_case(@EnumName)
       @ENUM_NAME = @enum_name.upcase
       @ENUM_SHORT = @ENUM_NAME.sub(/^#{@g_type_prefix.sub(/_TYPE.*$/, "")}/, "").sub(/^_/, "")
 
@@ -92,22 +92,38 @@ GType #{@enum_name}_get_type (void);
 #define #{@g_type_prefix}#{@ENUM_SHORT} (#{@enum_name}_get_type())]
     end
 
+    private
+    def to_snail_case(name)
+      prefix_processed_name = name.sub(/^[A-Z]/) do |prefix|
+        prefix.downcase
+      end
+      snail_cased_name = prefix_processed_name.gsub(/[A-Z]+/) do |upper_case|
+        down_case = upper_case.downcase
+        if down_case.size == 1
+          "_#{down_case}"
+        else
+          "_#{down_case[0..-2]}_#{down_case[-1..-1]}"
+        end
+      end
+      snail_cased_name.sub(/(^_|_$)/, "")
+    end
 
     def self.parse(data, g_type_prefix, options={})
       options ||= {}
       enums = []
       data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
-      data.scan(/^\s*typedef\s+enum\s*
+      data.scan(/^\s*typedef\s+enum\s*(\/\*<\s*flags\s*>\*\/)?\s*
                 \{?\s*(.*?)
-                \}\s*(\w+);/mx){|constants, name|
+                \}\s*(\w+);/mx) do |force_flags, constants, name|
         enum_options = {}
+        enum_options[:force_flags] = !force_flags.nil?
         force_flags_patterns = [(options[:force_flags] || [])].flatten
         if force_flags_patterns.any? {|pattern| pattern === name}
           enum_options[:force_flags] = true
         end
         enum = new(name, constants, g_type_prefix, enum_options)
         enums << enum
-      }
+      end
       enums
     end
   end

data/lib/mkmf-gnome2.rb

@@ -429,6 +429,122 @@ def check_cairo(options={})
   PKGConfig.have_package('cairo') and have_header('rb_cairo.h')
 end
 
+def package_platform
+  if File.exist?("/etc/debian_version")
+    :debian
+  elsif File.exist?("/etc/fedora-release")
+    :fedora
+  elsif File.exist?("/etc/redhat-release")
+    :redhat
+  elsif find_executable("brew")
+    :homebrew
+  elsif find_executable("port")
+    :macports
+  else
+    :unknown
+  end
+end
+
+def super_user?
+  Process.uid.zero?
+end
+
+def normalize_native_package_info(native_package_info)
+  native_package_info ||= {}
+  native_package_info = native_package_info.dup
+  native_package_info[:fedora] ||= native_package_info[:redhat]
+  native_package_info
+end
+
+def install_missing_native_package(native_package_info)
+  platform = package_platform
+  native_package_info = normalize_native_package_info(native_package_info)
+  package = native_package_info[platform]
+  return false if package.nil?
+
+  need_super_user_priviledge = true
+  case platform
+  when :debian
+    install_command = "apt-get install -V -y #{package}"
+  when :fedora, :redhat
+    install_command = "yum install -y #{package}"
+  when :homebrew
+    need_super_user_priviledge = false
+    install_command = "brew install #{package}"
+  when :macports
+    install_command = "port install -y #{package}"
+  else
+    return false
+  end
+
+  have_priviledge = (not need_super_user_priviledge or super_user?)
+  unless have_priviledge
+    sudo = find_executable("sudo")
+  end
+
+  installing_message = "installing '#{package}' native package... "
+  message("%s", installing_message)
+  failed_to_get_super_user_priviledge = false
+  if have_priviledge
+    succeeded = xsystem(install_command)
+  else
+    if sudo
+      install_command = "#{sudo} #{install_command}"
+      succeeded = xsystem(install_command)
+    else
+      succeeded = false
+      failed_to_get_super_user_priviledge = true
+    end
+  end
+
+  if failed_to_get_super_user_priviledge
+    result_message = "require super user privilege"
+  else
+    result_message = succeeded ? "succeeded" : "failed"
+  end
+  Logging.postpone do
+    "#{installing_message}#{result_message}\n"
+  end
+  message("#{result_message}\n")
+
+  error_message = nil
+  unless succeeded
+    if failed_to_get_super_user_priviledge
+      error_message = <<-EOM
+'#{package}' native package is required.
+run the following command as super user to install required native package:
+  \# #{install_command}
+EOM
+    else
+      error_message = <<-EOM
+failed to run '#{install_command}'.
+EOM
+    end
+  end
+  if error_message
+    message("%s", error_message)
+    Logging.message("%s", error_message)
+  end
+
+  Logging.message("--------------------\n\n")
+
+  succeeded
+end
+
+def required_pkg_config_package(package_info, native_package_info=nil)
+  if package_info.is_a?(Array)
+    required_package_info = package_info
+  else
+    required_package_info = [package_info]
+  end
+  return true if PKGConfig.have_package(*required_package_info)
+
+  native_package_info ||= {}
+  return false unless install_missing_native_package(native_package_info)
+
+  PKGConfig.have_package(*required_package_info)
+end
+
 add_include_path = Proc.new do |dir_variable|
   value = RbConfig::CONFIG[dir_variable]
   if value and File.exist?(value)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Project Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-08 00:00:00 Z
+date: 2012-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pkg-config
@@ -99,6 +99,7 @@ files:
 - ext/glib2/rbgobj_enums.c
 - ext/glib2/rbglib_win32.c
 - ext/glib2/rbglib_int64.c
+- ext/glib2/rbglib_io_constants.c
 - ext/glib2/glib2.def
 - ext/glib2/rbgobj_fundamental.c
 - ext/glib2/rbgcompat.h
@@ -191,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.