[SCM] ci-tooling packaging branch, master, updated. 92d3a9863a0f8f90478a861d0dd87021e1a7e327

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit 92d3a9863a0f8f90478a861d0dd87021e1a7e327
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 27 10:57:25 2014 +0100

    move projects list to config
---
 data/projects.json | 15 +++++++++++++++
 lib/projects.rb    | 37 +++++++++++--------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/projects.json b/data/projects.json
new file mode 100644
index 0000000..e4fb8ba
--- /dev/null
+++ b/data/projects.json
@@ -0,0 +1,15 @@
+{
+    "all_repos" : [ "frameworks", "plasma"],
+    "selective_repos" : {
+        "kde-applications" : [
+            "gwenview",
+            "kapptemplate",
+            "kate",
+            "libkeduvocdocument"
+        ],
+        "kde-sc" : [ "konsole" ],
+        "kde-std" : [ "sddm" ],
+        "kde-extras" : [ "qtcurve" ],
+        "kde-req" : [ "qca2" ]
+    }
+}
diff --git a/lib/projects.rb b/lib/projects.rb
index 8756c4b..1d07770 100644
--- a/lib/projects.rb
+++ b/lib/projects.rb
@@ -13,7 +13,7 @@ class Project
     attr_reader :dependees
 
     attr_reader :series_branches
-    
+
     def initialize(name, component)
         @name = name
         @component = component
@@ -41,9 +41,9 @@ class Project
                 while true and (i+=1) < 5
                     break if system("git pull")
                 end
-                
+
                 next unless File.exist?('debian/control')
-                
+
                 c = DebianControl.new
                 c.parse!
                 c.source['build-depends'].each do |dep|
@@ -75,39 +75,24 @@ class Projects < Array
     def initialize()
         super
 
-        components = [ 'frameworks', 'plasma' ]
-        components.each do |component|
+        config_file_path = File.expand_path(File.dirname(File.dirname(__FILE__))) + '/data/projects.json'
+        config = JSON::parse(File.read(config_file_path))
+
+        # Get all repos inside a component.
+        config['all_repos'].each do |component|
             repos = %x[ssh git.debian.org ls /git/pkg-kde/#{component}].chop!.gsub!('.git', '').split(' ')
             repos.each do |name|
                 self << Project.new(name, component)
             end
         end
 
-        selective_repos = {
-            'kde-applications' => [
-                'gwenview',
-                'kapptemplate',
-                'kalgebra',
-                'kate',
-                'khangman',
-                'libkeduvocdocument'
-            ],
-            'kde-sc' => [
-                         'konsole'
-        #                  'okteta',
-        #                  'parley'
-                        ],
-            # yes, debian gives us stds...
-            'kde-std' => [ 'sddm' ],
-            'kde-extras' => [ 'qtcurve' ],
-            'kde-req' => [ 'qca2' ]
-        }
-        selective_repos.each do |component, repos|
+        # Get selective component/repo combinations.
+        config['selective_repos'].each do |component, repos|
             repos.each do |name|
                 self << Project.new(name, component)
             end
         end
-        
+
         # Build a hash for quick lookup of which source provides which binary.
         provided_by = {}
         self.each do |project|

-- 
ci-tooling packaging