tenderlove	2015-02-18 03:17:46 +0900 (Wed, 18 Feb 2015)

  New Revision: 49632

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

  Log:
    * ext/psych/lib/psych.rb: bump psych version.
    * ext/psych/psych.gemspec: ditto
    * ext/psych/yaml/scanner.c: add latest libyaml change.
    * test/psych/helper.rb: support newer minitest
    * test/psych/test_to_yaml_properties.rb: ditto

  Modified files:
    trunk/ChangeLog
    trunk/ext/psych/lib/psych.rb
    trunk/ext/psych/psych.gemspec
    trunk/ext/psych/yaml/scanner.c
    trunk/test/psych/helper.rb
    trunk/test/psych/test_to_yaml_properties.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49631)
+++ ChangeLog	(revision 49632)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Feb 18 03:13:52 2015  Aaron Patterson <aaron@t...>
+
+	* ext/psych/lib/psych.rb: bump psych version.
+	* ext/psych/psych.gemspec: ditto
+	* ext/psych/yaml/scanner.c: add latest libyaml change.
+	* test/psych/helper.rb: support newer minitest
+	* test/psych/test_to_yaml_properties.rb: ditto
+
 Tue Feb 17 11:47:17 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
Index: ext/psych/yaml/scanner.c
===================================================================
--- ext/psych/yaml/scanner.c	(revision 49631)
+++ ext/psych/yaml/scanner.c	(revision 49632)
@@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_ https://github.com/ruby/ruby/blob/trunk/ext/psych/yaml/scanner.c#L1106
             && parser->indent == (ptrdiff_t)parser->mark.column);
 
     /*
-     * A simple key is required only when it is the first token in the current
-     * line.  Therefore it is always allowed.  But we add a check anyway.
-     */
-
-    assert(parser->simple_key_allowed || !required);    /* Impossible. */
-
-    /*
      * If the current position may start a simple key, save it.
      */
 
Index: ext/psych/lib/psych.rb
===================================================================
--- ext/psych/lib/psych.rb	(revision 49631)
+++ ext/psych/lib/psych.rb	(revision 49632)
@@ -217,7 +217,7 @@ require 'psych/class_loader' https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych.rb#L217
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.12'
+  VERSION         = '2.0.13'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
Index: ext/psych/psych.gemspec
===================================================================
--- ext/psych/psych.gemspec	(revision 49631)
+++ ext/psych/psych.gemspec	(revision 49632)
@@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L2
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "2.0.12"
+  s.version = "2.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
Index: test/psych/test_to_yaml_properties.rb
===================================================================
--- test/psych/test_to_yaml_properties.rb	(revision 49631)
+++ test/psych/test_to_yaml_properties.rb	(revision 49632)
@@ -1,7 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/test/psych/test_to_yaml_properties.rb#L1
 require_relative 'helper'
 
 module Psych
-  class TestToYamlProperties < MiniTest::Unit::TestCase
+  class TestToYamlProperties < Psych::TestCase
     class Foo
       attr_accessor :a, :b, :c
       def initialize
Index: test/psych/helper.rb
===================================================================
--- test/psych/helper.rb	(revision 49631)
+++ test/psych/helper.rb	(revision 49632)
@@ -5,7 +5,13 @@ require 'date' https://github.com/ruby/ruby/blob/trunk/test/psych/helper.rb#L5
 require 'psych'
 
 module Psych
-  class TestCase < MiniTest::Unit::TestCase
+  superclass = if defined?(Minitest::Test)
+                 Minitest::Test
+               else
+                 MiniTest::Unit::TestCase
+               end
+
+  class TestCase < superclass
     def self.suppress_warning
       verbose, $VERBOSE = $VERBOSE, nil
       yield

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