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

Commits on May 16, 2016

  1. Copy the full SHA
    f18ec2d View commit details
  2. Copy the full SHA
    90eabde View commit details

Commits on May 20, 2016

  1. Merge pull request #3892 from headius/did_you_mean

    Enabled did_you_mean, install during build, and clear gem paths
    headius committed May 20, 2016
    Copy the full SHA
    bccbfd0 View commit details
Showing with 16 additions and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/util/cli/Options.java
  2. +1 −0 core/src/main/ruby/jruby/kernel/gem_prelude.rb
  3. +1 −1 lib/pom.rb
  4. +13 −0 lib/pom.xml
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/cli/Options.java
Original file line number Diff line number Diff line change
@@ -218,7 +218,7 @@ public class Options {
public static final Option<String> CLI_BACKUP_EXTENSION = string(CLI, "cli.backup.extension", "Backup extension for in-place ARGV files. Same as -i.");
public static final Option<ProfilingMode> CLI_PROFILING_MODE = enumeration(CLI, "cli.profiling.mode", ProfilingMode.class, ProfilingMode.OFF, "Enable instrumented profiling modes.");
public static final Option<Boolean> CLI_RUBYGEMS_ENABLE = bool(CLI, "cli.rubygems.enable", true, "Enable/disable RubyGems.");
public static final Option<Boolean> CLI_DID_YOU_MEAN_ENABLE = bool(CLI, "cli.did_you_mean.enable", false, "Enable/disable did_you_mean.");
public static final Option<Boolean> CLI_DID_YOU_MEAN_ENABLE = bool(CLI, "cli.did_you_mean.enable", true, "Enable/disable did_you_mean.");
public static final Option<Boolean> CLI_RUBYOPT_ENABLE = bool(CLI, "cli.rubyopt.enable", true, "Enable/disable RUBYOPT processing at start.");
public static final Option<Boolean> CLI_STRIP_HEADER = bool(CLI, "cli.strip.header", false, "Strip text before shebang in script. Same as -x.");
public static final Option<Boolean> CLI_LOAD_GEMFILE = bool(CLI, "cli.load.gemfile", false, "Load a bundler Gemfile in cwd before running. Same as -G.");
1 change: 1 addition & 0 deletions core/src/main/ruby/jruby/kernel/gem_prelude.rb
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
begin
gem 'did_you_mean'
require 'did_you_mean'
Gem.clear_paths
rescue Gem::LoadError, LoadError
end if defined?(DidYouMean)
end
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ def initialize( name, version, default_spec = true )
ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
ImportedGem.new( 'racc', '${racc.version}'),
ImportedGem.new( 'net-telnet', '0.1.1'),
#ImportedGem.new( 'did_you_mean', '1.0.1'),
ImportedGem.new( 'did_you_mean', '1.0.1'),
]

project 'JRuby Lib Setup' do
13 changes: 13 additions & 0 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -187,6 +187,19 @@ DO NOT MODIFIY - GENERATED CODE
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>did_you_mean</artifactId>
<version>1.0.1</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<repositories>
<repository>