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: 9e127ec10e5a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14068903ade2
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Apr 13, 2016

  1. [Truffle] Correct name of RubyFileTypeDetector

    @chrisseaton
    chrisseaton committed Apr 13, 2016
    Copy the full SHA
    75aad88 View commit details

  2. [Truffle] Use abort in jruby-cext-c

    @chrisseaton
    chrisseaton committed Apr 13, 2016
    Copy the full SHA
    304e2ed View commit details

  3. [Truffle] Use unless rather than if .nil?

    @chrisseaton
    chrisseaton committed Apr 13, 2016
    Copy the full SHA
    1406890 View commit details
18 changes: 7 additions & 11 deletions bin/jruby-cext-c
View file
Original file line number Diff line number Diff line change
@@ -14,16 +14,14 @@ require 'yaml'

MX_DIR = ENV['MX_DIR']

if MX_DIR.nil?
$stderr.puts 'You need to set MX_DIR to a checkout of the mx repository'
exit 1
unless MX_DIR
abort 'You need to set MX_DIR to a checkout of the mx repository'
end

SULONG_DIR = ENV['SULONG_DIR']

if SULONG_DIR.nil?
$stderr.puts 'You need to set SULONG_DIR to the location of a built checkout of the Sulong repository'
exit 1
unless SULONG_DIR
abort 'You need to set SULONG_DIR to the location of a built checkout of the Sulong repository'
end

def mx(command, *args)
@@ -34,16 +32,14 @@ end

CEXT_DIR = ARGV[0]

if CEXT_DIR.nil?
$stderr.puts 'You need to pass the directory of a C extension so I can build it'
exit 1
unless CEXT_DIR
abort 'You need to pass the directory of a C extension so I can build it'
end

CONFIG_FILE = File.join(CEXT_DIR, '.jruby-cext-build.yml')

unless File.exist?(CONFIG_FILE)
$stderr.puts "There is no .jruby-cext-build.yml in this C extension at the moment - I don't know how to build it"
exit 1
abort "There is no .jruby-cext-build.yml in this C extension at the moment - I don't know how to build it"
end

CONFIG = YAML.load_file(CONFIG_FILE)
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/RubyFiletypeDetector.java
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
import java.util.Locale;
import java.util.regex.Pattern;

public final class RubyFiletypeDetector extends FileTypeDetector {
public final class RubyFileTypeDetector extends FileTypeDetector {

private static final String[] KNOWN_RUBY_FILES = new String[]{ "Gemfile", "Rakefile", "Mavenfile" };
private static final String[] KNOWN_RUBY_SUFFIXES = new String[]{ ".rb", ".rake", ".gemspec" };
2 changes: 1 addition & 1 deletion core/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
org.jruby.util.RubyFiletypeDetector
org.jruby.util.RubyFileTypeDetector