psych 2.2.1-java → 2.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4abaedecb21703f73add798b6dec33287c62eb
-  data.tar.gz: e96b021dfca8edb466f52e2044ae36eb851256cd
+  metadata.gz: c0a58d2ed5dca183df559e687f117c2ae9865945
+  data.tar.gz: b9c599dc17508b3ff061ed208befa1e16f3414e6
 SHA512:
-  metadata.gz: 1052fbfc6c835d820f802d4df316dbf28d690f1f49b0d42a74ea7f04d6de09930e609d41767d39cce9fa82f48af00d57204bc005cf0530fb61166bec56cccf6a
-  data.tar.gz: 5dc998f128e535dfb29bd21864b6759b60a41f592174d248b804bb2fb7ecc573335d34489224f47fb685f9947161931f19cfa5bba84165dc579bb3c930a9f573
+  metadata.gz: 5c48c9fe83330515c8ac2412db786be62c12e6976597e7e6c170f6246af520ddbbef3c45d19cc7d8e295c4597b7b319bf716c2bf4a868f960596eef76107d018
+  data.tar.gz: c4a73ccd603f874b65e98c0db1052c81bd795dd9e4fa5a86aa0f650124996bcc526221b4e795a0aece2bed9aef55e27310c0dcb47a062f5bef781d2846e1ea96

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2
   - 2.3.0
@@ -12,6 +11,8 @@ matrix:
 
 before_install: gem install bundler --no-document
 
+script: rake
+
 addons:
   apt:
     packages:

data/Rakefile

@@ -7,6 +7,8 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/test_*.rb']
+  t.verbose = true
+  t.warning = true
 end
 
 if RUBY_PLATFORM =~ /java/
@@ -17,7 +19,7 @@ if RUBY_PLATFORM =~ /java/
     # and tell maven via system properties the snakeyaml version
     # this is basically the same as running from the commandline:
     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
-    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')
+    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.17", '-Dverbose=true')
     ext.source_version = '1.7'
     ext.target_version = '1.7'
     ext.classpath = File.read('pkg/classpath')

data/ext/java/PsychParser.java

@@ -241,10 +241,9 @@ public class PsychParser extends RubyObject {
     private void handleDocumentStart(ThreadContext context, DocumentStartEvent dse, boolean tainted, IRubyObject handler) {
         Ruby runtime = context.runtime;
         DumperOptions.Version _version = dse.getVersion();
-        Integer[] versionInts = _version == null ? null : _version.getArray();
-        IRubyObject version = versionInts == null ?
+        IRubyObject version = _version == null ?
             RubyArray.newArray(runtime) :
-            RubyArray.newArray(runtime, runtime.newFixnum(versionInts[0]), runtime.newFixnum(versionInts[1]));
+            RubyArray.newArray(runtime, runtime.newFixnum(_version.major()), runtime.newFixnum(_version.minor()));
         
         Map<String, String> tagsMap = dse.getTags();
         RubyArray tags = RubyArray.newArray(runtime);

data/lib/psych/versions.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module Psych
   # The version is Psych you're using
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze

data/psych.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift './lib'
-load 'psych/versions.rb'
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'psych'
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = Psych::VERSION
+  s.version = "2.2.2"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
   s.date = "2016-11-14"
@@ -34,7 +34,7 @@ DESCRIPTION
   if RUBY_ENGINE == 'jruby'
     s.platform = 'java'
     s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"]
-    s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.requirements = "jar org.yaml:snakeyaml, 1.17"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: java
 authors:
 - Aaron Patterson