jruby support #21

ahorek · 2021-06-12T17:01:24Z

implements #20

ahorek · 2021-06-13T12:01:39Z

I've fixed false positive failures with assert_separately because any warning is an error https://github.com/jruby/jruby/blob/master/core/src/main/java/org/jruby/Ruby.java#L3089

hsbt · 2021-06-14T02:32:27Z

@knu Can you review this? I prefer to merge JRuby implementation to this repository.

knu

Thanks for the PR, I think this is the way to go!

lib/digest.rb

nobu · 2021-06-14T05:34:26Z

digest.gemspec

-    ext/digest/sha2/extconf.rb
-  ]
+
+  if RUBY_ENGINE == 'jruby'


Use Gem::Platform for --platform option of gem build.

Suggested change

if RUBY_ENGINE == 'jruby'

if Gem::Platform === spec.platform and spec.platform =~ 'java'

thanks! should we change it here as well? https://github.com/ruby/psych/blob/master/psych.gemspec#L51

Rakefile

nobu · 2021-06-14T05:38:37Z

digest.gemspec

-    "ext/digest/bubblebabble/bubblebabble.c", "ext/digest/bubblebabble/extconf.rb", "ext/digest/defs.h",
+    "ext/digest/bubblebabble/bubblebabble.c", "ext/digest/bubblebabble/extconf.rb", "ext/digest/bubblebabble/lib/bubblebabble.rb", "ext/digest/defs.h", 
    "ext/digest/digest.c", "ext/digest/digest.h", "ext/digest/digest_conf.rb", "ext/digest/extconf.rb",
    "ext/digest/md5/extconf.rb", "ext/digest/md5/md5.c", "ext/digest/md5/md5.h", "ext/digest/md5/md5cc.h",
-    "ext/digest/md5/md5init.c", "ext/digest/rmd160/extconf.rb", "ext/digest/rmd160/rmd160.c",
-    "ext/digest/rmd160/rmd160.h", "ext/digest/rmd160/rmd160init.c", "ext/digest/sha1/extconf.rb",
-    "ext/digest/sha1/sha1.c", "ext/digest/sha1/sha1.h", "ext/digest/sha1/sha1cc.h",
+    "ext/digest/md5/md5init.c", "ext/digest/md5/lib/md5.rb", "ext/digest/rmd160/extconf.rb", "ext/digest/rmd160/rmd160.c",
+    "ext/digest/rmd160/rmd160.h", "ext/digest/rmd160/rmd160init.c", "ext/digest/rmd160/lib/rmd160.rb", "ext/digest/sha1/extconf.rb",
+    "ext/digest/sha1/sha1.c", "ext/digest/sha1/sha1.h", "ext/digest/sha1/sha1cc.h", "ext/digest/sha1/lib/sha1.rb",


These added files should be inside if RUBY_ENGINE == 'jruby' block.

java sources don't have to be part of a released gem, so I removed them instead

rhenium · 2021-06-14T12:03:26Z

JRuby's digest is licensed under EPL 2.0/GPL 2.0/LGPL 2.1 unlike MRI's. To my understanding it can't simply be relicensed under Ruby's/2-clause BSDL, so that has to be reflected in the licenses field of the gemspec for JRuby builds.

I feel it's also worth mentioning in README that files under ext/java have a different license from others.

hsbt · 2021-06-14T12:19:24Z

Can we switch the license in gemspec each platforms?

ahorek · 2021-06-14T12:36:50Z

Can we switch the license in gemspec each platforms?

done!

headius · 2021-06-14T21:14:06Z

I will review quick as well but looks most of the issues have been addressed.

If it would be better for us to relicense we can try to contact past contributors and get permission, but it would take some time.

headius · 2021-06-14T21:22:45Z

Committers to the Digest library in JRuby, as far back as 2006, before which only Ola contributed to it:

Charles Oliver Nutter
Ola Bini
Thomas Enebo
Andrey Fadeyev
Chris Heald
Chris Seaton
kares
tduehr

headius

Mostly build plumbing but the changes look fine to me.

headius · 2021-06-14T21:30:16Z

@ahorek Have you tested this gem with a build of JRuby that does not include our built-in version? If that works then I think this is ready to go.

headius · 2021-06-14T21:42:23Z

Those JRuby digest contribs in GH user form:

ahorek · 2021-06-14T21:42:47Z

@headius yes, I tested it together with jruby/jruby#6719

standard build

rake compile
gem build

jruby build

rake compile:java
gem build --platform java

as suggested by @nobu we can build a Java version directly from CRuby, but it doesn't work the opposite way, on JRuby the Java platform is forced, so you won't be able to build a version for CRuby on JRuby.

cheald · 2021-06-14T22:07:21Z

I happily grant permission to relicense code I contributed.

headius · 2021-06-30T17:07:30Z

I think we should go ahead and merge this with the license disclaimer. If we really want to relicense open a separate issue and ping the folks I mentioned above for permission. Since only one replied here, it may take a little work to chase everyone down.

tduehr · 2021-06-30T22:36:33Z

I'm fine with re-licensing all code I contributed to JRuby to Ruby's/2-clause BSDL.

kares · 2021-07-01T04:39:16Z

👍 I consent to my contributions being relicensed under the Ruby license and the BSD 2-clause license.

enebo · 2021-07-01T15:00:33Z

I am fine with relicensing all code to Ruby's/2-clause BSDL.

headius · 2021-07-01T19:30:40Z

I consent to my contributions being relicensed under the Ruby license and the BSD 2-clause license.

kubum · 2021-07-01T20:48:40Z

Sorry for not coming back earlier. I am happy for this code to be in. The fragment I added in 2015 as part of the jruby/jruby#3238 PR, in fact, is just a mere port of an else branch from OpenSSH sshkey.c file written Java. The documentation header already points to it.

olabiniV2 · 2021-07-02T16:33:24Z

Hi everyone. I am Ola Bini - the owner of the @olabini account - which I'm currently locked out of. If any legal issues arise, I'm willing to provide offline government identification if necessary, to support this agreement.

I consent to my contributions being relicensed under the Ruby license and the BSD 2-clause license.

chrisseaton · 2021-07-02T19:34:57Z

Happy.

nobu · 2021-09-06T12:55:48Z

I think lib/digest.rb should move back to ext/digest/lib/, like as other .rb files under ext/digest/*/lib directories.
And jruby doesn’t have similar feature to copy incidental scripts?

knu · 2021-09-06T14:38:11Z

I think lib/digest.rb should move back to ext/digest/lib/, like as other .rb files under ext/digest/*/lib directories.
And jruby doesn’t have similar feature to copy incidental scripts?

The autoloading stuff should be moved there, but common parts can stay there.

knu · 2021-09-06T14:39:47Z

But I think I can and should do that myself, because I'll need to modify the import script (to ruby/ruby) anyway.

nobu · 2021-09-07T10:15:11Z

My proposal is to make JRuby libraries into a separate directory from the libraries under ext/digest.
https://github.com/nobu/digest/tree/jruby-support

ahorek · 2021-09-07T12:01:09Z

I agree with your proposal @nobu thanks for your help.

headius · 2021-09-07T16:43:55Z

And jruby doesn’t have similar feature to copy incidental scripts?

JRuby does not have a separate source dir for .rb files associated with extensions. If /ext/digest/lib is a better place and it is added to the load path for the gem, we should be able to find it. We might need to enhance our default gem installation logic to copy those files to the common stdlib dir, but that's for us to fix.

nobu · 2021-09-13T16:18:42Z

JRuby does not have a separate source dir for .rb files associated with extensions. If /ext/digest/lib is a better place and it is added to the load path for the gem, we should be able to find it.

That directory is for scripts to be installed by extconf.rb and make.
What I was thinking isn’t to add that directory to the load path, but is the same as Eregon’s suggestion (#21 (comment)).

knu · 2021-09-14T18:31:23Z

OK, I'll take this! Thanks to all the contributors who agreed with the license change!

ahorek · 2021-09-23T21:29:17Z

I've merged Nobu's changes and rebased against the current master. I think it should be ready.

knu · 2021-09-28T08:29:20Z

I just pushed #25 which should include the core parts of this PR while avoiding dynamic library file generation. Please look into it and leave any comments.

knu · 2021-09-30T06:15:21Z

Thank you all for your cooperation. This work has been merged, and I'll be working on a new gem release shortly.

headius · 2021-09-30T14:27:05Z

@knu Thank you! If possible, could you push a prerelease gem that we can run through JRuby CI, to ensure it is working properly?

knu · 2021-09-30T15:02:24Z

@headius Sure! I've pushed 3.1.0.pre0.

https://rubygems.org/gems/digest/versions/3.1.0.pre0
https://rubygems.org/gems/digest/versions/3.1.0.pre0-java

ahorek · 2021-09-30T15:26:02Z

@knu there's a missing jar file, see #27 could you take a look and try it one more time? thanks!

knu · 2021-09-30T17:06:10Z

Fixed and here's 3.1.0pre1.

https://rubygems.org/gems/digest/versions/3.1.0.pre1
https://rubygems.org/gems/digest/versions/3.1.0.pre1-java

knu · 2021-09-30T17:09:47Z

Argh, rake release doesn't seem to run rake compile and that's why pre1 still doesn't seem to include the jar file. I'll release another pre.

knu · 2021-09-30T17:32:16Z

I've released 3.1.0.pre2.

https://rubygems.org/gems/digest/versions/3.1.0.pre2
https://rubygems.org/gems/digest/versions/3.1.0.pre2-java

headius · 2021-09-30T17:34:18Z

@knu Thank goodness for prerelease gems! I will test this on our 3.0 dev branch now.

headius · 2021-09-30T18:21:18Z

Looking good so far but I need to modify our build to copy the ext lib files for JRuby into our standard lib directory. Once I know everything is installing properly, I will let you know.

headius · 2021-09-30T19:58:05Z

@knu I believe it is working! You may go ahead and release 3.1.0.

$ spec/mspec/bin/mspec ci spec/ruby/library/digest/
$ /Users/headius/projects/jruby/bin/jruby /Users/headius/projects/jruby/spec/mspec/bin/mspec-ci spec/ruby/library/digest/
jruby 9.4.0.0-SNAPSHOT (3.0.2) 2021-09-30 5039c194de OpenJDK 64-Bit Server VM 11.0.4+11 on 11.0.4+11 +jit [darwin-x86_64]
[/ | ==================100%================== | 00:00:00]      0F      0E 

Finished in 3.434759 seconds

68 files, 129 examples, 230 expectations, 0 failures, 0 errors, 5 tagged

knu · 2021-10-01T02:15:44Z

@headius Thank you!

ahorek mentioned this pull request Jun 12, 2021

draft: install digest from the gem jruby/jruby#6719

Closed

olleolleolle linked an issue Jun 13, 2021 that may be closed by this pull request

java version #20

Closed

knu reviewed Jun 14, 2021

View reviewed changes

lib/digest.rb Outdated Show resolved Hide resolved

nobu requested changes Jun 14, 2021

View reviewed changes

ahorek force-pushed the jruby_support branch 2 times, most recently from 60bfe18 to b0cdf61 Compare June 14, 2021 11:52

ahorek force-pushed the jruby_support branch from b0cdf61 to 6ac4e0b Compare June 14, 2021 12:19

ahorek force-pushed the jruby_support branch 2 times, most recently from 0df8176 to dbc83db Compare June 14, 2021 12:35

ahorek requested a review from nobu June 14, 2021 20:34

headius approved these changes Jun 14, 2021

View reviewed changes

knu mentioned this pull request Sep 7, 2021

Move digest.rb back under ext as the extension bundled library #23

Merged

knu self-assigned this Sep 14, 2021

import jruby version

cfbec34

ahorek force-pushed the jruby_support branch from 3b978c7 to cfbec34 Compare September 23, 2021 21:13

Separate Java libraries

e9d0aff

knu mentioned this pull request Sep 28, 2021

Integrate the JRuby extension #25

Merged

eregon mentioned this pull request Sep 29, 2021

Supporting require "foo/bar.so" to load foo/bar.jar in $LOAD_PATH jruby/jruby#6865

Open

knu closed this in 27ab6de Sep 30, 2021

	if RUBY_ENGINE == 'jruby'
	if Gem::Platform === spec.platform and spec.platform =~ 'java'

jruby support #21

jruby support #21

Uh oh!

Conversation

ahorek commented Jun 12, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahorek commented Jun 13, 2021

Uh oh!

hsbt commented Jun 14, 2021

Uh oh!

knu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nobu Jun 14, 2021

Choose a reason for hiding this comment

Uh oh!

ahorek Jun 14, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nobu Jun 14, 2021

Choose a reason for hiding this comment

Uh oh!

ahorek Jun 14, 2021

Choose a reason for hiding this comment

Uh oh!

rhenium commented Jun 14, 2021

Uh oh!

hsbt commented Jun 14, 2021

Uh oh!

ahorek commented Jun 14, 2021

Uh oh!

headius commented Jun 14, 2021

Uh oh!

headius commented Jun 14, 2021

Uh oh!

headius left a comment

Choose a reason for hiding this comment

Uh oh!

headius commented Jun 14, 2021

Uh oh!

headius commented Jun 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahorek commented Jun 14, 2021

Uh oh!

cheald commented Jun 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

headius commented Jun 30, 2021

Uh oh!

tduehr commented Jun 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kares commented Jul 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

enebo commented Jul 1, 2021

Uh oh!

headius commented Jul 1, 2021

Uh oh!

kubum commented Jul 1, 2021

Uh oh!

olabiniV2 commented Jul 2, 2021

Uh oh!

chrisseaton commented Jul 2, 2021

Uh oh!

nobu commented Sep 6, 2021

Uh oh!

knu commented Sep 6, 2021

Uh oh!

knu commented Sep 6, 2021

Uh oh!

nobu commented Sep 7, 2021

Uh oh!

ahorek commented Sep 7, 2021

Uh oh!

headius commented Sep 7, 2021

ahorek commented Jun 12, 2021 •

edited

Loading

headius commented Jun 14, 2021 •

edited

Loading

cheald commented Jun 14, 2021 •

edited

Loading

tduehr commented Jun 30, 2021 •

edited

Loading

kares commented Jul 1, 2021 •

edited

Loading

knu commented Sep 30, 2021 •

edited

Loading