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

Commits on Oct 3, 2014

  1. * fix version in GH-1983 test 

    * fix not more loadService debug
* fix list of activated gems
    @mkristian
    mkristian committed Oct 3, 2014
    Copy the full SHA
    a0f96db View commit details

  2. delete installed jars on clean to avoid packing old jars as well

    @mkristian
    mkristian committed Oct 3, 2014
    Copy the full SHA
    9a1b609 View commit details
4 changes: 3 additions & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,9 @@ def to_pathname

plugin( :clean,
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
:includes => [ '*' ] } ] )
:includes => [ '*' ] },
{ :directory => '${basedir}/ruby/shared',
:includes => [ '**/*.jar' ] } ] )

# tell maven to download the respective gem artifacts
default_gems.each do |g|
6 changes: 6 additions & 0 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -103,6 +103,12 @@
<include>*</include>
</includes>
</fileset>
<fileset>
<directory>${basedir}/ruby/shared</directory>
<includes>
<include>**/*.jar</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
2 changes: 1 addition & 1 deletion maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/irb.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
JAVA=`which java`
# jirb_swing does not work in those test environments
for i in irb jirb ; do
echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-1.7.16-SNAPSHOT.jar -S $i
echo "puts 'hello $i'" | PATH= $JAVA -jar jruby-complete-${1}.jar -S $i
done
5 changes: 3 additions & 2 deletions maven/jruby-complete/src/it/GH-1983_jruby-completedotjar-S-irb-doesnt-work-anymore/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>1.7.16-SNAPSHOT</version>
<version>@project.version@</version>
<type>jar</type>
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>../../local-repo/org/jruby/jruby-complete/1.7.16-SNAPSHOT</directory>
<directory>../../local-repo/org/jruby/jruby-complete/@project.version@</directory>
<includes>
<include>jruby-complete-*.jar</include>
</includes>
@@ -36,6 +36,7 @@
<executable>sh</executable>
<arguments>
<argument>irb.sh</argument>
<argument>@project.version@</argument>
</arguments>
</configuration>
</execution>
2 changes: 1 addition & 1 deletion ...ng_classpath_uri/osgi_app/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ public Option[] config() {

@Test
public void testSomething() throws Exception {
System.setProperty( "jruby.debug.loadService", "true");
//System.setProperty( "jruby.debug.loadService", "true");
IsolatedScriptingContainer container = new IsolatedScriptingContainer();
container.addLoadPath( org.jruby.osgi.bundle.Bundle.class.getClassLoader() );

4 changes: 2 additions & 2 deletions ...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -109,13 +109,13 @@ public void testJRubyCreate() throws Exception {
assertEquals( gemPath, "[\"uri:bundle://specifications\", \"uri:bundle://specifications\", \"uri:bundle://META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );

list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");

// ensure we can load can load embedded gems
loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
assertEquals(true, loaded);

list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"krypt\", \"krypt-core\", \"krypt-provider-jdk\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
}
}