pdd 0.20.4 → 0.20.8

data/lib/pdd.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 module PDD
   # If it breaks.
@@ -52,21 +52,25 @@ 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"
+        when 'WARN'
+          "#{Rainbow(severity).orange}: #{msg}\n"
         else
           "#{msg}\n"
         end
       }
-      @logger.level = Logger::ERROR
+      @logger.level = Logger::WARN
     end
     @logger
   end
 
   class << self
     attr_writer :logger
+    attr_accessor :opts
   end
 
   # Code base abstraction
@@ -75,6 +79,7 @@ module PDD
     # +opts+:: Options
     def initialize(opts)
       @opts = opts
+      PDD.opts = opts
       PDD.log.level = Logger::INFO if @opts[:verbose]
       PDD.log.level = Logger::ERROR if @opts[:quiet]
       PDD.log.info "My version is #{PDD::VERSION}"
@@ -83,19 +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)
-      unless @opts[:exclude].nil?
-        @opts[:exclude].each do |p|
-          sources = sources.exclude(p)
-          PDD.log.info "Excluding #{p}"
-        end
-      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|
@@ -147,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
 
@@ -168,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

data/pdd.gemspec

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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,17 +20,18 @@
 
 require 'English'
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require_relative 'lib/pdd/version'
 
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   if s.respond_to? :required_rubygems_version=
-    s.required_rubygems_version = Gem::Requirement.new('>= 0')
+    s.required_rubygems_version =
+      Gem::Requirement.new('>= 0')
   end
-  s.rubygems_version = '2.2'
-  s.required_ruby_version = '>= 2.2'
+  s.rubygems_version = '2.3'
+  s.required_ruby_version = '~> 2.3'
   s.name = 'pdd'
   s.version = PDD::VERSION
   s.license = 'MIT'
@@ -38,16 +39,17 @@ Gem::Specification.new do |s|
   s.description = 'Collects PDD puzzles from a source code base'
   s.authors = ['Yegor Bugayenko']
   s.email = 'yegor256@gmail.com'
-  s.homepage = 'http://github.com/yegor256/pdd'
+  s.homepage = 'http://github.com/cqfn/pdd'
   s.files = `git ls-files`.split($RS)
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'nokogiri', '1.8.2'
-  s.add_runtime_dependency 'rainbow', '~>3.0'
-  s.add_runtime_dependency 'slop', '4.6.1'
-  s.add_development_dependency 'codecov', '0.1.10'
+  s.add_runtime_dependency 'nokogiri', '~> 1.10'
+  s.add_runtime_dependency 'rainbow', '~> 3.0'
+  s.add_runtime_dependency 'slop', '~> 4.6'
+  s.add_development_dependency 'aruba', '~> 0.14.1'
+  s.add_development_dependency 'codecov', '0.2.12'
   s.add_development_dependency 'cucumber', '3.1.0'
   s.add_development_dependency 'minitest', '5.5.0'
   s.add_development_dependency 'rake', '12.0.0'
@@ -55,5 +57,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '3.1.0'
   s.add_development_dependency 'rubocop', '0.52.1'
   s.add_development_dependency 'rubocop-rspec', '1.15.1'
+  s.add_development_dependency 'slop', '4.9.1'
   s.add_development_dependency 'xcop', '0.5.8'
 end

data/test/test__helper.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-STDOUT.sync = true
+$stdout.sync = true
 
 require 'simplecov'
 SimpleCov.start
@@ -29,3 +29,16 @@ end
 
 require 'minitest/autorun'
 require_relative '../lib/pdd'
+
+def stub_source_find_github_user(file, path = '')
+  source = PDD::Source.new(file, path)
+  verbose_source = PDD::VerboseSource.new(file, source)
+  fake = proc do |info = {}|
+    email, author = info.values_at(:email, :author)
+    { 'login' => 'yegor256' } if email == 'yegor256@gmail.com' ||
+                                 author == 'Yegor Bugayenko'
+  end
+  source.stub :find_github_user, fake do
+    yield verbose_source
+  end
+end

data/test/test_duplicates.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -24,7 +24,7 @@ require_relative '../lib/pdd/rule/duplicates'
 
 # PDD::Rule::MaxDuplicates class test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 class TestMaxDuplicates < Minitest::Test
   def test_max_duplicates

data/test/test_estimates.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -24,7 +24,7 @@ require_relative '../lib/pdd/rule/estimates'
 
 # PDD::Rule::Estimate module tests.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 class TestEstimates < Minitest::Test
   def test_min

data/test/test_pdd.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -26,7 +26,7 @@ require_relative '../lib/pdd'
 
 # PDD main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 class TestPDD < Minitest::Test
   def test_basic
@@ -75,6 +75,7 @@ class TestPDD < Minitest::Test
         git add -f .
         git commit --quiet -am 'first version'
       ")
+
       matches(
         Nokogiri::XML(PDD::Base.new(opts).xml),
         [
@@ -95,6 +96,7 @@ class TestPDD < Minitest::Test
     Slop.parse args do |o|
       o.bool '-v', '--verbose'
       o.bool '-q', '--quiet'
+      o.bool '--skip-errors'
       o.string '-s', '--source'
       o.array '-e', '--exclude'
       o.array '-r', '--rule'

data/test/test_rake_task.rb

@@ -0,0 +1,18 @@
+require 'minitest/autorun'
+require 'tmpdir'
+require 'rake'
+require_relative '../lib/pdd/rake_task'
+
+# Test for RakeTask
+class TestRakeTask < Minitest::Test
+  def test_basic
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(file, "\x40todo #55 hello!")
+      PDD::RakeTask.new(:pdd1) do |task|
+        task.quiet = true
+      end
+      Rake::Task['pdd1'].invoke
+    end
+  end
+end

data/test/test_roles.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -24,7 +24,7 @@ require_relative '../lib/pdd/rule/roles'
 
 # PDD::Rule::Role module tests.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 class TestRoles < Minitest::Test
   def test_incorrect_role

data/test/test_source.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -25,7 +25,7 @@ require_relative '../lib/pdd/sources'
 
 # Source test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright:: Copyright (c) 2014-2021 Yegor Bugayenko
 # License:: MIT
 class TestSource < Minitest::Test
   def test_parsing
@@ -42,15 +42,39 @@ class TestSource < Minitest::Test
         ~~  and it also has to work
         "
       )
-      list = PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
-      assert_equal 2, list.size
-      puzzle = list.first
-      assert_equal '2-3', puzzle.props[:lines]
-      assert_equal 'привет, how are you doing?', puzzle.props[:body]
-      assert_equal '44', puzzle.props[:ticket]
-      assert puzzle.props[:author].nil?
-      assert puzzle.props[:email].nil?
-      assert puzzle.props[:time].nil?
+      stub_source_find_github_user(file, 'hey') do |source|
+        list = source.puzzles
+        assert_equal 2, list.size
+        puzzle = list.first
+        assert_equal '2-3', puzzle.props[:lines]
+        assert_equal 'привет, how are you doing?', puzzle.props[:body]
+        assert_equal '44', puzzle.props[:ticket]
+        assert puzzle.props[:author].nil?
+        assert puzzle.props[:email].nil?
+        assert puzzle.props[:time].nil?
+      end
+    end
+  end
+
+  def test_parsing_leading_spaces
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(
+        file,
+        "
+        * \x40todo #56:30min this is a
+        *       multi-line
+        *     comment!
+        "
+      )
+      stub_source_find_github_user(file, 'hey') do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '2-4', puzzle.props[:lines]
+        assert_equal 'this is a multi-line comment!', puzzle.props[:body]
+        assert_equal '56', puzzle.props[:ticket]
+      end
     end
   end
 
@@ -65,12 +89,58 @@ class TestSource < Minitest::Test
         "
       )
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
+        stub_source_find_github_user(file, 'hey', &:puzzles)
       end
       assert !error.message.index('Space expected').nil?
     end
   end
 
+  def test_succeed_despite_bad_puzzles
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(
+        file,
+        "
+        * \x40todo #44 this is an incorrectly formatted puzzle,
+        * with a second line without a leading space
+        Another badly formatted puzzle
+        * \x40todo this puzzle misses ticket name/number
+        Something else
+        * \x40todo #123 This puzzle is correctly formatted
+        "
+      )
+      PDD.opts = { 'skip-errors' => true }
+      stub_source_find_github_user(file, 'hey') do |source|
+        list = source.puzzles
+        PDD.opts = nil
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '7-7', puzzle.props[:lines]
+        assert_equal 'This puzzle is correctly formatted', puzzle.props[:body]
+        assert_equal '123', puzzle.props[:ticket]
+      end
+    end
+  end
+
+  def test_succeed_utf8_encoded_body
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(
+        file,
+        "
+        * \x40todo #44 Привет, мир, мне кофе
+        *  вторая линия
+        "
+      )
+      list = PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
+      assert_equal 1, list.size
+      puzzle = list.first
+      assert_equal '2-3', puzzle.props[:lines]
+      assert_equal 'Привет, мир, мне кофе вторая линия', puzzle.props[:body]
+      assert_equal '44', puzzle.props[:ticket]
+    end
+  end
+
   def test_failing_on_incomplete_puzzle
     Dir.mktmpdir 't5' do |dir|
       file = File.join(dir, 'ff.txt')
@@ -81,7 +151,7 @@ class TestSource < Minitest::Test
         "
       )
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'ff')).puzzles
+        stub_source_find_github_user(file, 'ff', &:puzzles)
       end
       assert !error.to_s.index("\x40todo is not followed by").nil?
     end
@@ -90,9 +160,9 @@ class TestSource < Minitest::Test
   def test_failing_on_broken_unicode
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'xx.txt')
-      File.write(file, ' * \x40todo #44 this is a broken unicode: ' + 0x92.chr)
+      File.write(file, " * \\x40todo #44 this is a broken unicode: #{0x92.chr}")
       assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'xx')).puzzles
+        stub_source_find_github_user(file, 'xx', &:puzzles)
       end
     end
   end
@@ -107,7 +177,7 @@ class TestSource < Minitest::Test
         "
       )
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
+        stub_source_find_github_user(file, 'hey', &:puzzles)
       end
       assert !error.message.index('is not followed by a puzzle marker').nil?
     end
@@ -123,7 +193,7 @@ class TestSource < Minitest::Test
         "
       )
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'x')).puzzles
+        stub_source_find_github_user(file, 'x', &:puzzles)
       end
       assert !error.message.index("\x40todo must have a leading space").nil?
     end
@@ -139,7 +209,7 @@ class TestSource < Minitest::Test
         "
       )
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'x')).puzzles
+        stub_source_find_github_user(file, 'x', &:puzzles)
       end
       assert !error.message.index('an unexpected space').nil?
     end
@@ -153,20 +223,24 @@ class TestSource < Minitest::Test
         cd '#{dir}'
         git init --quiet .
         git config user.email test@teamed.io
-        git config user.name test
+        git config user.name test_unknown
         echo '\x40todo #1 this is the puzzle' > a.txt
         git add a.txt
         git commit --quiet -am 'first version'
       ")
-      list = PDD::Source.new(File.join(dir, 'a.txt'), '').puzzles
-      assert_equal 1, list.size
-      puzzle = list.first
-      assert_equal '1-de87adc8', puzzle.props[:id]
-      assert_equal '1-1', puzzle.props[:lines]
-      assert_equal 'this is the puzzle', puzzle.props[:body]
-      assert_equal 'test', puzzle.props[:author]
-      assert_equal 'test@teamed.io', puzzle.props[:email]
-      assert_match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, puzzle.props[:time])
+
+      stub_source_find_github_user(File.join(dir, 'a.txt')) do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '1-de87adc8', puzzle.props[:id]
+        assert_equal '1-1', puzzle.props[:lines]
+        assert_equal 'this is the puzzle', puzzle.props[:body]
+        assert_equal 'test_unknown', puzzle.props[:author]
+        assert_equal 'test@teamed.io', puzzle.props[:email]
+        assert_match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/,
+                     puzzle.props[:time])
+      end
     end
   end
 
@@ -183,15 +257,19 @@ class TestSource < Minitest::Test
         git add a.txt
         git commit --quiet -am 'first version'
       ")
-      list = PDD::Source.new(File.join(dir, 'a.txt'), '').puzzles
-      assert_equal 1, list.size
-      puzzle = list.first
-      assert_equal '1-de87adc8', puzzle.props[:id]
-      assert_equal '1-1', puzzle.props[:lines]
-      assert_equal 'this is the puzzle', puzzle.props[:body]
-      assert_equal 'test', puzzle.props[:author]
-      assert_nil puzzle.props[:email]
-      assert_match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, puzzle.props[:time])
+
+      stub_source_find_github_user(File.join(dir, 'a.txt')) do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '1-de87adc8', puzzle.props[:id]
+        assert_equal '1-1', puzzle.props[:lines]
+        assert_equal 'this is the puzzle', puzzle.props[:body]
+        assert_equal 'test', puzzle.props[:author]
+        assert_nil puzzle.props[:email]
+        assert_match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/,
+                     puzzle.props[:time])
+      end
     end
   end
 
@@ -207,10 +285,37 @@ class TestSource < Minitest::Test
         git add a.txt
         git commit --quiet -am 'first version'
       ")
-      list = PDD::Source.new(File.join(dir, 'a.txt'), '').puzzles
-      assert_equal 1, list.size
-      puzzle = list.first
-      assert_equal '@yegor256', puzzle.props[:author]
+
+      stub_source_find_github_user(File.join(dir, 'a.txt')) do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '@yegor256', puzzle.props[:author]
+      end
+    end
+  end
+
+  def test_skips_uncommitted_changes
+    skip if Gem.win_platform?
+    Dir.mktmpdir 'test' do |dir|
+      raise unless system("
+        cd '#{dir}'
+        git init --quiet .
+        git config user.email yegor256@gmail.com
+        git config user.name test
+        echo 'hi' > a.txt
+        git add a.txt
+        git commit --quiet -am 'first version'
+        echo '\x40todo #1 this is a puzzle uncommitted' > a.txt
+      ")
+
+      stub_source_find_github_user(File.join(dir, 'a.txt')) do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_nil puzzle.props[:email]
+        assert_equal 'Not Committed Yet', puzzle.props[:author]
+      end
     end
   end
 
@@ -221,12 +326,14 @@ class TestSource < Minitest::Test
         file,
         '<!--/* @todo #123 puzzle info */-->'
       )
-      list = PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
-      assert_equal 1, list.size
-      puzzle = list.first
-      assert_equal '1-1', puzzle.props[:lines]
-      assert_equal 'puzzle info', puzzle.props[:body]
-      assert_equal '123', puzzle.props[:ticket]
+      stub_source_find_github_user(file, 'hey') do |source|
+        list = source.puzzles
+        assert_equal 1, list.size
+        puzzle = list.first
+        assert_equal '1-1', puzzle.props[:lines]
+        assert_equal 'puzzle info', puzzle.props[:body]
+        assert_equal '123', puzzle.props[:ticket]
+      end
     end
   end
 end

data/test/test_source_todo.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2018 Yegor Bugayenko
+# Copyright (c) 2014-2021 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
@@ -24,16 +24,18 @@ require_relative '../lib/pdd'
 require_relative '../lib/pdd/sources'
 
 class TestSourceTodo < Minitest::Test
-  def check_valid_puzzle(text, lines, body, ticket)
+  def check_valid_puzzle(text, lines, body, ticket, count = 1)
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'a.txt')
       File.write(file, text)
-      list = PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
-      assert_equal 1, list.size
-      puzzle = list.first
-      assert_equal lines, puzzle.props[:lines]
-      assert_equal body, puzzle.props[:body]
-      assert_equal ticket, puzzle.props[:ticket]
+      stub_source_find_github_user(file, 'hey') do |source|
+        list = source.puzzles
+        assert_equal count, list.size
+        puzzle = list.first
+        assert_equal lines, puzzle.props[:lines]
+        assert_equal body, puzzle.props[:body]
+        assert_equal ticket, puzzle.props[:ticket]
+      end
     end
   end
 
@@ -42,7 +44,7 @@ class TestSourceTodo < Minitest::Test
       file = File.join(dir, 'a.txt')
       File.write(file, text)
       error = assert_raises PDD::Error do
-        PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
+        stub_source_find_github_user(file, 'hey', &:puzzles)
       end
       assert !error.message.index(error_msg).nil?
     end
@@ -71,6 +73,18 @@ class TestSourceTodo < Minitest::Test
     )
   end
 
+  def test_todo_utf8_encoded_body
+    check_valid_puzzle(
+      "
+      // TODO #45 Привет, мир, мне кофе
+      //  вторая линия
+      ",
+      '2-3',
+      'Привет, мир, мне кофе вторая линия',
+      '45'
+    )
+  end
+
   def test_todo_colon_parsing
     check_valid_puzzle(
       "
@@ -82,6 +96,19 @@ class TestSourceTodo < Minitest::Test
     )
   end
 
+  def test_multiple_todo_colon
+    check_valid_puzzle(
+      "
+      // TODO: #45 task description
+      // TODO: #46 another task description
+      ",
+      '2-2',
+      'task description',
+      '45',
+      2
+    )
+  end
+
   def test_todo_colon_parsing_multi_line
     check_valid_puzzle(
       "