Skip to content

Commit 3f5fe6c

Browse files
author
R. Tyler Croy
committed
Merge pull request #54 from ysb33r/master
FIxes #53
2 parents 908516c + 1e04fd1 commit 3f5fe6c

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dependencies {
4242
testJRubyPrepare 'org.jruby:jruby-complete:1.7.14'
4343
}
4444

45+
4546
repositories {
4647
jcenter()
4748
mavenLocal()

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package com.github.jrubygradle
22

3-
import org.gradle.api.file.FileCollection
43
import org.gradle.testfixtures.ProjectBuilder
5-
import spock.lang.Ignore
6-
import spock.lang.IgnoreIf
7-
import spock.lang.IgnoreRest
8-
import spock.lang.Specification
4+
import spock.lang.*
95

106
import static org.gradle.api.logging.LogLevel.LIFECYCLE
117

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ class JRubyExec extends JavaExec {
132132
configuration = JRUBYEXEC_CONFIG
133133
}
134134

135+
GemUtils.OverwriteAction overwrite = project.gradle.startParameter.refreshDependencies ? GemUtils.OverwriteAction.OVERWRITE : GemUtils.OverwriteAction.SKIP
135136
def jrubyCompletePath = project.configurations.getByName(jrubyConfigurationName)
136137
File gemDir = tmpGemDir()
137138
gemDir.mkdirs()
@@ -143,7 +144,7 @@ class JRubyExec extends JavaExec {
143144
jrubyCompletePath,
144145
project.configurations.getByName(configuration),
145146
gemDir,
146-
GemUtils.OverwriteAction.OVERWRITE
147+
overwrite
147148
)
148149
}
149150

src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ class JRubyExecDelegate {
120120
proxy.validate()
121121
File gemDir=new File(project.jruby.gemInstallDir)
122122
Configuration config = project.configurations.getByName(JRUBYEXEC_CONFIG)
123+
GemUtils.OverwriteAction overwrite = project.gradle.startParameter.refreshDependencies ? GemUtils.OverwriteAction.OVERWRITE : GemUtils.OverwriteAction.SKIP
123124
project.mkdir gemDir
124-
GemUtils.extractGems(project,config,config,gemDir,GemUtils.OverwriteAction.SKIP)
125+
GemUtils.extractGems(project,config,config,gemDir,overwrite)
125126

126127
project.javaexec {
127128
classpath JRubyExecUtils.classpathFromConfiguration(config)

0 commit comments

Comments
 (0)