Move JRuby's ext and loader script (#39)

The strscan.rb file is only needed by JRuby, which does not have an
extension file format that loads itself. As noted in #35 having this
file present on TruffleRuby prevents their built-in strscan.rb from
loading, so the file was moved to lib/jruby/strscan.rb with lib/jruby
added as a require path. However this results in both lib/strscan.rb
and lib/jruby/strscan.rb getting copied into JRuby's stdlib when the
default gem is installed, leading to the confusing situation in #38.

This PR moves the jruby-specific strscan.rb under the jruby extension,
renaming that directory to be explicitly for JRuby, and adding that
new ext/jruby/lib path to the require paths so there's no nesting of
require paths to copy files multiple times.

* ext/java => ext/jruby
* lib/jruby/strscan.rb => ext/jruby/lib/strscan.rb
* Changes to Rakefile and gemspec for new locations

Fixes #38

Author: headius

Rakefile

@@ -21,7 +21,7 @@ if RUBY_ENGINE == "jruby"
     require 'maven/ruby/maven'
     ext.source_version = '1.8'
     ext.target_version = '1.8'
-    ext.ext_dir = 'ext/java'
+    ext.ext_dir = 'ext/jruby'
   end
 elsif RUBY_ENGINE == "ruby"
   require 'rake/extensiontask'
@@ -32,8 +32,8 @@ end
 
 desc "Run test"
 task :test do
-  require_path = RUBY_ENGINE == 'jruby' ? "lib/jruby" : "lib"
-  ENV["RUBYOPT"] = "-I#{require_path} -rbundler/setup"
+  extra_require_path = RUBY_ENGINE == 'jruby' ? "ext/jruby/lib" : "lib"
+  ENV["RUBYOPT"] = "-I#{extra_require_path} -rbundler/setup"
   ruby("run-test.rb")
 end
 

lib/jruby/strscan.rb ext/jruby/lib/strscan.rblib/jruby/strscan.rb renamed to ext/jruby/lib/strscan.rb

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.description = "Provides lexical scanning operations on a String."
 
   if RUBY_ENGINE == 'jruby'
-    s.require_paths = %w{lib/jruby lib}
-    s.files = %w{lib/strscan.jar lib/jruby/strscan.rb}
+    s.require_paths = %w{ext/jruby/lib lib}
+    s.files = %w{lib/strscan.jar ext/jruby/lib/strscan.rb}
     s.platform = "java"
   else
     s.require_paths = %w{lib}