[#209] mark end of puzzle body where indentation stops

Author: mbao01

features/cli.feature

@@ -43,8 +43,8 @@ Feature: Command Line Processing
     """
     ~~
     ~~ @todo #44 First
-    ~~  and second
-    ~~
+    ~~  and
+    ~~ second
     """
     When I run bin/pdd with "> out.xml"
     Then Exit code is zero

lib/pdd/source.rb

@@ -141,12 +141,21 @@ def minutes(num, units)
       min
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # @todo #209:30min temporarily disabled cyclomatic complexity for the method.
+    #  below. Please fix soon.
+    #
     # 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
+      line = lines[0][prefix.length + 1, lines[0].length] if lines[0]
+      is_indented = line&.start_with?(' ')
       lines
         .take_while { |t| match_markers(t).none? && t.start_with?(prefix) }
+        .take_while do |t|
+          !is_indented || t[prefix.length + 1, t.length].start_with?(' ')
+        end
         .take_while do |t|
           # account for carriage return in line endings
           t_len = t.length - 1
@@ -155,6 +164,7 @@ def tail(lines, prefix, start)
         .map { |t| t[prefix.length, t.length] }
         .map { |t| t.start_with?(' ') ? t[1, t.length] : t }
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     # @todo #75:30min Let's make it possible to fetch Subversion data
     #  in a similar way as we are doing with Git. We should also just

test/test_source.rb

@@ -22,6 +22,7 @@
 require 'tmpdir'
 require_relative '../lib/pdd'
 require_relative '../lib/pdd/sources'
+require_relative 'test__helper'
 
 # Source test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -46,8 +47,8 @@ def test_parsing
         list = source.puzzles
         assert_equal 2, list.size
         puzzle = list.first
-        assert_equal '2-4', puzzle.props[:lines]
-        assert_equal 'привет, how are you doing? -something else', \
+        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?
@@ -103,6 +104,28 @@ def test_no_prefix_multiline_puzzle_block
     end
   end
 
+  def test_space_indented_multiline_puzzle_block
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(
+        file,
+        "
+         # \x40todo #99:30min hello
+         #  good bye
+         # hello again
+        "
+      )
+      stub_source_find_github_user(file, 'hey') do |source|
+        PDD.opts = nil
+        assert_equal 1, source.puzzles.size
+        puzzle = source.puzzles.last
+        assert_equal '2-3', puzzle.props[:lines]
+        assert_equal 'hello good bye', puzzle.props[:body]
+        assert_equal '99', puzzle.props[:ticket]
+      end
+    end
+  end
+
   def test_multiple_puzzles_single_comment_block
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'a.txt')