psych 3.0.3.pre1-java → 3.0.3.pre2-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +7 -3
  2. data/Rakefile +3 -1
  3. data/ext/java/PsychParser.java +1 -1
  4. data/lib/psych.rb +6 -1
  5. data/lib/psych/versions.rb +2 -2
  6. data/psych.gemspec +2 -2
  7. metadata +190 -51
checksums.yaml CHANGED
@@ -1,3 +1,7 @@
1
- --- {SHA1: {metadata.gz: '08530fa7508cd486e3c6921faf6000abab894649', data.tar.gz: cae1748fbdd2448e550726cb74c3ef69b665b0e9},
2
- SHA512: {metadata.gz: f7e5bde4558d0447ae4878420a84475393ad424cabe30100792ffae8a794269835e350abdcbb6a90060f37a6358d40a0d154b339946ba252349e62021b0e5ce8,
3
- data.tar.gz: b17b4f8e4379b000e75e0f1f228b400ebac77f24c57c8293577d2f93249fb8dab482a26cb0b2f8ddbf3abf5e19a8be02c86ed95b1531282dbb783f6757de3ff3}}
1
+ ---
2
+ SHA256:
3
+ metadata.gz: f5d17ef194cbbe8ed14a00ca03ef37b6f38b4cbb271a369e52feb67c1970ef00
4
+ data.tar.gz: dd41ca84dea1cd7ee0cc30751171d123b7e53007b9d803e6baf5f2fdcd61b213
5
+ SHA512:
6
+ metadata.gz: a04a3df7b54f08f1a69f6abf43bdb92c758ec91b369d4bd9ad4b74c5a87e773cfc72cee0ff12d501f21498b1a10408ac559738d1ee6fc2cde193d285245226ce
7
+ data.tar.gz: 270acb39ad6c9e9d90f8de507afcf47d7afccc3ddd4624c3542922cfdd1d44536fc0f16f3a19fa1ba92e15a8de2cb8eae24d137d13401765eaf5d293ec07b36b
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.21", '-Dverbose=true')
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/ext/java/PsychParser.java CHANGED
@@ -296,7 +296,7 @@ public class PsychParser extends RubyObject {
296
296
  IRubyObject tag = stringOrNilFor(runtime, se.getTag(), tainted);
297
297
  IRubyObject plain_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInPlainScalar());
298
298
  IRubyObject quoted_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInNonPlainScalar());
299
- IRubyObject style = runtime.newFixnum(translateStyle(se.getStyle()));
299
+ IRubyObject style = runtime.newFixnum(translateStyle(se.getScalarStyle()));
300
300
  IRubyObject val = stringFor(runtime, se.getValue(), tainted);
301
301
 
302
302
  invoke(context, handler, "scalar", val, anchor, tag, plain_implicit,
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
- org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
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.pre1'
4
+ VERSION = '3.0.3.pre2'
5
5
 
6
6
  if RUBY_ENGINE == 'jruby'
7
- DEFAULT_SNAKEYAML_VERSION = '1.21'.freeze
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.pre1"
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.21"
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,51 +1,190 @@
1
- --- !ruby/object:Gem::Specification {name: psych, version: !ruby/object:Gem::Version {
2
- version: 3.0.3.pre1}, platform: java, authors: [Aaron Patterson, SHIBATA Hiroshi,
3
- Charles Oliver Nutter], autorequire: !!null '', bindir: bin, cert_chain: [], date: ! '2018-04-16
4
- 00:00:00.000000000 Z', dependencies: [!ruby/object:Gem::Dependency {requirement: !ruby/object:Gem::Requirement {
5
- requirements: [[">=", !ruby/object:Gem::Version {version: 0.4.1}]]}, name: rake-compiler,
6
- prerelease: false, type: ! ':development', version_requirements: !ruby/object:Gem::Requirement {
7
- requirements: [[">=", !ruby/object:Gem::Version {version: 0.4.1}]]}}, !ruby/object:Gem::Dependency {
8
- requirement: !ruby/object:Gem::Requirement {requirements: [["~>", !ruby/object:Gem::Version {
9
- version: '5.0'}]]}, name: minitest, prerelease: false, type: ! ':development',
10
- version_requirements: !ruby/object:Gem::Requirement {requirements: [["~>", !ruby/object:Gem::Version {
11
- version: '5.0'}]]}}, !ruby/object:Gem::Dependency {requirement: !ruby/object:Gem::Requirement {
12
- requirements: [[">=", !ruby/object:Gem::Version {version: 0.1.7}]]}, name: jar-dependencies,
13
- prerelease: false, type: ! ':runtime', version_requirements: !ruby/object:Gem::Requirement {
14
- requirements: [[">=", !ruby/object:Gem::Version {version: 0.1.7}]]}}, !ruby/object:Gem::Dependency {
15
- requirement: !ruby/object:Gem::Requirement {requirements: [[">=", !ruby/object:Gem::Version {
16
- version: '0'}]]}, name: ruby-maven, prerelease: false, type: ! ':development',
17
- version_requirements: !ruby/object:Gem::Requirement {requirements: [[">=", !ruby/object:Gem::Version {
18
- version: '0'}]]}}], description: "Psych is a YAML parser and emitter.\
19
- \ Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]\nfor its YAML parsing\
20
- \ and emitting capabilities. In addition to wrapping libyaml,\nPsych also knows\
21
- \ how to serialize and de-serialize most Ruby objects to and from the YAML format.\n",
22
- email: [aaron@tenderlovemaking.com, hsbt@ruby-lang.org, headius@headius.com], executables: [],
23
- extensions: [], extra_rdoc_files: [CHANGELOG.rdoc, README.md], files: [".gitignore",
24
- ".travis.yml", CHANGELOG.rdoc, Gemfile, Mavenfile, README.md, Rakefile, bin/console,
25
- bin/setup, ext/java/PsychEmitter.java, ext/java/PsychLibrary.java, ext/java/PsychParser.java,
26
- ext/java/PsychToRuby.java, ext/java/PsychYamlTree.java, ext/psych/depend, ext/psych/extconf.rb,
27
- ext/psych/psych.c, ext/psych/psych.h, ext/psych/psych_emitter.c, ext/psych/psych_emitter.h,
28
- ext/psych/psych_parser.c, ext/psych/psych_parser.h, ext/psych/psych_to_ruby.c,
29
- ext/psych/psych_to_ruby.h, ext/psych/psych_yaml_tree.c, ext/psych/psych_yaml_tree.h,
30
- ext/psych/yaml/LICENSE, ext/psych/yaml/api.c, ext/psych/yaml/config.h, ext/psych/yaml/dumper.c,
31
- ext/psych/yaml/emitter.c, ext/psych/yaml/loader.c, ext/psych/yaml/parser.c, ext/psych/yaml/reader.c,
32
- ext/psych/yaml/scanner.c, ext/psych/yaml/writer.c, ext/psych/yaml/yaml.h, ext/psych/yaml/yaml_private.h,
33
- lib/psych.jar, lib/psych.rb, lib/psych/class_loader.rb, lib/psych/coder.rb, lib/psych/core_ext.rb,
34
- lib/psych/exception.rb, lib/psych/handler.rb, lib/psych/handlers/document_stream.rb,
35
- lib/psych/handlers/recorder.rb, lib/psych/json/ruby_events.rb, lib/psych/json/stream.rb,
36
- lib/psych/json/tree_builder.rb, lib/psych/json/yaml_events.rb, lib/psych/nodes.rb,
37
- lib/psych/nodes/alias.rb, lib/psych/nodes/document.rb, lib/psych/nodes/mapping.rb,
38
- lib/psych/nodes/node.rb, lib/psych/nodes/scalar.rb, lib/psych/nodes/sequence.rb,
39
- lib/psych/nodes/stream.rb, lib/psych/omap.rb, lib/psych/parser.rb, lib/psych/scalar_scanner.rb,
40
- lib/psych/set.rb, lib/psych/stream.rb, lib/psych/streaming.rb, lib/psych/syntax_error.rb,
41
- lib/psych/tree_builder.rb, lib/psych/versions.rb, lib/psych/visitors.rb, lib/psych/visitors/depth_first.rb,
42
- lib/psych/visitors/emitter.rb, lib/psych/visitors/json_tree.rb, lib/psych/visitors/to_ruby.rb,
43
- lib/psych/visitors/visitor.rb, lib/psych/visitors/yaml_tree.rb, lib/psych/y.rb,
44
- lib/psych_jars.rb, psych.gemspec], homepage: 'https://github.com/ruby/psych',
45
- licenses: [MIT], metadata: {}, post_install_message: !!null '', rdoc_options: [
46
- "--main", README.md], require_paths: [lib], required_ruby_version: !ruby/object:Gem::Requirement {
47
- requirements: [[">=", !ruby/object:Gem::Version {version: 2.2.2}]]}, required_rubygems_version: !ruby/object:Gem::Requirement {
48
- requirements: [[">=", !ruby/object:Gem::Version {version: '0'}]]}, requirements: [
49
- 'jar org.yaml:snakeyaml, 1.21'], rubyforge_project: !!null '', rubygems_version: 2.6.14.1,
50
- signing_key: !!null '', specification_version: 4, summary: Psych is a YAML parser
51
- and emitter, test_files: []}
1
+ --- !ruby/object:Gem::Specification
2
+ name: psych
3
+ version: !ruby/object:Gem::Version
4
+ version: 3.0.3.pre2
5
+ platform: java
6
+ authors:
7
+ - Aaron Patterson
8
+ - SHIBATA Hiroshi
9
+ - Charles Oliver Nutter
10
+ autorequire:
11
+ bindir: bin
12
+ cert_chain: []
13
+ date: 2018-09-28 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ requirement: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - ">="
19
+ - !ruby/object:Gem::Version
20
+ version: 0.4.1
21
+ name: rake-compiler
22
+ prerelease: false
23
+ type: :development
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ requirements:
26
+ - - ">="
27
+ - !ruby/object:Gem::Version
28
+ version: 0.4.1
29
+ - !ruby/object:Gem::Dependency
30
+ requirement: !ruby/object:Gem::Requirement
31
+ requirements:
32
+ - - "~>"
33
+ - !ruby/object:Gem::Version
34
+ version: '5.0'
35
+ name: minitest
36
+ prerelease: false
37
+ type: :development
38
+ version_requirements: !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - "~>"
41
+ - !ruby/object:Gem::Version
42
+ version: '5.0'
43
+ - !ruby/object:Gem::Dependency
44
+ requirement: !ruby/object:Gem::Requirement
45
+ requirements:
46
+ - - ">="
47
+ - !ruby/object:Gem::Version
48
+ version: 0.1.7
49
+ name: jar-dependencies
50
+ prerelease: false
51
+ type: :runtime
52
+ version_requirements: !ruby/object:Gem::Requirement
53
+ requirements:
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
56
+ version: 0.1.7
57
+ - !ruby/object:Gem::Dependency
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: '0'
63
+ name: ruby-maven
64
+ prerelease: false
65
+ type: :development
66
+ version_requirements: !ruby/object:Gem::Requirement
67
+ requirements:
68
+ - - ">="
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
71
+ description: |
72
+ Psych is a YAML parser and emitter. Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
73
+ for its YAML parsing and emitting capabilities. In addition to wrapping libyaml,
74
+ Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format.
75
+ email:
76
+ - aaron@tenderlovemaking.com
77
+ - hsbt@ruby-lang.org
78
+ - headius@headius.com
79
+ executables: []
80
+ extensions: []
81
+ extra_rdoc_files:
82
+ - CHANGELOG.rdoc
83
+ - README.md
84
+ files:
85
+ - ".gitignore"
86
+ - ".travis.yml"
87
+ - CHANGELOG.rdoc
88
+ - Gemfile
89
+ - Mavenfile
90
+ - README.md
91
+ - Rakefile
92
+ - bin/console
93
+ - bin/setup
94
+ - ext/java/PsychEmitter.java
95
+ - ext/java/PsychLibrary.java
96
+ - ext/java/PsychParser.java
97
+ - ext/java/PsychToRuby.java
98
+ - ext/java/PsychYamlTree.java
99
+ - ext/psych/depend
100
+ - ext/psych/extconf.rb
101
+ - ext/psych/psych.c
102
+ - ext/psych/psych.h
103
+ - ext/psych/psych_emitter.c
104
+ - ext/psych/psych_emitter.h
105
+ - ext/psych/psych_parser.c
106
+ - ext/psych/psych_parser.h
107
+ - ext/psych/psych_to_ruby.c
108
+ - ext/psych/psych_to_ruby.h
109
+ - ext/psych/psych_yaml_tree.c
110
+ - ext/psych/psych_yaml_tree.h
111
+ - ext/psych/yaml/LICENSE
112
+ - ext/psych/yaml/api.c
113
+ - ext/psych/yaml/config.h
114
+ - ext/psych/yaml/dumper.c
115
+ - ext/psych/yaml/emitter.c
116
+ - ext/psych/yaml/loader.c
117
+ - ext/psych/yaml/parser.c
118
+ - ext/psych/yaml/reader.c
119
+ - ext/psych/yaml/scanner.c
120
+ - ext/psych/yaml/writer.c
121
+ - ext/psych/yaml/yaml.h
122
+ - ext/psych/yaml/yaml_private.h
123
+ - lib/psych.jar
124
+ - lib/psych.rb
125
+ - lib/psych/class_loader.rb
126
+ - lib/psych/coder.rb
127
+ - lib/psych/core_ext.rb
128
+ - lib/psych/exception.rb
129
+ - lib/psych/handler.rb
130
+ - lib/psych/handlers/document_stream.rb
131
+ - lib/psych/handlers/recorder.rb
132
+ - lib/psych/json/ruby_events.rb
133
+ - lib/psych/json/stream.rb
134
+ - lib/psych/json/tree_builder.rb
135
+ - lib/psych/json/yaml_events.rb
136
+ - lib/psych/nodes.rb
137
+ - lib/psych/nodes/alias.rb
138
+ - lib/psych/nodes/document.rb
139
+ - lib/psych/nodes/mapping.rb
140
+ - lib/psych/nodes/node.rb
141
+ - lib/psych/nodes/scalar.rb
142
+ - lib/psych/nodes/sequence.rb
143
+ - lib/psych/nodes/stream.rb
144
+ - lib/psych/omap.rb
145
+ - lib/psych/parser.rb
146
+ - lib/psych/scalar_scanner.rb
147
+ - lib/psych/set.rb
148
+ - lib/psych/stream.rb
149
+ - lib/psych/streaming.rb
150
+ - lib/psych/syntax_error.rb
151
+ - lib/psych/tree_builder.rb
152
+ - lib/psych/versions.rb
153
+ - lib/psych/visitors.rb
154
+ - lib/psych/visitors/depth_first.rb
155
+ - lib/psych/visitors/emitter.rb
156
+ - lib/psych/visitors/json_tree.rb
157
+ - lib/psych/visitors/to_ruby.rb
158
+ - lib/psych/visitors/visitor.rb
159
+ - lib/psych/visitors/yaml_tree.rb
160
+ - lib/psych/y.rb
161
+ - lib/psych_jars.rb
162
+ - psych.gemspec
163
+ homepage: https://github.com/ruby/psych
164
+ licenses:
165
+ - MIT
166
+ metadata: {}
167
+ post_install_message:
168
+ rdoc_options:
169
+ - "--main"
170
+ - README.md
171
+ require_paths:
172
+ - lib
173
+ required_ruby_version: !ruby/object:Gem::Requirement
174
+ requirements:
175
+ - - ">="
176
+ - !ruby/object:Gem::Version
177
+ version: 2.2.2
178
+ required_rubygems_version: !ruby/object:Gem::Requirement
179
+ requirements:
180
+ - - ">="
181
+ - !ruby/object:Gem::Version
182
+ version: '0'
183
+ requirements:
184
+ - jar org.yaml:snakeyaml, 1.23
185
+ rubyforge_project:
186
+ rubygems_version: 2.7.6
187
+ signing_key:
188
+ specification_version: 4
189
+ summary: Psych is a YAML parser and emitter
190
+ test_files: []