address #18 by injecting a Directive.or metaclass method

TrigonicSolutions · Jan 30, 2013 · c413a25 · c413a25
1 parent aa29b3d
commit c413a25
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+v1.4 -
+=================
+  * issue #18: add syntactic sugar to easily combine file type
+    directives with a logical or (|)
+
 v1.3 - 2013-01-08
 =================
   * bugfix: RPM_ARCH and RPM_OS were being added to the scripts in

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ derived from RedHat.  It leverages [Redline](http://redline-rpm.org/) Java libra
             fileMode = 0550
         }
         from('src/main/resources') {
-            fileType = CONFIG
+            fileType = CONFIG | NOREPLACE
             into 'conf'
         }
         from('home') {

diff --git a/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmPlugin.groovy b/src/main/groovy/com/trigonic/gradle/plugins/rpm/RpmPlugin.groovy
@@ -19,7 +19,8 @@ package com.trigonic.gradle.plugins.rpm
 import java.lang.reflect.Field
 
 import org.freecompany.redline.Builder
-import org.gradle.api.Plugin;
+import org.freecompany.redline.payload.Directive
+import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.internal.file.copy.CopySpecImpl
 import org.gradle.api.plugins.BasePlugin
@@ -43,5 +44,9 @@ class RpmPlugin implements Plugin<Project> {
         Builder.metaClass.getDefaultSourcePackage() {
             format.getLead().getName() + "-src.rpm"
         }
+
+        Directive.metaClass.or = { Directive other ->
+            new Directive(delegate.flag | other.flag)
+        }
     }
 }
diff --git a/src/test/groovy/com/trigonic/gradle/plugins/rpm/RpmPluginTest.groovy b/src/test/groovy/com/trigonic/gradle/plugins/rpm/RpmPluginTest.groovy
@@ -71,7 +71,7 @@ class RpmPluginTest {
 
             from(srcDir.toString() + '/main/groovy') {
                 createDirectoryEntry = true
-                fileType = CONFIG
+                fileType = CONFIG | NOREPLACE
             }
 
             from(noParentsDir) {