psych 3.0.3.pre1 → 3.0.3.pre2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Rakefile +3 -1
- data/lib/psych.rb +6 -1
- data/lib/psych/versions.rb +2 -2
- data/psych.gemspec +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 12fbc1c00fbee9ab8a0ee3154f5799465a57f21720d599f4fbaa2701412b483e
|
|
4
|
+
data.tar.gz: 90ca8a2427af258f186dd8227c7771cab2286bfdbcc26521d1b1c2106f66cfdf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c617ad82272c6f217604b400882693dd0d427313dd59d3f87479511f483033f275a757185e97632b0890b01264403432a64ea0f973d83728ee75433dd4c9f290
|
|
7
|
+
data.tar.gz: e1bb220ab43e1a5d17f60033931275ad3a429eba6ad05a186944911cc031cc8a27e966c9061e568b1f1c1789b194fccc4bb0d91363f2284830047e39e7349f3c
|
data/Rakefile
CHANGED
|
@@ -14,11 +14,13 @@ if RUBY_PLATFORM =~ /java/
|
|
|
14
14
|
require 'rake/javaextensiontask'
|
|
15
15
|
Rake::JavaExtensionTask.new("psych") do |ext|
|
|
16
16
|
require 'maven/ruby/maven'
|
|
17
|
+
# force load of versions to overwrite constants with values from repo.
|
|
18
|
+
load './lib/psych/versions.rb'
|
|
17
19
|
# uses Mavenfile to write classpath into pkg/classpath
|
|
18
20
|
# and tell maven via system properties the snakeyaml version
|
|
19
21
|
# this is basically the same as running from the commandline:
|
|
20
22
|
# rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
|
|
21
|
-
Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.
|
|
23
|
+
Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.23", '-Dverbose=true')
|
|
22
24
|
ext.source_version = '1.7'
|
|
23
25
|
ext.target_version = '1.7'
|
|
24
26
|
ext.classpath = File.read('pkg/classpath')
|
data/lib/psych.rb
CHANGED
|
@@ -3,7 +3,12 @@ require 'psych/versions'
|
|
|
3
3
|
case RUBY_ENGINE
|
|
4
4
|
when 'jruby'
|
|
5
5
|
require 'psych_jars'
|
|
6
|
-
|
|
6
|
+
if JRuby::Util.respond_to?(:load_ext)
|
|
7
|
+
JRuby::Util.load_ext('org.jruby.ext.psych.PsychLibrary')
|
|
8
|
+
else
|
|
9
|
+
require 'java'; require 'jruby'
|
|
10
|
+
org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
|
|
11
|
+
end
|
|
7
12
|
else
|
|
8
13
|
begin
|
|
9
14
|
require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
|
data/lib/psych/versions.rb
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
module Psych
|
|
3
3
|
# The version is Psych you're using
|
|
4
|
-
VERSION = '3.0.3.
|
|
4
|
+
VERSION = '3.0.3.pre2'
|
|
5
5
|
|
|
6
6
|
if RUBY_ENGINE == 'jruby'
|
|
7
|
-
DEFAULT_SNAKEYAML_VERSION = '1.
|
|
7
|
+
DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze
|
|
8
8
|
end
|
|
9
9
|
end
|
data/psych.gemspec
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
Gem::Specification.new do |s|
|
|
5
5
|
s.name = "psych"
|
|
6
|
-
s.version = "3.0.3.
|
|
6
|
+
s.version = "3.0.3.pre2"
|
|
7
7
|
s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
|
|
8
8
|
s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
|
|
9
9
|
s.summary = "Psych is a YAML parser and emitter"
|
|
@@ -53,7 +53,7 @@ DESCRIPTION
|
|
|
53
53
|
"ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java",
|
|
54
54
|
"ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"
|
|
55
55
|
]
|
|
56
|
-
s.requirements = "jar org.yaml:snakeyaml, 1.
|
|
56
|
+
s.requirements = "jar org.yaml:snakeyaml, 1.23"
|
|
57
57
|
s.add_dependency 'jar-dependencies', '>= 0.1.7'
|
|
58
58
|
s.add_development_dependency 'ruby-maven'
|
|
59
59
|
else
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: psych
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.0.3.
|
|
4
|
+
version: 3.0.3.pre2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Aaron Patterson
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2018-
|
|
13
|
+
date: 2018-09-28 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rake-compiler
|