Update psych to edf05c9f40e0c566e391f7e04b4a30327c31a828 #578

Closed
wants to merge 1 commit into
from

Projects

None yet

3 participants

@atambo
Member
atambo commented Mar 11, 2013

There's tons of string quotation fixes that I would ❤️ to see in jruby 1.7.4. In order to generate this diff I ran the following commands:

cp -R <psych checkout>/psych/lib/psych <jruby checkout>/lib/ruby/1.9
cp <psych checkout>/psych/lib/psych.rb <jruby checkout>/lib/ruby/1.9/psych.rb

@BanzaiMan
Member

I'd personally very much prefer that there is a Psych release which includes this.

@atambo
Member
atambo commented Mar 12, 2013

@tenderlove, could you make a 2.0.0 release of the psych gem?

If a 2.0.0 release of the psych gem is made will I be able to put that in my Gemfile and it will take precedence over the stdlib version in jruby? I know the json gem does that but there is a java platform version of the json gem...while the psych gem has a bunch of native stuff in it. I'm guessing the only way to do the psych in Gemfile thing for jruby would be to move to the way the json gem is handled by moving all of the jruby java bits into the psych gem itself?

@headius
Member
headius commented Mar 14, 2013

We do not currently support loading psych from the gem rather than from stdlib. We would like to be able to do that.

Until then, we'll have to update stdlib to pick up updates. For that, we will tend to prefer released versions.

@atambo
Member
atambo commented Mar 14, 2013

Sounds good, it looks like the 2.0 stdlib already has the fixes I need so I'll just wait for the next release and use --2.0 mode.

@atambo atambo closed this Mar 14, 2013
@headius
Member
headius commented Mar 14, 2013

I talked with @tenderlove and he said psych 2.0 is basically done but he's been holding off doing a gem release. We could pull from his 2.0.0 branch and apply updated psych to JRuby's 1.9 mode.

So, we could probably update any time. Any concerns about pulling psych 2.0 into our 1.9 mode?

Reopening to keep this task fresh.

@headius headius reopened this Mar 14, 2013
@headius
Member
headius commented Mar 14, 2013

@tenderlove also told me he does plan to backport some fixes into 1.9.3, which would mean we'd pick them up after that. So...we could move straight to 2.0 psych right now, or just wait until fixes trickle back.

I'd just as soon go to psych 2.0 stuff right now, so I'm going to explore that quickly.

@headius
Member
headius commented Mar 14, 2013

Sole failure in 1.9 psych tests when updating psych to the 2.0 versions:

  1) Failure:
test_tagged_binary_should_be_dumped_as_binary(Psych::TestString) [/Users/headius/projects/jruby/test/externals/ruby1.9/psych/test_string.rb:47]:
Expected /binary/ to match "--- hello world!\n".
@atambo
Member
atambo commented Mar 15, 2013

@headius, will 5120e5f update psych for 1.9 and 2.0 mode or only 2.0 mode? If so, then this can be closed?

@headius
Member
headius commented Mar 15, 2013

Ahh yes, 5120e5f does indeed use psych 2.0 in both 1.9 and 2.0 modes, so this can be closed.

@headius headius closed this Mar 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment