Commit graph

957 commits

Author SHA1 Message Date
Mislav Marohnić
960e183d4c Extract ruby-build usage from comments like we do in rbenv 2014-11-26 20:46:44 -08:00
Mislav Marohnić
4a6b9280bb Provide CLI usage help on stout/stderr appropriately
When requested via `-h|--help`, usage text should be displayed on stdout
and the exit status should be 0.

When usage text is shown due to invalid arguments, it should be
printed to stderr and exit status should be 1.
2014-11-26 20:46:44 -08:00
Mislav Marohnić
22c73bf3f5 Perform CLI argument validation as early as possible 2014-11-26 20:46:44 -08:00
Mislav Marohnić
38ae3b56b0 Improve ruby-build test for too many arguments
Use exactly the same arguments that would have `ruby-build` succeed at
executing, but add one more extra to test argument counting.
2014-11-26 20:46:44 -08:00
Ivan Kuchin
fa38b660e2 Abort with usage help on wrong number of CLI arguments
- rbenv-install accepts 0 or 1 argument
- rbenv-uninstall accepts 1 argument
- ruby-build accepts 2 arguments
2014-11-26 20:45:53 -08:00
Erik Michaels-Ober
63f6fa2e98 Merge pull request #672 from headius/jruby-9.0.0.0
JRuby 9000 is now 9.0.0.0 (official version number for release).
2014-11-18 17:29:31 +01:00
Charles Oliver Nutter
e9bfdb5737 JRuby 9000 is now 9.0.0.0 (official version number for release). 2014-11-18 08:14:30 -08:00
Mislav Marohnić
ff2b5dc90e Ensure that assert_output_contains receives an argument 2014-11-17 15:07:40 -08:00
Mislav Marohnić
7f1869cbcd Fix error message assertions in JRuby tests
`assert_failure` only accepts an expected message as argument, and only
if it matches the output in full.
2014-11-17 14:56:06 -08:00
Mislav Marohnić
d7b881d20e Fix script/test in a non-Travis environment
`script/test` will now only attempt to call `script/mirror` if either
TRAVIS_PULL_REQUEST or TRAVIS_COMMIT_RANGE is set.
2014-11-16 17:17:35 -08:00
Mislav Marohnić
19a59f42cc Ignore RUBY_CONFIGURE_OPTS from environment in testing
Avoids failures caused by somebody's environment possibly having
RUBY_CONFIGURE_OPTS exported to have a value.
2014-11-16 16:07:39 -08:00
Mislav Marohnić
553572ccf3 Merge pull request #669 from Zorbash/master
Mention 'subversion' in error message when svn is missing
2014-11-16 15:58:47 -08:00
Dimitrios Zorbas
e32e087d3b Change Error message for missing subversion
The current error message for missing subversion is "error: please install \`svn\` and try again", leading the user to try to find and install a package named "svn" (eg. `aptitude install svn for # debian / ubuntu). Changing it to "subversion" can help users unaware that svn is a binary installed by the subversion package, get through the error.
2014-11-17 00:37:56 +02:00
SHIBATA Hiroshi
ae0f2b9f22 ruby-build 20141113 2014-11-13 23:56:24 +09:00
SHIBATA Hiroshi
4211125ff1 Merge branch 'upgrade-latest-rubies' 2014-11-13 23:08:58 +09:00
SHIBATA Hiroshi
bb1c2427d2 added latest rubies: ruby-1.9.3-p551, ruby-2.0.0-p598 and ruby-2.1.5 2014-11-13 23:05:55 +09:00
Erik Michaels-Ober
d22a3205c5 Merge pull request #665 from olleolleolle/patch-1
Add jruby-1.7.16.1
2014-11-03 12:05:41 +01:00
Olle Jonsson
3b14690dde Add jruby-1.7.16.1
1.7.16.1 is a security fix release for CVE-2014-8080. All users are strongly recommended to upgrade.

http://jruby.org/2014/10/28/jruby-1-7-16-1.html
2014-11-03 11:56:30 +01:00
Mislav Marohnić
e8a97b10f6 Fix the test suite on Darwin
Setting CC makes sure that we never have to perform the Darwin-specific
check for whether we should default to `CC=clang` and thus break `uname`
stubs in unrelated tests.

CI never caught this because Travis already has CC set to gcc-4.6.
2014-10-31 04:13:57 +01:00
Mislav Marohnić
fc6e0ae69d Fix comparing OS X version when it has 3 components 2014-10-31 04:08:00 +01:00
Mislav Marohnić
de155dd12b Fix brew-publish command
[ci skip]
2014-10-28 20:46:24 +01:00
Mislav Marohnić
81807c6314 ruby-build 20141028 2014-10-28 20:33:20 +01:00
Mislav Marohnić
d536fa7a3f Merge branch 'duplicate-versions'
Closes #646, fixes #641
2014-10-28 20:29:40 +01:00
Mislav Marohnić
ffcb7ed67f Add test that ensures duplicate Ruby definitions don't get displayed 2014-10-28 19:30:01 +01:00
David Bayendor
54301c16bf Don't display duplicate definitions
This fixes `rbenv install -l` displaying each version twice due to
RUBY_BUILD_DEFINITIONS path containing ruby-build's own definitions path
twice: both as an rbenv plugin and by appending its own internal path.
2014-10-28 19:27:26 +01:00
Mislav Marohnić
194e007e62 Merge branch 'yosemite'
Fixes #651, fixes #648
2014-10-28 18:52:50 +01:00
Mislav Marohnić
84d61e8675 Unset CC to isolate from CI build environment 2014-10-28 18:03:14 +01:00
Mislav Marohnić
87d7e10934 Merge branch 'rbx'
See https://github.com/rubinius/rubinius/issues/3169
2014-10-28 17:55:05 +01:00
Mislav Marohnić
b3512f494e Avoid endless recursion when rbx is installed over existing one
When installing rbx over an existing location, the `gems/bin` directory
will already be a symlink to `bin/` and an attempt to recreate this will
end up in recursion that keeps growing a binstub file until the disk is full.
2014-10-28 15:41:09 +01:00
Mislav Marohnić
985200d4da Enable Rubinius builds to re-use cached LLVM dependencies between builds
If RUBY_BUILD_CACHE_PATH is set (typically "`rbenv root`/cache" if it
exists), have Rubinius `./configure` script download prebuilt LLVM
versions into that directory and re-use them if already present.
2014-10-28 15:41:09 +01:00
Mislav Marohnić
f104098909 Fix rbx-1.2.4 setup phase
Rubinius back then didn't have a Gemfile, so don't try to invoke `bundle`.
Instead, rely on the host Ruby to already have rake installed.
2014-10-28 15:41:09 +01:00
Mislav Marohnić
9a5256ed7a Work around Rubinius LLVM incompatibilities on Yosemite
Rubinius fails to download a prebuilt LLVM on Yosemite since one is not
available yet. Instead, download the prebuilt version for the previous
OS X release.

This fixes Rubinius 2.2.7+ builds, but the older ones still fail for me
on Yosemite. This could be due to the fact that they're old releases
which are not compatible with never dependencies on the system.
2014-10-28 15:41:09 +01:00
Mislav Marohnić
73fd499a2e Fix Rubinius build when libyaml is present in Homebrew
Rubinius never supported the `--with-libyaml-dir` configure option, so
we can never use `--if needs_yaml` since it's incompatible and might
break the build if libyaml was auto-discovered from Homebrew.

Starting from 2.2.0, Rubinius doesn't even need libyaml anymore since it
stopped building psych. Instead it requires users to install psych as a
gem which vendors its own libyaml anyway.
2014-10-28 15:41:09 +01:00
Mislav Marohnić
b396ad7cd1 Try openssl from Homebrew when calculating SHA-256 checksums
This makes checksums possible on Leopard where `shasum` is unavailable
and system openssl doesn't support `dgst -sha256`.

Fixes #656
2014-10-28 15:28:48 +01:00
Mislav Marohnić
6e39eb52a8 Use CC=clang by default on Yosemite to avoid gcc-4.2
Newer MRIs will pick up gcc-4.2 from PATH and use that instead of
`/usr/bin/gcc`. While this worked up till now, it will not work in
Yosemite anymore since Homebrew's apple-gcc42 is generally not
compatible with 10.10.

So when CC has not explicitly been set, set it to `clang` to avoid
searching the PATH for any other gcc versions. This fixes MRI builds on
systems where apple-gcc42 is installed.
2014-10-28 15:28:07 +01:00
Mislav Marohnić
dafba300b1 Silence warnings when testing gccs
This silences the warning that gcc-4.2 produces on Yosemite:

    couldn't understand kern.osversion `14.0.0'
2014-10-28 10:59:01 +01:00
Mislav Marohnić
10fd04909d Fix Yosemite builds that use gcc-4.2 through require_gcc
The definitions that use `require_gcc` are not compatible with Apple's
clang-powered `gcc` and need gcc-4.2 from Homebrew. However, builds
using gcc-4.2 fail on Yosemite with a warning:

    couldn't understand kern.osversion `14.0.0'

Although the warning is non-fatal, the build goes to shit from there. It
seems that setting the magical value `MACOSX_DEPLOYMENT_TARGET=10.9`
makes the build work and doesn't seem to have negative consequences.
2014-10-28 10:58:38 +01:00
SHIBATA Hiroshi
e7810a61eb Merge branch 'cve-2014-8080' 2014-10-27 21:55:31 +09:00
SHIBATA Hiroshi
7db9b2ad19 added definitions for CVE-2014-8080 2014-10-27 21:35:03 +09:00
Mislav Marohnić
9bb5895941 Merge pull request #655 from wilson/master
Use HTTPS URLs to fetch JRuby distfiles.
2014-10-26 17:30:51 +01:00
Wilson Bilkovich
abae45bd38 Use HTTPS URLs to fetch JRuby distfiles.
See https://twitter.com/jruby/status/525726366533443584 which expresses
the desire to see this change.
2014-10-24 12:38:52 -07:00
Mislav Marohnić
c2b2e1524f Merge pull request #653 from singlethink/bug-fix-noexec-check
Fix TMPDIR noexec check to explicitly exit with a zero exit status on success
2014-10-17 22:38:18 +02:00
Matthew Van Gundy
aaf8a852ff Fix TMPDIR noexec check to explicitly exit with a zero exit status on success
The TMPDIR check implemented in a4556a73 incorrectly reports that
TMPDIR cannot hold executables on 4.3.11(1) on Ubuntu 14.04.1 LTS.
This is because a script containing no commands returns a non-zero
exit code.  Contrast the following:

  bash 3.2.53(1) on OS X 10.9.5:

    $ bash -c '' && echo SUCCESS
    SUCCESS

  bash 4.3.11(1) on Ubuntu 14.04.1 LTS:

    $ bash -c '' || echo FAIL
    FAIL

This patch modifies the test script to explicitly call `exit 0` to
ensure that a successful exit code is returned if the script executes
successfully.
2014-10-17 11:15:42 -04:00
Erik Michaels-Ober
a330ab1c38 Merge pull request #652 from sstephenson/openssl-1.0.1j
Upgrade to openssl-1.0.1j
2014-10-16 08:57:28 +01:00
SHIBATA Hiroshi
5d738abbc9 upgrade openssl-1.0.1j 2014-10-16 09:48:04 +09:00
SHIBATA Hiroshi
803a49a831 Merge pull request #593 from azet/patch-1
Disable insecure SSL protocols
2014-10-16 08:39:56 +08:00
Erik Michaels-Ober
e1811b9fa3 ruby-build 20140926 2014-09-26 06:07:57 +04:00
SHIBATA Hiroshi
68c0cf6b10 Merge pull request #645 from makotosasaki/03
add jruby-1.7.16
2014-09-26 08:50:35 +08:00
Makoto Sasaki
5ecced491d add jruby-1.7.16 2014-09-26 09:18:40 +09:00
SHIBATA Hiroshi
4cf6dc582d Merge pull request #644 from meineerde/feature/upgrade_openssl_to_1.0.1i
Upgrade OpenSSL library to 1.0.1i
2014-09-24 21:36:40 +09:00