psych 2.0.12 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 38ed899f0b22c57d8a653dfb84f54a92d9c51ccd
-  data.tar.gz: b9fe79097035b8594dff79dacb4c85e55451be5f
+SHA256:
+  metadata.gz: e8c48b70d7c4ff53b1d536997a6e63173cb7e123e3f6e70f82c5de8596d93c4c
+  data.tar.gz: c49d610314f1628a1e84267010dcfac5a076276eac2cad8dbbba9079ede9e08f
 SHA512:
-  metadata.gz: 705e8c7667b4a841aab3a868a3a77cb5e55eb0e6a3d76c1169eba8244ab8b5307c83f85d5fa546f4fdbbdf62ee1a82d2336a30a17443556875ffa8b29fd60bfc
-  data.tar.gz: 76f6c273cd9a0570fc64c1f0e789f907cb3ceeeabe6764549713a59fbbf06d83953afa4fcb53b6ca9527c724778b459b4bfac3310eb6e8ebe342b15e8589678e
+  metadata.gz: 2d3d710995bfd6eb317994dd13024e5e3fd2967dbd379a1d510f86f7517177d2cc5e292a7d3b14c999071cc35ce625715ee3549fab90ce966567ba6e91f2475c
+  data.tar.gz: f1570e565d5dd8c9e5984155dfbc1418a594aaa871fab7b7fabe62f05bc0a3e72ab141dd9f39c09689f8f4949a5c6e58fa9b1ca99c26db3552b0c9866a6032ad

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/{ext/psych/yaml/LICENSE → LICENSE}

@@ -1,11 +1,13 @@
-Copyright (c) 2006 Kirill Simonov
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+Copyright (c) 2009 Aaron Patterson, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.

data/README.md

@@ -0,0 +1,80 @@
+# Psych
+
+* https://github.com/ruby/psych
+* https://docs.ruby-lang.org/en/master/Psych.html
+
+## Description
+
+Psych is a YAML parser and emitter.  Psych leverages
+[libyaml](https://pyyaml.org/wiki/LibYAML) for its YAML parsing and emitting
+capabilities.  In addition to wrapping libyaml, Psych also knows how to
+serialize and de-serialize most Ruby objects to and from the YAML format.
+
+## Examples
+
+```ruby
+# Safely load YAML in to a Ruby object
+Psych.safe_load('--- foo') # => 'foo'
+
+# Emit YAML from a Ruby object
+Psych.dump("foo")     # => "--- foo\n...\n"
+```
+
+## Dependencies
+
+* libyaml
+
+## Installation
+
+Psych has been included with MRI since 1.9.2, and is the default YAML parser
+in 1.9.3.
+
+If you want a newer gem release of Psych, you can use RubyGems:
+
+```bash
+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.
+
+```bash
+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:
+
+```ruby
+gem 'psych'
+require 'psych'
+```
+
+Or if you use Bundler add this to your `Gemfile`:
+
+```ruby
+gem 'psych'
+```
+
+JRuby ships with a pure Java implementation of Psych.
+
+## License
+
+Copyright 2009 Aaron Patterson, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the 'Software'), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/ext/psych/depend

@@ -1,3 +1,17 @@
+$(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 \
   $(hdrdir)/ruby/oniguruma.h

data/ext/psych/extconf.rb

@@ -1,38 +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)}
+if $mswin or $mingw or $cygwin
+  $CPPFLAGS << " -DYAML_DECLARE_STATIC"
+end
 
-  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'
+create_makefile 'psych' do |mk|
+  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

@@ -11,9 +11,9 @@ static VALUE libyaml_version(VALUE module)
 
     yaml_get_version(&major, &minor, &patch);
 
-    list[0] = INT2NUM((long)major);
-    list[1] = INT2NUM((long)minor);
-    list[2] = INT2NUM((long)patch);
+    list[0] = INT2NUM(major);
+    list[1] = INT2NUM(minor);
+    list[2] = INT2NUM(patch);
 
     return rb_ary_new4((long)3, list);
 }
@@ -22,6 +22,9 @@ VALUE mPsych;
 
 void Init_psych(void)
 {
+    #ifdef HAVE_RB_EXT_RACTOR_SAFE
+        RB_EXT_RACTOR_SAFE(true);
+    #endif
     mPsych = rb_define_module("Psych");
 
     rb_define_singleton_method(mPsych, "libyaml_version", libyaml_version, 0);
@@ -31,4 +34,3 @@ void Init_psych(void)
     Init_psych_to_ruby();
     Init_psych_yaml_tree();
 }
-/* vim: set noet sws=4 sw=4: */

data/ext/psych/psych.h

@@ -2,10 +2,7 @@
 #define PSYCH_H
 
 #include <ruby.h>
-
-#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
-#endif
 
 #include <yaml.h>