pdd 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef027790e2aa528548fcb97f52632e7740f2a28a9ed7180677bf189ba86b504f
-  data.tar.gz: 2432ac79d70ebb056a6b1338ca52b170e2c7134d14b32d0e8454e34ff86f57ad
+  metadata.gz: c76649118dbe4b4884f07d453b611ca05da5845e753357fcb98cd0e6e8324b64
+  data.tar.gz: 4b85d7b84b62f8d695d2e8b95a92bc03cb87d5e6acbef283723ac353a43c42cd
 SHA512:
-  metadata.gz: 8c91ee447d2b8aefde998e6516fdd1679c845b3a2360f8325a944e0833fe5818f23c7dfb465b0242dabc9828742849220951cbd8e91fc014e9603c78c83e4be8
-  data.tar.gz: 2910617b72caa5ad9b083fd6e1471fd6dcf8bb9e3ccea0ecf3577c5eaa060e4468f0278798cca1e77ce5ad9b77117486d55e5e3d536308c27931dce9dec0c60d
+  metadata.gz: 1a54147d056c4593c20142e9c45497308bc57c0ec34a63e84fc0f025e1722ed406102f9383196cec51a084baffe17d2de4174060c93173328605089410a48dff
+  data.tar.gz: 4270c5b9ec6e8b63ca371b2c6c5905b13394d5078943f1c66b8c8ec9ccc30ae25026efd375f3fd2d5bd8c2a1fd29080c86755935d5c91bc6d47baceda89e6edd

data/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

data/lib/pdd/source.rb

@@ -141,12 +141,21 @@ against the rules explained here: https://github.com/cqfn/pdd#how-to-format"
       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 @@ against the rules explained here: https://github.com/cqfn/pdd#how-to-format"
         .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

data/lib/pdd/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2014-2022 Yegor Bugayenko
 # License:: MIT
 module PDD
-  VERSION = '0.21.1'.freeze
+  VERSION = '0.21.2'.freeze
 end

data/test/test_source.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 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 @@ class TestSource < Minitest::Test
         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 @@ class TestSource < Minitest::Test
     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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri