rdtool 0.6.31 → 0.6.32

data/lib/rd/package.rb

@@ -1,4 +1,4 @@
-
+require 'rd/version'
 module RD
-  PACKAGE_VERSION = "0.6.31"
+  PACKAGE_VERSION = RD::VERSION
 end

data/lib/rd/rd2html-lib.rb

@@ -11,7 +11,7 @@ module RD
     include MethodParse
 
     SYSTEM_NAME = "RDtool -- RD2HTMLVisitor"
-    SYSTEM_VERSION = "$Version: 0.6.31$" #"
+    SYSTEM_VERSION = "$Version: "+ RD::VERSION+"$" 
     VERSION = Version.new_from_version_string(SYSTEM_NAME, SYSTEM_VERSION)
 
     def self.version

data/lib/rd/rd2man-lib.rb

@@ -16,7 +16,7 @@ module RD
     include MethodParse
 
     SYSTEM_NAME = "RDtool -- RD2ManVisitor"
-    SYSTEM_VERSION = "$Version: 0.6.31$" #"
+    SYSTEM_VERSION = "$Version: "+RD::VERSION+"$"
     VERSION = Version.new_from_version_string(SYSTEM_NAME, SYSTEM_VERSION)
 
     def self.version

data/lib/rd/rdblockparser.ry

@@ -302,7 +302,7 @@ def next_token
 	part_out = @tree.filter[@in_part].call(part)
 	
 	if @tree.filter[@in_part].mode == :rd # if output is RD formated
-	  subtree = parse_subtree(part_out.to_a)
+	  subtree = parse_subtree( (RUBY_VERSION >= '1.9.0' ? part_out.lines.to_a : part_out.to_a ) )
 	else # if output is target formated
 	  basename = TMPFILE.join('.')
 	  TMPFILE[-1] += 1

data/lib/rd/rdblockparser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
+# This file is automatically generated by racc 1.4.5
 # from racc grammer file "lib/rd/rdblockparser.ry".
 #
 
@@ -14,7 +14,7 @@ module RD
 
 class RDParser < Racc::Parser
 
-module_eval <<'..end lib/rd/rdblockparser.ry modeval..idc4b57748f0', 'lib/rd/rdblockparser.ry', 231
+module_eval <<'..end lib/rd/rdblockparser.ry modeval..id8f0eb19cd5', 'lib/rd/rdblockparser.ry', 231
 include ParserUtility
 
 TMPFILE = ["rdtmp", $$, 0]
@@ -89,7 +89,7 @@ def next_token
 	part_out = @tree.filter[@in_part].call(part)
 	
 	if @tree.filter[@in_part].mode == :rd # if output is RD formated
-	  subtree = parse_subtree(part_out.to_a)
+	  subtree = parse_subtree( (RUBY_VERSION >= '1.9.0' ? part_out.lines.to_a : part_out.to_a ) )
 	else # if output is target formated
 	  basename = TMPFILE.join('.')
 	  TMPFILE[-1] += 1
@@ -296,9 +296,9 @@ def format_line_num(*args)
 end
 private :format_line_num
 
-..end lib/rd/rdblockparser.ry modeval..idc4b57748f0
+..end lib/rd/rdblockparser.ry modeval..id8f0eb19cd5
 
-##### racc 1.4.4 generates ###
+##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,

data/lib/rd/rdinlineparser.ry

@@ -455,7 +455,7 @@ def make_reference_from_label(label)
 end
 
 def on_error(et, ev, values)
-  lines_of_rest = @src.rest.to_a.length
+  lines_of_rest = (RUBY_VERSION >= '1.9.0' ? @src.rest.lines.to_a.length : @src.rest.to_a.length )
   prev_words = prev_words_on_error(ev)
   at = 4 + prev_words.length
   message = <<-MSG

data/lib/rd/rdinlineparser.tab.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.4
+# This file is automatically generated by racc 1.4.5
 # from racc grammer file "lib/rd/rdinlineparser.ry".
 #
 
@@ -16,7 +16,7 @@ module RD
 
 class RDInlineParser < Racc::Parser
 
-module_eval <<'..end lib/rd/rdinlineparser.ry modeval..id193b0f608d', 'lib/rd/rdinlineparser.ry', 292
+module_eval <<'..end lib/rd/rdinlineparser.ry modeval..idb94166fc78', 'lib/rd/rdinlineparser.ry', 292
 include ParserUtility
 extend Forwardable
 
@@ -183,7 +183,7 @@ def make_reference_from_label(label)
 end
 
 def on_error(et, ev, values)
-  lines_of_rest = @src.rest.to_a.length
+  lines_of_rest = (RUBY_VERSION >= '1.9.0' ? @src.rest.lines.to_a.length : @src.rest.to_a.length )
   prev_words = prev_words_on_error(ev)
   at = 4 + prev_words.length
   message = <<-MSG
@@ -219,9 +219,9 @@ def next_words_on_error
   end
 end
 
-..end lib/rd/rdinlineparser.ry modeval..id193b0f608d
+..end lib/rd/rdinlineparser.ry modeval..idb94166fc78
 
-##### racc 1.4.4 generates ###
+##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,

data/lib/rd/tree.rb

@@ -10,7 +10,7 @@ module RD
     include Enumerable
 
     SYSTEM_NAME = "RDtool Framework -- Document Tree"
-    SYSTEM_VERSION = "$Version: 0.6.31$" #"
+    SYSTEM_VERSION = "$Version: "+RD::VERSION+"$"
     VERSION = Version.new_from_version_string(SYSTEM_NAME, SYSTEM_VERSION)
 
     def Tree.version

data/lib/rd/version.rb

@@ -1,5 +1,7 @@
-
 module RD
+
+  VERSION = '0.6.32'
+
   class Version
     attr_reader :name
     attr_reader :major, :minor, :patch_level

data/lib/rd/visitor.rb

@@ -3,7 +3,7 @@ require "rd/version"
 module RD
   class Visitor
     SYSTEM_NAME = "RDtool Framework -- Visitor"
-    SYSTEM_VERSION = "$Version: 0.6.31$" #"
+    SYSTEM_VERSION = "$Version: "+RD::VERSION+"$"
     VERSION = Version.new_from_version_string(SYSTEM_NAME, SYSTEM_VERSION)
 
     def Visitor.version

data/makerdtool.rb

@@ -4,12 +4,12 @@
 # Copyright (C) 2004 MoonWolf <moonwolf@moonwolf.com>
 # Copyright (C) 2011 Youhei SASAKI <uwabami@gfd-dennou.org>
 
-require 'rbconfig'
+require 'rbconfig' unless defined? RbConfig
 require 'optparse'
 require 'find'
 
-bindir     = Config::CONFIG['bindir']
-sitelibdir = Config::CONFIG['sitelibdir']
+bindir     = RbConfig::CONFIG['bindir']
+sitelibdir = RbConfig::CONFIG['sitelibdir']
 racc       = nil
 version    = ARGV.shift || File.read("VERSION")
 $dryrun    = false

data/rdtool.gemspec

@@ -1,134 +1,121 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
+# -*- coding: utf-8; mode: ruby -*-
 Gem::Specification.new do |s|
-  s.name = "rdtool"
-  s.version = "0.6.31"
-
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Youhei SASAKI"]
-  s.date = "2011-11-11"
+  s.rubygems_version = "1.3.5"
+
+  s.name = 'rdtool'
+  s.version = '0.6.32'
+  s.date = '2012-02-15'
+
+  s.summary = "RDtool is formatter for RD."
   s.description = "RD is multipurpose documentation format created for documentating Ruby and output of Ruby world. You can embed RD into Ruby script. And RD have neat syntax which help you to read document in Ruby script. On the other hand, RD have a feature for class reference."
+  s.authors = ["Youhei SASAKI"]
   s.email = "uwabami@gfd-dennou.org"
-  s.executables = ["rd2", "rdswap.rb"]
-  s.files = [
-    "COPYING.txt",
-    "Gemfile",
-    "HISTORY",
-    "LICENSE.txt",
-    "MANIFEST",
-    "README.rd",
-    "README.rd.ja",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "bin/rd2",
-    "bin/rdswap.rb",
-    "doc/rd-draft.rd",
-    "doc/rd-draft.rd.ja",
-    "lib/rd/block-element.rb",
-    "lib/rd/complex-list-item.rb",
-    "lib/rd/desclist.rb",
-    "lib/rd/document-struct.rb",
-    "lib/rd/dot.rd2rc",
-    "lib/rd/element.rb",
-    "lib/rd/filter.rb",
-    "lib/rd/inline-element.rb",
-    "lib/rd/labeled-element.rb",
-    "lib/rd/list.rb",
-    "lib/rd/loose-struct.rb",
-    "lib/rd/methodlist.rb",
-    "lib/rd/output-format-visitor.rb",
-    "lib/rd/package.rb",
-    "lib/rd/parser-util.rb",
-    "lib/rd/post-install",
-    "lib/rd/rbl-file.rb",
-    "lib/rd/rbl-suite.rb",
-    "lib/rd/rd-struct.rb",
-    "lib/rd/rd2html-lib.rb",
-    "lib/rd/rd2html-opt.rb",
-    "lib/rd/rd2man-lib.rb",
-    "lib/rd/rd2rdo-lib.rb",
-    "lib/rd/rd2rmi-lib.rb",
-    "lib/rd/rdblockparser.ry",
-    "lib/rd/rdblockparser.tab.rb",
-    "lib/rd/rdfmt.rb",
-    "lib/rd/rdinlineparser.ry",
-    "lib/rd/rdinlineparser.tab.rb",
-    "lib/rd/rdvisitor.rb",
-    "lib/rd/reference-resolver.rb",
-    "lib/rd/search-file.rb",
-    "lib/rd/tree.rb",
-    "lib/rd/version.rb",
-    "lib/rd/visitor.rb",
-    "makerdtool.rb",
-    "rdtool.gemspec",
-    "setup.rb",
-    "test.rb",
-    "test/data/includee1.html",
-    "test/data/includee2.html",
-    "test/data/includee3.nothtml",
-    "test/data/includee4.xhtml",
-    "test/data/label.rbl",
-    "test/data/label2.rbl",
-    "test/data/sub/includee2.html",
-    "test/data/sub/includee4.html",
-    "test/dummy-observer.rb",
-    "test/dummy.rb",
-    "test/temp-dir.rb",
-    "test/test-block-parser.rb",
-    "test/test-desclist-item.rb",
-    "test/test-document-element.rb",
-    "test/test-document-struct.rb",
-    "test/test-element.rb",
-    "test/test-headline.rb",
-    "test/test-inline-parser.rb",
-    "test/test-list-item.rb",
-    "test/test-list.rb",
-    "test/test-methodlist-item.rb",
-    "test/test-nonterminal-element.rb",
-    "test/test-nonterminal-inline.rb",
-    "test/test-output-format-visitor.rb",
-    "test/test-parser-util.rb",
-    "test/test-rbl-file.rb",
-    "test/test-rbl-suite.rb",
-    "test/test-rd2html-lib.rb",
-    "test/test-rdtree.rb",
-    "test/test-rdvisitor.rb",
-    "test/test-reference-resolver.rb",
-    "test/test-reference.rb",
-    "test/test-search-file.rb",
-    "test/test-terminal-inline.rb",
-    "test/test-textblock.rb",
-    "test/test-tree.rb",
-    "test/test-version.rb",
-    "test/test-visitor.rb",
-    "utils/rd-mode.el"
-  ]
   s.homepage = "http://github.com/uwabami/rdtool"
-  s.licenses = ["GPL", "Ruby"]
+  s.licenses = ["GPL-2+", "Ruby"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "RDtool is formatter for RD."
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.test_files = `git ls-files -- test/*`.split("\n")
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_development_dependency('racc', "~> 1.4.6")
+  s.add_development_dependency('rake', ">= 0") unless defined? Rake
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<racc>, ["~> 1.4.6"])
-    else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<racc>, ["~> 1.4.6"])
-    end
-  else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<racc>, ["~> 1.4.6"])
-  end
-end
+  # = MANIFEST =
+  s.files = %w[
+    COPYING.txt
+    Gemfile
+    HISTORY
+    LICENSE.txt
+    README.html
+    README.ja.html
+    README.rd
+    README.rd.ja
+    Rakefile
+    TODO
+    bin/rd2
+    bin/rdswap.rb
+    doc/rd-draft.html
+    doc/rd-draft.ja.html
+    doc/rd-draft.rd
+    doc/rd-draft.rd.ja
+    lib/rd/block-element.rb
+    lib/rd/complex-list-item.rb
+    lib/rd/desclist.rb
+    lib/rd/document-struct.rb
+    lib/rd/dot.rd2rc
+    lib/rd/element.rb
+    lib/rd/filter.rb
+    lib/rd/inline-element.rb
+    lib/rd/labeled-element.rb
+    lib/rd/list.rb
+    lib/rd/loose-struct.rb
+    lib/rd/methodlist.rb
+    lib/rd/output-format-visitor.rb
+    lib/rd/package.rb
+    lib/rd/parser-util.rb
+    lib/rd/post-install
+    lib/rd/rbl-file.rb
+    lib/rd/rbl-suite.rb
+    lib/rd/rd-struct.rb
+    lib/rd/rd2html-lib.rb
+    lib/rd/rd2html-opt.rb
+    lib/rd/rd2man-lib.rb
+    lib/rd/rd2rdo-lib.rb
+    lib/rd/rd2rmi-lib.rb
+    lib/rd/rdblockparser.ry
+    lib/rd/rdblockparser.tab.rb
+    lib/rd/rdfmt.rb
+    lib/rd/rdinlineparser.ry
+    lib/rd/rdinlineparser.tab.rb
+    lib/rd/rdvisitor.rb
+    lib/rd/reference-resolver.rb
+    lib/rd/search-file.rb
+    lib/rd/tree.rb
+    lib/rd/version.rb
+    lib/rd/visitor.rb
+    makerdtool.rb
+    rdtool.gemspec
+    setup.rb
+    test/data/includee1.html
+    test/data/includee2.html
+    test/data/includee3.nothtml
+    test/data/includee4.xhtml
+    test/data/label.rbl
+    test/data/label2.rbl
+    test/data/sub/includee2.html
+    test/data/sub/includee4.html
+    test/dummy-observer.rb
+    test/dummy.rb
+    test/temp-dir.rb
+    test/test-block-parser.rb
+    test/test-desclist-item.rb
+    test/test-document-element.rb
+    test/test-document-struct.rb
+    test/test-element.rb
+    test/test-headline.rb
+    test/test-inline-parser.rb
+    test/test-list-item.rb
+    test/test-list.rb
+    test/test-methodlist-item.rb
+    test/test-nonterminal-element.rb
+    test/test-nonterminal-inline.rb
+    test/test-output-format-visitor.rb
+    test/test-parser-util.rb
+    test/test-rbl-file.rb
+    test/test-rbl-suite.rb
+    test/test-rd2html-lib.rb
+    test/test-rdtree.rb
+    test/test-rdvisitor.rb
+    test/test-reference-resolver.rb
+    test/test-reference.rb
+    test/test-search-file.rb
+    test/test-terminal-inline.rb
+    test/test-textblock.rb
+    test/test-tree.rb
+    test/test-version.rb
+    test/test-visitor.rb
+    utils/rd-mode.el
+  ]
+  # = MANIFEST =
 
+end

data/setup.rb

@@ -660,7 +660,7 @@ module FileOperations
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -723,7 +723,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -784,9 +784,9 @@ class ToplevelInstaller
       load File.expand_path(arg.split(/=/, 2)[1])
       $".push 'rbconfig.rb'
     else
-      require 'rbconfig'
+      require 'rbconfig' unless defined? RbConfig
     end
-    ::Config::CONFIG
+    ::RbConfig::CONFIG
   end
 
   def initialize(ardir_root, config)
@@ -827,7 +827,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1414,7 +1414,7 @@ class Installer
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$