* 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c934771ca9
commit
f595568e47
@ -1,3 +1,11 @@
|
|||||||
|
Wed Feb 18 03:13:52 2015 Aaron Patterson <aaron@tenderlovemaking.com>
|
||||||
|
|
||||||
|
* 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@ruby-lang.org>
|
Tue Feb 17 11:47:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
|
* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
|
||||||
|
@ -217,7 +217,7 @@ require 'psych/class_loader'
|
|||||||
|
|
||||||
module Psych
|
module Psych
|
||||||
# The version is Psych you're using
|
# The version is Psych you're using
|
||||||
VERSION = '2.0.12'
|
VERSION = '2.0.13'
|
||||||
|
|
||||||
# The version of libyaml Psych is using
|
# The version of libyaml Psych is using
|
||||||
LIBYAML_VERSION = Psych.libyaml_version.join '.'
|
LIBYAML_VERSION = Psych.libyaml_version.join '.'
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Gem::Specification.new do |s|
|
Gem::Specification.new do |s|
|
||||||
s.name = "psych"
|
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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
|
@ -1105,13 +1105,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
|
|||||||
int required = (!parser->flow_level
|
int required = (!parser->flow_level
|
||||||
&& parser->indent == (ptrdiff_t)parser->mark.column);
|
&& 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.
|
* If the current position may start a simple key, save it.
|
||||||
*/
|
*/
|
||||||
|
@ -5,7 +5,13 @@ require 'date'
|
|||||||
require 'psych'
|
require 'psych'
|
||||||
|
|
||||||
module 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
|
def self.suppress_warning
|
||||||
verbose, $VERBOSE = $VERBOSE, nil
|
verbose, $VERBOSE = $VERBOSE, nil
|
||||||
yield
|
yield
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
require_relative 'helper'
|
require_relative 'helper'
|
||||||
|
|
||||||
module Psych
|
module Psych
|
||||||
class TestToYamlProperties < MiniTest::Unit::TestCase
|
class TestToYamlProperties < Psych::TestCase
|
||||||
class Foo
|
class Foo
|
||||||
attr_accessor :a, :b, :c
|
attr_accessor :a, :b, :c
|
||||||
def initialize
|
def initialize
|
||||||
|
Loading…
x
Reference in New Issue
Block a user