[SCM] ci-tooling packaging branch, master, updated. 140faea23dfb80980fb6187cad3820833debca1f

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=909a98b

The following commit has been merged in the master branch:
commit 909a98b143478f44b80143b068bf191b00b805a7
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jan 15 11:11:32 2016 +0100

    fix test and document this crap pile
    
          # In custom_ci:
          #  - type [String](optional) a unique identifier naming a special handling
          #      type which will run before general handling and can attempt to
          #      produce a repos array to construct. If it fails to do so general
          #      handling kicks in.
          #  - git_host [String](optional) a URL base for the repos
          #      (e.g. git://localhost/)
          #  - org [String](optional) the component to look for repos under.
          #      Unless special type handling is used org is equal to a
          #      #{Project.component}, it will be used in urls base/comp/name and
          #      usually act as grouping identifier for projects.
          #      Must not contain slashes!
          #  - repos [Array<String>] an array of repo names to create Project
          #      instances for. These repos will be looked for in a directory 'org'
          #      and cached in a directory 'org'. The Strings are roughly equal to
          #      #{Project.name}.
          #      Special array constructs are possible but dependent on special
          #      handling types.
          #      Must not contain slashes!
---
 data/projects_nci.json                              |  5 ++---
 lib/projects.rb                                     | 21 +++++++++++++++++++++
 .../data/test_projects/test_custom_ci/projects.json |  3 ++-
 test/test_projects.rb                               |  4 ++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/data/projects_nci.json b/data/projects_nci.json
index 7dbba42..1a598ae 100644
--- a/data/projects_nci.json
+++ b/data/projects_nci.json
@@ -9,11 +9,10 @@
 
   "custom_ci" : [
     {
-      "type" : "neon",
-      "org"  : "",
       "git_host":  "git://packaging.neon.kde.org.uk",
+      "org"  : "neon",
       "repos" : [
-        "neon/seeds"
+        "seeds"
       ]
     }
   ],
diff --git a/lib/projects.rb b/lib/projects.rb
index ef440cd..faa4791 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -244,6 +244,27 @@ class ProjectFactory
         end
       end
     when 'custom_ci'
+      # I do so hate my life.
+      # In custom_ci:
+      #  - type [String](optional) a unique identifier naming a special handling
+      #      type which will run before general handling and can attempt to
+      #      produce a repos array to construct. If it fails to do so general
+      #      handling kicks in.
+      #  - git_host [String](optional) a URL base for the repos
+      #      (e.g. git://localhost/)
+      #  - org [String](optional) the component to look for repos under.
+      #      Unless special type handling is used org is equal to a
+      #      #{Project.component}, it will be used in urls base/comp/name and
+      #      usually act as grouping identifier for projects.
+      #      Must not contain slashes!
+      #  - repos [Array<String>] an array of repo names to create Project
+      #      instances for. These repos will be looked for in a directory 'org'
+      #      and cached in a directory 'org'. The Strings are roughly equal to
+      #      #{Project.name}.
+      #      Special array constructs are possible but dependent on special
+      #      handling types.
+      #      Must not contain slashes!
+
       value.each do |custom_ci|
         repos = []
         # Special type handling.
diff --git a/test/data/test_projects/test_custom_ci/projects.json b/test/data/test_projects/test_custom_ci/projects.json
index f490b1d..3a7d92c 100644
--- a/test/data/test_projects/test_custom_ci/projects.json
+++ b/test/data/test_projects/test_custom_ci/projects.json
@@ -9,9 +9,10 @@
         },
         {
           "type" : "neon",
+          "org"  : "neon",
           "git_host":  "git://packaging.neon.kde.org.uk",
           "repos" : [
-            "neon/seeds"
+            "seeds"
           ]
         }
     ]
diff --git a/test/test_projects.rb b/test/test_projects.rb
index a705160..58f85b5 100644
--- a/test/test_projects.rb
+++ b/test/test_projects.rb
@@ -213,8 +213,8 @@ class ProjectTest < TestCase
     assert_equal('git://anongit.kde.org/scratch/davidedmundson/simplelogin.git', pro.upstream_scm.url)
 
     pro = projects[1]
-    assert_equal('neon/seeds', pro.name)
-    assert_equal('', pro.component)
+    assert_equal('seeds', pro.name)
+    assert_equal('neon', pro.component)
     assert_equal('git', pro.packaging_scm.type)
     assert_equal('git://packaging.neon.kde.org.uk/neon/seeds', pro.packaging_scm.url)
     assert_equal('kubuntu_unstable', pro.packaging_scm.branch)

-- 
ci-tooling packaging