Skip to content

Commit 0a66e46

Browse files
author
R. Tyler Croy
committed
Bump the integration tests to check for temple-0.6.10 which is a transitive dep of slim
The real fix will come later when we stop checking specific versions of gems on the file systems
1 parent a993097 commit 0a66e46

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/integTest/groovy/com/github/jrubygradle/JRubyPrepareGemsIntegrationSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class JRubyPrepareGemsIntegrationSpec extends Specification {
4949

5050
expect:
5151
new File(prepTask.outputDir,'gems/slim-2.0.2').exists()
52-
new File(prepTask.outputDir,'gems/temple-0.6.8').exists()
52+
new File(prepTask.outputDir,'gems/temple-0.6.10').exists()
5353
new File(prepTask.outputDir,'gems/tilt-2.0.1').exists()
5454
}
5555

@@ -70,7 +70,7 @@ class JRubyPrepareGemsIntegrationSpec extends Specification {
7070

7171
expect:
7272
new File(prepTask.outputDir,'gems/slim-2.0.2').exists()
73-
!new File(prepTask.outputDir,'gems/temple-0.6.8').exists()
73+
!new File(prepTask.outputDir,'gems/temple-0.6.10').exists()
7474
!new File(prepTask.outputDir,'gems/tilt-2.0.1').exists()
7575
}
7676

@@ -88,7 +88,7 @@ class JRubyPrepareGemsIntegrationSpec extends Specification {
8888

8989
expect:
9090
new File(jrpg.outputDir,'gems/slim-2.0.2').exists()
91-
new File(jrpg.outputDir,'gems/temple-0.6.8').exists()
91+
new File(jrpg.outputDir,'gems/temple-0.6.10').exists()
9292
new File(jrpg.outputDir,'gems/tilt-2.0.1').exists()
9393
}
9494
}

src/main/groovy/com/github/jrubygradle/JRubyPrepareGems.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.gradle.api.tasks.TaskAction
1010

1111
/**
1212
* @author Schalk W. Cronjé
13-
* @author R Taylor Croy
13+
* @author R Tyler Croy
1414
*/
1515
class JRubyPrepareGems extends DefaultTask {
1616

@@ -38,7 +38,7 @@ class JRubyPrepareGems extends DefaultTask {
3838
* @param f A file, directory, configuration or list of gems
3939
*/
4040
void gems(Object f) {
41-
if(this.gems == null) {
41+
if (this.gems == null) {
4242
this.gems = []
4343
}
4444
this.gems.add(f)
@@ -47,7 +47,7 @@ class JRubyPrepareGems extends DefaultTask {
4747
@TaskAction
4848
void copy() {
4949
File jrubyJar = JRubyExecUtils.jrubyJar(project.configurations.getByName(JRubyExec.JRUBYEXEC_CONFIG))
50-
GemUtils.extractGems(project,jrubyJar,getGems(),outputDir,GemUtils.OverwriteAction.SKIP)
50+
GemUtils.extractGems(project, jrubyJar, getGems(), outputDir, GemUtils.OverwriteAction.SKIP)
5151
}
5252

5353
private List<Object> gems

0 commit comments

Comments
 (0)