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

Commits on Nov 23, 2015

  1. [Truffle] code style

    @pitr-ch
    pitr-ch committed Nov 23, 2015
    Copy the full SHA
    528b8ae View commit details

  2. [Truffle] j+tr: print skipped files when verbose

    @pitr-ch
    pitr-ch committed Nov 23, 2015
    Copy the full SHA
    7c3190e View commit details

  3. [Truffle] j+tr: do not fail when no gem is found

    @pitr-ch
    pitr-ch committed Nov 23, 2015
    Copy the full SHA
    c284ac2 View commit details

  4. [Truffle] j+tr: use always the jruby from the same bin

    @pitr-ch
    pitr-ch committed Nov 23, 2015
    Copy the full SHA
    c2c9bc9 View commit details

  5. [Truffle] j+tr: print loaded configurations

    @pitr-ch
    pitr-ch committed Nov 23, 2015
    Copy the full SHA
    bda3166 View commit details
Showing with 9 additions and 4 deletions.
  1. +2 −1 bin/jruby+truffle
  2. +6 −2 lib/ruby/truffle/jruby+truffle/runner.rb
  3. +1 −1 truffle/src/main/ruby/core/method.rb
3 changes: 2 additions & 1 deletion bin/jruby+truffle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env ruby
#!/usr/bin/env bash
"exec" "`dirname $BASH_SOURCE[0]`/ruby" "$0" "$@"

require File.join(JRuby.runtime.instance_config.jruby_home, 'lib/ruby/truffle/jruby+truffle/runner')

8 changes: 6 additions & 2 deletions lib/ruby/truffle/jruby+truffle/runner.rb
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,10 @@ class JRubyTruffleRunner
merge_hash = -> ((k, v), old) { old.merge k => v }
apply_pattern = -> (pattern, old) do
Dir.glob(pattern) do |file|
next if @options[:run][:exclude_pattern].any? { |p| /#{p}/ =~ file }
if @options[:run][:exclude_pattern].any? { |p| /#{p}/ =~ file }
puts "skipped: #{file}" if @options[:global][:verbose]
next
end
@options[:run][:require] << File.expand_path(file)
end
old
@@ -219,9 +222,10 @@ def load_local_configuration
end

def apply_yaml_to_configuration(yaml_path)
if File.exist?(yaml_path)
if yaml_path && File.exist?(yaml_path)
yaml_data = YAML.load_file(yaml_path)
@options = deep_merge @options, yaml_data
puts "loading #{yaml_path}"
end
end

2 changes: 1 addition & 1 deletion truffle/src/main/ruby/core/method.rb
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ class Method
def inspect
file, line = source_location

if file and line
if file && line
"#<#{self.class}: #{receiver.class}(#{owner})##{name} #{file}:#{line}>"
else
"#<#{self.class}: #{receiver.class}(#{owner})##{name}>"