Skip to content

Commit f6b387c

Browse files
committed
Update to 2.6.1
PullRequest: truffleruby/654
2 parents 4f44445 + 7554e94 commit f6b387c

File tree

2,442 files changed

+84523
-26892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,442 files changed

+84523
-26892
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ test/mri/tests/cext-c/**/extconf.h
6262
test/mri/tests/cext-c/**/mkmf.log
6363
test/mri/tests/cext-c/**/*.o
6464

65+
conftest
66+
conftest.c
67+
Info.plist
68+
6569
# mx
6670
/mx.truffleruby/.pydevproject
6771
/mx.truffleruby/*.pyc

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.4
1+
2.6.1

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
# 1.0 RC 14
22

3+
Updated to Ruby 2.6.1.
4+
35
Bug fixes:
46

57
* Implement `rb_io_wait_writable` (#1586).
68
* Fixed error when using arrows keys first within `irb` or `pry` (#1478, #1486).
79
* Coerce the right hand side for all `BigDecimal` operations (#1598).
810
* Combining multiple `**` arguments containing duplicate keys produced
911
an incorrect hash. This has now been fixed (#1469).
12+
* `IO#read_nonblock` now returns the passed buffer object, if one is supplied.
13+
14+
New features:
15+
16+
* Implemented `String#delete_prefix`, `#delete_suffix`, and related methods.
17+
* Implemented `Dir.children` and `Dir#children`.
18+
* Implemented `Integer#sqrt`.
1019

1120
Changes:
1221

@@ -18,6 +27,8 @@ Changes:
1827
* The `-X` option now works as in MRI.
1928
* `--help:debug` is now `--help:internal`.
2029
* `--jvm.` and `--native.` have been deprecated, use `--vm.` instead to pass VM options.
30+
* `ripper` is still not implemented, but the module now exists and has some
31+
methods that are implemented as no-ops.
2132

2233
# 1.0 RC 13
2334

bin/bundle

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
# ignored by Ruby interpreter
3+
4+
# get the absolute path of the executable and resolve symlinks
5+
SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
6+
while [ -h "$SELF_PATH" ]; do
7+
# 1) cd to directory of the symlink
8+
# 2) cd to the directory of where the symlink points
9+
# 3) get the pwd
10+
# 4) append the basename
11+
DIR=$(dirname "$SELF_PATH")
12+
SYM=$(readlink "$SELF_PATH")
13+
SELF_PATH=$(cd "$DIR" && cd "$(dirname "$SYM")" && pwd)/$(basename "$SYM")
14+
done
15+
exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
16+
17+
#!ruby
18+
# ^ marks start of Ruby interpretation
19+
20+
# from libexec/bundler (not libexec/bundle)
21+
22+
# Exit cleanly from an early interrupt
23+
Signal.trap("INT") do
24+
Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
25+
exit 1
26+
end
27+
28+
require "bundler"
29+
# Check if an older version of bundler is installed
30+
$LOAD_PATH.each do |path|
31+
next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
32+
err = String.new
33+
err << "Looks like you have a version of bundler that's older than 0.9.\n"
34+
err << "Please remove your old versions.\n"
35+
err << "An easy way to do this is by running `gem cleanup bundler`."
36+
abort(err)
37+
end
38+
39+
require "bundler/friendly_errors"
40+
Bundler.with_friendly_errors do
41+
require "bundler/cli"
42+
43+
# Allow any command to use --help flag to show help for that command
44+
help_flags = %w[--help -h]
45+
help_flag_used = ARGV.any? {|a| help_flags.include? a }
46+
args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
47+
48+
Bundler::CLI.start(args, :debug => true)
49+
end

bin/bundler

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
# ignored by Ruby interpreter
3+
4+
# get the absolute path of the executable and resolve symlinks
5+
SELF_PATH=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0")
6+
while [ -h "$SELF_PATH" ]; do
7+
# 1) cd to directory of the symlink
8+
# 2) cd to the directory of where the symlink points
9+
# 3) get the pwd
10+
# 4) append the basename
11+
DIR=$(dirname "$SELF_PATH")
12+
SYM=$(readlink "$SELF_PATH")
13+
SELF_PATH=$(cd "$DIR" && cd "$(dirname "$SYM")" && pwd)/$(basename "$SYM")
14+
done
15+
exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
16+
17+
#!ruby
18+
# ^ marks start of Ruby interpretation
19+
20+
# from libexec/bundler
21+
22+
# Exit cleanly from an early interrupt
23+
Signal.trap("INT") do
24+
Bundler.ui.debug("\n#{caller.join("\n")}") if defined?(Bundler)
25+
exit 1
26+
end
27+
28+
require "bundler"
29+
# Check if an older version of bundler is installed
30+
$LOAD_PATH.each do |path|
31+
next unless path =~ %r{/bundler-0\.(\d+)} && $1.to_i < 9
32+
err = String.new
33+
err << "Looks like you have a version of bundler that's older than 0.9.\n"
34+
err << "Please remove your old versions.\n"
35+
err << "An easy way to do this is by running `gem cleanup bundler`."
36+
abort(err)
37+
end
38+
39+
require "bundler/friendly_errors"
40+
Bundler.with_friendly_errors do
41+
require "bundler/cli"
42+
43+
# Allow any command to use --help flag to show help for that command
44+
help_flags = %w[--help -h]
45+
help_flag_used = ARGV.any? {|a| help_flags.include? a }
46+
args = help_flag_used ? Bundler::CLI.reformatted_help_args(ARGV) : ARGV
47+
48+
Bundler::CLI.start(args, :debug => true)
49+
end

bin/irb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
1717
#!ruby
1818
# ^ marks start of Ruby interpretation
1919

20+
# from libexec/irb
21+
2022
#
2123
# irb.rb - interactive ruby
2224
# $Release Version: 0.9.6 $

bin/rdoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
1717
#!ruby
1818
# ^ marks start of Ruby interpretation
1919

20+
# from libexec/rdoc
21+
2022
#
2123
# RDoc: Documentation tool for source code
2224
# (see lib/rdoc/rdoc.rb for more information)

bin/ri

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ exec "$(dirname $SELF_PATH)/ruby" "$SELF_PATH" "$@"
1717
#!ruby
1818
# ^ marks start of Ruby interpretation
1919

20+
# from libexec/ri
21+
2022
begin
2123
gem 'rdoc'
2224
rescue NameError => e # --disable-gems

bin/testrb

Lines changed: 0 additions & 23 deletions
This file was deleted.

ci.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ local part_definitions = {
386386
run+: [
387387
["mx", "unittest", "org.truffleruby"],
388388
["mx", "tck"],
389-
] + jt(["test", "specs"] + self["$.run.specs"].test_spec_options) +
390-
jt(["test", "specs", ":ruby25"]),
389+
] + jt(["test", "specs"] + self["$.run.specs"].test_spec_options),
390+
# + jt(["test", "specs", ":next"]) disabled as it's currently empty and MSpec doesn't support empty sets of files
391391
},
392392

393393
test_fast: {

0 commit comments

Comments
 (0)