goffice 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a70695ed84471c40dd91f81234f4e2321399e4
-  data.tar.gz: 8a3c46633007e58ec7060d6fa46ec9bdfaa7ad8c
+  metadata.gz: cdf5849b4f57e71d04d8a5dde7ca97318322f856
+  data.tar.gz: e1664fb871f68e75d600a3ec66e1e6b2b20752c1
 SHA512:
-  metadata.gz: ad2662eff88fc6ac589c2fd00e2f34b2665f2ea1b835823f8deec9c36c2848c8bf9594ed022deb6aecfc0fc68f34899f7d7b4f8e1a3924728b82b7b2745e3012
-  data.tar.gz: 490e43de24fe8d1d0be6ba857c2deb5dbe16785124725ae1bda217708c3efb8de2184b59a3565591486306e989421ff4820e5edd1362ae7a8ec2ddbc638b534b
+  metadata.gz: d677c3a59f7147b3ee83541dd995c54b7bfbdb2be491341a07402aca624537ab6c72770180808406cb1e061905a9b744db29208dfaedc128da16c3a9518574ea
+  data.tar.gz: ea2d01a9210fbade1c4793a99318cdf3d7809cd33a4c5e389e357247442247b52f08eab9eef835196ca94cacd42359f51d262ac95a4665ceb8180025f4523617

data/dependency-check/Rakefile

@@ -0,0 +1,68 @@
+# Copyright (C) 2017  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
+
+# Copyright (C) 2017  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 "pkg-config"
+require "native-package-installer"
+
+case RUBY_PLATFORM
+when /mingw|mswin/
+  task :default => "nothing"
+else
+  task :default => "dependency:check"
+end
+
+task :nothing do
+end
+
+namespace :dependency do
+  desc "Check dependency"
+  task :check do
+    unless PKGConfig.check_version?("libgoffice-0.10")
+      goffice010_spec = {
+        :debian => "libgoffice-0.10-dev",
+        :homebrew => "goffice",
+      }
+      unless NativePackageInstaller.install(goffice08_spec)
+        unless PKGConfig.check_version?("libgoffice-0.8")
+          goffice08_spec = {
+            :debian => "libgoffice-0.8-dev",
+            :redhat => "goffice08-devel",
+            :homebrew => "goffice",
+          }
+          unless NativePackageInstaller.install(goffice08_spec)
+            exit(false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/goffice.rb

@@ -27,7 +27,7 @@ GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
 require "goffice/loader"
 
-module GOffice 
+module GOffice
   LOG_DOMAIN = "GOffice"
   GLib::Log.set_log_domain(LOG_DOMAIN)
 

data/lib/goffice/loader.rb

@@ -27,10 +27,13 @@ module GOffice
 
     def define_version(repository, namespace)
       major, minor, micro = repository.get_version(namespace).split(".")
-      @base_module.const_set("MAJOR", Integer(major))
-      @base_module.const_set("MINOR", Integer(minor))
-      micro = Integer(micro) unless micro.nil?
-      @base_module.const_set("MICRO", micro)
+      version_module = Module.new do
+        const_set("MAJOR", Integer(major))
+        const_set("MINOR", Integer(minor))
+        micro = Integer(micro) unless micro.nil?
+        const_set("MICRO", micro)
+      end
+      @base_module.const_set("Version", version_module)
     end
 
     def require_libraries

data/lib/goffice/version.rb

@@ -24,7 +24,7 @@ module GOffice
         version = [
           MAJOR,
           MINOR,
-          MICRO,
+          MICRO || 0,
         ].compact
         (version <=> [major, minor, micro]) >= 0
       end

data/test/goffice-test-utils.rb

@@ -17,7 +17,10 @@
 require "test-unit"
 
 module GOfficeTestUtils
-  def omit_on_travis_ci
-    omit("This test can't be run on Travis CI") if ENV["CI"]
+  private
+  def only_goffice_version(major, minor, micro=nil)
+    unless GOffice::Version.or_later?(major, minor, micro)
+      omit("Require GOffice >= #{major}.#{minor}.#{micro}")
+    end
   end
 end

data/test/run-test.rb

@@ -58,5 +58,11 @@ $LOAD_PATH.unshift(File.join(goffice_base, "test"))
 require "goffice-test-utils"
 
 require "goffice"
+begin
+  GOffice.init
+rescue GObjectIntrospection::RepositoryError
+  puts("Omit because typelib file doesn't exist: #{$!.message}")
+  exit(true)
+end
 
 exit Test::Unit::AutoRunner.run(true, File.join(goffice_base, "test"))

data/test/test-data-scalar-str.rb

@@ -18,7 +18,7 @@ class DataScalarStrTest < Test::Unit::TestCase
   include GOfficeTestUtils
 
   test ".new" do
-    omit_on_travis_ci
+    only_goffice_version(0, 10, 27)
     data = GOffice::DataScalarStr.new("XXX")
     assert_equal("XXX", data.str)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goffice
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gsf
@@ -16,49 +16,51 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 description: Ruby/GOFFICE is a Ruby binding of GOFFICE.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-extensions: []
+extensions:
+- dependency-check/Rakefile
 extra_rdoc_files: []
 files:
 - Rakefile
+- dependency-check/Rakefile
 - lib/goffice.rb
 - lib/goffice/loader.rb
 - lib/goffice/version.rb
@@ -67,7 +69,7 @@ files:
 - test/test-data-scalar-str.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
-- LGPLv2.1+
+- LGPL-2.1+
 metadata: {}
 post_install_message: 
 rdoc_options: []