jsonnet 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2872d26e221e6ec8bbd30265edd0109eb9f1c68fa19fcfaa888c9921f096f771
-  data.tar.gz: b91f326aa5a64a97f9f088a17b6462e8cf77d8e82679c11231cc68eff2b495e5
+  metadata.gz: 92c5f9344c4b31e1c183acd4e12b5bd596540a13c938a4eb938f0759a754adce
+  data.tar.gz: db67d7972db0f962419dafb2b8ae8fdcd2bd7e3847f6315379a4fdaa1843b3f4
 SHA512:
-  metadata.gz: dab85234e40a4b05ae60a4fe7423af108df27b9e3d2db119e6d18edb40f9abbb92c20a5cf7c25fb5d20e3a090031fae42ec93fab135ea3c6682adaf3ec006693
-  data.tar.gz: 8aea3bbab4b7661a4ee6d055bd6fdd9b5c0834feae98f266b5d162563b860b932689f4fcd4096a3f2dcdf12fb5e960b2fbb7f7e65ce23d1d177d5f85128dbb56
+  metadata.gz: 3b2b912c43980ad07bb4e40c1f467c67b919c80552b6c51984699f9127a645b099e5f43e60bfe2574634d8ba8e9b2116106511ee54880eae2e876aead524169f
+  data.tar.gz: 1aac5b2c3b9047242184d613a26730a4418abbcb35008f1a91c71279d95a6747952c46b39b5720c25ced447e3a325d1b2aef7d7de92fe11775c3033bc734368b

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 $ gem install jsonnet
 ```
 
-By default this gem will compile and install Jsonnet (v0.16.0) as part of
+By default this gem will compile and install Jsonnet (v0.18.0) as part of
 installation. However you can use the system version of Jsonnet if you prefer.
 This would be the recommended route if you want to use a different version
 of Jsonnet or are having problems installing this.

data/ext/jsonnet/callbacks.c

@@ -27,7 +27,7 @@ invoke_callback(VALUE args)
 {
     long len = RARRAY_LEN(args);
     VALUE callback = rb_ary_entry(args, 0);
-    return rb_funcall2(callback, id_call, len - 1, RARRAY_PTR(args) + 1);
+    return rb_funcall2(callback, id_call, (int)(len - 1), RARRAY_PTR(args) + 1);
 }
 
 /*

data/ext/jsonnet/extconf.rb

@@ -13,9 +13,28 @@ unless using_system_libraries?
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
-  recipe = MiniPortile.new('jsonnet', 'v0.17.0')
-  recipe.files = ['https://github.com/google/jsonnet/archive/v0.17.0.tar.gz']
+  recipe = MiniPortile.new('jsonnet', 'v0.18.0')
+  recipe.files = ['https://github.com/google/jsonnet/archive/v0.18.0.tar.gz']
   class << recipe
+    CORE_OBJS = %w[
+      desugarer.o formatter.o lexer.o libjsonnet.o parser.o pass.o static_analysis.o string_utils.o vm.o
+    ].map {|name| File.join('core', name) }
+    MD5_OBJS = %w[
+      md5.o
+    ].map {|name| File.join('third_party', 'md5', name) }
+    C4_CORE_OBJS = %w[
+      base64.o
+      char_traits.o
+      error.o
+      format.o
+      language.o
+      memory_resource.o
+      memory_util.o
+      time.o
+    ].map {|name| File.join('third_party', 'rapidyaml', 'rapidyaml', 'ext', 'c4core', 'src', 'c4', name) }
+    RAPID_YAML_OBJS = %w[
+      common.o parse.o preprocess.o tree.o
+    ].map {|name| File.join('third_party', 'rapidyaml', 'rapidyaml', 'src', 'c4', 'yml', name) }
 
     def compile
       # We want to create a file a library we can link to. Jsonnet provides us
@@ -24,7 +43,7 @@ unless using_system_libraries?
       # we compile the c into .o files and then create an archive that can
       # be linked to
       execute('compile', make_cmd)
-      execute('archive', 'ar rcs libjsonnet.a core/desugarer.o core/formatter.o core/lexer.o core/libjsonnet.o core/parser.o core/pass.o core/static_analysis.o core/string_utils.o core/vm.o third_party/md5/md5.o')
+      execute('archive', 'ar rcs libjsonnet.a ' + target_object_files.join(' '))
     end
 
     def configured?
@@ -41,6 +60,15 @@ unless using_system_libraries?
       FileUtils.cp(File.join(work_path, 'include', 'libjsonnet.h'), include_path)
       FileUtils.cp(File.join(work_path, 'include', 'libjsonnet_fmt.h'), include_path)
     end
+
+    private
+    def target_object_files
+      if version >= 'v0.18.0'
+        CORE_OBJS + MD5_OBJS + C4_CORE_OBJS + RAPID_YAML_OBJS
+      else
+        CORE_OBJS + MD5_OBJS
+      end
+    end
   end
 
   recipe.cook
@@ -49,11 +77,12 @@ unless using_system_libraries?
   $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH
   $CPPFLAGS << " -I#{recipe.path}/include"
 
-  # This resolves an issue where you can get improper linkage when compiling
-  # and get an error like "undefined symbol: _ZTVN10__cxxabiv121__vmi_class_type_infoE"
-  # experienced on ubuntu.
-  # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=193950
-  $LIBS << " -lstdc++"
+  # jsonnet_wrap extension must be linked with c++ stdlib because
+  # the C++ library Rapid YAML is being statically linked.
+  rbconfig = RbConfig::MAKEFILE_CONFIG
+  if rbconfig['LDSHAREDXX']
+    rbconfig['LDSHARED'] = rbconfig['LDSHAREDXX']
+  end
 end
 
 abort 'libjsonnet.h not found' unless have_header('libjsonnet.h')

data/ext/jsonnet/vm.c

@@ -7,6 +7,10 @@
 
 #include "ruby_jsonnet.h"
 
+#ifndef NORETURN
+# define NORETURN(x) x
+#endif
+
 /*
  * defines the core part of Jsonnet::VM
  */
@@ -385,7 +389,7 @@ vm_fmt_snippet(VALUE self, VALUE snippet, VALUE fname)
 void
 rubyjsonnet_init_vm(VALUE mJsonnet)
 {
-    cVM = rb_define_class_under(mJsonnet, "VM", rb_cData);
+    cVM = rb_define_class_under(mJsonnet, "VM", rb_cObject);
     rb_define_singleton_method(cVM, "new", vm_s_new, -1);
     rb_define_private_method(cVM, "eval_file", vm_evaluate_file, 3);
     rb_define_private_method(cVM, "eval_snippet", vm_evaluate, 3);
@@ -424,7 +428,7 @@ rubyjsonnet_init_vm(VALUE mJsonnet)
 }
 
 static void
-raise_error(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_error)(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     VALUE ex;
     const int state = rubyjsonnet_jump_tag(msg);
@@ -451,13 +455,13 @@ raise_error(VALUE exception_class, struct JsonnetVm *vm, char *msg, rb_encoding
  * @sa rescue_callback
  */
 static void
-raise_eval_error(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_eval_error)(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     raise_error(eEvaluationError, vm, msg, enc);
 }
 
 static void
-raise_format_error(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
+NORETURN(raise_format_error)(struct JsonnetVm *vm, char *msg, rb_encoding *enc)
 {
     raise_error(eFormatError, vm, msg, enc);
 }

data/lib/jsonnet/version.rb

@@ -1,3 +1,3 @@
 module Jsonnet
-  VERSION = "0.4.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonnet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yuki Yugui Sonoda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Jsonnet library