Skip to content
This repository has been archived by the owner on Feb 21, 2022. It is now read-only.

Commit

Permalink
log dependency updates on lifecycle log level
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamilszymanski
kamilszymanski committed Mar 30, 2015
1 parent 56c809e commit b5aaa25
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 31 deletions.
15 changes: 9 additions & 6 deletions src/main/groovy/com/ofg/uptodate/LoggerProxy.groovy
View file
Expand Up @@ -3,13 +3,16 @@ package com.ofg.uptodate
import org.slf4j.Logger

class LoggerProxy {
void warn(Logger logger, String warning) {
logger.warn(warning)

void lifecycle(Logger logger, String message) {
logger.lifecycle(message)
}
void info(Logger logger, String warning) {
logger.info(warning)

void info(Logger logger, String message) {
logger.info(message)
}
void debug(Logger logger, String warning) {
logger.debug(warning)

void debug(Logger logger, String message) {
logger.debug(message)
}
}
2 changes: 1 addition & 1 deletion src/main/groovy/com/ofg/uptodate/UptodatePlugin.groovy
View file
Expand Up @@ -41,7 +41,7 @@ class UptodatePlugin implements Plugin<Project> {
Set<Dependency> dependenciesWithNewVersions = newVersionFinder.findNewer(dependencies)
newVersionFinder.printDependencies(dependenciesWithNewVersions)
} else {
loggerProxy.info(log, 'No dependencies found in project configuration.')
loggerProxy.lifecycle(log, 'No dependencies found in project configuration.')
}
}
createdTask.group = "Dependencies"
Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/com/ofg/uptodate/finder/NewVersionFinderInAllRepositories.groovy
View file
Expand Up @@ -43,10 +43,10 @@ class NewVersionFinderInAllRepositories {

void printDependencies(Set<Dependency> dependenciesWithNewVersions) {
if (dependenciesWithNewVersions.isEmpty()) {
loggerProxy.info(log, NO_NEW_VERSIONS_MESSAGE)
loggerProxy.lifecycle(log, NO_NEW_VERSIONS_MESSAGE)
} else {
List<Dependency> sortedUpdates = dependenciesWithNewVersions.sort(new DependencyGroupAndNameComparator())
loggerProxy.warn(log, "$NEW_VERSIONS_MESSAGE_HEAD\n${sortedUpdates.join('\n')}")
loggerProxy.lifecycle(log, "$NEW_VERSIONS_MESSAGE_HEAD\n${sortedUpdates.join('\n')}")
}
}
}
1 change: 0 additions & 1 deletion src/test/groovy/com/ofg/uptodate/UptodatePluginSpec.groovy
View file
Expand Up @@ -25,7 +25,6 @@ class UptodatePluginSpec extends Specification {
executeUptodateTask()
then:
1 * loggerProxy.info(_, { it.contains('JCenter repository is not found')})
1 * loggerProxy.info(_, 'No dependencies found in project configuration.')
}

protected void executeUptodateTask() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/com/ofg/uptodate/finder/AllRepositoriesnewVersionFinderSpec.groovy
View file
Expand Up @@ -33,7 +33,7 @@ class AllRepositoriesnewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'junit:junit:4.11'\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
}
Expand Down
19 changes: 10 additions & 9 deletions src/test/groovy/com/ofg/uptodate/finder/jcenter/JCenterNewVersionFinderSpec.groovy
View file
@@ -1,11 +1,13 @@
package com.ofg.uptodate.finder.jcenter

import com.ofg.uptodate.finder.HttpProxyServerProvider
import com.ofg.uptodate.finder.NewFinderSpec
import groovy.text.SimpleTemplateEngine
import org.codehaus.groovy.runtime.StackTraceUtils

import static com.ofg.uptodate.VersionPatterns.*
import static com.ofg.uptodate.Xmls.*
import static com.ofg.uptodate.finder.NewVersionFinderInAllRepositories.NO_NEW_VERSIONS_MESSAGE

@Mixin([JCenterReponseProvider, HttpProxyServerProvider])
class JCenterNewVersionFinderSpec extends NewFinderSpec {
Expand Down Expand Up @@ -38,7 +40,7 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
}

Expand All @@ -50,7 +52,7 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
}

def "should not fail or display excluded versions for dependencies found in external repo"() {
Expand All @@ -62,21 +64,20 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
where:
artifactVersion << ['2.2.2-BETA', '2.2.Beta3', '2.2.2-alpha', '2.2.Alpha-3', '1.3.RC', '1.3.CR1', '1.0.0-SNAPSHOT']
}

def "should not display header on warn but only message on info when no new dependencies are found"() {
def 'should inform when no new dependencies are found'() {
given:
artifactMetadataRequestResponse('junit', 'junit', JUNIT_META_DATA)
and:
project.dependencies.add(TEST_COMPILE_CONFIGURATION, 'junit:junit:4.11')
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.info(_, "No new versions are available.")
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
}

def 'should not list dependencies from excluded configurations'() {
Expand All @@ -91,7 +92,7 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'junit:junit:4.11'")
}

Expand Down Expand Up @@ -126,7 +127,7 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
cleanup:
shutdownHttpProxyServer()
Expand All @@ -147,7 +148,7 @@ class JCenterNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
cleanup:
shutdownHttpProxyServer()
Expand Down
22 changes: 11 additions & 11 deletions src/test/groovy/com/ofg/uptodate/finder/maven/MavenNewVersionFinderSpec.groovy
View file
@@ -1,11 +1,13 @@
package com.ofg.uptodate.finder.maven

import com.ofg.uptodate.finder.HttpProxyServerProvider
import com.ofg.uptodate.finder.NewFinderSpec
import groovy.text.SimpleTemplateEngine
import org.codehaus.groovy.runtime.StackTraceUtils

import static com.ofg.uptodate.Jsons.*
import static com.ofg.uptodate.VersionPatterns.*
import static com.ofg.uptodate.finder.NewVersionFinderInAllRepositories.NO_NEW_VERSIONS_MESSAGE

@Mixin([MavenReponseProvider, HttpProxyServerProvider])
class MavenNewVersionFinderSpec extends NewFinderSpec {
Expand Down Expand Up @@ -42,7 +44,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
}

Expand All @@ -54,7 +56,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
}

def "should not fail or display excluded versions for dependencies found in external repo"() {
Expand All @@ -66,21 +68,20 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
where:
artifactVersion << ['2.2.2-BETA', '2.2.Beta3', '2.2.2-alpha', '2.2.Alpha-3', '1.3.RC', '1.3.CR1', '1.0.0-SNAPSHOT']
}

def "should not display header on warn but only message on info when no new dependencies are found"() {
def 'should inform when no new dependencies are found'() {
given:
artifactMetadataRequestResponse('junit', 'junit', JUNIT_RESPONSE)
and:
project.dependencies.add(TEST_COMPILE_CONFIGURATION, 'junit:junit:4.11')
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.info(_, "No new versions are available.")
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
}

def 'should not list dependencies from excluded configurations'() {
Expand All @@ -95,7 +96,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'junit:junit:4.11'")
}

Expand All @@ -120,8 +121,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
0 * loggerProxy.warn(_, _)
1 * loggerProxy.info(_, "No new versions are available.")
1 * loggerProxy.lifecycle(_, NO_NEW_VERSIONS_MESSAGE)
}

def 'should list all dependencies that have newer versions if running behind a proxy server configured via plugin'() {
Expand All @@ -142,7 +142,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
cleanup:
shutdownHttpProxyServer()
Expand All @@ -163,7 +163,7 @@ class MavenNewVersionFinderSpec extends NewFinderSpec {
when:
executeUptodateTask()
then:
1 * loggerProxy.warn(_, "New versions available:\n" +
1 * loggerProxy.lifecycle(_, "New versions available:\n" +
"'org.hibernate:hibernate-core:4.3.6.Final'")
cleanup:
shutdownHttpProxyServer()
Expand Down

0 comments on commit b5aaa25

Please sign in to comment.