gmt 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47175ab0f9f220eec500e98bb1b392ec93ae42b61e13c851bae392a0dd4d9d08
-  data.tar.gz: 0f24492604a31c82461d730be0afbc508849ff757939ac99596020f8ffe0c6f7
+  metadata.gz: 6ad7de33d11e4ab6419c28a78a14ba7ae9d5e0418485ab794060f8ca7a5a6f21
+  data.tar.gz: 11e72187266c674aad88d7597f2f50a2b714c2443820564a470bef2a180a5fdf
 SHA512:
-  metadata.gz: 7fb19342fb1e3480531f02e1d9ca34203791820952c2d683d5294af027a5f9cc8205f9f2ed07fa452b7a0f9bb4dd51b9bafe36e7b08934e745fea6410cfb4c30
-  data.tar.gz: 8e59daf96977b38a4498c7934d04ec302c7044a50af43e07ad36118742c87070d1d1eb268578f4c3a17c41a3c04912d3db1afd849b0e16d96cce98b7b13f9172
+  metadata.gz: 921660bab096dd80e3908914ceca695090c83c9a7a644be6b594dc51c448c03ae1d6d33de02f5f02dc028ea32496bd672d8ac3ff980d98ee1ec7ed0170788f35
+  data.tar.gz: ffc9d3d9a51563c4e0295ccf7c621053db09fb5c302639dcabe0e516a01c09415670e8eab9f012857b0d4ecfe119a4a38a85c6962b178dc90451951a35a027a3

data/ext/gmt/gmt.c

@@ -4,6 +4,8 @@
 #include <gmt.h>
 #include <gmt_version.h>
 
+#include <errno.h>
+
 #include "option.h"
 
 #define API_VER(major, minor, release) (10000 * major + 100 * minor + release)
@@ -17,18 +19,6 @@ typedef struct
 
 /* helpers */
 
-static void raise_unless_class_data(gmt_t *gmt)
-{
-  if (gmt == NULL)
-    rb_raise(rb_eRuntimeError, "failed fetch of GMT class data");
-}
-
-static void raise_if_error(int err, const char *module)
-{
-  if (err)
-    rb_raise(rb_eRuntimeError, "failed call to GMT module %s", module);
-}
-
 static void gmt_free(void*);
 
 static rb_data_type_t data_type = {
@@ -117,7 +107,9 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
 
   gmt_t *gmt;
   TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
-  raise_unless_class_data(gmt);
+
+  if (gmt == NULL)
+    rb_raise(rb_eRuntimeError, "failed fetch of GMT class data");
 
   void *session = gmt->session;
 
@@ -125,10 +117,22 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
   gmt_opts = ruby_array_to_gmt_options(opts, session);
   gmt_opts = append_inputs_to_gmt_options(files, gmt_opts, session);
 
+  errno = 0;
   int err = GMT_Call_Module(session, name, -1, gmt_opts);
+  int gmt_errno = errno;
 
   GMT_Destroy_Options(session, &gmt_opts);
-  raise_if_error(err, name);
+
+  if (err != 0)
+    {
+      VALUE gmt_syserr;
+
+      if ((gmt_errno != 0) &&
+          ((gmt_syserr = rb_syserr_new(gmt_errno, NULL)) != 0))
+        rb_exc_raise(gmt_syserr);
+      else
+        rb_raise(rb_eRuntimeError, "failed call to GMT module %s", name);
+    }
 
   return Qtrue;
 }

data/ext/gmt/option.c

@@ -32,7 +32,7 @@ static gmt_option_t* append_option(void *session,
   return GMT_Append_Option(session, gmt_opt, gmt_opts);
 }
 
-extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
+gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
 {
   if (TYPE(opts) != T_ARRAY)
     rb_raise(rb_eArgError, "options should be an array");
@@ -74,9 +74,9 @@ extern gmt_option_t* ruby_array_to_gmt_options(VALUE opts, void *session)
   return gmt_opts;
 }
 
-extern gmt_option_t* append_inputs_to_gmt_options(VALUE files,
-						  gmt_option_t* gmt_opts,
-						  void *session)
+gmt_option_t* append_inputs_to_gmt_options(VALUE files,
+                                           gmt_option_t *gmt_opts,
+                                           void *session)
 {
   if (TYPE(files) != T_ARRAY)
     rb_raise(rb_eArgError, "inputs should be an array");

data/ext/gmt/option.h

@@ -14,7 +14,7 @@
 
 typedef struct GMT_OPTION gmt_option_t;
 
-extern gmt_option_t* ruby_array_to_gmt_options(VALUE, void*);
-extern gmt_option_t* append_inputs_to_gmt_options(VALUE, gmt_option_t*, void*);
+gmt_option_t* ruby_array_to_gmt_options(VALUE, void*);
+gmt_option_t* append_inputs_to_gmt_options(VALUE, gmt_option_t*, void*);
 
 #endif

data/lib/gmt.rb

@@ -66,6 +66,18 @@
 #
 # using this format.
 #
+# One occasionally has need for multiple calls to the same option: the
+# <code>-B</code> option being the usual culprit. In this case, use a single
+# <code>:B</code> key and an array of the arguments:
+#
+#    B: [
+#      'xa%g+l%s' % [dx, x_label],
+#      'ya%g+l%s' % [dy, y_label],
+#      'nWeS'
+#     ], ...
+#
+# for example.
+#
 # == PostScript functions
 #
 # When creating complex PostScript plots one needs to make several calls to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2024-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,7 +131,7 @@ requirements:
 - GMT5/6 development libraries (compile)
 - GMT5/6 installation (test)
 - ghostscript (test)
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Generic Mapping Tools (GMT)