Merge pull request jbake-org#12 from ancho/feature/local-jbake-snapshot

rename task jbake to bake and fix usage of jbake snapshot releases

.gitignore

@@ -12,4 +12,4 @@ user.gradle
 .settings
 *.classpath
 *.project
-
+gradle.properties

README.adoc

@@ -22,14 +22,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'me.champeau.gradle:jbake-gradle-plugin:0.2'
+    classpath 'me.champeau.gradle:jbake-gradle-plugin:0.2.1'
   }
 }
 
 apply plugin: 'me.champeau.jbake'
 ----
 
-This will add a `jbake` task to your build, which will search for a standard http://www.jbake.org[JBake] source tree in
+This will add a `bake` task to your build, which will search for a standard http://www.jbake.org[JBake] source tree in
 `src/jbake` and generate content into `$buildDir/jbake` (typically `build/jbake`).
 
 == Configuration

atlassian-ide-plugin.xml

@@ -0,0 +1,5 @@
+<atlassian-ide-plugin>
+  <project-configuration id="1">
+    <servers id="2" />
+  </project-configuration>
+</atlassian-ide-plugin>

build.gradle

@@ -23,6 +23,7 @@ repositories {
 dependencies {
     compile gradleApi()
     compile localGroovy()
+    compile 'com.github.zafarkhaja:java-semver:0.8.0'
     provided 'org.jbake:jbake-core:2.3.2'
     testCompile('org.spockframework:spock-core:0.7-groovy-2.0') {
         exclude group:'org.codehaus.groovy'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 03 18:00:04 CEST 2014
+#Sun May 03 12:39:37 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip

src/main/groovy/me/champeau/gradle/JBakePlugin.groovy

@@ -15,6 +15,7 @@
  */
 package me.champeau.gradle
 
+import com.github.zafarkhaja.semver.Version
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -39,7 +40,7 @@ class JBakePlugin implements Plugin<Project> {
 
         addDependenciesAfterEvaluate()
 
-        project.task('jbake', type: JBakeTask, group: 'Documentation', description: 'Bake a jbake project'){
+        project.task('bake', type: JBakeTask, group: 'Documentation', description: 'Bake a jbake project'){
 
             classpath = configuration
             conventionMapping.input = { project.file("$project.projectDir/$project.jbake.srcDirName") }
@@ -60,7 +61,9 @@ class JBakePlugin implements Plugin<Project> {
         project.dependencies {
             jbake("org.jbake:jbake-core:${extension.version}")
 
-            if ( new Version(extension.version) > new Version("2.3.0") ){
+            Version currentVersion = Version.valueOf(extension.version)
+            Version jbake2_3_0 = Version.valueOf("2.3.0")
+            if ( currentVersion.greaterThan( jbake2_3_0 ) ){
                 jbake("org.asciidoctor:asciidoctorj:${extension.asciidoctorjVersion}")
             }
             else {

src/test/groovy/me/champeau/gradle/JBakePluginSpec.groovy

@@ -22,7 +22,7 @@ class JBakePluginSpec extends Specification {
     def "should add a JBakeTask"(){
 
         expect:
-        project.tasks.jbake instanceof JBakeTask
+        project.tasks.bake instanceof JBakeTask
     }
 
     def "should add jbake configuration"(){
@@ -114,7 +114,7 @@ class JBakePluginSpec extends Specification {
         project.jbake.srcDirName = srcDirName
 
         then:
-        project.tasks.jbake.input == expectedFile
+        project.tasks.bake.input == expectedFile
     }
 
     def "output dir should be configured by extension"(){
@@ -126,7 +126,7 @@ class JBakePluginSpec extends Specification {
         project.jbake.destDirName = destDirName
 
         then:
-        project.tasks.jbake.output == expectedFile
+        project.tasks.bake.output == expectedFile
     }
 
     def "clearcache should be configured by extension"(){
@@ -137,7 +137,7 @@ class JBakePluginSpec extends Specification {
         project.jbake.clearCache = clearCache
 
         then:
-        project.tasks.jbake.clearCache == clearCache
+        project.tasks.bake.clearCache == clearCache
     }
 
     def "should be configurable by extension"(){
@@ -149,7 +149,7 @@ class JBakePluginSpec extends Specification {
         project.jbake.configuration = configuration
 
         then:
-        project.tasks.jbake.configuration['render.tags'] == false
+        project.tasks.bake.configuration['render.tags'] == false
     }
 
 }