ruby.git/ext/psych, branch ruby_2_1

merge revision(s) r45453,r45455,r45577: [Backport #9798]

2014-05-04T15:45:33+00:00

	* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
	  libyaml-0.1.6 for CVE-2014-2525.

	* ext/psych/yaml/config.h: ditto.

	* ext/psych/yaml/scanner.c: ditto.

	* ext/psych/yaml/yaml_private.h: ditto.

	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r45221: [Backport #9798]

2014-05-04T15:40:57+00:00

	* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
	  objects.

	* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
	  objects.

	* test/psych/test_encoding.rb: add test

	* ext/psych/lib/psych.rb: add version


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 44809,44811,44813,44815,44816,44817,44818,44918,45003: [Backport #9482]

2014-02-24T04:24:15+00:00

	* ext/psych/yaml/emitter.c: merge libyaml 0.1.5

	* ext/psych/yaml/loader.c: ditto

	* ext/psych/yaml/parser.c: ditto

	* ext/psych/yaml/reader.c: ditto

	* ext/psych/yaml/scanner.c: ditto

	* ext/psych/yaml/writer.c: ditto

	* ext/psych/yaml/yaml_private.h: ditto

	* ext/psych/lib/psych.rb: New release of psych.

	* ext/psych/psych.gemspec: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 44531: [Backport #9300]

2014-02-21T14:06:17+00:00

	* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
	  quotes should not have changed.  [ruby-core:59316] [Bug #9300]

	* ext/psych/lib/psych.rb: fixed missing require.

	* test/psych/test_string.rb: test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/yaml/emitter.c: Fix typo in the variable name

2013-12-14T01:19:06+00:00

s/preceeded/preceded/

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych.rb: psych version 2.0.2

2013-11-26T22:14:34+00:00

* ext/psych/psych.gemspec: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/scalar_scanner.rb: fix support for negative

2013-11-26T21:41:48+00:00

  years.
* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
* test/psych/test_date_time.rb: test for change.
  Fixes: https://github.com/tenderlove/psych/issues/168

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/scalar_scanner.rb: fix regexp for matching TIME

2013-11-26T19:48:03+00:00

  strings.
* test/psych/test_date_time.rb: test for change.
  Fixes: https://github.com/tenderlove/psych/issues/171

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before

2013-11-05T19:15:40+00:00

  reviving objects. Fixes GH psych #168
* test/psych/test_merge_keys.rb: test for change
  https://github.com/tenderlove/psych/issues/168

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage when

2013-10-29T18:25:57+00:00

  testing if a string is binary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e