[前][次][番号順一覧][スレッド一覧]

ruby-changes:45627

From: hsbt <ko1@a...>
Date: Fri, 24 Feb 2017 15:32:55 +0900 (JST)
Subject: [ruby-changes:45627] hsbt:r57700 (trunk): Update psych-2.2.3

hsbt	2017-02-24 15:32:48 +0900 (Fri, 24 Feb 2017)

  New Revision: 57700

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57700

  Log:
    Update psych-2.2.3
    
     * It's only typo fix for CRuby.

  Modified files:
    trunk/ext/psych/lib/psych/versions.rb
    trunk/ext/psych/psych.gemspec
    trunk/ext/psych/yaml/emitter.c
Index: ext/psych/yaml/emitter.c
===================================================================
--- ext/psych/yaml/emitter.c	(revision 57699)
+++ ext/psych/yaml/emitter.c	(revision 57700)
@@ -1493,7 +1493,7 @@ yaml_emitter_analyze_scalar(yaml_emitter https://github.com/ruby/ruby/blob/trunk/ext/psych/yaml/emitter.c#L1493
     int break_space = 0;
     int space_break = 0;
 
-    int preceeded_by_whitespace = 0;
+    int preceded_by_whitespace = 0;
     int followed_by_whitespace = 0;
     int previous_space = 0;
     int previous_break = 0;
@@ -1524,7 +1524,7 @@ yaml_emitter_analyze_scalar(yaml_emitter https://github.com/ruby/ruby/blob/trunk/ext/psych/yaml/emitter.c#L1524
         flow_indicators = 1;
     }
 
-    preceeded_by_whitespace = 1;
+    preceded_by_whitespace = 1;
     followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
 
     while (string.pointer != string.end)
@@ -1570,7 +1570,7 @@ yaml_emitter_analyze_scalar(yaml_emitter https://github.com/ruby/ruby/blob/trunk/ext/psych/yaml/emitter.c#L1570
                 }
             }
 
-            if (CHECK(string, '#') && preceeded_by_whitespace) {
+            if (CHECK(string, '#') && preceded_by_whitespace) {
                 flow_indicators = 1;
                 block_indicators = 1;
             }
@@ -1619,7 +1619,7 @@ yaml_emitter_analyze_scalar(yaml_emitter https://github.com/ruby/ruby/blob/trunk/ext/psych/yaml/emitter.c#L1619
             previous_break = 0;
         }
 
-        preceeded_by_whitespace = IS_BLANKZ(string);
+        preceded_by_whitespace = IS_BLANKZ(string);
         MOVE(string);
         if (string.pointer != string.end) {
             followed_by_whitespace = IS_BLANKZ_AT(string, WIDTH(string));
Index: ext/psych/lib/psych/versions.rb
===================================================================
--- ext/psych/lib/psych/versions.rb	(revision 57699)
+++ ext/psych/lib/psych/versions.rb	(revision 57700)
@@ -1,9 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/versions.rb#L1
 # frozen_string_literal: false
 module Psych
   # The version is Psych you're using
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze
   end
 end
Index: ext/psych/psych.gemspec
===================================================================
--- ext/psych/psych.gemspec	(revision 57699)
+++ ext/psych/psych.gemspec	(revision 57700)
@@ -1,10 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L1
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require 'psych'
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = Psych::VERSION
+  s.version = "2.2.3"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@t...", "hsbt@r...", "headius@h..."]
   s.date = "2016-11-14"
@@ -34,7 +32,7 @@ DESCRIPTION https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L32
   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, 1.17"
+    s.requirements = "jar org.yaml:snakeyaml, 1.18"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]