psych 3.3.2 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 816fda8fc436476e4117450ad248554d12b2d41c25439e457c171583b0ad3e6a
-  data.tar.gz: 83ce5b7ccd045a76f430d7a13b30c356d05be0014d753945f412ab0e939fe0da
+  metadata.gz: e81adcfc8e167dbe8951e4b32794238a09003e57e75cc9e7f807d90c20aee917
+  data.tar.gz: 98cab7d17c5f91abbd84c95b089e71b4928b9554d5a8b154841c1d6d96c63f69
 SHA512:
-  metadata.gz: 855d085016ed2c1f30bc3a3433247ad34ce06220d3871b7a92b922d89fde0a645471b8512f41b9d43812de407dcfaf01b23458475dfc1e0c37b9bbb6ff8d91f6
-  data.tar.gz: 1191a34c8cf1c82687fbf94a25fdcce854c585718ef69aaedf97eb5a2cc1b07225ec44769a00b58124f67d58e33f138f657ea2233094f76bad1d2479d7a1b400
+  metadata.gz: 9297958a815fe84220641506bc65e17133d2c551cc34d50d0261f95e51d7a19e706b06bb98b59bbde587825f9256f0579a68d250346134f2f766a79c93fa1288
+  data.tar.gz: a86c4526fb081f9b18cc13e6f8326c3335e80913013f448bf9ef0d0f741af7d1bdc52392014076fe3b709427e47ae42dce7f4ffe0e896de82c8d3d218e23cfb0

data/CONTRIBUTING.md

@@ -0,0 +1,24 @@
+## How to contribute to Psych
+
+Full details [here](https://bugs.ruby-lang.org/projects/ruby/wiki/HowToContribute)
+
+#### **Did you find a bug?**
+
+* **Do not open an issue if the bug is a security vulnerability
+  in Psych**, instead refer to our [security policy](https://www.ruby-lang.org/en/security/) and email [here](security@ruby-lang.org).
+
+* **Ensure the bug was not already reported** by searching on ruby-core, the ruby github repo and on Psych's github repo. More info [here](https://bugs.ruby-lang.org/projects/ruby/wiki/HowToReport)
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://bugs.ruby-lang.org/). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch for small fixes. Anything larger look [here](https://bugs.ruby-lang.org/projects/ruby/wiki/HowToContribute); submit a Feature.
+
+* Ensure you clearly describe the problem and solution. Include the relevant ticket/issue number if applicable.
+
+Psych is a volunteer effort. We encourage you to pitch in and [join the team](https://github.com/ruby/psych/contributors)!
+
+Thanks! :heart: :heart: :heart:
+
+The Psych Team

data/README.md

@@ -1,6 +1,7 @@
 # Psych
 
 *   https://github.com/ruby/psych
+*   https://docs.ruby-lang.org/en/master/Psych.html
 
 ## Description
 
@@ -32,6 +33,11 @@ If you want a newer gem release of Psych, you can use rubygems:
 
     gem install psych
 
+
+Psych supported the static build with specific version of libyaml sources. You can build psych with libyaml-0.2.5 like this.
+
+    gem install psych -- --with-libyaml-source-dir=/path/to/libyaml-0.2.5
+
 In order to use the gem release in your app, and not the stdlib version,
 you'll need the following:
 
@@ -44,11 +50,6 @@ Or if you use Bundler add this to your `Gemfile`:
 
 JRuby ships with a pure Java implementation of Psych.
 
-If you're on Rubinius, Psych is available in 1.9 mode, please refer to the
-Language Modes section of the [Rubinius
-README](https://github.com/rubinius/rubinius#readme) for more information on
-building and 1.9 mode.
-
 ## License
 
 Copyright 2009 Aaron Patterson, et al.

data/ext/psych/depend

@@ -1,4 +1,16 @@
-$(OBJS): $(YAML_H)
+$(TARGET_SO): $(LIBYAML)
+
+libyaml $(LIBYAML):
+	cd libyaml && $(MAKE)
+	$(AR) $(ARFLAGS) $(LIBYAML) $(LIBYAML_OBJDIR)/*.$(OBJEXT)
+	$(RANLIB) $(LIBYAML)
+
+clean-so::
+	-cd libyaml && $(MAKE) clean
+
+distclean-so::
+	-cd libyaml && $(MAKE) distclean
+	-$(Q)$(RMDIRS) libyaml/* libyaml
 
 $(OBJS): $(HDRS) $(ruby_headers) \
   $(hdrdir)/ruby/encoding.h \

data/ext/psych/extconf.rb

@@ -1,43 +1,53 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: true
 require 'mkmf'
-require 'fileutils'
 
-# :stopdoc:
-
-dir_config 'libyaml'
-
-if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_library('yaml', 'yaml_get_version'))
-  # Embed libyaml since we could not find it.
-
-  $VPATH << "$(srcdir)/yaml"
-  $INCFLAGS << " -I$(srcdir)/yaml"
-
-  $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
+if $mswin or $mingw or $cygwin
+  $CPPFLAGS << " -DYAML_DECLARE_STATIC"
+end
 
-  header = 'yaml/yaml.h'
-  header = "{$(VPATH)}#{header}" if $nmake
-  if have_macro("_WIN32")
-    $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+yaml_source = with_config("libyaml-source-dir")
+if yaml_source
+  yaml_source = yaml_source.gsub(/\$\((\w+)\)|\$\{(\w+)\}/) {ENV[$1||$2]}
+  yaml_source = yaml_source.chomp("/")
+  yaml_configure = "#{File.expand_path(yaml_source)}/configure"
+  unless File.exist?(yaml_configure)
+    raise "Configure script not found in #{yaml_source.quote}"
   end
 
-  have_header 'dlfcn.h'
-  have_header 'inttypes.h'
-  have_header 'memory.h'
-  have_header 'stdint.h'
-  have_header 'stdlib.h'
-  have_header 'strings.h'
-  have_header 'string.h'
-  have_header 'sys/stat.h'
-  have_header 'sys/types.h'
-  have_header 'unistd.h'
-
-  find_header 'yaml.h'
-  have_header 'config.h'
+  puts("Configuring libyaml source in #{yaml_source.quote}")
+  yaml = "libyaml"
+  Dir.mkdir(yaml) unless File.directory?(yaml)
+  shared = $enable_shared || !$static
+  args = [
+    yaml_configure,
+    "--enable-#{shared ? 'shared' : 'static'}",
+    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-').sub(/arm64/, 'arm')}",
+    "CC=#{RbConfig::CONFIG['CC']}",
+    *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
+  ]
+  puts(args.quote.join(' '))
+  unless system(*args, chdir: yaml)
+    raise "failed to configure libyaml"
+  end
+  inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
+  $INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
+  puts("INCFLAGS=#$INCFLAGS")
+  libyaml = "libyaml.#$LIBEXT"
+  $cleanfiles << libyaml
+  $LOCAL_LIBS.prepend("$(LIBYAML) ")
+else # default to pre-installed libyaml
+  pkg_config('yaml-0.1')
+  dir_config('libyaml')
+  find_header('yaml.h') or abort "yaml.h not found"
+  find_library('yaml', 'yaml_get_version') or abort "libyaml not found"
 end
 
 create_makefile 'psych' do |mk|
-  mk << "YAML_H = #{header}".strip << "\n"
+  mk << "LIBYAML = #{libyaml}".strip << "\n"
+  mk << "LIBYAML_OBJDIR = libyaml/src#{shared ? '/.libs' : ''}\n"
+  mk << "OBJEXT = #$OBJEXT"
+  mk << "RANLIB = #{config_string('RANLIB') || config_string('NULLCMD')}\n"
 end
 
 # :startdoc:

data/ext/psych/psych.c

@@ -23,7 +23,7 @@ VALUE mPsych;
 void Init_psych(void)
 {
     #ifdef HAVE_RB_EXT_RACTOR_SAFE
-	RB_EXT_RACTOR_SAFE(true);
+        RB_EXT_RACTOR_SAFE(true);
     #endif
     mPsych = rb_define_module("Psych");
 

data/ext/psych/psych_emitter.c

@@ -17,7 +17,7 @@ static ID id_canonical;
 static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 {
     if(!yaml_emitter_emit(emitter, event))
-	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+        rb_raise(rb_eRuntimeError, "%s", emitter->problem);
 }
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
@@ -82,13 +82,13 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
-	line_width = rb_funcall(options, id_line_width, 0);
-	indent     = rb_funcall(options, id_indentation, 0);
-	canonical  = rb_funcall(options, id_canonical, 0);
+        line_width = rb_funcall(options, id_line_width, 0);
+        indent     = rb_funcall(options, id_indentation, 0);
+        canonical  = rb_funcall(options, id_canonical, 0);
 
-	yaml_emitter_set_width(emitter, NUM2INT(line_width));
-	yaml_emitter_set_indent(emitter, NUM2INT(indent));
-	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+        yaml_emitter_set_width(emitter, NUM2INT(line_width));
+        yaml_emitter_set_indent(emitter, NUM2INT(indent));
+        yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
     rb_ivar_set(self, id_io, io);
@@ -136,84 +136,118 @@ static VALUE end_stream(VALUE self)
     return self;
 }
 
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+struct start_document_data {
+    VALUE self;
+    VALUE version;
+    VALUE tags;
+    VALUE imp;
+
+    yaml_tag_directive_t * head;
+};
+
+static VALUE start_document_try(VALUE d)
 {
+    struct start_document_data * data = (struct start_document_data *)d;
+    VALUE self = data->self;
+    VALUE version = data->version;
+    VALUE tags = data->tags;
+    VALUE imp = data->imp;
+
     yaml_emitter_t * emitter;
-    yaml_tag_directive_t * head = NULL;
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-
     Check_Type(version, T_ARRAY);
 
     if(RARRAY_LEN(version) > 0) {
-	VALUE major = rb_ary_entry(version, (long)0);
-	VALUE minor = rb_ary_entry(version, (long)1);
+        VALUE major = rb_ary_entry(version, (long)0);
+        VALUE minor = rb_ary_entry(version, (long)1);
 
-	version_directive.major = NUM2INT(major);
-	version_directive.minor = NUM2INT(minor);
+        version_directive.major = NUM2INT(major);
+        version_directive.minor = NUM2INT(minor);
     }
 
     if(RTEST(tags)) {
-	long i = 0;
-	long len;
-	rb_encoding * encoding = rb_utf8_encoding();
-
-	Check_Type(tags, T_ARRAY);
-
-	len = RARRAY_LEN(tags);
-	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
-	tail  = head;
-
-	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_AREF(tags, i);
-	    VALUE name;
-	    VALUE value;
-
-	    Check_Type(tuple, T_ARRAY);
-
-	    if(RARRAY_LEN(tuple) < 2) {
-		xfree(head);
-		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
-	    }
-	    name  = RARRAY_AREF(tuple, 0);
-	    value = RARRAY_AREF(tuple, 1);
-	    StringValue(name);
-	    StringValue(value);
-	    name = rb_str_export_to_enc(name, encoding);
-	    value = rb_str_export_to_enc(value, encoding);
-
-	    tail->handle = (yaml_char_t *)StringValueCStr(name);
-	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
-
-	    tail++;
-	}
+        long i = 0;
+        long len;
+        rb_encoding * encoding = rb_utf8_encoding();
+
+        Check_Type(tags, T_ARRAY);
+
+        len = RARRAY_LEN(tags);
+        data->head = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+        tail = data->head;
+
+        for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+            VALUE tuple = RARRAY_AREF(tags, i);
+            VALUE name;
+            VALUE value;
+
+            Check_Type(tuple, T_ARRAY);
+
+            if(RARRAY_LEN(tuple) < 2) {
+                rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+            }
+
+            name  = RARRAY_AREF(tuple, 0);
+            value = RARRAY_AREF(tuple, 1);
+            StringValue(name);
+            StringValue(value);
+            name = rb_str_export_to_enc(name, encoding);
+            value = rb_str_export_to_enc(value, encoding);
+
+            tail->handle = (yaml_char_t *)StringValueCStr(name);
+            tail->prefix = (yaml_char_t *)StringValueCStr(value);
+
+            tail++;
+        }
     }
 
     yaml_document_start_event_initialize(
-	    &event,
-	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
-	    head,
-	    tail,
-	    imp ? 1 : 0
-	    );
+            &event,
+            (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+            data->head,
+            tail,
+            imp ? 1 : 0
+            );
 
     emit(emitter, &event);
 
-    if(head) xfree(head);
-
     return self;
 }
 
+static VALUE start_document_ensure(VALUE d)
+{
+    struct start_document_data * data = (struct start_document_data *)d;
+
+    xfree(data->head);
+
+    return Qnil;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    struct start_document_data data = {
+        .self = self,
+        .version = version,
+        .tags = tags,
+        .imp = imp,
+
+        .head = NULL,
+    };
+
+    return rb_ensure(start_document_try, (VALUE)&data, start_document_ensure, (VALUE)&data);
+}
+
 /* call-seq: emitter.end_document(implicit)
  *
  * End a document emission with an +implicit+ ending.
@@ -241,14 +275,14 @@ static VALUE end_document(VALUE self, VALUE imp)
  * See Psych::Handler#scalar
  */
 static VALUE scalar(
-	VALUE self,
-	VALUE value,
-	VALUE anchor,
-	VALUE tag,
-	VALUE plain,
-	VALUE quoted,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE value,
+        VALUE anchor,
+        VALUE tag,
+        VALUE plain,
+        VALUE quoted,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -261,25 +295,26 @@ static VALUE scalar(
     value = rb_str_export_to_enc(value, encoding);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
+    const char *value_ptr = StringValuePtr(value);
     yaml_scalar_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    (yaml_char_t*)StringValuePtr(value),
-	    (int)RSTRING_LEN(value),
-	    plain ? 1 : 0,
-	    quoted ? 1 : 0,
-	    (yaml_scalar_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            (yaml_char_t*)value_ptr,
+            (int)RSTRING_LEN(value),
+            plain ? 1 : 0,
+            quoted ? 1 : 0,
+            (yaml_scalar_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -294,36 +329,36 @@ static VALUE scalar(
  * See Psych::Handler#start_sequence
  */
 static VALUE start_sequence(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_sequence_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -357,12 +392,12 @@ static VALUE end_sequence(VALUE self)
  * See Psych::Handler#start_mapping
  */
 static VALUE start_mapping(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -372,22 +407,22 @@ static VALUE start_mapping(
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     yaml_mapping_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_mapping_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_mapping_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -426,14 +461,14 @@ static VALUE alias(VALUE self, VALUE anchor)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
 
     yaml_alias_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
+            );
 
     emit(emitter, &event);