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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit fb471e7f2b507bf337edd16e7c8ea3a019bc5dde
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 12 12:18:48 2015 +0200

    expand qml ignore rule test case
    
    - everything after # is a comment both at the beginning or inline
    - lines that do not have 1-2 space separated parts are not qualifying and
      we can't parse them
---
 lib/qml/ignore_rule.rb                   | 8 +++++---
 test/data/test_qml_ignore_rule/test_read | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/qml/ignore_rule.rb b/lib/qml/ignore_rule.rb
index 6595baf..d96e9a1 100644
--- a/lib/qml/ignore_rule.rb
+++ b/lib/qml/ignore_rule.rb
@@ -20,9 +20,11 @@ module QML
     def self.read(path)
       rules = File.read(path).split($/)
       rules.collect! do |line|
-        # FIXME: needs test baking
-        next if line.start_with?('#')
-        new(*line.split(/\s+/))
+        line = line.split('#')[0]
+        next if line.nil? || line.empty?
+        parts = line.split(/\s+/)
+        next unless parts.size.between?(1, 2)
+        new(*parts)
       end
       rules.compact
     end
diff --git a/test/data/test_qml_ignore_rule/test_read b/test/data/test_qml_ignore_rule/test_read
index 7145e20..c7339ce 100644
--- a/test/data/test_qml_ignore_rule/test_read
+++ b/test/data/test_qml_ignore_rule/test_read
@@ -1,4 +1,6 @@
 org.kde.kwin 1.0
 org.kde.plasma                                              
 org.kde.plasma.abc           2.0
-org.kde.plasma.*	1.0
+org.kde.plasma.*	1.0  # inline comment
+
+# comment

-- 
ci-tooling packaging