fixes #3, #4, #5, #6

kordamp · Mar 5, 2014 · 2cd596d · 2cd596d
1 parent f26db24
commit 2cd596d
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 141 deletions.
diff --git a/README.adoc b/README.adoc
@@ -1,10 +1,9 @@
 = Gipsy
 :author: Andres Almiray
-:version: 0.3.0
+:version: 0.4.0
 
-image::https://travis-ci.org/aalmiray/gipsy.png?branch=master["Build Status", link="https://travis-ci.org/aalmiray/gipsy"]
-
-image::https://d2weczhvl823v0.cloudfront.net/aalmiray/gipsy/trend.png["Bitdeli Badge", link="https://bitdeli.com/free"]
+image:https://travis-ci.org/aalmiray/gipsy.png?branch=master["Build Status", link="https://travis-ci.org/aalmiray/gipsy"]
+image:http://img.shields.io/:semver-{version}-blue.svg["Semantic Versioning", link="http://semver.org"]
 
 image::https://api.bintray.com/packages/aalmiray/kordamp/jipsy/images/download.png["Bintray", link="https://bintray.com/aalmiray/kordamp/gipsy/{version}"]
 
@@ -29,7 +28,6 @@ This library provides a mechanism for enforcing those rules by simply adding an
 example say there exists the following `Calculator` service interface
 
 [source,groovy]
-[subs="verbatim,attributes"]
 ----
 package com.acme
 
@@ -41,7 +39,6 @@ interface Calculator {
 A basic implementation of such service may be as follows
 
 [source,groovy]
-[subs="verbatim,attributes"]
 ----
 package com.acme
 
@@ -112,3 +109,5 @@ consumers of your library.
 == Creating Your Own AST Transformations
 
 TBD
+
+image::https://d2weczhvl823v0.cloudfront.net/aalmiray/gipsy/trend.png["Bitdeli Badge", link="https://bitdeli.com/free"]
diff --git a/build.gradle b/build.gradle
@@ -14,12 +14,25 @@
  * limitations under the License.
  */
 
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'net.saliman:gradle-cobertura-plugin:2.2.2'
+        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:0.2.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:0.3'
+    }
+}
+
 apply plugin: 'idea'
 apply plugin: 'java'
+apply plugin: 'cobertura'
+apply plugin: 'coveralls'
 apply plugin: 'build-dashboard'
 apply from: 'gradle/idea.gradle'
-apply from: 'gradle/coverage.gradle'
-apply from: 'gradle/codeQuality.gradle'
+apply from: 'gradle/code-quality.gradle'
 apply from: 'gradle/publish.gradle'
 
 repositories {
@@ -33,8 +46,20 @@ dependencies {
     testCompile 'junit:junit:4.11'
 }
 
+cobertura {
+    coverageFormats = ['html', 'xml']
+    coverageSourceDirs = sourceSets.main.java.srcDirs
+}
+
 task sourceJar(type: Jar) {
-    from sourceSets.main.allJava
+    group 'Build'
+    description 'An archive of the source code'
+    from sourceSets.main.allSource
+    classifier 'sources'
+}
+
+artifacts {
+    sourceJar
 }
 
 compileJava {

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-version=0.3.0
+version=0.4.0
 group=org.kordamp.gipsy
-groovyVersion=2.2.1
+groovyVersion=2.2.2
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
diff --git a/gradle/codeQuality.gradle → gradle/code-quality.gradle b/gradle/codeQuality.gradle → gradle/code-quality.gradle
diff --git a/gradle/coverage.gradle b/gradle/coverage.gradle
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -16,53 +16,15 @@
 
 import java.text.SimpleDateFormat
 
-apply plugin: 'maven-publish'
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-
-            pom.withXml {
-                asNode().with {
-                    appendNode('name', 'gipsy')
-                    appendNode('description',
-                        'Groovy version of the Jipsy Annotation Processor')
-                    appendNode('url', 'http://github.com/aalmiray/gipsy')
-                    appendNode('inceptionYear', '2013')
-                    appendNode('licenses')
-                        .appendNode('license')
-                        .appendNode('name', 'The Apache Software License, Version 2.0').parent()
-                        .appendNode('url', 'http://www.apache.org/licenses/LICENSE-2.0.txt').parent()
-                        .appendNode('distribution', 'repo')
-                    appendNode('scm')
-                        .appendNode('url', 'https://github.com/aalmiray/gipsy')
-                    Node developers = appendNode('developers')
-                    [
-                        aalmiray: 'Andres Almiray',
-                    ].each { devId, devName ->
-                        developers.appendNode('developer')
-                            .appendNode('id', devId).parent()
-                            .appendNode('name', devName).parent()
-                            .appendNode('roles')
-                            .appendNode('role', 'Developer')
-                    }
-                }
-            }
-
-            artifact sourceJar {
-                classifier "sources"
-            }
-        }
-    }
-}
-
 Date buildTimeAndDate = new Date()
 ext {
-    buildTime = new SimpleDateFormat('dd-MMM-yyyy').format(buildTimeAndDate)
-    buildDate = new SimpleDateFormat('hh:mm aa').format(buildTimeAndDate)
+    buildTime = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
+    buildDate = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
 }
 
+apply plugin: 'maven-publish'
+apply plugin: 'bintray'
+
 jar {
     manifest {
         attributes(
@@ -78,4 +40,66 @@ jar {
             'Implementation-Vendor': 'Kordamp'
         )
     }
+}
+
+def pomConfig = {
+    name project.name
+    description 'Groovy version of Jipsy, a configurable AST Transformation to simplify the use of the Service Provider Interface.'
+    url 'http://github.com/aalmiray/gipsy'
+    inceptionYear '2013'
+    licenses {
+        license([:]) {
+            name 'The Apache Software License, Version 2.0'
+            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+            distribution 'repo'
+        }
+    }
+    scm {
+        url 'https://github.com/aalmiray/gipsy'
+    }
+    developers {
+        [
+            aalmiray: 'Andres Almiray',
+        ].each { devId, devName ->
+            developer {
+                id devId
+                name devName
+                roles {
+                    role 'Developer'
+                }
+            }
+        }
+    }
+}
+
+publishing {
+    publications {
+        mavenCustom(MavenPublication) {
+            from components.java
+            artifact sourceJar
+
+            pom.withXml {
+                asNode().children().last() + pomConfig
+            }
+        }
+    }
+}
+
+task install(dependsOn: publishToMavenLocal)
+
+if (!project.hasProperty('bintrayUsername')) ext.bintrayUsername = ''
+if (!project.hasProperty('bintrayApiKey')) ext.bintrayApiKey = ''
+
+bintray {
+    user = project.bintrayUsername
+    key = project.bintrayApiKey
+    publications = ['mavenCustom']
+    pkg {
+        repo = 'kordamp'
+        userOrg = 'aalmiray'
+        name = 'gipsy'
+        desc = 'Groovy version of Jipsy, a configurable AST Transformation to simplify the use of the Service Provider Interface.'
+        licenses = ['Apache-2.0']
+        labels = ['groovy', 'jipsy', 'gipsy', 'annotation', 'processor']
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Dec 25 23:53:16 CET 2013
+#Fri Feb 28 15:36:50 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
diff --git a/src/main/java/org/kordamp/gipsy/transform/AbstractFilePersistence.java b/src/main/java/org/kordamp/gipsy/transform/AbstractFilePersistence.java
@@ -28,11 +28,31 @@
  * @author Andres Almiray
  */
 public abstract class AbstractFilePersistence extends AbstractPersistence {
+    private static final String DEFAULT_TARGET_DIR = "org.kordamp.gipsy.DEFAULT_TARGET_DIR";
+
     protected final File outputDir;
 
     public AbstractFilePersistence(File outputDir, String name, Logger logger, String path) {
         super(name, logger, path);
-        this.outputDir = outputDir;
+        if (outputDir == null) {
+            String defaultPath = System.getProperty(DEFAULT_TARGET_DIR);
+            if (defaultPath != null && defaultPath.trim().length() > 0) {
+                try {
+                    this.outputDir = new File(defaultPath);
+                    this.outputDir.mkdirs();
+                } catch (Exception e) {
+                    throw new IllegalArgumentException(e);
+                }
+            } else {
+                try {
+                    this.outputDir = File.createTempFile(new File(path).getName(), "");
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }
+        } else {
+            this.outputDir = outputDir;
+        }
     }
 
     @Override

diff --git a/src/main/java/org/kordamp/gipsy/transform/GipsyASTTransformation.java b/src/main/java/org/kordamp/gipsy/transform/GipsyASTTransformation.java
@@ -26,6 +26,7 @@
 import org.kordamp.jipsy.processor.ProcessorLogger;
 import org.kordamp.jipsy.processor.service.ServiceProviderProcessor;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -49,7 +50,18 @@ public void visit(ASTNode[] nodes, SourceUnit source) {
             return;
         }
 
+        String mainClassName = moduleNode.getMainClassName();
+        PackageNode modulePackage = moduleNode.getPackage();
+        List<AnnotationNode> packageAnnotations = modulePackage != null ? modulePackage.getAnnotations() : new ArrayList<AnnotationNode>();
+
         for (ClassNode classNode : moduleNode.getClasses()) {
+            if (classNode.isDerivedFrom(ClassHelper.SCRIPT_TYPE) &&
+                mainClassName.equals(classNode.getName()) &&
+                !packageAnnotations.isEmpty()) {
+                process(classNode, packageAnnotations, moduleNode);
+                continue;
+            }
+
             List<AnnotationNode> annotations = classNode.getAnnotations(getAnnotationClassNode());
             if (annotations.isEmpty()) {
                 continue;
@@ -83,7 +95,7 @@ protected final void process(ClassNode classNode, List<AnnotationNode> annotatio
     public static boolean hasNoArgsConstructor(ClassNode classNode) {
         for (ConstructorNode constructorNode : classNode.getDeclaredConstructors()) {
             Parameter[] parameters = constructorNode.getParameters();
-            if (parameters == null || parameters.length == 0) {
+            if (constructorNode.isPublic() && parameters == null || parameters.length == 0) {
                 return true;
             }
         }