From 0ddc738c6cb669655c6fbe71bcf3a94e04a0ceb3 Mon Sep 17 00:00:00 2001
From: elnebuloso <jan.thoennessen@googlemail.com>
Date: Thu, 13 Nov 2014 01:58:47 +0100
Subject: [PATCH] chain project.jenkins.init

---
 .gitignore                                    |  1 +
 CHANGELOG.md                                  |  7 ++-
 VERSION                                       |  2 +-
 build.properties                              |  8 +---
 commons/chains/php-composer-package.xml       |  1 +
 commons/chains/php.xml                        |  1 +
 commons/commons.xml                           |  2 +-
 commons/targets/project.xml                   |  2 +
 commons/targets/project/jenkins/init.xml      | 37 ++++++++++++++++
 commons/targets/project/version/update.xml    |  2 -
 .../Update.php => Project/Jenkins/Init.php}   | 44 +++++++++----------
 11 files changed, 70 insertions(+), 37 deletions(-)
 create mode 100644 commons/targets/project/jenkins/init.xml
 rename src/Commons/Phing/Task/{Version/Update.php => Project/Jenkins/Init.php} (55%)

diff --git a/.gitignore b/.gitignore
index 2d76cfa..c7369fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@
 /bin
 /build
 /vendor
+build.properties.jenkins
 build.properties.local
 composer.lock
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 003498a..746bf86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # CHANGELOG
 
-## 6.7.1
+## 6.8.0
 
-- testing jenkins github publisher
+- new target: project.jenkins.init
+- project.jenkins.init writes jenkins build.properties
+- project.jenkins.init added in chain php on build:before
+- project.jenkins.init added in chain php-composer-package on build:before
 
 ## 6.7.0
 
diff --git a/VERSION b/VERSION
index 61af239..e029aa9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.7.19
+6.8.0
diff --git a/build.properties b/build.properties
index 48cc125..f6ac7b9 100644
--- a/build.properties
+++ b/build.properties
@@ -1,9 +1,3 @@
 project.vendor = elnebuloso
 project.name = phing-commons
-project.chains = php
-
-;JENKINS ENVIRONMENT VARIABLES
-PBC_PROJECT_VERSION = 6.7.19
-
-[JENKINS]
-PBC_PROJECT_VERSION_JENKINS = 6.7.19
+project.chains = php
\ No newline at end of file
diff --git a/commons/chains/php-composer-package.xml b/commons/chains/php-composer-package.xml
index 369c5d8..c2665b0 100644
--- a/commons/chains/php-composer-package.xml
+++ b/commons/chains/php-composer-package.xml
@@ -7,6 +7,7 @@
 
     <target name="init:main" hidden="true" depends="composer.validate, composer.update" />
     <target name="test:main" hidden="true" depends="test.phplint, test.phpunit" />
+    <target name="build:before" hidden="true" depends="project.jenkins.init" />
     <target name="build:after" hidden="true" depends="report" />
 
 </project>
\ No newline at end of file
diff --git a/commons/chains/php.xml b/commons/chains/php.xml
index 4e1927a..4858099 100644
--- a/commons/chains/php.xml
+++ b/commons/chains/php.xml
@@ -6,6 +6,7 @@
     <echo message="loading chain: php" />
 
     <target name="test:main" hidden="true" depends="test.phplint, test.phpunit" />
+    <target name="build:before" hidden="true" depends="project.jenkins.init" />
     <target name="build:after" hidden="true" depends="report" />
 
 </project>
\ No newline at end of file
diff --git a/commons/commons.xml b/commons/commons.xml
index 194ee46..57c39d9 100644
--- a/commons/commons.xml
+++ b/commons/commons.xml
@@ -55,7 +55,7 @@
     <!-- ============================================ -->
     <!-- commons tasks                                -->
     <!-- ============================================ -->
-    <taskdef classname="Commons_Phing_Task_Version_Update" name="commons-project-version-update" />
+    <taskdef classname="Commons_Phing_Task_Project_Jenkins_Init" name="commons-project-jenkins-init" />
     <taskdef classname="Commons_Phing_Task_System_ImportChains" name="commons-system-import-chains" />
 
 
diff --git a/commons/targets/project.xml b/commons/targets/project.xml
index e4a64e0..c85162b 100644
--- a/commons/targets/project.xml
+++ b/commons/targets/project.xml
@@ -4,12 +4,14 @@
 <project default="project:help">
 
 
+    <import file="${phing:commons:commons}/targets/project/jenkins/init.xml" />
     <import file="${phing:commons:commons}/targets/project/version/update.xml" />
 
 
     <target name="project:help" depends="project.version.update:help">
         <echo message="TARGET                                            DESCRIPTION" />
         <echo message="----------------------------------------------------------------------------------------------------" />
+        <echo message="project.jenkins.init                              Init Jenkins, write Jenkins Properties File" />
         <echo message="project.version.update                            Updates Files Project Files with new Version" />
     </target>
 
diff --git a/commons/targets/project/jenkins/init.xml b/commons/targets/project/jenkins/init.xml
new file mode 100644
index 0000000..2f33444
--- /dev/null
+++ b/commons/targets/project/jenkins/init.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<project default="project.jenkins.init">
+
+
+    <target name="project.jenkins.init:init" hidden="true">
+        <echo message="no actions defined" level="debug" />
+    </target>
+
+
+    <target name="project.jenkins.init:before" hidden="true">
+        <echo message="no actions defined" level="debug" />
+    </target>
+
+
+    <target name="project.jenkins.init:main" hidden="true">
+        <commons-project-jenkins-init version="${project.version}" propertiesFile="${project.root}/build.properties" />
+    </target>
+
+
+    <target name="project.jenkins.init:after" hidden="true">
+        <echo message="no actions defined" level="debug" />
+    </target>
+
+
+    <target name="project.jenkins.init" depends="project.jenkins.init:init, project.jenkins.init:before, project.jenkins.init:main, project.jenkins.init:after">
+        <echo message="successful" />
+    </target>
+
+
+    <target name="project.jenkins.init:help" depends="project.jenkins.init:init">
+        <echo message="no help defined" />
+    </target>
+
+
+</project>
\ No newline at end of file
diff --git a/commons/targets/project/version/update.xml b/commons/targets/project/version/update.xml
index 9a40e37..f0dcd57 100644
--- a/commons/targets/project/version/update.xml
+++ b/commons/targets/project/version/update.xml
@@ -22,8 +22,6 @@
 
         <echo message="" />
         <echo message="version: ${project.version}" />
-
-        <commons-project-version-update version="${project.version}" propertiesFile="${project.root}/build.properties" />
     </target>
 
 
diff --git a/src/Commons/Phing/Task/Version/Update.php b/src/Commons/Phing/Task/Project/Jenkins/Init.php
similarity index 55%
rename from src/Commons/Phing/Task/Version/Update.php
rename to src/Commons/Phing/Task/Project/Jenkins/Init.php
index b193916..f643310 100644
--- a/src/Commons/Phing/Task/Version/Update.php
+++ b/src/Commons/Phing/Task/Project/Jenkins/Init.php
@@ -4,7 +4,7 @@
  *
  * @author Jeff Tunessen <jeff.tunessen@gmail.com>
  */
-class Commons_Phing_Task_Version_Update extends Task {
+class Commons_Phing_Task_Project_Jenkins_Init extends Task {
 
     /**
      * @var string
@@ -16,6 +16,11 @@ class Commons_Phing_Task_Version_Update extends Task {
      */
     private $propertiesFile;
 
+    /**
+     * @var array
+     */
+    private $properties;
+
     /**
      * @param string $version
      * @throws \BuildException
@@ -43,32 +48,20 @@ public function setPropertiesFile($propertiesFile) {
      * @return void
      */
     public function main() {
-        $properties = parse_ini_file($this->propertiesFile);
+        $this->properties = parse_ini_file($this->propertiesFile);
 
-        if($properties === false) {
+        if($this->properties === false) {
             throw new \BuildException('unable to parse properties file');
         }
 
-        // remove properties that were updated
-        $this->unsetProperty($properties, 'project.version');
-        $this->unsetProperty($properties, 'PBC_PROJECT_VERSION');
-
-        $fp = fopen($this->propertiesFile, "r+");
+        $fp = fopen(dirname($this->propertiesFile) . '/build.properties.jenkins', "w+");
 
         if(flock($fp, LOCK_EX)) {
             ftruncate($fp, 0); // write new file content
 
-            foreach($properties as $key => $value) {
-                fwrite($fp, $this->getIniSetting($key, $value));
-            }
-
-            fwrite($fp, PHP_EOL);
-            fwrite($fp, ';JENKINS ENVIRONMENT VARIABLES' . PHP_EOL);
-            fwrite($fp, $this->getIniSetting('PBC_PROJECT_VERSION', $this->version));
-
-            fwrite($fp, PHP_EOL);
-            fwrite($fp, '[JENKINS]' . PHP_EOL);
-            fwrite($fp, $this->getIniSetting('PBC_PROJECT_VERSION_JENKINS', $this->version));
+            $this->writeIniSetting($fp, 'PBC_PROJECT_VERSION_JENKINS', $this->version);
+            $this->writeIniSettingFromBuildProperty($fp, 'project.vendor');
+            $this->writeIniSettingFromBuildProperty($fp, 'project.name');
 
             flock($fp, LOCK_UN); // release lock
         }
@@ -80,19 +73,22 @@ public function main() {
     }
 
     /**
+     * @param resource $fp
      * @param string $key
      * @param string $value
      * @return string
      */
-    private function getIniSetting($key, $value) {
-        return "$key = $value" . PHP_EOL;
+    private function writeIniSetting($fp, $key, $value) {
+        fwrite($fp, "$key = $value" . PHP_EOL);
     }
 
     /**
-     * @param array $properties
+     * @param resource $fp
      * @param string $key
      */
-    private function unsetProperty(array &$properties, $key) {
-        unset($properties[$key]);
+    private function writeIniSettingFromBuildProperty($fp, $key) {
+        if(array_key_exists($key, $this->properties)) {
+            $this->writeIniSetting($fp, 'PBC_' . strtoupper(str_replace('.', '_', $key)), $this->properties[$key]);
+        }
     }
 }
\ No newline at end of file