diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
| commit | f595568e475b225b2ee5cce9d4667ba551177ee6 (patch) | |
| tree | f664bc35af3f156f02cf3fd2fffefb3e77827250 | |
| parent | c934771ca9ca54bb20f01b818035873594793dfa (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/psych/lib/psych.rb | 2 | ||||
| -rw-r--r-- | ext/psych/psych.gemspec | 2 | ||||
| -rw-r--r-- | ext/psych/yaml/scanner.c | 7 | ||||
| -rw-r--r-- | test/psych/helper.rb | 8 | ||||
| -rw-r--r-- | test/psych/test_to_yaml_properties.rb | 2 |
6 files changed, 18 insertions, 11 deletions
@@ -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> * lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index 3e9b7aa1fb..085e828224 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -217,7 +217,7 @@ require 'psych/class_loader' 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 '.' diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec index 40b0e2ed5d..a9cc547c43 100644 --- a/ext/psych/psych.gemspec +++ b/ext/psych/psych.gemspec @@ -2,7 +2,7 @@ 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"] diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c index 08ad8edb45..8d81590e59 100644 --- a/ext/psych/yaml/scanner.c +++ b/ext/psych/yaml/scanner.c @@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser) && 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. */ diff --git a/test/psych/helper.rb b/test/psych/helper.rb index 11b2216b20..0111e11337 100644 --- a/test/psych/helper.rb +++ b/test/psych/helper.rb @@ -5,7 +5,13 @@ require 'date' 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 diff --git a/test/psych/test_to_yaml_properties.rb b/test/psych/test_to_yaml_properties.rb index 5b4860c435..724aab4f0e 100644 --- a/test/psych/test_to_yaml_properties.rb +++ b/test/psych/test_to_yaml_properties.rb @@ -1,7 +1,7 @@ require_relative 'helper' module Psych - class TestToYamlProperties < MiniTest::Unit::TestCase + class TestToYamlProperties < Psych::TestCase class Foo attr_accessor :a, :b, :c def initialize |