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: d03d09e18769
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 320f656d25bb
Choose a head ref

Commits on Apr 25, 2015

  1. Fix typo in error message

    jkutner committed Apr 25, 2015
    Copy the full SHA
    2f57e88 View commit details

Commits on Apr 26, 2015

  1. Merge pull request #2875 from jkutner/patch-1

    Fix typo in error message
    mkristian committed Apr 26, 2015
    Copy the full SHA
    6213244 View commit details
  2. Copy the full SHA
    04d4ba5 View commit details
  3. Added uri:classloader handling to RubyInstanceConfig.getScriptSource.…

    … This is to support Warbler's runnable feature
    jkutner committed Apr 26, 2015
    3
    Copy the full SHA
    208abc2 View commit details
  4. Merge pull request #2876 from jkutner/master

    Added uri:classloader handling to RubyInstanceConfig.getScriptSource.
    mkristian committed Apr 26, 2015
    Copy the full SHA
    869a321 View commit details

Commits on Apr 27, 2015

  1. 2
    Copy the full SHA
    4a0cede View commit details
  2. [Truffle] Formatting.

    chrisseaton committed Apr 27, 2015
    Copy the full SHA
    f625f07 View commit details
  3. Revert "[Truffle] When debugging a benchmark, exceptions should be fa…

    …tal, not thrown."
    
    This reverts commit 28f9e82.
    chrisseaton committed Apr 27, 2015
    Copy the full SHA
    8b974d3 View commit details
  4. Get enough pom.xml to use 1.0.9 of jruby.plugins.version (EE integs d…

    …o not seem hooked up and I don't want to redden our CI by trying to change them)
    enebo committed Apr 27, 2015
    Copy the full SHA
    741efe5 View commit details
  5. No more patchlevels but windows ruby installer write this field to re…

    …gistry. Default to 0.
    enebo committed Apr 27, 2015
    Copy the full SHA
    5090935 View commit details
  6. Copy the full SHA
    819a015 View commit details
  7. Gah. tar needs to get gzipped

    enebo committed Apr 27, 2015
    Copy the full SHA
    776534d View commit details
  8. [Truffle] Add cgi to stdlib.

    bjfish committed Apr 27, 2015
    2
    Copy the full SHA
    8bb41db View commit details
  9. No reason to truncate NUL:

    enebo committed Apr 27, 2015
    Copy the full SHA
    59b4ba4 View commit details

Commits on Apr 28, 2015

  1. Readline somewhere does STDXXX.fileno and we redefine std{in,out,err}…

    …. Also change constants in addition to globals
    enebo committed Apr 28, 2015
    1
    Copy the full SHA
    a5c372d View commit details
  2. Copy the full SHA
    7d4b866 View commit details
  3. Copy the full SHA
    5968ffa View commit details
  4. [Truffle] Add json to stdlib.

    bjfish committed Apr 28, 2015
    3
    Copy the full SHA
    e75cd2d View commit details
  5. Bump for version

    enebo committed Apr 28, 2015
    Copy the full SHA
    cb96d72 View commit details
  6. Update to RubyGems 2.4.6.

    headius committed Apr 28, 2015
    Copy the full SHA
    c38758f View commit details
  7. Copy the full SHA
    6044f60 View commit details
  8. Copy the full SHA
    320f656 View commit details
Showing with 757 additions and 611 deletions.
  1. +1 −1 VERSION
  2. +10 −0 bin/jirb_swing
  3. +1 −1 core/pom.rb
  4. +2 −2 core/pom.xml
  5. +7 −2 core/src/main/java/org/jruby/RubyInstanceConfig.java
  6. +0 −7 core/src/main/java/org/jruby/util/NullDeviceResource.java
  7. +23 −20 core/src/main/java/org/jruby/util/URLResource.java
  8. +2 −2 lib/pom.xml
  9. +2 −2 lib/ruby/stdlib/rubygems.rb
  10. +2 −3 lib/ruby/stdlib/rubygems/basic_specification.rb
  11. +2 −2 lib/ruby/stdlib/rubygems/commands/help_command.rb
  12. +3 −1 lib/ruby/stdlib/rubygems/commands/open_command.rb
  13. +1 −1 lib/ruby/stdlib/rubygems/commands/yank_command.rb
  14. +1 −2 lib/ruby/stdlib/rubygems/compatibility.rb
  15. +11 −1 lib/ruby/stdlib/rubygems/dependency_installer.rb
  16. +1 −1 lib/ruby/stdlib/rubygems/installer.rb
  17. +2 −1 lib/ruby/stdlib/rubygems/package.rb
  18. +4 −4 lib/ruby/stdlib/rubygems/package/tar_writer.rb
  19. +0 −7 lib/ruby/stdlib/rubygems/path_support.rb
  20. +1 −1 lib/ruby/stdlib/rubygems/psych_additions.rb
  21. +1 −1 lib/ruby/stdlib/rubygems/remote_fetcher.rb
  22. +10 −4 lib/ruby/stdlib/rubygems/request_set.rb
  23. +4 −4 lib/ruby/stdlib/rubygems/request_set/gem_dependency_api.rb
  24. +52 −464 lib/ruby/stdlib/rubygems/request_set/lockfile.rb
  25. +334 −0 lib/ruby/stdlib/rubygems/request_set/lockfile/parser.rb
  26. +108 −0 lib/ruby/stdlib/rubygems/request_set/lockfile/tokenizer.rb
  27. +12 −1 lib/ruby/stdlib/rubygems/requirement.rb
  28. +1 −1 lib/ruby/stdlib/rubygems/security/signer.rb
  29. +12 −12 lib/ruby/stdlib/rubygems/specification.rb
  30. +18 −1 lib/ruby/stdlib/rubygems/test_case.rb
  31. +0 −8 lib/ruby/stdlib/rubygems/user_interaction.rb
  32. +1 −0 lib/ruby/truffle/mri/cgi.rb
  33. +1 −0 lib/ruby/truffle/mri/cgi/cookie.rb
  34. +1 −0 lib/ruby/truffle/mri/cgi/core.rb
  35. +1 −0 lib/ruby/truffle/mri/cgi/html.rb
  36. +1 −0 lib/ruby/truffle/mri/cgi/session.rb
  37. +1 −0 lib/ruby/truffle/mri/cgi/session/pstore.rb
  38. +1 −0 lib/ruby/truffle/mri/json.rb
  39. +1 −0 lib/ruby/truffle/mri/json/add/bigdecimal.rb
  40. +1 −0 lib/ruby/truffle/mri/json/add/complex.rb
  41. +1 −0 lib/ruby/truffle/mri/json/add/core.rb
  42. +1 −0 lib/ruby/truffle/mri/json/add/date.rb
  43. +1 −0 lib/ruby/truffle/mri/json/add/date_time.rb
  44. +1 −0 lib/ruby/truffle/mri/json/add/exception.rb
  45. +1 −0 lib/ruby/truffle/mri/json/add/ostruct.rb
  46. +1 −0 lib/ruby/truffle/mri/json/add/range.rb
  47. +1 −0 lib/ruby/truffle/mri/json/add/rational.rb
  48. +1 −0 lib/ruby/truffle/mri/json/add/regexp.rb
  49. +1 −0 lib/ruby/truffle/mri/json/add/struct.rb
  50. +1 −0 lib/ruby/truffle/mri/json/add/symbol.rb
  51. +1 −0 lib/ruby/truffle/mri/json/add/time.rb
  52. +1 −0 lib/ruby/truffle/mri/json/common.rb
  53. +1 −0 lib/ruby/truffle/mri/json/ext.rb
  54. +1 −0 lib/ruby/truffle/mri/json/generic_object.rb
  55. +1 −0 lib/ruby/truffle/mri/json/pure.rb
  56. +1 −0 lib/ruby/truffle/mri/json/pure/generator.rb
  57. +1 −0 lib/ruby/truffle/mri/json/pure/parser.rb
  58. +1 −0 lib/ruby/truffle/mri/json/version.rb
  59. +1 −1 maven/jruby-complete/pom.xml
  60. +1 −1 maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.xml
  61. +4 −4 maven/jruby-dist/pom.rb
  62. +2 −2 maven/jruby-dist/pom.xml
  63. +4 −3 maven/jruby-jars/pom.xml
  64. +1 −1 maven/jruby/pom.xml
  65. +1 −1 maven/pom.xml
  66. +1 −1 pom.rb
  67. +2 −2 pom.xml
  68. +1 −1 rakelib/installer.rake
  69. +0 −3 spec/truffle/tags/core/module/private_class_method_tags.txt
  70. +1 −0 spec/truffle/tags/library/cgi/cookie/path_tags.txt
  71. +2 −0 spec/truffle/tags/library/cgi/cookie/to_s_tags.txt
  72. +1 −0 spec/truffle/tags/library/cgi/escape_tags.txt
  73. +5 −0 spec/truffle/tags/library/cgi/htmlextension/a_tags.txt
  74. +2 −0 spec/truffle/tags/library/cgi/htmlextension/blockquote_tags.txt
  75. +2 −0 spec/truffle/tags/library/cgi/htmlextension/caption_tags.txt
  76. +5 −0 spec/truffle/tags/library/cgi/htmlextension/html_tags.txt
  77. +5 −0 spec/truffle/tags/library/cgi/htmlextension/textarea_tags.txt
  78. +1 −0 spec/truffle/tags/library/cgi/http_header_tags.txt
  79. +1 −0 spec/truffle/tags/library/cgi/rfc1123_date_tags.txt
  80. +1 −1 spec/truffle/truffle.mspec
  81. +3 −0 test/mri/excludes_truffle/TestJSON.rb
  82. +1 −0 test/mri/excludes_truffle/TestJSONEncoding.rb
  83. +2 −0 test/mri/excludes_truffle/TestJSONGenerate.rb
  84. +1 −0 test/mri/excludes_truffle/TestJSONStringMatching.rb
  85. +2 −0 test/mri/excludes_truffle/TestJSONUnicode.rb
  86. +10 −10 test/mri_truffle.index
  87. +11 −2 test/pom.xml
  88. +5 −11 tool/jt.rb
  89. +1 −1 truffle/pom.xml
  90. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  91. +7 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/InteroplatedRegexpNode.java
  92. +8 −2 truffle/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
  93. +2 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ByteArrayNodes.java
  94. +1 −1 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
  95. +3 −3 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.0.0.0-SNAPSHOT
9.0.0.0.pre2
10 changes: 10 additions & 0 deletions bin/jirb_swing
Original file line number Diff line number Diff line change
@@ -39,6 +39,16 @@ frame = JFrame.new(FRAME_TITLE).tap do |frame|

tar = org.jruby.demo.readline.TextAreaReadline.new(text, HEADER)
tar.hook_into_runtime_with_streams(JRuby.runtime)

# Ruby does not like redefining constants but we do not want the warnings
# readline reads constants and not the globals so we need to reassign
# the globals.
saved_verbose = $VERBOSE
$VERBOSE = nil
STDIN = $stdin
STDOUT = $stdout
STDERR = $stderr
$VERBOSE = saved_verbose
end
end)

2 changes: 1 addition & 1 deletion core/pom.rb
Original file line number Diff line number Diff line change
@@ -255,7 +255,7 @@
'mainClass' => 'org.jruby.Main' } ] )
execute_goals( 'shade',
:id => 'shade the asm classes',
:phase => 'verify',
:phase => 'package',
'artifactSet' => {
'includes' => [ 'com.github.jnr:jnr-ffi',
'org.ow2.asm:*' ]
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>9.0.0.0.pre2</version>
</parent>
<artifactId>jruby-core</artifactId>
<name>JRuby Core</name>
@@ -548,7 +548,7 @@
</execution>
<execution>
<id>shade the asm classes</id>
<phase>verify</phase>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
9 changes: 7 additions & 2 deletions core/src/main/java/org/jruby/RubyInstanceConfig.java
Original file line number Diff line number Diff line change
@@ -40,6 +40,8 @@
import org.jruby.util.KCode;
import org.jruby.util.NormalizedFile;
import org.jruby.util.SafePropertyAccessor;
import org.jruby.util.URLResource;
import org.jruby.util.FileResource;
import org.jruby.util.cli.ArgumentProcessor;
import org.jruby.util.cli.Options;
import org.jruby.util.cli.OutputStrings;
@@ -342,7 +344,7 @@ else if (home.startsWith("cp:")) {
}
if (home.startsWith("jar:") || ( home.startsWith("file:") && home.contains(".jar!/") ) ||
home.startsWith("classpath:") || home.startsWith("uri:")) {
error.println("Warning: JRuby home with uri like pathes may not have full functionality - use at your own risk");
error.println("Warning: JRuby home with uri like paths may not have full functionality - use at your own risk");
}
// do not normalize on plain jar like pathes coming from jruby-rack
else if (!home.contains(".jar!/") && !home.startsWith("uri:")) {
@@ -391,6 +393,9 @@ public InputStream getScriptSource() {
stream = new URL("jar:" + script).openStream();
} else if (script.startsWith("classpath:")) {
stream = getScriptSourceFromJar(script);
} else if (script.startsWith("uri:classloader:")) {
FileResource urlResource = URLResource.create(loader, script);
stream = urlResource.inputStream();
} else {
File file = JRubyFile.create(getCurrentDirectory(), getScriptFileName());
if (isXFlag()) {
@@ -1405,7 +1410,7 @@ public String getProfilingService() {
public void setProfilingService( String service ) {
this.profilingService = service;
}

private static ClassLoader setupLoader() {
ClassLoader loader = RubyInstanceConfig.class.getClassLoader();

7 changes: 0 additions & 7 deletions core/src/main/java/org/jruby/util/NullDeviceResource.java
Original file line number Diff line number Diff line change
@@ -151,13 +151,6 @@ private Channel createChannel(ModeFlags flags) throws ResourceException {
throw new ResourceException.IOError(ioe);
}

try {
if (flags.isTruncate()) fileChannel.truncate(0);
} catch (IOException ioe) {
// ignore; it's a pipe or fifo that can't be truncated (we only care about illegal seek).
if (!ioe.getMessage().equals("Illegal seek")) throw new ResourceException.IOError(ioe);
}

return fileChannel;
}
}
43 changes: 23 additions & 20 deletions core/src/main/java/org/jruby/util/URLResource.java
Original file line number Diff line number Diff line change
@@ -40,11 +40,11 @@ public class URLResource extends AbstractFileResource {
URLResource(String uri, URL url, String[] files) {
this(uri, url, null, null, files);
}

URLResource(String uri, ClassLoader cl, String pathname, String[] files) {
this(uri, null, cl, pathname, files);
}

private URLResource(String uri, URL url, ClassLoader cl, String pathname, String[] files) {
this.uri = uri;
this.list = files;
@@ -53,7 +53,7 @@ private URLResource(String uri, URL url, ClassLoader cl, String pathname, String
this.pathname = pathname;
this.fileStat = new JarFileStat(this);
}

@Override
public String absolutePath()
{
@@ -129,7 +129,7 @@ public FileStat stat() {
public FileStat lstat() {
return stat(); // URLs don't have symbolic links, so lstat == stat
}

@Override
public JRubyFile hackyGetJRubyFile() {
return JRubyNonExistentFile.NOT_EXIST;
@@ -149,20 +149,23 @@ public Channel openChannel( ModeFlags flags, int perm ) throws ResourceException
return Channels.newChannel(inputStream());
}

public static FileResource create(ClassLoader cl, String pathname) {
try
{
pathname = new URI(pathname.replaceFirst("^/*", "/")).normalize().getPath().replaceAll("^/([.][.]/)*", "");
} catch (URISyntaxException e) {
pathname = pathname.replaceAll("^[.]?/*", "");
}
URL url = cl.getResource(pathname);
String[] files = listClassLoaderFiles(cl, pathname);
return new URLResource(URI_CLASSLOADER + pathname,
cl,
url == null ? null : pathname,
files);
}

public static FileResource createClassloaderURI(Ruby runtime, String pathname) {
ClassLoader cl = runtime.getJRubyClassLoader();
try
{
pathname = new URI(pathname.replaceFirst("^/*", "/")).normalize().getPath().replaceAll("^/([.][.]/)*", "");
} catch (URISyntaxException e) {
pathname = pathname.replaceAll("^[.]?/*", "");
}
URL url = cl.getResource(pathname);
String[] files = listClassLoaderFiles(cl, pathname);
return new URLResource(URI_CLASSLOADER + pathname,
cl,
url == null ? null : pathname,
files);
return create(runtime.getJRubyClassLoader(), pathname);
}

public static FileResource create(Ruby runtime, String pathname)
@@ -176,7 +179,7 @@ public static FileResource create(Ruby runtime, String pathname)
}
return createRegularURI(pathname);
}

private static FileResource createRegularURI(String pathname) {
URL url;
try
@@ -185,7 +188,7 @@ private static FileResource createRegularURI(String pathname) {
// and make file:/a protocol to be file:///a so the second replace does not apply
pathname = pathname.replaceFirst( "file:/([^/])", "file:///$1" );
pathname = pathname.replaceFirst( ":/([^/])", "://$1" );

url = new URL(pathname);
// we do not want to deal with those url here like this though they are valid url/uri
if (url.getProtocol().startsWith("http")){
@@ -311,5 +314,5 @@ public static URL getResourceURL(Ruby runtime, String location)
throw new RuntimeException("BUG in " + URLResource.class);
}
}

}
4 changes: 2 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jruby</groupId>
<artifactId>jruby-parent</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>9.0.0.0.pre2</version>
</parent>
<artifactId>jruby-stdlib</artifactId>
<name>JRuby Lib Setup</name>
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<version>9.0.0.0.pre2</version>
<scope>test</scope>
</dependency>
<dependency>
4 changes: 2 additions & 2 deletions lib/ruby/stdlib/rubygems.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
require 'thread'

module Gem
VERSION = '2.4.5'
VERSION = '2.4.6'
end

# Must be first since it unloads the prelude from 1.9.2
@@ -598,7 +598,7 @@ def self.load_yaml

unless test_syck
begin
gem 'psych', '~> 1.2', '>= 1.2.1'
gem 'psych', '>= 1.2.1'
rescue Gem::LoadError
# It's OK if the user does not have the psych gem installed. We will
# attempt to require the stdlib version
5 changes: 2 additions & 3 deletions lib/ruby/stdlib/rubygems/basic_specification.rb
Original file line number Diff line number Diff line change
@@ -61,8 +61,7 @@ def contains_requirable_file? file
@contains_requirable_file ||= {}
@contains_requirable_file[file] ||=
begin
if instance_variable_defined?(:@ignored) or
instance_variable_defined?('@ignored') then
if instance_variable_defined?(:@ignored) then
return false
elsif missing_extensions? then
@ignored = true
@@ -145,7 +144,7 @@ def full_require_paths
File.join full_gem_path, path
end

full_paths.unshift extension_dir unless @extensions.nil? || @extensions.empty?
full_paths << extension_dir unless @extensions.nil? || @extensions.empty?

full_paths
end
4 changes: 2 additions & 2 deletions lib/ruby/stdlib/rubygems/commands/help_command.rb
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ class Gem::Commands::HelpCommand < Gem::Command
Ruby Version and Engine Dependency
==================================
You can specifiy the version, engine and engine version of ruby to use with
You can specify the version, engine and engine version of ruby to use with
your gem dependencies file. If you are not running the specified version
RubyGems will raise an exception.
@@ -223,7 +223,7 @@ class Gem::Commands::HelpCommand < Gem::Command
The #group method allows multiple groups.
The #gemspec development dependencies are placed in the :development group by
default. This may be overriden with the :development_group option:
default. This may be overridden with the :development_group option:
gemspec development_group: :other
4 changes: 3 additions & 1 deletion lib/ruby/stdlib/rubygems/commands/open_command.rb
Original file line number Diff line number Diff line change
@@ -61,7 +61,9 @@ def open_gem name
end

def open_editor path
system(*@editor.split(/\s+/) + [path])
Dir.chdir(path) do
system(*@editor.split(/\s+/) + [path])
end
end

def spec_for name
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/commands/yank_command.rb
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ def description # :nodoc:
data you will need to change them immediately and yank your gem.
If you are yanking a gem due to intellectual property reasons contact
http://help.rubygems.org for permanant removal. Be sure to mention this
http://help.rubygems.org for permanent removal. Be sure to mention this
as the reason for the removal request.
EOF
end
3 changes: 1 addition & 2 deletions lib/ruby/stdlib/rubygems/compatibility.rb
Original file line number Diff line number Diff line change
@@ -20,8 +20,7 @@ module Gem

$LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library

if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
# TODO path does not exist here
if path = $LOADED_FEATURES.find {|n| n.end_with? '/rubygems.rb'} then
raise LoadError, "another rubygems is already loaded from #{path}"
end

12 changes: 11 additions & 1 deletion lib/ruby/stdlib/rubygems/dependency_installer.rb
Original file line number Diff line number Diff line change
@@ -218,7 +218,17 @@ def find_gems_with_sources dep, best_only=false # :nodoc:
tuples, errors = Gem::SpecFetcher.fetcher.search_for_dependency dep

if best_only && !tuples.empty?
tuples.sort! { |a,b| b[0].version <=> a[0].version }
tuples.sort! do |a,b|
if b[0].version == a[0].version
if b[0].platform != Gem::Platform::RUBY
1
else
-1
end
else
b[0].version <=> a[0].version
end
end
tuples = [tuples.first]
end

2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/installer.rb
Original file line number Diff line number Diff line change
@@ -681,7 +681,7 @@ def app_script_text(bin_file_name)
# return the stub script text used to launch the true Ruby script

def windows_stub_script(bindir, bin_file_name)
ruby = Gem.ruby.chomp('"').tr(File::SEPARATOR, "\\")
ruby = Gem.ruby.gsub(/^\"|\"$/, "").tr(File::SEPARATOR, "\\")
return <<-TEXT
@ECHO OFF
IF NOT "%~f0" == "~f0" GOTO :WinNT
3 changes: 2 additions & 1 deletion lib/ruby/stdlib/rubygems/package.rb
Original file line number Diff line number Diff line change
@@ -366,8 +366,9 @@ def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:

FileUtils.mkdir_p mkdir, mkdir_options

open destination, 'wb', entry.header.mode do |out|
open destination, 'wb' do |out|
out.write entry.read
FileUtils.chmod entry.header.mode, destination
end if entry.file?

verbose destination
8 changes: 4 additions & 4 deletions lib/ruby/stdlib/rubygems/package/tar_writer.rb
Original file line number Diff line number Diff line change
@@ -291,7 +291,7 @@ def mkdir(name, mode)

def split_name(name) # :nodoc:
if name.bytesize > 256
raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
raise Gem::Package::TooLongFileName.new("File \"#{name}\" has a too long path (should be 256 or less)")
end

if name.bytesize <= 100 then
@@ -311,11 +311,11 @@ def split_name(name) # :nodoc:
name = newname

if name.bytesize > 100
raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long name (should be 100 or less)")
end

if prefix.bytesize > 155 then
raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
raise Gem::Package::TooLongFileName.new("File \"#{prefix}/#{name}\" has a too long base path (should be 155 or less)")
end
end

7 changes: 0 additions & 7 deletions lib/ruby/stdlib/rubygems/path_support.rb
Original file line number Diff line number Diff line change
@@ -42,13 +42,6 @@ def initialize(env=ENV)

private

##
# Set the Gem home directory (as reported by Gem.dir).

def home=(home)
@home = home.to_s
end

##
# Set the Gem search path (as reported by Gem.path).

2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/psych_additions.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This exists just to satify bugs in marshal'd gemspecs that
# This exists just to satisfy bugs in marshal'd gemspecs that
# contain a reference to YAML::PrivateType. We prune these out
# in Specification._load, but if we don't have the constant, Marshal
# blows up.
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/remote_fetcher.rb
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ def api_endpoint(uri)
# filename. Returns nil if the gem cannot be located.
#--
# Should probably be integrated with #download below, but that will be a
# larger, more emcompassing effort. -erikh
# larger, more encompassing effort. -erikh

def download_to_cache dependency
found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
Loading