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: 073462da1b9c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4eee05ebae04
Choose a head ref
  • 10 commits
  • 57 files changed
  • 1 contributor

Commits on May 15, 2018

  1. Whitespace cleanup.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    ffea136 View commit details

  2. Alphabetize and reformat.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    e601cb5 View commit details

  3. Switch to fileutils default gem.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    0c0161d View commit details

  4. Switch to cmath default gem.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    eb3306c View commit details

  5. Switch to csv default gem.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    70f918d View commit details

  6. Switch to scanf default gem.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    983272d View commit details

  7. Switch to webrick default gem and add xmlrpc default gem.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    4662b4a View commit details

  8. Move bundled (preinstalled) gems out of defaults.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    5b186cd View commit details

  9. Remove tracing tests that have not been used for some time.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    057e607 View commit details

  10. Clean up bad code patterns triggering warnings that break test.

    @headius
    headius committed May 15, 2018
    Copy the full SHA
    4eee05e View commit details
Showing with 175 additions and 12,527 deletions.
  1. +5 −0 .gitignore
  2. +0 −1 .travis.yml
  3. +1 −1 core/src/main/java/org/jruby/ir/operands/UndefinedValue.java
  4. +32 −17 lib/pom.rb
  5. +102 −24 lib/pom.xml
  6. +0 −435 lib/ruby/stdlib/cmath.rb
  7. +0 −2,355 lib/ruby/stdlib/csv.rb
  8. +0 −1,658 lib/ruby/stdlib/fileutils.rb
  9. +2 −2 lib/ruby/stdlib/jruby/compiler.rb
  10. +22 −21 lib/ruby/stdlib/jruby/compiler/java_class.rb
  11. +0 −776 lib/ruby/stdlib/scanf.rb
  12. +0 −227 lib/ruby/stdlib/webrick.rb
  13. +0 −6 lib/ruby/stdlib/webrick/.document
  14. +0 −159 lib/ruby/stdlib/webrick/accesslog.rb
  15. +0 −309 lib/ruby/stdlib/webrick/cgi.rb
  16. +0 −36 lib/ruby/stdlib/webrick/compat.rb
  17. +0 −158 lib/ruby/stdlib/webrick/config.rb
  18. +0 −172 lib/ruby/stdlib/webrick/cookie.rb
  19. +0 −30 lib/ruby/stdlib/webrick/htmlutils.rb
  20. +0 −96 lib/ruby/stdlib/webrick/httpauth.rb
  21. +0 −117 lib/ruby/stdlib/webrick/httpauth/authenticator.rb
  22. +0 −108 lib/ruby/stdlib/webrick/httpauth/basicauth.rb
  23. +0 −408 lib/ruby/stdlib/webrick/httpauth/digestauth.rb
  24. +0 −132 lib/ruby/stdlib/webrick/httpauth/htdigest.rb
  25. +0 −94 lib/ruby/stdlib/webrick/httpauth/htgroup.rb
  26. +0 −125 lib/ruby/stdlib/webrick/httpauth/htpasswd.rb
  27. +0 −53 lib/ruby/stdlib/webrick/httpauth/userdb.rb
  28. +0 −338 lib/ruby/stdlib/webrick/httpproxy.rb
  29. +0 −587 lib/ruby/stdlib/webrick/httprequest.rb
  30. +0 −505 lib/ruby/stdlib/webrick/httpresponse.rb
  31. +0 −152 lib/ruby/stdlib/webrick/https.rb
  32. +0 −280 lib/ruby/stdlib/webrick/httpserver.rb
  33. +0 −23 lib/ruby/stdlib/webrick/httpservlet.rb
  34. +0 −152 lib/ruby/stdlib/webrick/httpservlet/abstract.rb
  35. +0 −47 lib/ruby/stdlib/webrick/httpservlet/cgi_runner.rb
  36. +0 −122 lib/ruby/stdlib/webrick/httpservlet/cgihandler.rb
  37. +0 −88 lib/ruby/stdlib/webrick/httpservlet/erbhandler.rb
  38. +0 −522 lib/ruby/stdlib/webrick/httpservlet/filehandler.rb
  39. +0 −47 lib/ruby/stdlib/webrick/httpservlet/prochandler.rb
  40. +0 −194 lib/ruby/stdlib/webrick/httpstatus.rb
  41. +0 −513 lib/ruby/stdlib/webrick/httputils.rb
  42. +0 −76 lib/ruby/stdlib/webrick/httpversion.rb
  43. +0 −156 lib/ruby/stdlib/webrick/log.rb
  44. +0 −378 lib/ruby/stdlib/webrick/server.rb
  45. +0 −215 lib/ruby/stdlib/webrick/ssl.rb
  46. +0 −270 lib/ruby/stdlib/webrick/utils.rb
  47. +0 −18 lib/ruby/stdlib/webrick/version.rb
  48. +0 −29 lib/ruby/stdlib/webrick/webrick.gemspec
  49. +6 −7 pom.rb
  50. +5 −6 pom.xml
  51. +0 −11 rakelib/test.rake
  52. +0 −2 test/tracing/dummy.rb
  53. +0 −2 test/tracing/dummy1.rb
  54. +0 −2 test/tracing/dummy2.rb
  55. +0 −4 test/tracing/other.rb
  56. +0 −255 test/tracing/test_trace_func.rb
  57. +0 −6 tool/sync_ruby_files.rb
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,10 @@ lib/ruby/cext/
lib/ruby/gems
lib/ruby/stdlib/*.jar
lib/ruby/stdlib/ant*
lib/ruby/stdlib/cmath.rb
lib/ruby/stdlib/csv.rb
lib/ruby/stdlib/did_you_mean*
lib/ruby/stdlib/fileutils.rb
lib/ruby/stdlib/gauntlet_rdoc.rb
lib/ruby/stdlib/ipaddr*
lib/ruby/stdlib/jar*
@@ -75,6 +78,8 @@ lib/ruby/stdlib/readline*
lib/ruby/stdlib/minitest*
lib/ruby/stdlib/power_assert*
lib/ruby/stdlib/psych*
lib/ruby/stdlib/scanf.rb
lib/ruby/stdlib/webrick*
lib/ruby/stdlib/**/maven-metadata-local.xml
release.properties
share
1 change: 0 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ env:
- PHASE='-Prake -Dtask=test:mri:fullint'
- PHASE='-Prake -Dtask=test:mri:jit'
- PHASE='-Prake -Dtask=test:slow_suites'
- PHASE='-Prake -Dtask=test:tracing'
- PHASE='-Prake -Dtask=spec:ji'
- PHASE='-Prake -Dtask=spec:compiler'
- PHASE='-Prake -Dtask=spec:compiler' JRUBY_OPTS=-Xcompile.invokedynamic
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/operands/UndefinedValue.java
View file
Original file line number Diff line number Diff line change
@@ -400,7 +400,7 @@ public String toString() {
public void visit(IRVisitor visitor) {
visitor.UndefinedValue(this);
}

@Deprecated
public Object dataGetStructChecked() { throw undefinedOperation(); }
}
49 changes: 32 additions & 17 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -24,23 +24,31 @@ def initialize( name, version, default_spec = true )
end
end

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.21' ),
ImportedGem.new( 'jruby-readline', '1.2.2' ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
ImportedGem.new( 'minitest', '${minitest.version}' ),
ImportedGem.new( 'test-unit', '${test-unit.version}' ),
ImportedGem.new( 'power_assert', '${power_assert.version}' ),
ImportedGem.new( 'psych', '3.0.2' ),
ImportedGem.new( 'json', '${json.version}' ),
ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
ImportedGem.new( 'net-telnet', '0.1.1'),
ImportedGem.new( 'did_you_mean', '1.0.1'),
ImportedGem.new( 'rake-ant', '1.0.4'),
ImportedGem.new( 'ipaddr', '1.2.0'),
]
default_gems = [
ImportedGem.new('cmath', '1.0.0'),
ImportedGem.new('csv', '1.0.0'),
ImportedGem.new('fileutils', '1.1.0'),
ImportedGem.new('ipaddr', '1.2.0'),
ImportedGem.new('jar-dependencies', '${jar-dependencies.version}'),
ImportedGem.new('jruby-readline', '1.2.2'),
ImportedGem.new('jruby-openssl', '0.9.21'),
ImportedGem.new('json', '${json.version}'),
ImportedGem.new('psych', '3.0.2'),
ImportedGem.new('rake-ant', '1.0.4'),
ImportedGem.new('rdoc', '${rdoc.version}'),
ImportedGem.new('scanf', '1.0.0'),
ImportedGem.new('webrick', '1.4.2'),
]

bundled_gems = [
['did_you_mean', '1.2.0'],
['minitest', '${minitest.version}'],
['net-telnet', '0.1.1'],
['power_assert', '${power_assert.version}'],
['rake', '${rake.version}'],
['test-unit', '${test-unit.version}'],
['xmlrpc', '0.3.0'],
]

project 'JRuby Lib Setup' do

@@ -87,6 +95,13 @@ def initialize( name, version, default_spec = true )
end
end

bundled_gems.each do |name, version|
# use provided scope so it is not a real dependency for runtime
dependency 'rubygems', name, version, :type => 'gem', :scope => :provided do
exclusion 'rubygems:jar-dependencies'
end
end

default_gemnames = default_gems.collect { |g| g.name }

plugin :dependency,
126 changes: 102 additions & 24 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -33,8 +33,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.21</version>
<artifactId>cmath</artifactId>
<version>1.0.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -46,8 +46,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-readline</artifactId>
<version>1.2.2</version>
<artifactId>csv</artifactId>
<version>1.0.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -59,8 +59,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rake</artifactId>
<version>${rake.version}</version>
<artifactId>fileutils</artifactId>
<version>1.1.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -72,8 +72,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rdoc</artifactId>
<version>${rdoc.version}</version>
<artifactId>ipaddr</artifactId>
<version>1.2.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -85,8 +85,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<artifactId>jar-dependencies</artifactId>
<version>${jar-dependencies.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -98,8 +98,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<artifactId>jruby-readline</artifactId>
<version>1.2.2</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -111,8 +111,21 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<artifactId>jruby-openssl</artifactId>
<version>0.9.21</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -137,8 +150,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<artifactId>rake-ant</artifactId>
<version>1.0.4</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -150,8 +163,60 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>${jar-dependencies.version}</version>
<artifactId>rdoc</artifactId>
<version>${rdoc.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>scanf</artifactId>
<version>1.0.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>webrick</artifactId>
<version>1.4.2</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>did_you_mean</artifactId>
<version>1.2.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -176,8 +241,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>did_you_mean</artifactId>
<version>1.0.1</version>
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -189,8 +254,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rake-ant</artifactId>
<version>1.0.4</version>
<artifactId>rake</artifactId>
<version>${rake.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -202,8 +267,21 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ipaddr</artifactId>
<version>1.2.0</version>
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>xmlrpc</artifactId>
<version>0.3.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
Loading