summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jruby' of github.com:tenderlove/psych into jrubyv2.0.14jrubyAaron Patterson2015-08-213-3/+4
|\ | | | | | | | | * 'jruby' of github.com:tenderlove/psych: no need to supply jruby itself to the classpath
| * Merge pull request #237 from mkristian/no-jruby-depAaron Patterson2015-08-213-3/+4
| |\ | | | | | | no need to supply jruby itself to the classpath
| | * no need to supply jruby itself to the classpathChristian Meier2015-05-283-3/+4
| |/
* | Merge branch 'master' into jrubyAaron Patterson2015-08-214-8/+8
|\ \ | |/ |/| | | | | | | * master: psych: allocate structs with wrapper update minitest gem to 5.x, add Ruby 2.2 test target
| * Merge pull request #233 from miketheman/update_minitest_verisonSHIBATA Hiroshi2015-06-282-3/+4
| |\ | | | | | | update minitest gem to 5.x, add Ruby 2.2 test target
| | * update minitest gem to 5.x, add Ruby 2.2 test targetMike Fiedler2015-05-032-3/+4
| | | | | | | | | | | | | | | Follows #213 Closes #212
| * | Merge pull request #238 from nobu/potential_memory_leakSHIBATA Hiroshi2015-05-292-5/+4
| |\ \ | | |/ | |/| potential memory leak
| | * psych: allocate structs with wrappernobu2015-05-292-5/+4
| |/ | | | | | | | | | | | | | | | | * ext/psych/psych_emitter.c (allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. * ext/psych/psych_parser.c (allocate): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* | bumping versionAaron Patterson2015-05-271-1/+1
| |
* | Merge pull request #235 from mkristian/snakeyaml-propertyAaron Patterson2015-05-062-4/+3
|\ \ | | | | | | little ruby-maven related improvements
| * | little ruby-maven related improvementsChristian Meier2015-05-062-4/+3
|/ / | | | | | | | | * pass in the snakeyaml.version via the commandline * use the jruby version which runs rake for the java compilation as well
* | Default to UTF-8 when encoding does not appear to be unicode.Charles Oliver Nutter2015-05-051-4/+9
| | | | | | | | Fixes jruby/jruby#2901.
* | bumping to 2.0.14.pre1Aaron Patterson2015-05-051-1/+1
| |
* | don't add the jar file to the manifestAaron Patterson2015-04-292-2/+19
| |
* | Merge branch 'master' into jrubyAaron Patterson2015-04-292-2/+9
|\ \ | |/ | | | | | | | | * master: add test don't assume any tag starting with 'str' is a string
| * Merge pull request #229 from filialpails/patch-1Aaron Patterson2015-03-302-2/+9
| |\ | | | | | | Fix mappings with !str tags
| | * add testfilialpails2015-03-301-0/+7
| | |
| | * don't assume any tag starting with 'str' is a stringRob Steward2015-03-301-2/+2
| |/
* | Merge branch 'master' into jrubyAaron Patterson2015-03-0312-77/+195
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Adding Rubinius as an Allowed Failure bump version Fix CVE-2014-9130 Adding RVM listing for Rubinius fix minitest warnings * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when dumping objects with custom coders. [ruby-core:66215] [Bug #10496] * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular expressions with newlines. tenderlove/psych#222 * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix bump version Fix anchor Fix assertion regexps bump version Only dump ivars for subclasses of String, not for String. With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217. Only dump ivars for subclasses of Hash, not for Hash. Fixes #216. Fixes part of #217. Fix block chomping and add more tests Preset @line_width in YAMLTree#initialize for better performance Use appropriate style for serialized strings Remove unnnecessary 'str' variable in YAMLTree#visit_String
| * Merge pull request #224 from bjfish/patch-1Aaron Patterson2015-02-231-0/+4
| |\ | | | | | | Adding RVM listing for Rubinius
| | * Adding Rubinius as an Allowed FailureBrandon Fish2015-02-221-0/+3
| | |
| | * Adding RVM listing for RubiniusBrandon Fish2015-02-141-0/+1
| | | | | | | | | Hello, I would like to add Rubinius to your RVM list in your travis build to test this gem for compatibility. Thank you.
| * | bump versionv2.0.13Aaron Patterson2015-02-171-1/+1
| | |
| * | Merge pull request #225 from flori/fix-cve-2014-9130Aaron Patterson2015-02-171-7/+0
| |\ \ | | |/ | |/| Fix CVE-2014-9130
| | * Fix CVE-2014-9130Florian Frank2015-02-171-7/+0
| |/ | | | | | | | | | | | | | | See https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9130 This is already fixed in libyaml via this patch: https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
| * fix minitest warningsAaron Patterson2015-02-062-2/+8
| |
| * * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes whenAaron Patterson2015-02-063-3/+33
| | | | | | | | | | | | dumping objects with custom coders. [ruby-core:66215] [Bug #10496] * test/psych/test_coder.rb: test for fix
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regularAaron Patterson2015-02-063-2/+13
| | | | | | | | | | | | | | | | expressions with newlines. tenderlove/psych#222 * test/psych/test_yaml.rb: test for change. fixes #222
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes withv2.0.12Aaron Patterson2015-01-284-1/+17
| | | | | | | | | | | | | | instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix
| * bump versionv2.0.11Aaron Patterson2015-01-201-1/+1
| |
| * Merge pull request #221 from nobu/fix-anchorAaron Patterson2015-01-172-9/+17
| |\ | | | | | | Fix anchor
| | * Fix anchorNobuyoshi Nakada2015-01-172-9/+17
| | | | | | | | | | | | | | | Anchors like `\Z` are not valid inside character class. Use negative-lookahead instead.
| | * Fix assertion regexpsNobuyoshi Nakada2015-01-171-2/+2
| |/ | | | | | | `|' is a meta character, so needs to be escaped.
| * bump versionv2.0.10Aaron Patterson2015-01-161-1/+1
| |
| * Merge pull request #218 from jemc/masterAaron Patterson2015-01-162-44/+48
| |\ | | | | | | Fix issue #217 and #216 - Only dump ivars for subclasses of Hash and String.
| | * Only dump ivars for subclasses of String, not for String.Joe Eli McIlvain2015-01-151-4/+5
| | | | | | | | | | | | With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217.
| | * Only dump ivars for subclasses of Hash, not for Hash.Joe Eli McIlvain2015-01-152-40/+43
| |/ | | | | | | | | Fixes #216. Fixes part of #217.
| * Merge pull request #215 from jirutka/patch-2Aaron Patterson2015-01-132-18/+64
| |\ | | | | | | Use appropriate style for serialized strings (replaces #195)
| | * Fix block chomping and add more testsJakub Jirutka2015-01-132-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no [chomping indicator][1] is specified for a folded or literal block, then YAML parser should preserve the final line break (i.e. the string should end with \n). This implies that when dumping a string *without* the trailing newline to YAML, we should specify the stripping indicator (-). [1]: http://yaml.org/spec/1.2/2009-07-21/spec.html#id2593651
| | * Preset @line_width in YAMLTree#initialize for better performanceJakub Jirutka2015-01-121-12/+9
| | |
| | * Use appropriate style for serialized stringsJakub Jirutka2015-01-122-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When psych parses YAML with string in the folded style as: a: > some inline content and serializes it back to YAML, then it renders the string in the literal style instead: a: | some inline content This patch fixes this behaviour. When a string doesn't contain newlines (blank line at the end is ignored) and it's not necessary to be quoted, then it will use plain style or folded style according to its length and the `line_width` option. # line_width = 100 a: some inline content # line_width = 11 a: > some inline content This change was originally proposed by @Iazel.
| | * Remove unnnecessary 'str' variable in YAMLTree#visit_StringJakub Jirutka2015-01-121-4/+3
| |/
* | setup java platform gemChristian Meier2015-02-268-12/+55
| | | | | | | | | | | | | | use maven to resolve jar dependencies for compilation. setup jar-dependencies to install the snakeyaml jar when installing the gem via rubygems or bundler. added java code to reflect the snakeyaml vesion which got finally loaded into the jruby-classloader.
* | Merge remote-tracking branch 'origin/master' into jrubyCharles Oliver Nutter2015-01-0996-518/+15063
|\ \ | |/ | | | | | | Conflicts: .gitignore
| * bumping version:v2.0.9Aaron Patterson2015-01-081-1/+1
| |
| * Merge branch 'master' into jirutka-patch-1Aaron Patterson2015-01-0821-47/+367
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (21 commits) * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash subclasses. Fixes github.com/tenderlove/psych/issues/196 * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars removed isolate task removed isolate plugin added minitest dependency into gemspec added install task into travis added ruby-head env bumping version to 2.0.8 fixed build error caused by trunk changes bumping version to 2.0.7 merging from ruby trunk backport r48512 from ruby/ruby trunk. Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394 backport r48214 from ruby/ruby trunk. Allow dumping any BasicObject that defines #marshal_dump or #marshal_load bumping version * ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and loading. Fixes GH #85. Thanks @brentdax for the patch! * test/psych/test_exception.rb: test for fix * ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that look like integers but have a newline. Fixes GH #189 * test/psych/test_string.rb: test for fix * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings should not be treated as merge keys. * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys containing "<<" should roundtrip. * test/psych/test_merge_keys.rb: test for change. Fixes GH #203 ... Conflicts: lib/psych/visitors/yaml_tree.rb
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hashAaron Patterson2015-01-083-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | subclasses. Fixes github.com/tenderlove/psych/issues/196 * test/psych/test_hash.rb: test for change fixes #196
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivarsAaron Patterson2015-01-084-8/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: dump hashes with ivars. Fixes github.com/psych/issues/43 * test/psych/test_hash.rb: test for change fixes #43
| | * Merge pull request #213 from hsbt/ruby-headAaron Patterson2014-12-062-3/+6
| | |\ | | | | | | | | Added ruby-head env into travis
| | | * removed isolate taskSHIBATA Hiroshi2014-12-061-1/+1
| | | |
View Lorry Controller Status