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

[Harald Sitter]

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

The following commit has been merged in the master branch:
commit d09fd3bae8f7707d45e3fa22108c68fa7cce9086
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 12 10:52:14 2015 +0200

    put log linters on a shared linter base class
    
    the base encapsulates ignores provisioning (i.e. loading)
---
 lib/lint/linter.rb           | 19 +++++++++++++++++++
 lib/lint/log/cmake.rb        |  4 ++--
 lib/lint/log/lintian.rb      |  4 ++--
 lib/lint/log/list_missing.rb |  4 ++--
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/lib/lint/linter.rb b/lib/lint/linter.rb
new file mode 100644
index 0000000..33dcfef
--- /dev/null
+++ b/lib/lint/linter.rb
@@ -0,0 +1,19 @@
+require_relative '../ci/pattern'
+require_relative 'result'
+
+module Lint
+  class Linter
+    attr_accessor :ignores
+
+    def initialize
+      @ignores = []
+    end
+
+    def load_include_ignores(file_path)
+      File.read(file_path).strip.split($/).each do |line|
+        next if line.strip.start_with?('#') || line.empty?
+        @ignores << CI::IncludePattern.new(line)
+      end
+    end
+  end
+end
diff --git a/lib/lint/log/cmake.rb b/lib/lint/log/cmake.rb
index c3d5927..93e8861 100644
--- a/lib/lint/log/cmake.rb
+++ b/lib/lint/log/cmake.rb
@@ -1,4 +1,4 @@
-require_relative '../result'
+require_relative '../linter'
 require_relative 'build_log_segmenter'
 
 module Lint
@@ -7,7 +7,7 @@ module Lint
     # FIXME: presently we simply result with names, this however lacks context
     #        in the log then, so the output should be changed to a descriptive
     #        line
-    class CMake
+    class CMake < Linter
       include BuildLogSegmenter
 
       METHS = {
diff --git a/lib/lint/log/lintian.rb b/lib/lint/log/lintian.rb
index 947001c..8934632 100644
--- a/lib/lint/log/lintian.rb
+++ b/lib/lint/log/lintian.rb
@@ -1,9 +1,9 @@
-require_relative '../result'
+require_relative '../linter'
 require_relative 'build_log_segmenter'
 
 module Lint
   class Log
-    class Lintian
+    class Lintian < Linter
       include BuildLogSegmenter
 
       EXCLUSION = [
diff --git a/lib/lint/log/list_missing.rb b/lib/lint/log/list_missing.rb
index fd7fa28..1ff65a1 100644
--- a/lib/lint/log/list_missing.rb
+++ b/lib/lint/log/list_missing.rb
@@ -1,9 +1,9 @@
-require_relative '../result'
+require_relative '../linter'
 require_relative 'build_log_segmenter'
 
 module Lint
   class Log
-    class ListMissing
+    class ListMissing < Linter
       include BuildLogSegmenter
 
       def lint(data)

-- 
ci-tooling packaging