jruby-gradle
/
jruby-gradle-plugin
mirror of https://github.com/jruby-gradle/jruby-gradle-plugin
1
0
Fork 0
Code Issues Releases Wiki Activity

Partially deal with != in ranges, by ignoring the version (#290)

This commit is contained in:
Schalk Cronje 2019-06-05 21:42:26 +02:00
parent c92c9a8403
commit 9387814caf
16 changed files with 140 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base-plugin/src/main/groovy/com/github/jrubygradle/GenerateGradleRb.groovy
View File

@ -65,6 +65,7 @@ class GenerateGradleRb extends DefaultTask implements JRubyAwareTask {
@TaskAction
@CompileDynamic
@SuppressWarnings('DuplicateStringLiteral')
void generate() {
Object source = getSourceFromResource()
File destination = destinationFile().parentFile

14
base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy
View File

@ -30,7 +30,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
* system Ruby environment.
*/
@Input
boolean InheritRubyEnv = false
boolean inheritRubyEnv = false
JRubyExec() {
super()
@ -155,7 +155,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
*/
@Deprecated
String getJrubyVersion() {
deprecated("Use jruby.getJrubyVersion rather getJrubyVersion()")
deprecated('Use jruby.getJrubyVersion rather getJrubyVersion()')
jruby.jrubyVersion
}
@ -172,7 +172,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
*/
@Deprecated
void jrubyVersion(final String ver) {
deprecated("Use jruby.jrubyVersion rather jrubyVersion")
deprecated('Use jruby.jrubyVersion rather jrubyVersion')
jruby.jrubyVersion(ver)
}
@ -184,7 +184,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
*/
@Deprecated
void configuration(Configuration newConfiguration) {
deprecated("Use jruby.setGemConfiguration() rather than configuration()")
deprecated('Use jruby.setGemConfiguration() rather than configuration()')
jruby.gemConfiguration(newConfiguration)
}
@ -196,7 +196,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
*/
@Deprecated
void configuration(String newConfiguration) {
deprecated("Use jruby.setGemConfiguration() rather than configuration()")
deprecated('Use jruby.setGemConfiguration(newConfiguration) rather than configuration(newConfiguration)')
jruby.gemConfiguration(newConfiguration)
}
@ -211,7 +211,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
*/
@Deprecated
void setJrubyVersion(final String version) {
deprecated("Use jruby.setJrubyVersion rather setJrubyVersion")
deprecated('Use jruby.setJrubyVersion rather setJrubyVersion')
jruby.jrubyVersion(version)
}
@ -219,7 +219,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
@SuppressWarnings('UnnecessaryGetter')
void exec() {
File gemDir = getGemWorkDir().get()
setEnvironment prepareJRubyEnvironment(this.environment, inheritRubyEnv, gemDir)
setEnvironment prepareJRubyEnvironment(this.environment, this.inheritRubyEnv, gemDir)
super.classpath jruby.jrubyConfiguration
super.setArgs(getArgs())
super.exec()

2
base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy
View File

@ -316,7 +316,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
if (taskResolutionStrategiesOnly) {
this.resolutionsStrategies
} else {
getExtFromProject().allResolutionStrategyActions + this.resolutionsStrategies
extFromProject.allResolutionStrategyActions + this.resolutionsStrategies
}
} else {
this.resolutionsStrategies

22
base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecDelegate.groovy
View File

@ -96,6 +96,7 @@ class JRubyExecDelegate {
notSupported(USE_ARGS_ALTERNATIVES)
}
@SuppressWarnings('UnusedMethodParameter')
JavaExecSpec setArgs(Object... a) {
notSupported(USE_ARGS_ALTERNATIVES)
}
@ -157,27 +158,8 @@ class JRubyExecDelegate {
this.jrubyArgs
}
// JavaExecSpec copyTo(JavaExecSpec execSpec) {
// delegate.copyTo(execSpec)
//
// execSpec.workingDir = delegate.workingDir
// execSpec.args = delegate.getArgs()
// execSpec.classpath = delegate.jruby.jrubyConfiguration
// execSpec.main = delegate.main
//
// execSpec.errorOutput = delegate.errorOutput
// execSpec.standardOutput = delegate.standardOutput
// execSpec.standardInput = delegate.standardInput
// execSpec.ignoreExitValue = delegate.ignoreExitValue
//
// execSpec.environment = prepareJRubyEnvironment(
// delegate.environment, delegate.inheritRubyEnv, delegate.gemWorkDir.get()
// )
// }
private void notSupported(final String msg) {
throw new UnsupportedOperationException()
throw new UnsupportedOperationException(msg)
}
private static final String USE_ARGS_ALTERNATIVES = 'Use jrubyArgs/scriptArgs instead of `args`'

28
core-plugin/src/integTest/groovy/com/github/jrubygradle/api/core/IvyXmlProxyServerIntegrationSpec.groovy
View File

@ -4,11 +4,13 @@ import org.gradle.testkit.runner.BuildResult
import org.gradle.testkit.runner.GradleRunner
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import spock.lang.IgnoreIf
import spock.lang.Issue
import spock.lang.Specification
import java.util.regex.Pattern
@IgnoreIf({ System.getProperty('TESTS_ARE_OFFLINE') })
class IvyXmlProxyServerIntegrationSpec extends Specification {
@Rule
@ -52,7 +54,7 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
.withProjectDir(projectDir)
.withPluginClasspath()
.withTestKitDir(testKitDir)
.withArguments(['dependencies', '--configuration=something', '-i', '-s'])
.withArguments(['dependencies', '--configuration=something', '-i', '-s'])
.forwardOutput()
.withDebug(true)
.build()
@ -74,8 +76,8 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
build()
then:
new File(projectDir,'build/something/credit_card_validator-1.3.2.gem').exists()
new File(projectDir,'build/something/base_app-1.0.6.gem').exists()
new File(projectDir, 'build/something/credit_card_validator-1.3.2.gem').exists()
new File(projectDir, 'build/something/base_app-1.0.6.gem').exists()
}
@ -110,8 +112,24 @@ class IvyXmlProxyServerIntegrationSpec extends Specification {
findFiles ~/^rake-.*gem$/
}
@Issue('https://github.com/jruby-gradle/jruby-gradle-plugin/issues/290')
void 'Resolve ranges with =, != and non-dotted versions'() {
setup:
withBuildFile '''
dependencies {
something 'rubygems:github-pages:106'
}
'''
when:
build()
then:
findFiles ~/^github-pages-106.gem$/
}
private List<File> findFiles(Pattern pat) {
new File(projectDir,'build/something').listFiles( new FilenameFilter() {
new File(projectDir, 'build/something').listFiles(new FilenameFilter() {
@Override
boolean accept(File dir, String name) {
name =~ pat

2
core-plugin/src/main/groovy/com/github/jrubygradle/api/core/AbstractJRubyPrepare.groovy
View File

@ -95,5 +95,3 @@ abstract class AbstractJRubyPrepare extends DefaultTask implements JRubyAwareTas
private Object outputDir = { -> "${project.buildDir}/.gems" }
}

119
core-plugin/src/main/groovy/com/github/jrubygradle/api/gems/GemVersion.groovy
View File

@ -2,6 +2,7 @@ package com.github.jrubygradle.api.gems
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import java.util.regex.MatchResult
import java.util.regex.Pattern
@ -41,37 +42,42 @@ import static com.github.jrubygradle.api.gems.GemVersion.Boundary.OPEN_ENDED
* @since 2.0 (Moved here from base plugin where it existed since 0.4.0)
*/
@CompileStatic
@Slf4j
class GemVersion implements Comparable<GemVersion> {
/** How versions at boundaries are defined.
*
*/
@SuppressWarnings('DuplicateStringLiteral')
enum Boundary {
/** The specified version is included on the border.
*
*/
INCLUSIVE('[',']'),
INCLUSIVE('[', ']'),
/** THe specified version is excluded on the border.
*
*/
EXCLUSIVE(']','['),
EXCLUSIVE(']', '['),
/** All values below (on the low border) or above (on the high border)
* are acceptable
*
*/
OPEN_ENDED('(',')')
OPEN_ENDED('(', ')')
final String low
final String high
private Boundary( String low, String hi) {
private Boundary(String low, String hi) {
this.low = low
this.high = hi
}
}
public static final GemVersion NO_VERSION = new GemVersion(null, null, null, null)
public static final GemVersion EVERYTHING = new GemVersion(OPEN_ENDED, null, null, OPEN_ENDED)
public static final String MAX_VERSION = '99999'
public static final String MIN_VERSION = '0.0.0'
@ -92,11 +98,16 @@ class GemVersion implements Comparable<GemVersion> {
private static final Pattern GREATER_EQUAL = ~/^>=\s*(.+)/
private static final Pattern GREATER = ~/^>\s*(.+)/
private static final Pattern EQUAL = ~/^=\s*(.+)/
private static final Pattern NOT_EQUAL = ~/^!=\s*(.+)/
private static final Pattern LESS = ~/^<\s*(.+)/
private static final Pattern LESS_EQUAL = ~/^<=\s*(.+)/
private static final Pattern TWIDDLE_WAKKA = ~/^~>\s*(.+)/
private static final String VERSION_SPLIT = '.'
private static final String PAD_ZERO = '0'
private static final String EMPTY = ''
private static final String NOT_GEM_REQ = 'This does not look like a standard GEM version requirement'
final String low
final String high
@ -114,10 +125,43 @@ class GemVersion implements Comparable<GemVersion> {
new GemVersion(singleRequirement)
}
/** Takes a GEM requirement list and creates a list of GEM versions
*
* @param multipleRequirements Comma-separated list of GEM requirements.
* @return List of GEM versions. Can be empty if all requirements evaluate to {@link #NO_VERSION}.
*/
static List<GemVersion> gemVersionsFromMultipleGemRequirements(String multipleRequirements) {
multipleRequirements.split(/,\s*/).collect { String it ->
gemVersionFromGemRequirement(it)
}.findAll {
it != NO_VERSION
}
}
/** Takes a GEM requirement list and creates a single GEM versoin, by taking a union of
* all requirements.
*
* @param multipleRequirements Comma-separated list of GEM requirements.
* @return Unioned GEM
*/
static GemVersion singleGemVersionFromMultipleGemRequirements(String multipleRequirements) {
List<GemVersion> gemVersions = gemVersionsFromMultipleGemRequirements(multipleRequirements)
if (gemVersions.empty) {
EVERYTHING
} else if (gemVersions.size() == 1) {
gemVersions.first()
} else {
gemVersions[1..-1].inject(gemVersions.first()) { range, value ->
range.union(value)
}
}
}
/** Create a Gem version instance from a single GEM version requirement.
*
* @param singleRequirement Single GEM requirement string.
* @return GemVersion instance.
* @return GemVersion instance. Can return {@link #NO_VERSION} if the version is parseable,
* but not translatable to Ivy format.
*
* @since 2.0
*/
@ -145,6 +189,9 @@ class GemVersion implements Comparable<GemVersion> {
exact,
INCLUSIVE
)
} else if (singleRequirement.matches(NOT_EQUAL)) {
log.info("'${singleRequirement}' is supported by Ivy.")
NO_VERSION
} else if (singleRequirement.matches(LESS_EQUAL)) {
new GemVersion(
OPEN_ENDED,
@ -240,13 +287,13 @@ class GemVersion implements Comparable<GemVersion> {
Boundary newHighBoundary
String newHigh
if(!high && other.high) {
if (!high && other.high) {
newHigh = other.high
newHighBoundary = other.highBoundary
} else if (high && !other.high) {
newHigh = high
newHighBoundary = highBoundary
} else if(!high && !other.high) {
} else if (!high && !other.high) {
newHigh = null
newHighBoundary = highBoundary
} else {
@ -298,9 +345,9 @@ class GemVersion implements Comparable<GemVersion> {
}
if (lowBoundary != other.lowBoundary) {
if(lowBoundary == OPEN_ENDED) {
if (lowBoundary == OPEN_ENDED) {
return -1
} else if(other.lowBoundary == OPEN_ENDED) {
} else if (other.lowBoundary == OPEN_ENDED) {
return 1
}
return lowBoundary == INCLUSIVE ? -1 : 1
@ -313,9 +360,9 @@ class GemVersion implements Comparable<GemVersion> {
}
if (highBoundary != other.highBoundary) {
if(highBoundary == OPEN_ENDED) {
if (highBoundary == OPEN_ENDED) {
return 1
} else if(other.highBoundary == OPEN_ENDED) {
} else if (other.highBoundary == OPEN_ENDED) {
return -1
}
return highBoundary == INCLUSIVE ? 1 : -1
@ -339,17 +386,21 @@ class GemVersion implements Comparable<GemVersion> {
* @return Gradle Ivy version range
*/
String toString() {
if (lowBoundary == INCLUSIVE && highBoundary == INCLUSIVE && low == high) {
if (this == EVERYTHING) {
'+'
} else if (this == NO_VERSION) {
']0,0['
} else if (lowBoundary == INCLUSIVE && highBoundary == INCLUSIVE && low == high) {
low
} else {
"${lowBoundary?.low ?: ''}${low ?: ''},${high ?: ''}${highBoundary?.high ?: ''}"
"${lowBoundary?.low ?: EMPTY}${low ?: EMPTY},${high ?: EMPTY}${highBoundary?.high ?: EMPTY}"
}
}
private static GemVersion parseTwiddleWakka(String singleRequirement) {
String base = getVersionFromRequirement(singleRequirement, TWIDDLE_WAKKA)
List<String> parts = base.tokenize('.')
if(1 == parts) {
List<String> parts = base.tokenize(VERSION_SPLIT)
if (1 == parts) {
throw new GemVersionException(
"'${singleRequirement}' does not look like a correctly formattedGEM twiddle-wakka requirement"
)
@ -357,9 +408,9 @@ class GemVersion implements Comparable<GemVersion> {
String lastNumberPart = parts[0..-2].reverse().find {
it =~ ONLY_DIGITS
}
if(lastNumberPart == null) {
if (lastNumberPart == null) {
throw new GemVersionException("Cannot extract last number part from '${singleRequirement}'. " +
'This does not look like a standard GEM version requirement')
NOT_GEM_REQ)
}
int bottomAdds = 3 - parts.size()
if (bottomAdds < 0) {
@ -367,7 +418,7 @@ class GemVersion implements Comparable<GemVersion> {
}
try {
Integer nextUp = lastNumberPart.toInteger() + 1
String leader = parts.size() <= 2 ? '' : "${parts[0..-3].join('.')}."
String leader = parts.size() <= 2 ? EMPTY : "${parts[0..-3].join(VERSION_SPLIT)}."
new GemVersion(
INCLUSIVE,
"${base}${'.0' * bottomAdds}",
@ -376,7 +427,7 @@ class GemVersion implements Comparable<GemVersion> {
)
} catch (NumberFormatException e) {
throw new GemVersionException("Can extract last number part from '${singleRequirement}'. " +
'This does not look like a standard GEM version requirement', e)
NOT_GEM_REQ, e)
}
}
@ -409,7 +460,7 @@ class GemVersion implements Comparable<GemVersion> {
*/
@CompileDynamic
private GemVersion(final String gradleVersionPattern) {
String cleanedString = gradleVersionPattern.replaceAll(~/\p{Blank}/,'')
String cleanedString = gradleVersionPattern.replaceAll(~/\p{Blank}/, '')
MatchResult dotPlus = cleanedString =~ DOT_PLUS
MatchResult plus = cleanedString =~ PLUS
MatchResult digitsPlus = cleanedString =~ DIGITS_PLUS
@ -419,15 +470,15 @@ class GemVersion implements Comparable<GemVersion> {
if (dotPlus.matches()) {
String base = dotPlus[0][1]
this.low = padVersion(base,'0')
this.high = padVersion(base,MAX_VERSION)
this.low = padVersion(base, PAD_ZERO)
this.high = padVersion(base, MAX_VERSION)
this.lowBoundary = INCLUSIVE
this.highBoundary = INCLUSIVE
} else if (plus.matches()) {
this.low = MIN_VERSION
this.lowBoundary = INCLUSIVE
this.highBoundary = OPEN_ENDED
} else if(digitsPlus.matches()) {
} else if (digitsPlus.matches()) {
this.lowBoundary = INCLUSIVE
this.highBoundary = INCLUSIVE
this.low = "${digitsPlus[0][1]}.${digitsPlus[0][2]}"
@ -436,11 +487,11 @@ class GemVersion implements Comparable<GemVersion> {
this.lowBoundary = OPEN_ENDED
this.high = openBottom[0][1]
this.highBoundary = openBottom[0][2] == UP_IN ? INCLUSIVE : EXCLUSIVE
} else if(openTop.matches()) {
} else if (openTop.matches()) {
this.highBoundary = OPEN_ENDED
this.low = openTop[0][2]
this.lowBoundary = openTop[0][1] == LOW_IN ? INCLUSIVE : EXCLUSIVE
} else if(range.matches()) {
} else if (range.matches()) {
this.lowBoundary = range[0][1] == LOW_IN ? INCLUSIVE : EXCLUSIVE
this.highBoundary = range[0][4] == UP_IN ? INCLUSIVE : EXCLUSIVE
this.low = range[0][2]
@ -468,15 +519,15 @@ class GemVersion implements Comparable<GemVersion> {
* a part with pure digits.
*/
private int compare(String lhs, String rhs) {
if(!lhs && !rhs) {
if (!lhs && !rhs) {
return 0
}
if(!lhs && rhs) {
if (!lhs && rhs) {
return -1
}
if(lhs && !rhs) {
if (lhs && !rhs) {
return -1
}
@ -488,17 +539,17 @@ class GemVersion implements Comparable<GemVersion> {
boolean lhsNumerical = lhsParts[i].matches(ONLY_DIGITS)
boolean rhsNumerical = rhsParts[i].matches(ONLY_DIGITS)
if(lhsNumerical && rhsNumerical) {
if (lhsNumerical && rhsNumerical) {
cmp = lhsParts[i].toInteger() <=> rhsParts[i].toInteger()
} else if(lhsNumerical && !rhsNumerical) {
} else if (lhsNumerical && !rhsNumerical) {
cmp = 1
} else if(!lhsNumerical && rhsNumerical) {
} else if (!lhsNumerical && rhsNumerical) {
cmp = -1
} else {
cmp = lhsParts[i] <=> rhsParts[i]
}
if(cmp != 0) {
if (cmp != 0) {
return cmp
}
}
@ -508,7 +559,7 @@ class GemVersion implements Comparable<GemVersion> {
private String padVersion(final String base, final String padValue) {
String pad = ".${padValue}"
int adds = 3 - base.tokenize('.').size()
int adds = 3 - base.tokenize(VERSION_SPLIT).size()
if (adds < 0) {
adds = 0
}
@ -516,7 +567,7 @@ class GemVersion implements Comparable<GemVersion> {
}
private String stripNonIntegerTail(String version) {
version?.replaceFirst(~/\.\p{Alpha}.*$/,'')
version?.replaceFirst(~/\.\p{Alpha}.*$/, '')
}
}

1
core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/DefaultRubyGemRestApi.groovy
View File

@ -1,6 +1,5 @@
package com.github.jrubygradle.internal.core
import com.github.jrubygradle.api.gems.GemInfo
import com.github.jrubygradle.internal.gems.DefaultGemDependency
import com.github.jrubygradle.internal.gems.DefaultGemInfo

1
core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/IvyXmlGlobalProxyRegistry.groovy
View File

@ -1,6 +1,5 @@
package com.github.jrubygradle.internal.core
import groovy.transform.CompileStatic
import org.gradle.api.Project

9
core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/IvyXmlRatpackProxyServer.groovy
View File

@ -1,8 +1,7 @@
package com.github.jrubygradle.internal.core
import com.github.jrubygradle.api.gems.GemVersion
import com.github.jrubygradle.api.gems.GemInfo
import com.github.jrubygradle.api.gems.GemVersion
import com.github.jrubygradle.internal.gems.GemToIvy
import groovy.transform.CompileStatic
import groovy.transform.Synchronized
@ -15,8 +14,8 @@ import ratpack.server.ServerConfig
import java.nio.file.Files
import java.nio.file.Path
import static com.github.jrubygradle.api.gems.GemVersion.gemVersionFromGradleIvyRequirement
import static IvyUtils.revisionsAsHtmlDirectoryListing
import static com.github.jrubygradle.api.gems.GemVersion.gemVersionFromGradleIvyRequirement
import static java.nio.file.Files.move
import static java.nio.file.StandardCopyOption.ATOMIC_MOVE
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
@ -65,7 +64,7 @@ class IvyXmlRatpackProxyServer implements com.github.jrubygradle.api.core.IvyXml
*
*/
@Override
@SuppressWarnings('DuplicateStringLiteral')
@SuppressWarnings(['DuplicateStringLiteral', 'AbcMetric'])
void run() {
server = RatpackServer.start {
it.serverConfig(
@ -99,7 +98,7 @@ class IvyXmlRatpackProxyServer implements com.github.jrubygradle.api.core.IvyXml
String revision = getGemQueryRevisionFromIvy(name, ctx.allPathTokens['revision'])
Path ivyXml = ivyFile(group, name, revision)
Path ivyXmlSha1 = ivyXml.resolveSibling("${ivyXml.toFile().name}.sha1")
if(Files.exists(ivyXmlSha1)) {
if (Files.exists(ivyXmlSha1)) {
ctx.response.contentType('text/plain').sendFile(ivyXmlSha1)
} else {
// TODO: Resolve ivy.xml first.

1
core-plugin/src/main/groovy/com/github/jrubygradle/internal/gems/DefaultGemInfo.groovy
View File

@ -1,6 +1,5 @@
package com.github.jrubygradle.internal.gems
import com.github.jrubygradle.api.gems.GemInfo
import com.github.jrubygradle.api.gems.GemDependency
import groovy.transform.CompileStatic

22
core-plugin/src/main/groovy/com/github/jrubygradle/internal/gems/GemToIvy.groovy
View File

@ -1,7 +1,5 @@
package com.github.jrubygradle.internal.gems
import com.github.jrubygradle.api.gems.GemVersion
import com.github.jrubygradle.api.gems.GemInfo
import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
@ -9,7 +7,7 @@ import groovy.xml.MarkupBuilder
import java.security.MessageDigest
import static com.github.jrubygradle.api.gems.GemVersion.gemVersionFromGemRequirement
import static com.github.jrubygradle.api.gems.GemVersion.singleGemVersionFromMultipleGemRequirements
/** Converts from Gem metadata to Ivy metadata.
*
@ -75,7 +73,11 @@ class GemToIvy {
if (gem.dependencies) {
dependencies {
gem.dependencies.each { dep ->
dependency(org: this.org, name: dep.name, rev: translateGemRevisionRequirements(dep.requirements))
dependency(
org: this.org,
name: dep.name,
rev: singleGemVersionFromMultipleGemRequirements(dep.requirements).toString()
)
}
}
}
@ -106,18 +108,6 @@ class GemToIvy {
shaFile
}
private String translateGemRevisionRequirements(String requirements) {
List<GemVersion> reqs = requirements.split(/,\s*/).collect { String it ->
gemVersionFromGemRequirement(it)
}
if (reqs.size() > 1) {
reqs.min().union(reqs.max()).toString()
} else {
reqs[0].toString()
}
}
private final String serverUri
private final String org = 'rubygems'
}

1
core-plugin/src/main/groovy/com/github/jrubygradle/internal/gems/GemVersionResolver.groovy
View File

@ -1,6 +1,5 @@
package com.github.jrubygradle.internal.gems
import com.github.jrubygradle.api.gems.GemVersion
import com.github.jrubygradle.api.gems.GemGroups
import groovy.transform.PackageScope

11
core-plugin/src/test/groovy/com/github/jrubygradle/api/gems/GemVersionSpec.groovy
View File

@ -4,14 +4,16 @@ import com.github.jrubygradle.api.gems.GemVersion
import spock.lang.Specification
import spock.lang.Unroll
import static com.github.jrubygradle.api.gems.GemVersion.gemVersionFromGemRequirement
import static com.github.jrubygradle.api.gems.GemVersion.gemVersionFromGradleIvyRequirement
import static com.github.jrubygradle.api.gems.GemVersion.singleGemVersionFromMultipleGemRequirements
class GemVersionSpec extends Specification {
@Unroll
void "#gemRequirement (gem) ⇒ #ivyNotation (ivy)"() {
void "#gemRequirement (gem requirement) ⇒ #ivyNotation (ivy)"() {
when:
String ivy = GemVersion.gemVersionFromGemRequirement(gemRequirement).toString()
String ivy = gemVersionFromGemRequirement(gemRequirement).toString()
then:
ivy == ivyNotation
@ -75,6 +77,11 @@ class GemVersionSpec extends Specification {
']2.5.1.1,99999]' | ']2.5.1.1,)' | ']2.5.1.1,99999]'
}
void 'Ivy union of < 3, >= 1.2'() {
expect:
singleGemVersionFromMultipleGemRequirements('< 3,>= 1.2').toString() == '[1.2,3['
}
void "intersects with conflict"() {
given:
GemVersion subject = gemVersionFromGradleIvyRequirement('[1.2.1,1.2.3]')

3
gradle/codenarc.groovy
View File

@ -322,9 +322,6 @@ ruleset {
UseCollectMany
UseCollectNested
UseOfNotifyMethod
VariableName {
doNotApplyToFileNames = '*Spec.groovy,*Specification.groovy'
}
VectorIsObsolete
VolatileArrayField
VolatileLongOrDoubleField

9
jar-plugin/src/main/groovy/com/github/jrubygradle/jar/JRubyJarPlugin.groovy
View File

@ -1,20 +1,15 @@
package com.github.jrubygradle.jar
import static com.github.jrubygradle.jar.JRubyJar.DEFAULT_JRUBYJAR_CONFIG
import groovy.transform.PackageScope
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.tasks.testing.Test
import static com.github.jrubygradle.jar.JRubyJar.DEFAULT_JRUBYJAR_CONFIG
/**
* @author Schalk W. Cronjé
* @author Christian Meier
*/
class JRubyJarPlugin implements Plugin<Project> {
private static final String TEST_TASK_NAME = 'test'
void apply(Project project) {
project.apply plugin: 'com.github.jruby-gradle.base'
project.apply plugin: 'java-base'