pdd 0.14 → 0.14.1

data/.rultor.yml

@@ -1,14 +1,12 @@
 assets:
-  rubygems.yml: "yegor256/home#assets/rubygems.yml"
-  s3cfg: "yegor256/home#assets/s3cfg"
-
+  rubygems.yml: yegor256/home#assets/rubygems.yml
+  s3cfg: yegor256/home#assets/s3cfg
 install: |
   sudo apt-get update
   sudo apt-get install -y --fix-missing libmagic1 libmagic-dev
   sudo gem install pdd
-
 release:
-  script: |
+  script: |-
     sudo bundle install
     rake
     rm -rf *.gem
@@ -22,3 +20,14 @@ release:
     s3cmd --no-progress put pdd.xml --config=../s3cfg s3://pdd.teamed.io/pdd.xml
     s3cmd --no-progress put assets/puzzles.xsd --acl-public --config=../s3cfg s3://pdd-xsd.teamed.io/${tag}.xsd
     s3cmd --no-progress put assets/puzzles.xsl --acl-public --config=../s3cfg s3://pdd-xsl.teamed.io/${tag}.xsl
+  commanders:
+  - yegor256
+architect:
+- yegor256
+- davvd
+merge:
+  commanders:
+  - yegor256
+deploy:
+  commanders:
+  - yegor256

data/assets/puzzles.xsd

@@ -24,6 +24,13 @@
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="puzzle">
     <xs:all>
+      <xs:element name="id" minOccurs="1">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:pattern value="[a-zA-Z0-9\-]+"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:element>
       <xs:element name="ticket">
         <xs:simpleType>
           <xs:restriction base="xs:string">

data/assets/puzzles.xsl

@@ -62,11 +62,13 @@
               <col/>
               <col/>
               <col/>
+              <col/>
               <col style="width:7em;"/>
               <col/>
             </colgroup>
             <thead>
               <tr>
+                <th><xsl:text>id</xsl:text></th>
                 <th><xsl:text>ticket</xsl:text></th>
                 <th><xsl:text>body</xsl:text></th>
                 <th><xsl:text>estimate</xsl:text></th>
@@ -83,6 +85,7 @@
   </xsl:template>
   <xsl:template match="puzzle">
     <tr>
+      <td><xsl:value-of select="id"/></td>
       <td><xsl:value-of select="ticket"/></td>
       <td>
         <code>

data/features/step_definitions/steps.rb

@@ -46,7 +46,7 @@ end
 Given(/^I have a "([^"]*)" file with content:$/) do |file, text|
   FileUtils.mkdir_p(File.dirname(file)) unless File.exist?(file)
   File.open(file, 'w') do |f|
-    f.write(text)
+    f.write(text.gsub(/\\xFF/, "\xFF"))
   end
 end
 

data/features/unicode.feature

@@ -12,3 +12,14 @@ Feature: Unicode
     LANG=C ruby -Ipdd/lib pdd/bin/pdd test.txt -v -f=/dev/null -e=pdd/**/*
     """
     Then Exit code is zero
+
+  Scenario: Skip file with broken Unicode
+    Given I have a "test.txt" file with content:
+    """
+    \xFF test
+    # @todo #44 \xFF hey
+    \xFF test again
+    """
+    When I run bin/pdd with "--exclude=test.txt --v -f=/dev/null"
+    Then Stdout contains "excluding test.txt"
+    Then Exit code is zero

data/lib/pdd.rb

@@ -76,6 +76,7 @@ module PDD
       @opts = opts
       PDD.log.level = Logger::INFO if @opts.verbose?
       PDD.log.info "my version is #{PDD::VERSION}"
+      PDD.log.info "Ruby version is #{RUBY_VERSION} at #{RUBY_PLATFORM}"
     end
 
     # Generate XML.

data/lib/pdd/source.rb

@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'digest/md5'
 require 'pdd/puzzle'
 
 module PDD
@@ -36,19 +37,40 @@ module PDD
 
     # Fetch all puzzles.
     def puzzles
+      PDD.log.info "reading #{@path}..."
       re = /(.*(?:^|\s))@todo\s+#([\w\-\.:\/]+)\s+(.+)/
       puzzles = []
       lines = File.readlines(@file)
       lines.each_with_index do |line, idx|
         re.match(line) do |match|
-          puzzles << puzzle(lines.drop(idx + 1), match, idx)
+          begin
+            puzzles << puzzle(lines.drop(idx + 1), match, idx)
+          rescue Error => ex
+            raise Error, "#{ex.message} in line ##{idx}"
+          end
         end
+        /(.*(?:^|\s))@todo\s+#([\w\-\.:\/]+)/
       end
       puzzles
     end
 
     private
 
+    # Fetch puzzle
+    def puzzle(lines, match, idx)
+      tail = tail(lines, match[1])
+      body = (match[3] + ' ' + tail.join(' ')).gsub(/[\s\n\t]+/, ' ').strip
+      marker = marker(match[2])
+      Puzzle.new(
+        marker.merge(
+          id: "#{marker[:ticket]}-#{Digest::MD5.hexdigest(body)[0..7]}",
+          lines: "#{idx + 1}-#{idx + tail.size + 1}",
+          body: body,
+          file: @path
+        ).merge(git(idx + 1))
+      )
+    end
+
     # Parse a marker.
     def marker(text)
       re = /([\w\d\-\.]+)(?::(\d+)(?:(m|h)[a-z]*)?)?(?:\/([A-Z]+))?/
@@ -68,23 +90,6 @@ module PDD
       min
     end
 
-    # Fetch puzzle
-    def puzzle(lines, match, idx)
-      begin
-        tail = tail(lines, match[1])
-      rescue Error => ex
-        raise Error, "#{ex.message} in line ##{idx}"
-      end
-      body = (match[3] + ' ' + tail.join(' ')).gsub(/[\s\n\t]+/, ' ').strip
-      Puzzle.new(
-        marker(match[2]).merge(
-          lines: "#{idx + 1}-#{idx + tail.size + 1}",
-          body: body,
-          file: @path
-        ).merge(git(idx + 1))
-      )
-    end
-
     # Fetch puzzle tail (all lines after the first one)
     def tail(lines, prefix)
       lines

data/lib/pdd/version.rb

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

data/test/test_pdd.rb

@@ -76,6 +76,7 @@ class TestPDD < Minitest::Test
         Nokogiri::XML(PDD::Base.new(opts).xml),
         [
           '/puzzles[count(puzzle)=1]',
+          '/puzzles/puzzle[id]',
           '/puzzles/puzzle[file="x.txt"]',
           '/puzzles/puzzle[author="Mr. Tester"]',
           '/puzzles/puzzle[email="test@teamed.io"]',

data/test/test_source.rb

@@ -35,14 +35,14 @@ class TestSources < Minitest::Test
       file = File.join(dir, 'a.txt')
       File.write(
         file,
-        '
+        "
         * @todo #44 hello,
-        *  how are you doing?
+        *  how are you\t\r\tdoing?
         * -something else
         Something else
         ~~ @todo #ABC-3 this is another puzzle
         ~~  and it also has to work
-        '
+        "
       )
       list = PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
       assert_equal 2, list.size
@@ -70,6 +70,23 @@ class TestSources < Minitest::Test
     end
   end
 
+  def test_failing_on_invalid_puzzle_without_hash_sign
+    skip('doesnt work now')
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'a.txt')
+      File.write(
+        file,
+        '
+        * @todo 44 this puzzle is not formatted correctly
+        '
+      )
+      error = assert_raises PDD::Error do
+        PDD::VerboseSource.new(file, PDD::Source.new(file, 'hey')).puzzles
+      end
+      assert !error.message.index('Incorrect format').nil?
+    end
+  end
+
   def test_reads_git_author
     Dir.mktmpdir 'test' do |dir|
       fail unless system("
@@ -86,6 +103,7 @@ class TestSources < Minitest::Test
       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]

metadata

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