pdd 0.20.7 → 0.21.1

data/features/parsing.feature

@@ -25,6 +25,32 @@ Feature: Parsing
     And XML matches "//puzzle[role='DEV']"
     And XML matches "//puzzle[estimate='0']"
 
+  Scenario: Simple puzzle within comment block
+    Given I have a "test/a/b/Sample.java" file with content:
+    """
+    public class Main {
+      /**
+       * Some other documentation
+       * text that is not relevant to
+       * the puzzle below.
+       * @todo #13 This puzzle has a correct format
+       * It doesn't start with a space on
+       * the second and the third lines
+       */
+      public void main(String[] args) {
+        // later
+      }
+    }
+    """
+    When I run pdd
+    Then XML matches "/puzzles[count(puzzle)=1]"
+    And XML matches "//puzzle[file='test/a/b/Sample.java']"
+    And XML matches "//puzzle[ticket='13']"
+    And XML matches "//puzzle[lines='6-8']"
+    And XML matches "//puzzle[starts-with(body,'This')]"
+    And XML matches "//puzzle[role='DEV']"
+    And XML matches "//puzzle[estimate='0']"
+
   Scenario: Multiple puzzles in one file
     Given I have a "test/a/b/c/Sample.java" file with content:
     """
@@ -34,6 +60,9 @@ Feature: Parsing
        * @todo #ABC-67:15min And this one ever later
        * @todo #F-78-3:2h/DEV This is for a developer
        *  who will join us later
+       * @todo #44 This puzzle has a correct format
+       * even though it doesn't start with a space on
+       * the second and the third lines
        */
       public void main(String[] args) {
         // later
@@ -41,10 +70,11 @@ Feature: Parsing
     }
     """
     When I run pdd
-    Then XML matches "/puzzles[count(puzzle)=3]"
+    Then XML matches "/puzzles[count(puzzle)=4]"
     And XML matches "//puzzle[ticket='13' and lines='3-3']"
     And XML matches "//puzzle[ticket='13' and body='This one later']"
     And XML matches "//puzzle[ticket='ABC-67' and lines='4-4']"
     And XML matches "//puzzle[ticket='F-78-3' and lines='5-6']"
     And XML matches "//puzzle[ticket='ABC-67' and estimate='15']"
     And XML matches "//puzzle[ticket='F-78-3' and estimate='120']"
+    And XML matches "//puzzle[ticket='44' and lines='7-9']"

data/features/rake.feature

@@ -1,19 +1,21 @@
 Feature: Rake Task
-  Scenario: For now we failed if run rake task
+  As a source code writer I want to be able to
+  run PDD from Rakefile
+  Scenario: PDD can be used in Rakefile
     Given It is Unix
-    And a file named "Rakefile" with:
+    And I have a "Rakefile" file with content:
     """
     require 'pdd/rake_task'
-    PDD::RakeTask.new
+    PDD::RakeTask.new(:pdd) do |task|
+      task.includes = ['a.txt']
+    end
     """
-    When I run the following commands with `bash`:
-    """bash
-    rake pdd
+    And I have a "a.txt" file with content:
     """
-    Then the exit status should be 1
-    And the stderr should contain:
+    \x40todo #55 hello!
     """
-    NOT IMPLEMENTED
-    """
-    When I remove a file named "Rakefile" with full force
-    Then a file named "Rakefile" does not exist
+
+    When I run bash with "rake pdd"
+    Then Exit code is zero
+
+

data/features/step_definitions/steps.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -64,9 +64,9 @@ When(/^I run pdd it fails with "([^"]*)"$/) do |txt|
   begin
     PDD::Base.new(@opts).xml
     passed = true
-  rescue PDD::Error => ex
-    unless ex.message.include?(txt)
-      raise "PDD failed but exception doesn't contain \"#{txt}\": #{ex.message}"
+  rescue PDD::Error => e
+    unless e.message.include?(txt)
+      raise "PDD failed but exception doesn't contain \"#{txt}\": #{e.message}"
     end
   end
   raise "PDD didn't fail" if passed
@@ -79,9 +79,7 @@ When(%r{^I run bin/pdd with "([^"]*)"$}) do |arg|
 end
 
 Then(/^Stdout contains "([^"]*)"$/) do |txt|
-  unless @stdout.include?(txt)
-    raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}"
-  end
+  raise "STDOUT doesn't contain '#{txt}':\n#{@stdout}" unless @stdout.include?(txt)
 end
 
 Then(/^Stdout is empty$/) do
@@ -90,11 +88,10 @@ end
 
 Then(/^XML file "([^"]+)" matches "([^"]+)"$/) do |file, xpath|
   raise "File #{file} doesn't exit" unless File.exist?(file)
+
   xml = Nokogiri::XML.parse(File.read(file))
   xml.remove_namespaces!
-  if xml.xpath(xpath).empty?
-    raise "XML file #{file} doesn't match \"#{xpath}\":\n#{xml}"
-  end
+  raise "XML file #{file} doesn't match \"#{xpath}\":\n#{xml}" if xml.xpath(xpath).empty?
 end
 
 Then(/^Exit code is zero$/) do

data/features/support/env.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/features/uses_config.feature

@@ -16,6 +16,6 @@ Feature: Using .pdd config file
     """
     When I run bin/pdd with ""
     Then Exit code is zero
-    And Stdout contains "Reading ."
+    And Stdout contains "Reading from root dir ."
     And XML file "out.xml" matches "/puzzles[count(puzzle)=1]"
 

data/lib/pdd/puzzle.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/lib/pdd/rake_task.rb

@@ -1,30 +1,29 @@
 require 'rake'
 require 'rake/tasklib'
+require 'minitest/autorun'
+require 'nokogiri'
+require 'tmpdir'
+require 'slop'
+require 'pdd'
 
 # PDD Rake task
 module PDD
   # Rake task
   class RakeTask < Rake::TaskLib
-    attr_accessor :name
+    attr_accessor :name, :fail_on_error, :includes, :license, :quiet
+
     def initialize(*args, &task_block)
-      # @todo #125:30m Needs to have more parameters to run this task.
-      #  For now, we just have a single parameter - the name.
-      #  Needs more parameters like the xcop rake task has.
       @name = args.shift || :pdd
+      @includes = []
+      @excludes = []
+      @license = nil
+      @quiet = false
       desc 'Run PDD' unless ::Rake.application.last_description
       task(name, *args) do |_, task_args|
         RakeFileUtils.send(:verbose, true) do
           yield(*[self, task_args].slice(0, task_block.arity)) if block_given?
-          run
         end
       end
     end
-
-    def run
-      # @todo #125:30m need to implement this method.
-      #  For now, it's just a task,
-      #  that accepts one parameter and throws a system error.
-      abort('NOT IMPLEMENTED')
-    end
   end
 end

data/lib/pdd/rule/duplicates.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -35,6 +35,7 @@ module PDD
           .group_by { |p| p.xpath('body/text()').to_s }
           .map do |_, puzzles|
             next nil if puzzles.count <= @max
+
             "there are #{puzzles.count} duplicate(s) of the same puzzle: " +
               puzzles.map do |p|
                 "#{p.xpath('file/text()')}:#{p.xpath('lines/text()')}"

data/lib/pdd/rule/estimates.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/lib/pdd/rule/roles.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -34,6 +34,7 @@ module PDD
           @xml.xpath('//puzzle').map do |p|
             role = p.xpath('role/text()').to_s
             next nil if @roles.include?(role)
+
             "puzzle #{p.xpath('file/text()')}:#{p.xpath('lines/text()')}" +
               if role.empty?
                 " doesn't define any role"\

data/lib/pdd/rule/text.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -34,6 +34,7 @@ module PDD
           @xml.xpath('//puzzle').map do |p|
             words = p.xpath('body/text()').to_s.split.size
             next nil if words >= @min
+
             "Puzzle #{p.xpath('file/text()')}:#{p.xpath('lines/text()')}"\
             " has a very short description of just #{words} words while"\
             " a minimum of #{@min} is required"

data/lib/pdd/source.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -37,10 +37,31 @@ module PDD
       @path = path
     end
 
-    def match_markers(line)
-      MARKERS.map do |mkr|
-        %r{(.*(?:^|\s))#{mkr}\s+#([\w\-\.:/]+)\s+(.+)}.match(line)
-      end.compact
+    def match_markers(l)
+      if l.downcase.include? 'todo'
+        /[^\s]\x40todo/.match(l) do |_|
+          raise Error, get_no_leading_space_error("\x40todo")
+        end
+        /\x40todo(?!\s+#)/.match(l) do |_|
+          raise Error, get_no_puzzle_marker_error("\x40todo")
+        end
+        /\x40todo\s+#\s/.match(l) do |_|
+          raise Error, get_space_after_hash_error("\x40todo")
+        end
+        /[^\s]TODO:?/.match(l) do |_|
+          raise Error, get_no_leading_space_error('TODO')
+        end
+        /TODO(?!:?\s+#)/.match(l) do |_|
+          raise Error, get_no_puzzle_marker_error('TODO')
+        end
+        /TODO:?\s+#\s/.match(l) do |_|
+          raise Error, get_space_after_hash_error('TODO')
+        end
+        a = [%r{(.*(?:^|\s))(?:\x40todo|TODO:|TODO)\s+#([\w\-.:/]+)\s+(.+)}.match(l)]
+        a.compact
+      else
+        []
+      end
     end
 
     # Fetch all puzzles.
@@ -50,7 +71,6 @@ module PDD
       lines = File.readlines(@file, encoding: 'UTF-8')
       lines.each_with_index do |line, idx|
         begin
-          check_rules(line)
           match_markers(line).each do |m|
             puzzles << puzzle(lines.drop(idx + 1), m, idx)
           end
@@ -82,31 +102,11 @@ after the hash sign, it should not be there, \
 see https://github.com/cqfn/pdd#how-to-format"
     end
 
-    def check_rules(line)
-      /[^\s]\x40todo/.match(line) do |_|
-        raise Error, get_no_leading_space_error("\x40todo")
-      end
-      /\x40todo(?!\s+#)/.match(line) do |_|
-        raise Error, get_no_puzzle_marker_error("\x40todo")
-      end
-      /\x40todo\s+#\s/.match(line) do |_|
-        raise Error, get_space_after_hash_error("\x40todo")
-      end
-      /[^\s]TODO:?/.match(line) do |_|
-        raise Error, get_no_leading_space_error('TODO')
-      end
-      /TODO(?!:?\s+#)/.match(line) do |_|
-        raise Error, get_no_puzzle_marker_error('TODO')
-      end
-      /TODO:?\s+#\s/.match(line) do |_|
-        raise Error, get_space_after_hash_error('TODO')
-      end
-    end
-
     # Fetch puzzle
     def puzzle(lines, match, idx)
-      tail = tail(lines, match[1], idx)
-      body = (match[3] + ' ' + tail.join(' ')).gsub(/\s+/, ' ').strip
+      col_idx = match[0].length - match[0].lstrip.length
+      tail = tail(lines, match[1], col_idx)
+      body = "#{match[3]} #{tail.join(' ')}".gsub(/\s+/, ' ').strip
       body = body.chomp('*/-->').strip
       marker = marker(match[2])
       Puzzle.new(
@@ -121,7 +121,7 @@ see https://github.com/cqfn/pdd#how-to-format"
 
     # Parse a marker.
     def marker(text)
-      re = %r{([\w\-\.]+)(?::(\d+)(?:(m|h)[a-z]*)?)?(?:/([A-Z]+))?}
+      re = %r{([\w\-.]+)(?::(\d+)(?:(m|h)[a-z]*)?)?(?:/([A-Z]+))?}
       match = re.match(text)
       if match.nil?
         raise "Invalid puzzle marker \"#{text}\", most probably formatted \
@@ -143,16 +143,17 @@ against the rules explained here: https://github.com/cqfn/pdd#how-to-format"
 
     # Fetch puzzle tail (all lines after the first one)
     def tail(lines, prefix, start)
+      prefix = prefix.rstrip
+      prefix = " #{' ' * start}" if prefix.empty? # fallback to space indentation
       lines
         .take_while { |t| match_markers(t).none? && t.start_with?(prefix) }
-        .map { |t| t[prefix.length, t.length] }
-        .take_while { |t| t =~ /^[ a-zA-Z0-9]/ }
-        .each_with_index do |t, i|
-          next if t.start_with?(' ')
-          raise Error, "Space expected at #{start + i + 2}:#{prefix.length}; \
-make sure all lines in the puzzle body have a single leading space."
+        .take_while do |t|
+          # account for carriage return in line endings
+          t_len = t.length - 1
+          t_len <= prefix.length || t_len > prefix.length + 2
         end
-        .map { |t| t[1, t.length] }
+        .map { |t| t[prefix.length, t.length] }
+        .map { |t| t.start_with?(' ') ? t[1, t.length] : t }
     end
 
     # @todo #75:30min Let's make it possible to fetch Subversion data
@@ -167,21 +168,22 @@ make sure all lines in the puzzle body have a single leading space."
       if `#{git} rev-parse --is-inside-work-tree 2>/dev/null`.strip == 'true'
         cmd = "#{git} blame -L #{pos},#{pos} --porcelain #{name}"
         add_github_login(Hash[
-          `#{cmd}`.split("\n").map do |line|
-            if line =~ /^author /
-              [:author, line.sub(/^author /, '')]
-            elsif line =~ /^author-mail [^@]+@[^\.]+\..+/
-              [:email, line.sub(/^author-mail <(.+)>$/, '\1')]
-            elsif line =~ /^author-time /
-              [
-                :time,
-                Time.at(
-                  line.sub(/^author-time ([0-9]+)$/, '\1').to_i
-                ).utc.iso8601
-              ]
-            end
-          end.compact
-        ])
+                           `#{cmd}`.split("\n").map do |line|
+                             case line
+                             when /^author /
+                               [:author, line.sub(/^author /, '')]
+                             when /^author-mail [^@]+@[^.]+\..+/
+                               [:email, line.sub(/^author-mail <(.+)>$/, '\1')]
+                             when /^author-time /
+                               [
+                                 :time,
+                                 Time.at(
+                                   line.sub(/^author-time ([0-9]+)$/, '\1').to_i
+                                 ).utc.iso8601
+                               ]
+                             end
+                           end.compact
+                         ])
       else
         {}
       end
@@ -207,12 +209,14 @@ make sure all lines in the puzzle body have a single leading space."
       email, author = info.values_at(:email, :author)
       # if email is not defined, changes have not been committed
       return if email.nil?
+
       base_uri = 'https://api.github.com/search/users?per_page=1'
       query = base_uri + "&q=#{email}+in:email"
       json = get_json query
       # find user by name instead since users can make github email private
       unless json['total_count'].positive?
         return if author.nil?
+
         query = base_uri + "&q=#{author}+in:fullname"
         json = get_json query
       end
@@ -240,8 +244,8 @@ make sure all lines in the puzzle body have a single leading space."
     # Fetch all puzzles.
     def puzzles
       @source.puzzles
-    rescue Error => ex
-      raise Error, "#{@file}; #{ex.message}"
+    rescue Error => e
+      raise Error, "#{@file}; #{e.message}"
     end
   end
 end

data/lib/pdd/sources.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -18,71 +18,79 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'shellwords'
+require 'rainbow'
 require 'English'
+require 'filemagic'
 require_relative 'source'
+require_relative '../../utils/glob'
 
 module PDD
   # Code base abstraction
   class Sources
     # Ctor.
     # +dir+:: Directory with source code files
-    def initialize(dir, ptns = [])
+    def initialize(dir)
       @dir = File.absolute_path(dir)
-      @exclude = ptns + ['.git/**/*']
-      @include = ptns + ['.git/**/*']
+      @exclude = ['.git/**/*']
+      @include = []
     end
 
     # Fetch all sources.
     def fetch
+      exclude_paths = @exclude.map do |ptn|
+        Glob.new(File.join(@dir, ptn)).to_regexp
+      end
       files = Dir.glob(
         File.join(@dir, '**/*'), File::FNM_DOTMATCH
-      ).reject { |f| File.directory?(f) }
-      included = 0
-      @include.each do |ptn|
-        Dir.glob(File.join(@dir, ptn), File::FNM_DOTMATCH) do |f|
-          files.keep_if { |i| i != f }
-          included += 1
-        end
+      ).reject do |f|
+        File.directory?(f) || exclude_paths.any? { |ptn| f.match(ptn) }
       end
-      PDD.log.info "#{files.size} file(s) found, #{included} files included"
-      excluded = 0
-      @exclude.each do |ptn|
-        Dir.glob(File.join(@dir, ptn), File::FNM_DOTMATCH) do |f|
-          files.delete_if { |i| i == f }
-          excluded += 1
-        end
-      end
-      PDD.log.info "#{files.size} file(s) found, #{excluded} excluded"
+      files += Dir.glob(
+        @include.map { |ptn| File.join(@dir, ptn) }
+      ).reject { |f| File.directory?(f) }
+      files = files.uniq # remove duplicates
       files.reject { |f| binary?(f) }.map do |file|
         path = file[@dir.length + 1, file.length]
         VerboseSource.new(path, Source.new(file, path))
       end
     end
 
-    def exclude(ptn)
-      Sources.new(@dir, @exclude.push(ptn))
+    def exclude(paths)
+      paths = paths.nil? ? [] : paths
+      paths = paths.is_a?(Array) ? paths : [paths]
+      @exclude.push(*paths)
+      paths&.each do |path|
+        PDD.log.info "#{Rainbow('Excluding').orange} #{path}"
+      end
+      self
     end
 
-    def include(ptn)
-      Sources.new(@dir, @include.push(ptn))
+    def include(paths)
+      paths = paths.nil? ? [] : paths
+      paths = paths.is_a?(Array) ? paths : [paths]
+      @include.push(*paths)
+      paths&.each do |path|
+        PDD.log.info "#{Rainbow('Including').blue} #{path}"
+      end
+      self
     end
 
     private
 
-    # @todo #98:30min Change the implementation of this method
-    #  to also work in Windows machines. Investigate the possibility
-    #  of use a gem for this. After that, remove the skip of the test
-    #  `test_ignores_binary_files` in `test_sources.rb`.
     def binary?(file)
-      return false if Gem.win_platform?
-      `grep -qI '.' #{Shellwords.escape(file)}`
-      if $CHILD_STATUS.success?
+      if text_file?(file)
         false
       else
         PDD.log.info "#{file} is a binary file (#{File.size(file)} bytes)"
         true
       end
     end
+
+    def text_file?(file)
+      fm = FileMagic.new(FileMagic::MAGIC_MIME)
+      fm.file(file) =~ %r{^text/}
+    ensure
+      fm.close
+    end
   end
 end

data/lib/pdd/version.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -20,8 +20,8 @@
 
 # PDD main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2022 Yegor Bugayenko
 # License:: MIT
 module PDD
-  VERSION = '0.20.7'.freeze
+  VERSION = '0.21.1'.freeze
 end

data/lib/pdd.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright (c) 2014-2022 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -30,7 +30,7 @@ require_relative 'pdd/rule/roles'
 
 # PDD main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2022 Yegor Bugayenko
 # License:: MIT
 module PDD
   # If it breaks.
@@ -52,11 +52,12 @@ module PDD
   # Get logger.
   def self.log
     unless defined?(@logger)
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new($stdout)
       @logger.formatter = proc { |severity, _, _, msg|
-        if severity == 'ERROR'
+        case severity
+        when 'ERROR'
           "#{Rainbow(severity).red}: #{msg}\n"
-        elsif severity == 'WARN'
+        when 'WARN'
           "#{Rainbow(severity).orange}: #{msg}\n"
         else
           "#{msg}\n"
@@ -87,20 +88,15 @@ module PDD
 
     # Generate XML.
     def xml
-      dir = @opts[:source] ? @opts[:source] : Dir.pwd
-      PDD.log.info "Reading #{dir}"
+      dir = @opts[:source] || Dir.pwd
+      PDD.log.info "Reading from root dir #{dir}"
       require_relative 'pdd/sources'
-      sources = Sources.new(dir)
-      @opts[:include]&.each do |p|
-        sources = sources.include(p)
-      end
-      @opts[:exclude]&.each do |p|
-        sources = sources.exclude(p)
-        PDD.log.info "Excluding #{p}"
-      end
+      sources = Sources.new(File.expand_path(dir))
+      sources.exclude((@opts[:exclude] || []) + (@opts['skip-gitignore'] || []))
+      sources.include(@opts[:include])
       sanitize(
         rules(
-          Nokogiri::XML::Builder.new do |xml|
+          Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
             xml << "<?xml-stylesheet type='text/xsl' href='#{xsl}'?>"
             xml.puzzles(attrs) do
               sources.fetch.each do |source|
@@ -152,16 +148,19 @@ module PDD
       unless list.select { |r| r.start_with?('max-duplicates:') }.empty?
         raise PDD::Error, 'You can\'t modify max-duplicates, it\'s always 1'
       end
+
       list.push('max-duplicates:1').map do |r|
         name, value = r.split(':')
         rule = RULES[name]
         raise "Rule '#{name}' doesn't exist" if rule.nil?
+
         rule.new(doc, value).errors.each do |e|
           PDD.log.error e
           total += 1
         end
       end
       raise PDD::Error, "#{total} errors, see log above" unless total.zero?
+
       xml
     end
 
@@ -173,6 +172,7 @@ module PDD
       errors.each { |e| PDD.log.error e }
       PDD.log.error(xml) unless errors.empty?
       raise SchemaError, errors.join('; ') unless errors.empty?
+
       xml
     end
   end