gmt 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c457c3b27d88eb6ecebfe6b4099964280c56034
-  data.tar.gz: 46117cbd3d877e969dc3c5b0ac81fffbb119c3b6
+  metadata.gz: 116cb71a63ceee278a6cd534b47283c5d90a49d2
+  data.tar.gz: 793f1e3ec6e3f1fbfdf1278fbf373bdb4627a67a
 SHA512:
-  metadata.gz: 9db2d2eb4e8c28b4437030383e11f7a117b4a0405a17afe0fc631829479ec7ba6580d2e3b292b020ba39589e4b8f123e47f0b6a10ce53fcadd9e0de4b0c4fa7e
-  data.tar.gz: b1139fd50414084518919b2504fec7a39a3d0b0f39a07d0da43434f888c581e1e16a3aaffeb9dbe37577e0b38b6e2e439c05f6165706ce2782c1870818c36071
+  metadata.gz: 3ddc705150d74f92d57f92424a5ab70b323f1be9fd58f8b637b8b3d5935f596081ca531d40e795015d1e474803bc59ed30efe8459667bc8d6c78877f5c22a1fc
+  data.tar.gz: d1c2536387dfc8f7a76624cc6d3b1f041922a0de3e412815acdb6ae2af795b17494e0a51b60e0db005a7a8afc9cfba4727d24d7942f94e07b6ecc9a1eec2790a

data/ext/gmt/extconf.rb

@@ -23,17 +23,33 @@ LIB_DIRS = [
 dir_config('gmt', HEADER_DIRS, LIB_DIRS)
 
 abort 'missing gmt.h' unless find_header('gmt.h')
+abort 'missing gmt_version.h' unless find_header('gmt_version.h')
 
-SYM =
+FUNCS =
   [
     'GMT_Create_Session',
     'GMT_Destroy_Session',
   ]
 
-abort "libgmt is missing" unless find_library('gmt', SYM.first)
+abort "libgmt is missing" unless find_library('gmt', FUNCS.first)
 
-SYM.each do |func|
+FUNCS.each do |func|
   abort "missing #{func}()" unless have_func(func)
 end
 
+MACROS =
+  [
+    'GMT_MAJOR_VERSION',
+    'GMT_MINOR_VERSION',
+    'GMT_RELEASE_VERSION'
+  ]
+
+MACROS.each do |macro|
+  abort "missing #{macro}" unless have_macro(macro, 'gmt_version.h')
+end
+
+# remove a C90 specific warning
+
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+
 create_makefile 'gmt/gmt'

data/ext/gmt/gmt.c

@@ -1,8 +1,13 @@
 #include <ruby.h>
 #include <gmt.h>
+#include <gmt_version.h>
 
 #include "option.h"
 
+#define API_VER(major, minor, release) (10000 * major + 100 * minor + release)
+#define GMT_API_VER API_VER(GMT_MAJOR_VERSION, GMT_MINOR_VERSION, GMT_RELEASE_VERSION)
+#define API_AT_LEAST(major, minor, release) (GMT_API_VER >= API_VER(major, minor, release))
+
 typedef struct
 {
   void *session;
@@ -139,6 +144,14 @@ GMT_FUN(pswiggle)
 GMT_FUN(psxy)
 GMT_FUN(psxyz)
 
+#if API_AT_LEAST(5, 3, 0)
+GMT_FUN(pssolar)
+#endif
+
+#if API_AT_LEAST(5, 4, 0)
+GMT_FUN(psternary)
+#endif
+
 /* Gridding of Data Tables */
 
 GMT_FUN(greenspline)
@@ -261,6 +274,14 @@ void Init_gmt(void)
   RB_DPM(psxy);
   RB_DPM(psxyz);
 
+#if API_AT_LEAST(5, 3, 0)
+  RB_DPM(pssolar);
+#endif
+
+#if API_AT_LEAST(5, 4, 0)
+  RB_DPM(psternary);
+#endif
+
   /* Gridding of Data Tables */
 
   RB_DPM(greenspline);
@@ -340,6 +361,12 @@ void Init_gmt(void)
   RB_DPM(gmt2kml);
   RB_DPM(kml2gmt);
   RB_DPM(psconvert);
+
+  /* version constants */
+
+  rb_define_const(cGMT, "VERSION_MAJOR", INT2NUM(GMT_MAJOR_VERSION));
+  rb_define_const(cGMT, "VERSION_MINOR", INT2NUM(GMT_MINOR_VERSION));
+  rb_define_const(cGMT, "VERSION_RELEASE", INT2NUM(GMT_RELEASE_VERSION));
 }
 
 #undef RB_DPM

data/ext/gmt/option.c

@@ -39,7 +39,7 @@ extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
 
   gmt_option_t *gmt_opts = NULL;
 
-  for (size_t i = 0 ; i < RARRAY_LEN(opts) ; i++)
+  for (size_t i = 0 ; i < (size_t)RARRAY_LEN(opts) ; i++)
     {
       VALUE opt = RARRAY_PTR(opts)[i];
 
@@ -81,7 +81,7 @@ extern gmt_option_t* append_inputs_to_gmt_options(VALUE files,
   if (TYPE(files) != T_ARRAY)
     rb_raise(rb_eArgError, "inputs should be an array");
 
-  for (size_t i = 0 ; i < RARRAY_LEN(files) ; i++)
+  for (size_t i = 0 ; i < (size_t)RARRAY_LEN(files) ; i++)
     {
       VALUE file = RARRAY_PTR(files)[i];
 

data/lib/gmt.rb

@@ -47,7 +47,7 @@
 #
 # Each GMT function is available as instance method, and each has the same
 # signatures: several _arguments_, typically input files, followed by a
-# single options hash.  The options has corresponds to the command-line
+# single options hash.  The options hash corresponds to the command-line
 # options of the GMT program; hence the shell command
 #
 #    gmt makecpt -Cgebco depths.txt -i2 -Z -E24 > my_depths.cpt
@@ -91,8 +91,41 @@ class GMT
 
   class << self
 
+    # @param [Integer] major The major version
+    # @param [Integer] minor The minor version
+    # @param [Integer] release The release version
+    # @return [Boolean] +true+ if the current API version is at least as requested
+    #
+    # @example If the current API version if 5.3.2, then
+    #   GMT.version_at_least?(5) #=> true
+    #   GMT.version_at_least?(5, 3, 1) #=> true
+    #   GMT.version_at_least?(5, 3, 3) #=> false
+    def version_at_least?(major, minor=0, release=0)
+      if VERSION_MAJOR > major then
+        true
+      elsif VERSION_MAJOR < major then
+        false
+      else
+        version_at_least_minor?(minor, release)
+      end
+    end
+
     private
 
+    def version_at_least_minor?(minor, release)
+      if VERSION_MINOR > minor then
+        true
+      elsif VERSION_MINOR < minor then
+        false
+      else
+        version_at_least_release?(release)
+      end
+    end
+
+    def version_at_least_release?(release)
+      VERSION_RELEASE >= release
+    end
+
     # @macro [attach] wrapper_ps
     #
     #   A PostScript function (accepts +:file+ and +:position+ options).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: |
   A Ruby extension for the Generic Mapping Tools (GMT5)
   cartographic toolset.