wrongdoc 1.0.0 → 1.0.1

data/.gitignore

@@ -8,3 +8,4 @@
 /doc
 /man
 /pkg
+/local.mk

data/ChangeLog

@@ -1,5 +1,56 @@
 ChangeLog from http://git.bogomips.org/cgit/wrongdoc.git
 
+   commit e4857711b394634edee25a682d607a16c6880608
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 02:30:57 2010 +0000
+   
+       wrongdoc 1.0.1 - minor bugfixes
+       
+       Document merging is more flexible regarding XHTML fragments
+       and will now handle projects that do not use document merging.
+       Release changelog generation for Rubyforge is also fixed.
+   
+   commit 8c7113204a9a55a6b5a63134e27283c4295d3cc1
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 02:51:57 2010 +0000
+   
+       release: changelog versioning fix
+       
+       Oops, totally broken!
+   
+   commit 9a5c21e6b4a3e201eee7668a89d80d790ecbdf2e
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 02:48:36 2010 +0000
+   
+       add local.mk .gitignore
+       
+       Oops
+   
+   commit 86eac3ce63b7b3951a02b0cf2a25e11d40930569
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 02:47:40 2010 +0000
+   
+       release: redirect stdout conditionally
+       
+       No point in redirecting if we're already the same descriptor.
+   
+   commit 1f381662a8bbe12be52f030cc85268c1edc91246
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 02:22:29 2010 +0000
+   
+       merge: parse a document fragment
+       
+       We may not get a valid XML document from the Pandoc
+       fragment generator.
+   
+   commit 8b605e267154b88fbebd4161e30bcbfef7bbc797
+   Author: Eric Wong <normalperson@yhbt.net>
+   Date:   Fri Dec 24 01:41:17 2010 +0000
+   
+       merge: not all projects need merge_html
+       
+       In fact, most don't.
+   
    commit 24415920ff7ee31b294d785e776a2a7dd2ad6367
    Author: Eric Wong <normalperson@yhbt.net>
    Date:   Fri Dec 24 00:24:59 2010 +0000

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 1.0.0
+GIT_VERSION = 1.0.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.0.0.GIT
+DEF_VER=v1.0.1.GIT
 
 LF='
 '

data/LATEST

@@ -1,4 +1,6 @@
-=== wrongdoc 1.0.0 - initial release / 
+=== wrongdoc 1.0.1 - minor bugfixes / 
 
-  Welcome to hell
+  Document merging is more flexible regarding XHTML fragments
+  and will now handle projects that do not use document merging.
+  Release changelog generation for Rubyforge is also fixed.
 

data/NEWS

@@ -1,3 +1,9 @@
+=== wrongdoc 1.0.1 - minor bugfixes / 2010-12-24 02:52 UTC
+
+  Document merging is more flexible regarding XHTML fragments
+  and will now handle projects that do not use document merging.
+  Release changelog generation for Rubyforge is also fixed.
+
 === wrongdoc 1.0.0 - initial release / 2010-12-24 01:07 UTC
 
   Welcome to hell

data/lib/wrongdoc/merge.rb

@@ -2,16 +2,16 @@ class Wrongdoc::Merge
   include Wrongdoc::ParseXML
 
   def initialize(opts)
-    @merge_html = opts[:merge_html]
+    @merge_html = opts[:merge_html] || {}
   end
 
   def run
     @merge_html.each do |file, source|
       rdoc_html = "doc/#{file}.html"
-      src = Nokogiri::XML(File.read(source))
+      src = Nokogiri::XML.fragment(File.read(source))
       File.open(rdoc_html, "a+") { |fp|
         doc = parse_xml(fp.read)
-        doc.search("div#documentation")[0].add_child(src.root)
+        doc.search("div#documentation")[0].add_child(src)
         fp.truncate 0
         fp.write doc.to_xhtml
       }

data/lib/wrongdoc/release.rb

@@ -7,7 +7,7 @@ module Wrongdoc::Release
     if vtags.empty?
       cmds << %w(git log)
     else
-      version = vtags[0]
+      version = vtags[-1]
       prev = vtags[vtags.index(version) - 1]
       if prev
         cmds << [ 'git', 'diff', '--stat', prev, version ]
@@ -21,8 +21,10 @@ module Wrongdoc::Release
     cmds.each_with_index do |cmd,i|
       i > 0 and io.puts
       pid, status = Process.waitpid2(fork do
-        $stdout.reopen(io)
-        io.close
+        if io.fileno != $stdout.fileno
+          $stdout.reopen(io)
+          io.close
+        end
         exec *cmd
       end)
       status.success? or abort status.inspect

data/lib/wrongdoc.rb

@@ -6,8 +6,8 @@ require 'nokogiri'
 
 module Wrongdoc
 
-  # the version of wrongdoc, currently 1.0.0
-  VERSION = '1.0.0'
+  # the version of wrongdoc, currently 1.0.1
+  VERSION = '1.0.1'
 
   autoload :Readme, 'wrongdoc/readme'
   autoload :History, 'wrongdoc/history'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrongdoc
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - wrongdoc hackers