vte3 2.2.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bcd8fdc0b8b9e19027204cc232c442f454c322
-  data.tar.gz: 8c9db262d2beae07bcb59b998e8a0e429d97093f
+  metadata.gz: 94408dceea5a6c1b7509a685823fd20e1742ceeb
+  data.tar.gz: 2435d3de5366f369e1e2c9a854ee7ec8e6701ad0
 SHA512:
-  metadata.gz: 5f5c14ee4fb112339eae65491285d3572a45f952391b6831642d65fa68630e6ce277f26f1b2b9112b4d6dbf98d35ef116b568cff7473495c89042be528394abe
-  data.tar.gz: a0ce903de96acd5281cb2bcef8110bc740c1b376c9984c179ee8d15274b4b0ee95a620a4ef2c645472342a36198241484ff07d86040df6bd2044c719a068a954
+  metadata.gz: 3a2927cb3923cf0f8d73b2e6217bf128e6747acac55bca80c5123403f5cf85de23b37e1d93678f678d4be058e320e66fde881f2bc3ce70835e5a84c8fdcb2094
+  data.tar.gz: 24892fe03e9f46399822cf0c13b620500ac7dd8afd24be76a2ec1177223bb832b1d8fbfaecfca969c094c5cdfb0db6580ddb8f8036e2ed690aed09031a0b947e

data/Rakefile

@@ -1,4 +1,20 @@
 # -*- ruby -*-
+#
+# Copyright (C) 2011-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
 
 $LOAD_PATH.unshift("./../glib2/lib")
 require 'gnome2/rake/package-task'
@@ -6,41 +22,41 @@ require 'gnome2/rake/package-task'
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/VTE is a Ruby binding of VTE."
   package.description = "Ruby/VTE is a Ruby binding of VTE."
-  package.dependency.gem.runtime = ["gtk3"]
+  package.dependency.gem.runtime = ["gtk3", "gobject-introspection"]
   package.windows.packages = []
   package.windows.dependencies = []
   package.windows.build_dependencies = [
-    "glib2", "atk", "pango", "gdk_pixbuf2", "gdk3",
+    "glib2",
+    "gio2",
+    "atk",
+    "pango",
+    "gdk_pixbuf2",
+    "gdk3",
+    "gobject-introspection",
   ]
-  package.windows.build_packages = [
-    # {
-    #   :name => "ncurses",
-    #   :download_base_url => "http://ftp.gnu.org/pub/gnu/ncurses",
-    #   :label => "ncurses",
-    #   :version => "5.9",
-    #   :configure_args => [
-    #     "--enable-sp-funcs",
-    #     "--enable-term-driver",
-    #     "--with-shared",
-    #     "--without-normal",
-    #     "--without-progs",
-    #     "--without-tests",
-    #   ],
-    #   :patches => [
-    #     "ncurses-5.9-support-mingw32.diff",
-    #     "ncurses-5.9-add-missing-exe.diff",
-    #   ],
-    # },
-    # {
-    #   :name => "vte",
-    #   :download_site => :gnome,
-    #   :label => "vte",
-    #   :version => "0.34.2",
-    #   :configure_args => [],
-    #   :compression_method => "xz",
-    # }
+  package.windows.gobject_introspection_dependencies = [
+    "gio2",
+    "atk",
+    "pango",
+    "gdk_pixbuf2",
+    "gdk3",
+  ]
+  package.external_packages = [
+    {
+      :name => "vte",
+      :download_site => :gnome,
+      :label => "vte",
+      :version => "0.41.90",
+      :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--disable-vala",
+        ],
+        :patches => [
+        ],
+        :need_autoreconf => true,
+      },
+    },
   ]
-  package.post_install_message = "This library is experimental."
 end
 package_task.define
-

data/lib/vte3.rb

@@ -1,4 +1,56 @@
+# 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 "gobject-introspection"
 require "gtk3"
-require "vte3.so"
-require "vte3/deprecated"
 
+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)
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
+
+require "vte3/loader"
+
+module Vte
+  LOG_DOMAIN = "Vte"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
+
+  class Error < StandardError
+  end
+
+  class << self
+    def const_missing(name)
+      init
+      if const_defined?(name)
+        const_get(name)
+      else
+        super
+      end
+    end
+
+    def init
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
+      Gtk.init if Gtk.respond_to?(:init)
+      loader = Loader.new(self)
+      loader.load("Vte")
+    end
+  end
+end

data/lib/vte3/deprecated.rb

@@ -1,3 +1,19 @@
+# Copyright (C) 2014-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 Vte
   extend GLib::Deprecatable
 
@@ -8,7 +24,6 @@ module Vte
     define_deprecated_const :CursorShape, 'Vte::TerminalCursorShape'
     define_deprecated_const :WriteFlags, 'Vte::TerminalWriteFlags'
 
-    define_deprecated_method :match_set_cursor_type, :match_set_cursor
     define_deprecated_method :fork_pty, :raise => "Use 'Vte::Pty#fork'."
     define_deprecated_method :using_xft?, :warn => "Don't use this method." do |_self|
       false
@@ -16,30 +31,13 @@ module Vte
     define_deprecated_method :padding, :warn => "Use 'inner-border' style property." do |_self|
       [0, 0]
     end
-    define_deprecated_method :char_descent, :warn => "Don't use this method." do |_self|
-      0
-    end
-    define_deprecated_method :char_ascent, :warn => "Don't use this method." do |_self|
-      0
-    end
-    define_deprecated_method_by_hash_args :fork_command,
-        'command, argv, envv, directory, lastlog, utmp, wtmp',
-        ':pty_flags => :default, :working_directory => <current>, :argv => <user_shell>, :envv => nil, :spawn_flags => :child_inherits_stdin' do
-        |_self, command, argv, envv, directory, lastlog = true, utmp = true, wtmp = true|
-      pty_flags = [!lastlog && :no_lastlog, !utmp && :no_utmp, !wtmp && :no_wtmp].select{|f| f}
-      argv = command && [command, *argv]
-      [{:pty_flags => pty_flags, :working_directory => directory, :argv => argv, :envv => envv}]
+
+    unless method_defined?(:pty_object)
+      define_deprecated_method :pty_object, :pty
     end
 
-    alias :__set_font__ :set_font
-    private :__set_font__
-    def set_font(*args)
-      if args.size == 1
-        params = args.first
-      else
-        raise GLib::DeprecatedError.new("#{caller[0]}: '#{self.class}#set_font(desc_or_name, antialias)' style has been deprecated. Use '#{self.class}#set_font(desc_or_name)' style.")
-      end
-      __set_font__(params)
+    unless method_defined?(:fork_command)
+      define_deprecated_method :fork_command, :spawn
     end
   end
 end

data/lib/vte3/loader.rb

@@ -0,0 +1,66 @@
+# Copyright (C) 2014-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 Vte
+  class Loader < GObjectIntrospection::Loader
+    private
+    def load_function_info(info)
+      name = info.name
+      case name
+      when "init"
+        # ignore
+      else
+        super
+      end
+    end
+
+    def pre_load(repository, namespace)
+      define_version_module
+    end
+
+    def define_version_module
+      @version_module = Module.new
+      @base_module.const_set("Version", @version_module)
+    end
+
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def require_libraries
+      require "vte3/pty"
+      require "vte3/terminal"
+      require "vte3/version"
+
+      require "vte3/deprecated"
+    end
+
+    def load_constant_info(info)
+      case info.name
+      when /_VERSION\z/
+        @version_module.const_set($PREMATCH, info.value)
+      else
+        super
+      end
+    end
+
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+  end
+end

data/lib/vte3/pty.rb

@@ -0,0 +1,29 @@
+# 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 Vte
+  class Pty
+    alias_method :size_raw, :size
+    def size
+      succeeded, rows, columns = size_raw
+      if succeeded
+        [rows, columns]
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/vte3/terminal.rb

@@ -0,0 +1,73 @@
+# 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 Vte
+  class Terminal
+    if method_defined?(:fork_command_full)
+      def fork_command(options={})
+        pty_flags = options[:pty_flags] || PtyFlags::DEFAULT
+        working_directory = options[:working_directory]
+        argv = options[:argv] || [ENV["SHELL"] || "/bin/sh"]
+        envv = options[:envv]
+        default_spawn_flags =
+          GLib::Spawn::CHILD_INHERITS_STDIN | GLib::Spawn::SEARCH_PATH
+        spawn_flags = options[:spawn_flags] || default_spawn_flags
+        succeeded, pid = fork_command_full(pty_flags,
+                                           working_directory,
+                                           argv,
+                                           envv,
+                                           spawn_flags)
+        if succeeded
+          pid
+        else
+          nil
+        end
+      end
+
+      alias_method :spawn, :fork_command
+
+      alias_method :pty_raw, :pty
+      def pty
+        pty_object
+      end
+    else
+      def spawn(options)
+        pty_flags = options[:pty_flags] || PtyFlags::DEFAULT
+        working_directory = options[:working_directory]
+        argv = options[:argv] || [ENV["SHELL"] || "/bin/sh"]
+        envv = options[:envv]
+        default_spawn_flags =
+          GLib::Spawn::CHILD_INHERITS_STDIN | GLib::Spawn::SEARCH_PATH
+        spawn_flags = options[:spawn_flags] || default_spawn_flags
+        succeeded, pid = spawn_sync(pty_flags,
+                                    working_directory,
+                                    argv,
+                                    envv,
+                                    spawn_flags)
+        if succeeded
+          pid
+        else
+          nil
+        end
+      end
+    end
+
+    alias_method :feed_child_raw, :feed_child
+    def feed_child(text)
+      feed_child_raw(text, text.bytesize)
+    end
+  end
+end

data/lib/vte3/version.rb

@@ -0,0 +1,35 @@
+# 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 Vte
+  module Version
+    if const_defined?(:MAJOR)
+      STRING = [MAJOR, MINOR, MICRO].join(".")
+
+      class << self
+        def or_later?(major, minor, micro=nil)
+          micro ||= 0
+          version = [
+            MAJOR,
+            MINOR,
+            MICRO,
+          ]
+          (version <=> [major, minor, micro]) >= 0
+        end
+      end
+    end
+  end
+end

data/test/run-test.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014-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
+
+ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
+ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
+
+glib_base = File.join(ruby_gnome2_base, "glib2")
+atk_base = File.join(ruby_gnome2_base, "atk")
+pango_base = File.join(ruby_gnome2_base, "pango")
+gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
+cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
+gio2_base = File.join(ruby_gnome2_base, "gio2")
+gdk3_base = File.join(ruby_gnome2_base, "gdk3")
+gtk3_base = File.join(ruby_gnome2_base, "gtk3")
+vte3_base = File.join(ruby_gnome2_base, "vte3")
+
+modules = [
+  [glib_base, "glib2"],
+  [atk_base, "atk"],
+  [pango_base, "pango"],
+  [cairo_gobject_base, "cairo-gobject"],
+  [gdk_pixbuf_base, "gdk_pixbuf2"],
+  [gobject_introspection_base, "gobject-introspection"],
+  [gio2_base, "gio2"],
+  [gdk3_base, "gdk3"],
+  [gtk3_base, "gtk3"],
+  [vte3_base, "vte3"],
+]
+
+modules.each do |target, module_name|
+  makefile = File.join(target, "Makefile")
+  if File.exist?(makefile) and system("which make > /dev/null")
+    `make -C #{target.dump} > /dev/null` or exit(false)
+  end
+  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
+  $LOAD_PATH.unshift(File.join(target, "lib"))
+end
+
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require "glib-test-init"
+
+$LOAD_PATH.unshift(File.join(vte3_base, "test"))
+require "vte3-test-utils"
+
+require "vte3"
+
+exit Test::Unit::AutoRunner.run(true)