pdd 0.4.1 → 0.5

data/.rultor.yml

@@ -1,10 +1,13 @@
 assets:
   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"
 
 release:
   script:
-    - "sudo apt-get update"
-    - "sudo apt-get install -y --fix-missing libmagic1 libmagic-dev"
     - "sudo bundle install"
     - "rake"
     - "rm -rf *.gem"
@@ -12,4 +15,8 @@ release:
     - "gem build pdd.gemspec"
     - "chmod 0600 ../rubygems.yml"
     - "gem push *.gem --config-file ../rubygems.yml"
-
+    - "gem install pdd"
+    - "pdd --source=$(pwd) --verbose --file=pdd.xml -e=test/** -e=features/** -e=README.md"
+    - "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.teamed.io/xsd/${tag}.xsd"
+    - "s3cmd --no-progress put assets/puzzles.xsl --acl-public --config=../s3cfg s3://pdd.teamed.io/xsl/${tag}.xsl"

data/features/cli.feature

@@ -46,7 +46,7 @@ Feature: Command Line Processing
     """
     ~~ @todo #44 some puzzle to be excluded as well
     """
-    When I run bin/pdd with "-e **/*.md --exclude **/*.txt > out.xml"
+    When I run bin/pdd with "-e f/g/**/*.md --exclude a/**/*.txt > out.xml"
     Then Exit code is zero
     And XML file "out.xml" matches "/puzzles[count(puzzle)=0]"
 

data/lib/pdd.rb

@@ -76,8 +76,8 @@ module PDD
       end unless @opts[:exclude].nil?
       sanitize(
         Nokogiri::XML::Builder.new do |xml|
-          xml << '<?xml-stylesheet type="text/xsl" href="puzzles.xsl"?>'
-          xml.puzzles(version: PDD::VERSION, date: Time.now.utc.iso8601) do
+          xml << "<?xml-stylesheet type='text/xsl' href='#{xsl}'?>"
+          xml.puzzles(attrs) do
             sources.fetch.each do |source|
               source.puzzles.each do |puzzle|
                 PDD.log.info "puzzle #{puzzle.props[:ticket]}:" \
@@ -93,6 +93,23 @@ module PDD
 
     private
 
+    def attrs
+      {
+        'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        'xsi:noNamespaceSchemaLocation' => "#{host}/xsd/#{PDD::VERSION}.xsd",
+        'version' => PDD::VERSION,
+        'date' => Time.now.utc.iso8601
+      }
+    end
+
+    def host
+      'http://pdd.teamed.io'
+    end
+
+    def xsl
+      "#{host}/xsl/#{PDD::VERSION}.xsl"
+    end
+
     def render(puzzle, xml)
       props = puzzle.props
       xml.puzzle do

data/lib/pdd/sources.rb

@@ -38,15 +38,16 @@ module PDD
 
     # Fetch all sources.
     def fetch
-      files = Rake::FileList.new(@dir + '/**/*') do |list|
+      files = Rake::FileList.new(File.join(@dir, '**/*')) do |list|
         @exclude.each do |ptn|
-          Rake::FileList.new(@dir + '/' + ptn).each do |f|
+          Rake::FileList.new(File.join(@dir, ptn)).each do |f|
             list.exclude(f)
           end
         end
-      end
+      end.to_a
+      PDD.log.info "#{files.size} file(s) found"
       types = [/^text\//, /application\/xml/]
-      files.to_a
+      files
         .select { |f| types.index { |re| @magic.file(f) =~ re } }
         .map do |file|
           Source.new(file, file[@dir.length + 1, file.length])

data/lib/pdd/version.rb

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

data/pdd.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="puzzles.xsl"?>
+<puzzles version="1.0.snapshot" date="2014-08-13T12:52:38Z"/>

data/test/test_pdd.rb

@@ -40,9 +40,22 @@ class TestPDD < Minitest::Test
         on 'e', 'exclude', as: Array, argument: :required
       end
       File.write(File.join(dir, 'a.txt'), '@todo #55 hello!')
-      xml = Nokogiri::XML::Document.parse(PDD::Base.new(opts).xml)
-      assert_equal 1, xml.xpath('/puzzles/@version').size
-      assert_equal 1, xml.xpath('/puzzles/puzzle[file="a.txt"]').size
+      matches(
+        Nokogiri::XML::Document.parse(PDD::Base.new(opts).xml),
+        [
+          '/processing-instruction("xml-stylesheet")[contains(.,".xsl")]',
+          '/puzzles/@version',
+          '/puzzles/@date',
+          '/puzzles[count(puzzle)=1]',
+          '/puzzles/puzzle[file="a.txt"]'
+        ]
+      )
+    end
+  end
+
+  def matches(xml, xpaths)
+    xpaths.each do |xpath|
+      fail "doesn't match '#{xpath}': #{xml}" unless xml.xpath(xpath).size == 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdd
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -265,6 +265,7 @@ files:
 - lib/pdd/sources.rb
 - lib/pdd/version.rb
 - pdd.gemspec
+- pdd.xml
 - test/test_helper.rb
 - test/test_pdd.rb
 - test/test_source.rb