Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7df3e56395cf^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2d3914ae663b
Choose a head ref

Commits on May 28, 2015

  1. Copy the full SHA
    a6db2cd View commit details
  2. Copy the full SHA
    207c3c2 View commit details

Commits on May 29, 2015

  1. Copy the full SHA
    fa690dc View commit details
  2. Copy the full SHA
    46c7d68 View commit details
  3. avoid (local) context ref over-head + refactor to context.nil esp. in…

    … anon-class methods
    
    ... where ctx is a local while runtime.getNil() comes from parent scope
    also added a packEnumValues helper with context being passed instead of runtime
    kares committed May 29, 2015
    Copy the full SHA
    20e3382 View commit details
  4. Copy the full SHA
    d8aa8af View commit details
  5. Copy the full SHA
    cd30b12 View commit details
  6. Copy the full SHA
    7de07f9 View commit details
  7. Copy the full SHA
    56e8746 View commit details
  8. Copy the full SHA
    1ea53a6 View commit details
  9. Copy the full SHA
    2c9825d View commit details
  10. keep mkdir consistent when using uri-like paths

    * there was a problem with file:////path/to/dir where the extra slashes
      did confuse the logic
    * all pathes starting with uri: can not create any directories
    
    fixes #2972
    
    Sponsored by Lookout Inc.
    mkristian committed May 29, 2015
    Copy the full SHA
    0137667 View commit details

Commits on May 30, 2015

  1. ensure relative_require on root of uri:classloader:/

    this fixes a regression of 0137667
    
    Sponsored by Lookout Inc.
    mkristian committed May 30, 2015
    Copy the full SHA
    562a240 View commit details
  2. Copy the full SHA
    92a1923 View commit details
  3. Copy the full SHA
    b32767d View commit details
  4. Copy the full SHA
    23b872e View commit details
  5. Copy the full SHA
    e12ad7e View commit details
  6. Copy the full SHA
    1a94da8 View commit details

Commits on Jun 2, 2015

  1. use new JRuby.create to load script from command line script source

    delegate script source argument to the new load service FileResource
    factory and allow all uri like paths which the regular JRuby code
    uses as well.
    
    fixes #2948
    
    Sponsored by Lookout Inc.
    mkristian committed Jun 2, 2015
    3
    Copy the full SHA
    4da7547 View commit details
  2. Copy the full SHA
    d7fc016 View commit details
  3. Add support for http.nonProxyHosts and rework ENV_JAVA support.

    Fixes #2983.
    
    Note that Ruby 1.9 has no support for environment-driven proxy
    settings, so this change is only available in 2.0 mode on JRuby
    1.7.
    headius committed Jun 2, 2015
    Copy the full SHA
    35cf0da View commit details

Commits on Jun 3, 2015

  1. set ENV['RUBY'] when jruby.home is not regular directory

    JRuby comes with rake as part of its ruby stdlib. rake has a feature
    to spawn a new ruby process and execute things. this is used by unit
    tests and rspec. this spawn needs to determin the ruby executable. when
    jruby runs from the jruby-complete.jar then ENV['RUBY'] will tell rake to
    use which does actual execute and spawn a new
    `java -cp jruby-complete.jar org.jruby.Main` process.
    
    added an integration test in maven/jruby-complete/src/it which executes
    `java -jar jruby-complete.jar -S rake test:mri`
    
    there are still short comings with ArgumentProcessor and some -J-xyz switches
    
    Sponsored by Lookout Inc.
    mkristian committed Jun 3, 2015
    5
    Copy the full SHA
    5c45c39 View commit details
  2. Copy the full SHA
    1e43071 View commit details
  3. if current directory is inside the classloader a spawn jruby process …

    …should do the same
    
    first the code need to launch a new jruby process, when the current
    directory is inside the classloader then the spawned jruby process
    needs to have the same current directory
    
    Sponsored by Lookout Inc.
    mkristian committed Jun 3, 2015
    Copy the full SHA
    3a4235a View commit details

Commits on Jun 4, 2015

  1. Copy the full SHA
    98cab87 View commit details
  2. Copy the full SHA
    f8a17c1 View commit details
  3. Copy the full SHA
    a11eb7a View commit details
  4. Copy the full SHA
    0ab74b7 View commit details
  5. Copy the full SHA
    8c2b5f5 View commit details
  6. Copy the full SHA
    fb4d26b View commit details
  7. Copy the full SHA
    46ae07b View commit details
  8. Copy the full SHA
    7daf537 View commit details
  9. handle big decimal ** float value calculation (with Java double math)…

    … ...
    
    since we're now not raising users should get ~ the value they expect (closing #1967)
    kares committed Jun 4, 2015
    Copy the full SHA
    5c5b5cb View commit details
  10. minor BigDecimal code cleanup

    kares committed Jun 4, 2015
    Copy the full SHA
    fdf5201 View commit details
  11. Copy the full SHA
    2b990bc View commit details
  12. Copy the full SHA
    4ac1c5d View commit details
  13. Copy the full SHA
    e492b3a View commit details
  14. basic BigDecimal sub-class test ... all working the same as MRI 1.8/1.9

    ... no need to address #365 as the allocate+initialize sequence seems MRI-like
    kares committed Jun 4, 2015
    Copy the full SHA
    967ca40 View commit details

Commits on Jun 5, 2015

  1. Merge branch 'jruby-1_7'

    * jruby-1_7: (38 commits)
      basic BigDecimal sub-class test ... all working the same as MRI 1.8/1.9
      avoid deprecated newInstance + one less pattern to match on BigDecimal.new
      [bigdecimal] keep the simplified newInstance backport 1.8 compatible
      [bigdecimal] backport simplified newInstance impl from master
      minor BigDecimal code cleanup
      handle big decimal ** float value calculation (with Java double math) ... since we're now not raising users should get ~ the value they expect (closing #1967)
      static-ize and simplify private helpers
      BigDecimal should not raise error on pow/** with float arg (under 1.9 #1967)
      some more (internal) RubyBigDecimal dry-ing / tidy-ing
      do coercion on * and / (same as MRI has been doing since 1.8) ... fixes #2538
      handle BigDecimal cmp failure compatibly with MRI (fixes #2539)
      pass around context in BigDecimal impl + simplify cmp method's code
      move JI java.mat.BigDecimal test out of Ruby's BigDecimal tests
      [travis-ci] test-extended on jdk8
      if current directory is inside the classloader a spawn jruby process should do the same
      use the new bin stubs from new rubygems
      set ENV['RUBY'] when jruby.home is not regular directory
      Add support for http.nonProxyHosts and rework ENV_JAVA support.
      pik the right class in URLResourceTest
      use new JRuby.create to load script from command line script source
      ...
    
    Conflicts:
    	.travis.yml
    	core/src/main/java/org/jruby/RubyDir.java
    	core/src/main/java/org/jruby/RubyEnumerable.java
    	core/src/main/java/org/jruby/RubyEnumerator.java
    	core/src/main/java/org/jruby/RubyHash.java
    	core/src/main/java/org/jruby/RubyInstanceConfig.java
    	core/src/main/java/org/jruby/RubyModule.java
    	core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
    	core/src/main/java/org/jruby/util/ClasspathResource.java
    	core/src/main/java/org/jruby/util/URLResource.java
    	core/src/test/java/org/jruby/util/URLResourceTest.java
    	lib/ruby/2.0/net/http.rb
    	lib/ruby/2.0/uri/generic.rb
    	maven/jruby/src/it/runnable/spec/one_spec.rb
    	test/test_backquote.rb
    	test/test_big_decimal.rb
    	test/test_dir.rb
    	test/test_file.rb
    	test/test_higher_javasupport.rb
    	test/test_load.rb
    kares committed Jun 5, 2015
    Copy the full SHA
    7df3e56 View commit details
  2. 1
    Copy the full SHA
    2d3914a View commit details
Showing with 1,457 additions and 912 deletions.
  1. +1 −1 bin/rake
  2. +1 −1 bin/rdoc
  3. +1 −1 bin/ri
  4. +266 −265 core/src/main/java/org/jruby/RubyEnumerable.java
  5. +62 −61 core/src/main/java/org/jruby/RubyEnumerator.java
  6. +41 −41 core/src/main/java/org/jruby/RubyHash.java
  7. +9 −2 core/src/main/java/org/jruby/RubyInstanceConfig.java
  8. +4 −4 core/src/main/java/org/jruby/RubyModule.java
  9. +380 −314 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
  10. +30 −29 core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java
  11. +6 −4 core/src/main/java/org/jruby/javasupport/Java.java
  12. +1 −4 core/src/main/java/org/jruby/javasupport/JavaUtil.java
  13. +10 −2 core/src/main/java/org/jruby/util/ShellLauncher.java
  14. +23 −5 core/src/main/java/org/jruby/util/URLResource.java
  15. +15 −15 core/src/test/java/org/jruby/util/URLResourceTest.java
  16. +16 −16 lib/ruby/stdlib/uri/generic.rb
  17. +35 −0 maven/jruby-complete/src/it/extended/Mavenfile
  18. +86 −0 maven/jruby-complete/src/it/extended/pom.xml
  19. +150 −4 maven/jruby/src/it/integrity/pom.xml
  20. BIN maven/jruby/src/it/integrity/src/main/resources/hello.jar
  21. +1 −0 maven/jruby/src/it/integrity/src/main/resources/hello.rb
  22. +23 −0 maven/jruby/src/it/integrity/verify.bsh
  23. +5 −3 maven/jruby/src/it/runnable/Mavenfile
  24. +3 −1 maven/jruby/src/it/runnable/Rakefile
  25. +17 −2 maven/jruby/src/it/runnable/pom.xml
  26. +5 −1 maven/jruby/src/it/runnable/spec/one_spec.rb
  27. +0 −40 maven/jruby/src/it/runnable/src/main/java/Main.java
  28. +7 −4 maven/jruby/src/it/runnable/verify.bsh
  29. 0 test/jruby/relative.rb
  30. +1 −0 test/jruby/require_relative.rb
  31. +7 −1 test/jruby/test_backquote.rb
  32. +152 −40 test/jruby/test_big_decimal.rb
  33. +15 −13 test/jruby/test_dir.rb
  34. +26 −26 test/jruby/test_file.rb
  35. +35 −0 test/jruby/test_hash.rb
  36. +8 −0 test/jruby/test_higher_javasupport.rb
  37. +14 −10 test/jruby/test_load.rb
  38. +1 −2 test/{ → jruby}/test_load_gem_extensions.rb
2 changes: 1 addition & 1 deletion bin/rake
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
2 changes: 1 addition & 1 deletion bin/rdoc
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
2 changes: 1 addition & 1 deletion bin/ri
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ version = ">= 0"
if ARGV.first
str = ARGV.first
str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
if str =~ /\A_(.*)_\z/
if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
version = $1
ARGV.shift
end
Loading