Merge pull request #8 from ctoestreich/master

Fixed create-jesque-job script
michaelcameron · Dec 16, 2011 · 15f6f24 · 15f6f24
2 parents 601166c + de55e6c
commit 15f6f24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/grails-app/jobs/grails/plugin/jesque/test/RedisAutoWireJob.groovy b/grails-app/jobs/grails/plugin/jesque/test/RedisAutoWireJob.groovy
@@ -5,6 +5,7 @@ class RedisAutoWireJob {
     def redisService
 
     void perform() {
+        redisService.hello = "world"
         redisService.worked = "true"
         println "hello world"
     }

diff --git a/scripts/CreateJesqueJob.groovy b/scripts/CreateJesqueJob.groovy
@@ -21,22 +21,16 @@ import org.apache.tools.ant.taskdefs.Ant
  *
  * @author Christian Oestreich
  */
-
-Ant.property(environment: "env")
-grailsHome = Ant.antProject.properties."env.GRAILS_HOME"
-
-
 includeTargets << grailsScript("_GrailsInit")
 includeTargets << grailsScript("_GrailsCreateArtifacts")
 
 target('default': "Creates a new Jesque job") {
     depends(checkVersion, parseArguments)
 
-    def suffix = "Job"
+    def name = argsMap["params"][0]
+    def suffix = name.endsWith('Job') ? '' : "Job"
     def type = "JesqueJob"
     promptForName(type: type)
-
-    def name = argsMap["params"][0]
     createArtifact(name: name, suffix: suffix, type: type, path: "grails-app/jobs")
     createUnitTest(name: name, suffix: suffix)
     if(hasSpockInstalled()) {

diff --git a/test/integration/grails/plugin/jesque/JesqueServiceInjectionSpec.groovy b/test/integration/grails/plugin/jesque/JesqueServiceInjectionSpec.groovy
@@ -18,7 +18,7 @@ class JesqueServiceInjectionSpec extends IntegrationSpec {
         def queueName = 'redisAutoWireJob'
         def existingProcessedCount = queueInfoDao.processedCount
         def existingFailureCount = failureDao.count
-        redisService.hello = "world"
+        redisService.hello = ""
 
         when:
         jesqueService.enqueue(queueName, RedisAutoWireJob.simpleName)
@@ -38,7 +38,7 @@ class JesqueServiceInjectionSpec extends IntegrationSpec {
         def queueName = 'redisAutoWireJobQueueName'
         def existingProcessedCount = queueInfoDao.processedCount
         def existingFailureCount = failureDao.count
-        redisService.hello = "world"
+        redisService.hello = ""
 
         when:
         jesqueService.enqueue(queueName, RedisAutoWireJob.simpleName)