pdd 0.12 → 0.13

data/assets/puzzles.xsd

@@ -66,6 +66,21 @@
           </xs:restriction>
         </xs:simpleType>
       </xs:element>
+      <xs:element name="author" minOccurs="0">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value=".+"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:element>
+      <xs:element name="email" minOccurs="0">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value=".+"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:element>
+      <xs:element name="time" minOccurs="0" type="xs:dateTime"/>
     </xs:all>
   </xs:complexType>
   <xs:element name="puzzles">

data/lib/pdd/source.rb

@@ -81,7 +81,7 @@ module PDD
           lines: "#{idx + 1}-#{idx + tail.size + 1}",
           body: body,
           file: @path
-        )
+        ).merge(git(idx + 1))
       )
     end
 
@@ -95,6 +95,28 @@ module PDD
         .each { |txt| fail Error, 'Too many spaces' if txt =~ /^\s{2,}/ }
         .map { |txt| txt[1, txt.length] }
     end
+
+    # Git information at the line
+    def git(pos)
+      cmd = [
+        "cd #{File.dirname(@file)}",
+        "git blame -L #{pos},#{pos} --porcelain #{File.basename(@file)}"
+      ].join(' && ')
+      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).iso8601
+            ]
+          end
+        end.compact
+      ]
+    end
   end
 
   # Verbose Source.

data/lib/pdd/version.rb

@@ -26,5 +26,5 @@
 # Copyright:: Copyright (c) 2014 Yegor Bugayenko
 # License:: MIT
 module PDD
-  VERSION = '0.12'
+  VERSION = '0.13'
 end

data/test/test_pdd.rb

@@ -59,6 +59,34 @@ class TestPDD < Minitest::Test
     end
   end
 
+  def test_git_repo
+    Dir.mktmpdir 'test' do |dir|
+      opts = opts(['-v', '-s', dir])
+      fail unless system("
+        set -e
+        cd '#{dir}'
+        git init .
+        git config user.email test@teamed.io
+        git config user.name 'Mr. Tester'
+        echo '@todo #1 this is the puzzle' > x.txt
+        git add x.txt
+        git commit -am 'first version'
+      ")
+      matches(
+        Nokogiri::XML(PDD::Base.new(opts).xml),
+        [
+          '/puzzles[count(puzzle)=1]',
+          '/puzzles/puzzle[file="x.txt"]',
+          '/puzzles/puzzle[author="Mr. Tester"]',
+          '/puzzles/puzzle[email="test@teamed.io"]',
+          '/puzzles/puzzle[time]'
+        ]
+      )
+    end
+  end
+
+  private
+
   def opts(args)
     Slop.parse args do
       on 'v', 'verbose'

data/test/test_source.rb

@@ -69,4 +69,28 @@ class TestSources < Minitest::Test
       assert !error.message.index('Space expected').nil?
     end
   end
+
+  def test_reads_git_author
+    Dir.mktmpdir 'test' do |dir|
+      fail unless system("
+        set -e
+        cd '#{dir}'
+        git init .
+        git config user.email test@teamed.io
+        git config user.name test
+        echo '@todo #1 this is the puzzle' > a.txt
+        git add a.txt
+        git commit -am 'first version'
+        git blame a.txt
+      ")
+      list = PDD::Source.new(File.join(dir, 'a.txt'), '').puzzles
+      assert_equal 1, list.size
+      puzzle = list.first
+      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 !puzzle.props[:time].nil?
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri