clutter 2.2.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4bee67052ac394ce8b3bcd9a6a97720013886c
-  data.tar.gz: 558aea70b4fadacf848ae839abd5d58c3c63dc0a
+  metadata.gz: 810fa9198d0fd0502517658b504ae6315752dfdb
+  data.tar.gz: 02e08e97a0a7e1c0d2bd8714ce914cf9054cd03d
 SHA512:
-  metadata.gz: 8074b5587f0ae0a8b09643e0ad6b5c0f3dfd86e1d90fd53ff54681297f25a62a4c085a18aab0962bdd0805020c3c22047ff15d16f8b6c2b32a05083695cd2efe
-  data.tar.gz: 30513df305f8d552e2bdd2020794cb4c1bdfd01861e0b9c92fcaba176a20a3a0aaaf0afd03f789f1fef13a814b6150d257a665dc01d658af66358051102d21bb
+  metadata.gz: 3a9d1e3c2f1e922855e46dbe4b575b140db21ea9562bf7a8c193df96be696b9815cb67a7801b0552f75640ba381d4430cf781b2adb25c79969d93a61830874ca
+  data.tar.gz: 3db592918a7d22cfeb3561dab7ef657310d44be27507a75c5a929404a973a52f9c60e89b20a3921dacf02db575ad2013f9f6fa1d83bbdffb8f08ba80e07d7b9c

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  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
@@ -82,7 +82,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "cogl",
       :download_site => :gnome,
       :label => "Cogl",
-      :version => "1.18.2",
+      :version => "1.20.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -96,14 +96,14 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "json-glib",
       :download_site => :gnome,
       :label => "JSON-GLib",
-      :version => "1.0.2",
+      :version => "1.0.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
         ],
         :patches => [
-          "json-glib-1.0.2-add-missing-config-h.diff",
+          # "json-glib-1.0.2-add-missing-config-h.diff",
         ],
         :need_autoreconf => true,
         :built_file => "bin/libjson-glib-1.0-0.dll",
@@ -113,7 +113,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "clutter",
       :download_site => :gnome,
       :label => "Clutter",
-      :version => "1.20.0",
+      :version => "1.22.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/lib/clutter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  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
@@ -50,7 +50,7 @@ module Clutter
         remove_method(:const_missing)
       end
       loader = Loader.new(self, argv)
-      loader.load("Clutter")
+      loader.load
       require "clutter/actor"
       require "clutter/actor-iter"
       require "clutter/animatable"
@@ -63,6 +63,7 @@ module Clutter
       require "clutter/text"
       require "clutter/text-buffer"
       require "clutter/threads"
+      require "clutter/version"
     end
   end
 
@@ -70,6 +71,8 @@ module Clutter
     class InitError < StandardError
     end
 
+    NAMESPACE = "Clutter"
+
     def initialize(base_module, init_arguments)
       super(base_module)
       @init_arguments = init_arguments
@@ -78,6 +81,10 @@ module Clutter
       @event_infos = []
     end
 
+    def load
+      super(NAMESPACE)
+    end
+
     private
     def pre_load(repository, namespace)
       init = repository.find(namespace, "init")
@@ -95,6 +102,8 @@ module Clutter
       @base_module.const_set("Threads", @threads_module)
       @feature_module = Module.new
       @base_module.const_set("Feature", @feature_module)
+      @version_module = Module.new
+      @base_module.const_set("Version", @version_module)
     end
 
     def post_load(repository, namespace)
@@ -106,6 +115,12 @@ module Clutter
       load_events
     end
 
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+
     def load_events
       @event_infos.each do |event_info|
         define_struct(event_info, :parent => Event)
@@ -161,6 +176,8 @@ module Clutter
       when /\AKEY_/
         @key_constants[info.name] = true
         @keys_module.const_set(info.name, info.value)
+      when /_VERSION\z/
+        @version_module.const_set($PREMATCH, info.value)
       else
         @other_constant_infos << info
       end

data/lib/clutter/version.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2015  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
+
+module Clutter
+  module Version
+    STRING = [MAJOR, MINOR, MICRO].join(".")
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        Clutter.check_version?(major, minor, micro)
+      end
+    end
+  end
+end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  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
@@ -44,8 +44,6 @@ end
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 
-$VERBOSE = false # TODO: remove me
-
 $LOAD_PATH.unshift(File.join(gobject_introspection_base, "test"))
 require "gobject-introspection-test-utils"
 
@@ -54,6 +52,14 @@ require "clutter-test-utils"
 
 require "clutter"
 
-Clutter.init([])
+repository = GObjectIntrospection::Repository.default
+begin
+  repository.require(Clutter::Loader::NAMESPACE)
+rescue GLib::Error
+  puts("Omit because typelib file doesn't exist: #{$!.message}")
+  exit(true)
+end
+
+Clutter.init
 
 exit Test::Unit::AutoRunner.run(true, clutter_base)

data/test/test-clutter-version.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2015  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
+
+class TestClutterVersion < Test::Unit::TestCase
+  include ClutterTestUtils
+
+  test "STRING" do
+    major = Clutter::Version::MAJOR
+    minor = Clutter::Version::MINOR
+    micro = Clutter::Version::MICRO
+    assert_equal([major, minor, micro].join("."),
+                 Clutter::Version::STRING)
+  end
+
+  sub_test_case("#or_later?") do
+    test "same" do
+      assert_true(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                             Clutter::Version::MINOR,
+                                             Clutter::Version::MICRO))
+    end
+
+    test "later" do
+      assert_true(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                             Clutter::Version::MINOR - 1,
+                                             Clutter::Version::MICRO))
+    end
+
+    test "earlier" do
+      assert_false(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                              Clutter::Version::MINOR + 1,
+                                              Clutter::Version::MICRO))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clutter
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 3.0.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cairo-gobject
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - lib/clutter/text-buffer.rb
 - lib/clutter/text.rb
 - lib/clutter/threads.rb
+- lib/clutter/version.rb
 - sample/basic-actor.rb
 - sample/bin-layout.rb
 - sample/box-layout.rb
@@ -117,6 +118,7 @@ files:
 - test/test-clutter-shader-effect.rb
 - test/test-clutter-text-buffer.rb
 - test/test-clutter-timeline.rb
+- test/test-clutter-version.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
 - LGPLv2.1 or later