wrongdoc 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. data/.gitignore +1 -0
  2. data/ChangeLog +51 -0
  3. data/GIT-VERSION-FILE +1 -1
  4. data/GIT-VERSION-GEN +1 -1
  5. data/LATEST +4 -2
  6. data/NEWS +6 -0
  7. data/lib/wrongdoc/merge.rb +3 -3
  8. data/lib/wrongdoc/release.rb +5 -3
  9. data/lib/wrongdoc.rb +2 -2
  10. metadata +3 -3
data/.gitignore CHANGED
@@ -8,3 +8,4 @@
8
8
  /doc
9
9
  /man
10
10
  /pkg
11
+ /local.mk
data/ChangeLog CHANGED
@@ -1,5 +1,56 @@
1
1
  ChangeLog from http://git.bogomips.org/cgit/wrongdoc.git
2
2
 
3
+ commit e4857711b394634edee25a682d607a16c6880608
4
+ Author: Eric Wong <normalperson@yhbt.net>
5
+ Date: Fri Dec 24 02:30:57 2010 +0000
6
+
7
+ wrongdoc 1.0.1 - minor bugfixes
8
+
9
+ Document merging is more flexible regarding XHTML fragments
10
+ and will now handle projects that do not use document merging.
11
+ Release changelog generation for Rubyforge is also fixed.
12
+
13
+ commit 8c7113204a9a55a6b5a63134e27283c4295d3cc1
14
+ Author: Eric Wong <normalperson@yhbt.net>
15
+ Date: Fri Dec 24 02:51:57 2010 +0000
16
+
17
+ release: changelog versioning fix
18
+
19
+ Oops, totally broken!
20
+
21
+ commit 9a5c21e6b4a3e201eee7668a89d80d790ecbdf2e
22
+ Author: Eric Wong <normalperson@yhbt.net>
23
+ Date: Fri Dec 24 02:48:36 2010 +0000
24
+
25
+ add local.mk .gitignore
26
+
27
+ Oops
28
+
29
+ commit 86eac3ce63b7b3951a02b0cf2a25e11d40930569
30
+ Author: Eric Wong <normalperson@yhbt.net>
31
+ Date: Fri Dec 24 02:47:40 2010 +0000
32
+
33
+ release: redirect stdout conditionally
34
+
35
+ No point in redirecting if we're already the same descriptor.
36
+
37
+ commit 1f381662a8bbe12be52f030cc85268c1edc91246
38
+ Author: Eric Wong <normalperson@yhbt.net>
39
+ Date: Fri Dec 24 02:22:29 2010 +0000
40
+
41
+ merge: parse a document fragment
42
+
43
+ We may not get a valid XML document from the Pandoc
44
+ fragment generator.
45
+
46
+ commit 8b605e267154b88fbebd4161e30bcbfef7bbc797
47
+ Author: Eric Wong <normalperson@yhbt.net>
48
+ Date: Fri Dec 24 01:41:17 2010 +0000
49
+
50
+ merge: not all projects need merge_html
51
+
52
+ In fact, most don't.
53
+
3
54
  commit 24415920ff7ee31b294d785e776a2a7dd2ad6367
4
55
  Author: Eric Wong <normalperson@yhbt.net>
5
56
  Date: Fri Dec 24 00:24:59 2010 +0000
data/GIT-VERSION-FILE CHANGED
@@ -1 +1 @@
1
- GIT_VERSION = 1.0.0
1
+ GIT_VERSION = 1.0.1
data/GIT-VERSION-GEN CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/bin/sh
2
2
 
3
3
  GVF=GIT-VERSION-FILE
4
- DEF_VER=v1.0.0.GIT
4
+ DEF_VER=v1.0.1.GIT
5
5
 
6
6
  LF='
7
7
  '
data/LATEST CHANGED
@@ -1,4 +1,6 @@
1
- === wrongdoc 1.0.0 - initial release /
1
+ === wrongdoc 1.0.1 - minor bugfixes /
2
2
 
3
- Welcome to hell
3
+ Document merging is more flexible regarding XHTML fragments
4
+ and will now handle projects that do not use document merging.
5
+ Release changelog generation for Rubyforge is also fixed.
4
6
 
data/NEWS CHANGED
@@ -1,3 +1,9 @@
1
+ === wrongdoc 1.0.1 - minor bugfixes / 2010-12-24 02:52 UTC
2
+
3
+ Document merging is more flexible regarding XHTML fragments
4
+ and will now handle projects that do not use document merging.
5
+ Release changelog generation for Rubyforge is also fixed.
6
+
1
7
  === wrongdoc 1.0.0 - initial release / 2010-12-24 01:07 UTC
2
8
 
3
9
  Welcome to hell
data/lib/wrongdoc/merge.rb CHANGED
@@ -2,16 +2,16 @@ class Wrongdoc::Merge
2
2
  include Wrongdoc::ParseXML
3
3
 
4
4
  def initialize(opts)
5
- @merge_html = opts[:merge_html]
5
+ @merge_html = opts[:merge_html] || {}
6
6
  end
7
7
 
8
8
  def run
9
9
  @merge_html.each do |file, source|
10
10
  rdoc_html = "doc/#{file}.html"
11
- src = Nokogiri::XML(File.read(source))
11
+ src = Nokogiri::XML.fragment(File.read(source))
12
12
  File.open(rdoc_html, "a+") { |fp|
13
13
  doc = parse_xml(fp.read)
14
- doc.search("div#documentation")[0].add_child(src.root)
14
+ doc.search("div#documentation")[0].add_child(src)
15
15
  fp.truncate 0
16
16
  fp.write doc.to_xhtml
17
17
  }
data/lib/wrongdoc/release.rb CHANGED
@@ -7,7 +7,7 @@ module Wrongdoc::Release
7
7
  if vtags.empty?
8
8
  cmds << %w(git log)
9
9
  else
10
- version = vtags[0]
10
+ version = vtags[-1]
11
11
  prev = vtags[vtags.index(version) - 1]
12
12
  if prev
13
13
  cmds << [ 'git', 'diff', '--stat', prev, version ]
@@ -21,8 +21,10 @@ module Wrongdoc::Release
21
21
  cmds.each_with_index do |cmd,i|
22
22
  i > 0 and io.puts
23
23
  pid, status = Process.waitpid2(fork do
24
- $stdout.reopen(io)
25
- io.close
24
+ if io.fileno != $stdout.fileno
25
+ $stdout.reopen(io)
26
+ io.close
27
+ end
26
28
  exec *cmd
27
29
  end)
28
30
  status.success? or abort status.inspect
data/lib/wrongdoc.rb CHANGED
@@ -6,8 +6,8 @@ require 'nokogiri'
6
6
 
7
7
  module Wrongdoc
8
8
 
9
- # the version of wrongdoc, currently 1.0.0
10
- VERSION = '1.0.0'
9
+ # the version of wrongdoc, currently 1.0.1
10
+ VERSION = '1.0.1'
11
11
 
12
12
  autoload :Readme, 'wrongdoc/readme'
13
13
  autoload :History, 'wrongdoc/history'
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wrongdoc
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 0
10
- version: 1.0.0
9
+ - 1
10
+ version: 1.0.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - wrongdoc hackers