sdoc 0.2.20 → 0.3.0

data/.rake_tasks~

@@ -0,0 +1,20 @@
+build
+check_dependencies
+check_dependencies:development
+check_dependencies:runtime
+gem_file_list
+gemspec
+gemspec:debug
+gemspec:generate
+gemspec:validate
+ghost
+git:release
+github:release
+install
+release
+test
+version
+version:bump:major
+version:bump:minor
+version:bump:patch
+version:write

data/Rakefile

@@ -1,51 +1,12 @@
-require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems'
 
-task :default => :test
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new("test") do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.warning = true
-  t.verbose = true
-end
+gem 'rspec', '>= 2.5.0'
+require 'rspec/core/rake_task'
 
-desc "Generate file list for .gemspec"
-task :gem_file_list do
-  f = FileList.new
-  f.include('lib/**/**')
-  f.include('rdoc/**/**')
-  f.exclude('rdoc/test/**/**')
-  print "%w(" + f.to_a.select{|file| !File.directory? file }.join(' ') + ")\n"
-end
-
-begin
-  require 'jeweler'
-  
-  spec = Gem::Specification.new do |gem|
-    gem.name = "sdoc"
-    gem.summary = "rdoc html with javascript search index."
-    gem.email = "voloko@gmail.com"
-    gem.homepage = "http://github.com/voloko/sdoc"
-    gem.authors = ["Volodya Kolesnikov"]
-    gem.add_dependency("rdoc", "= 2.4.3")
-    
-    if defined?(JRUBY_VERSION)
-      gem.platform = Gem::Platform.new(['universal', 'java', nil])
-      gem.add_dependency("json_pure", ">= 1.1.3")
-    else
-      gem.add_dependency("json", ">= 1.1.3")
-    end    
-  end
-  
-  jewler = Jeweler::Tasks.new(spec)
-
-  desc "Replace system gem with symlink to this folder"
-  task 'ghost' do
-    path = Gem.searcher.find(jewler.gemspec.name).full_gem_path
-    system 'sudo', 'rm', '-r', path
-    symlink File.expand_path('.'), path
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: (sudo) gem install jeweler"
-end
+desc "Run all specs"
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+task :test => :spec

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 20
+:patch: 0
 :major: 0
 :build: 
-:minor: 2
+:minor: 3

data/bin/sdoc

@@ -1,11 +1,27 @@
 #!/usr/bin/env ruby -KU
-
 require File.dirname(__FILE__) + '/../lib/sdoc' # add extensions
 
 begin
+  ARGV.push('--format=sdoc') if ARGV.grep(/\A(-f|--fmt|--format|-r|-R|--ri|--ri-site)\b/).empty?
   r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
+  r.document ARGV
+rescue SystemExit
+  raise
+rescue Exception => e
+  if $DEBUG_RDOC then
+    $stderr.puts e.message
+    $stderr.puts "#{e.backtrace.join "\n\t"}"
+    $stderr.puts
+  elsif Interrupt === e then
+    $stderr.puts
+    $stderr.puts 'Interrupted'
+  else
+    $stderr.puts "uh-oh! RDoc had a problem:"
+    $stderr.puts e.message
+    $stderr.puts
+    $stderr.puts "run with --debug for full backtrace"
+  end
+
+  exit 1
 end
+

data/bin/sdoc-merge

@@ -6,7 +6,20 @@ require 'sdoc/merge'
 begin
   m = SDoc::Merge.new
   m.merge(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
+rescue SystemExit
+  raise
+rescue Exception => e
+  if $DEBUG_RDOC then
+    $stderr.puts e.message
+    $stderr.puts "#{e.backtrace.join "\n\t"}"
+    $stderr.puts
+  elsif Interrupt === e then
+    $stderr.puts
+    $stderr.puts 'Interrupted'
+  else
+    $stderr.puts "uh-oh! SDoc merge had a problem:"
+    $stderr.puts e.message
+  end
+  exit 1
 end
+

data/lib/rdoc/discover.rb

@@ -1 +1,5 @@
-require File.join(File.dirname(__FILE__), '/../sdoc')
+begin
+  gem 'rdoc', '~> 3'
+  require File.join(File.dirname(__FILE__), '/../sdoc')
+rescue Gem::LoadError
+end

data/lib/sdoc.rb

@@ -1,23 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 require "rubygems"
-gem "rdoc", "= 2.4.3"
+gem 'rdoc', '~> 3'
 
-require "rdoc/rdoc"
-
-module SDoc
-end
-
-require "sdoc/generator/shtml"
-require "sdoc/c_parser_fix"
-
-unless defined? SDOC_FIXED_RDOC_OPTIONS
-  SDOC_FIXED_RDOC_OPTIONS = 1
-  class RDoc::Options
-    alias_method :rdoc_initialize, :initialize
+module SDoc end
   
-    def initialize
-      rdoc_initialize
-      @generator = RDoc::Generator::SHtml
-    end
-  end
-end
+require 'sdoc/generator'

data/lib/sdoc/{generator/shtml.rb → generator.rb}

@@ -1,17 +1,20 @@
-require 'sdoc/json_backend'
-require 'iconv'
+require 'rubygems'
+require 'erb'
 require 'pathname'
 require 'fileutils'
-require 'erb'
-
-gem 'rdoc', '>= 2.4.2'
-require 'rdoc/rdoc'
-require 'rdoc/generator'
-require 'rdoc/generator/markup'
+if Gem.available? "json"
+  gem "json", ">= 1.1.3"
+else
+  gem "json_pure", ">= 1.1.3"
+end
+require 'json'
 
 require 'sdoc/github'
 require 'sdoc/templatable'
 require 'sdoc/helpers'
+require 'rdoc'
+require 'rdoc/rdoc'
+require 'rdoc/generator'
 
 class RDoc::ClassModule
   def document_self_or_methods
@@ -23,14 +26,21 @@ class RDoc::ClassModule
   end
 end
 
-class RDoc::Generator::SHtml
-  RDoc::RDoc.add_generator( self )
+class RDoc::Options
+  attr_accessor :github
+end
+
+class RDoc::Generator::SDoc
+  RDoc::RDoc.add_generator self
+
+  DESCRIPTION = 'Searchable HTML documentation'
+
   include ERB::Util
   include SDoc::GitHub
   include SDoc::Templatable
   include SDoc::Helpers
 
-  GENERATOR_DIRS = [File.join('sdoc', 'generator'), File.join('rdoc', 'generator')]
+  GENERATOR_DIRS = [File.join('sdoc', 'generator')]
 
   # Used in js to reduce index sizes
   TYPE_CLASS  = 1
@@ -46,19 +56,23 @@ class RDoc::Generator::SHtml
   RESOURCES_DIR = File.join('resources', '.')
 
   attr_reader :basedir
-
-  def self.for(options)
-    self.new(options)
-  end
-
-  def self.template_dir template
-    $LOAD_PATH.map do |path|
-      GENERATOR_DIRS.map do |dir|
-        File.join path, dir, 'template', template
-      end
-    end.flatten.find do |dir|
-      File.directory? dir
+  
+  attr_reader :options
+
+  def self.setup_options(options)
+    @github = false
+    options.template = 'direct'
+
+    opt = options.option_parser
+    opt.separator nil
+    opt.separator "SDoc generator options:"
+    opt.separator nil
+    opt.on("--github", "-g",
+           "Generate links to github.") do |value|
+      options.github = true
     end
+
+    opt.separator nil
   end
 
   def initialize(options)
@@ -70,7 +84,7 @@ class RDoc::Generator::SHtml
 
     template = @options.template || 'direct'
 
-    templ_dir = self.class.template_dir template
+    templ_dir = self.class.template_dir_for template
 
     raise RDoc::Error, "could not find template #{template.inspect}" unless
     templ_dir
@@ -79,8 +93,8 @@ class RDoc::Generator::SHtml
     @basedir = Pathname.pwd.expand_path
   end
 
-  def generate( top_levels )
-    @outputdir = Pathname.new( @options.op_dir ).expand_path( @basedir )
+  def generate(top_levels)
+    @outputdir = Pathname.new(@options.op_dir).expand_path(@basedir)
     @files = top_levels.sort
     @classes = RDoc::TopLevel.all_classes_and_modules.sort
 
@@ -101,18 +115,28 @@ class RDoc::Generator::SHtml
     FILE_DIR
   end
 
+  def self.template_dir_for template
+    $LOAD_PATH.map do |path|
+      GENERATOR_DIRS.map do |dir|
+        File.join path, dir, 'template', template
+      end
+    end.flatten.find do |dir|
+      File.directory? dir
+    end
+  end
+
 
   protected
   ### Output progress information if debugging is enabled
   def debug_msg( *msg )
     return unless $DEBUG_RDOC
     $stderr.puts( *msg )
-  end  
+  end
 
   ### Create class tree structure and write it as json
   def generate_class_tree
     debug_msg "Generating class tree"
-    topclasses = @classes.select {|klass| !(RDoc::ClassModule === klass.parent) } 
+    topclasses = @classes.select {|klass| !(RDoc::ClassModule === klass.parent) }
     tree = generate_file_tree + generate_class_tree_level(topclasses)
     debug_msg "  writing class tree to %s" % TREE_FILE
     File.open(TREE_FILE, "w", 0644) do |f|
@@ -125,9 +149,9 @@ class RDoc::Generator::SHtml
     tree = []
     classes.select{|c| c.with_documentation? }.sort.each do |klass|
       item = [
-        klass.name, 
+        klass.name,
         klass.document_self_or_methods ? klass.path : '',
-        klass.module? ? '' : (klass.superclass ? " < #{String === klass.superclass ? klass.superclass : klass.superclass.full_name}" : ''), 
+        klass.module? ? '' : (klass.superclass ? " < #{String === klass.superclass ? klass.superclass : klass.superclass.full_name}" : ''),
         generate_class_tree_level(klass.classes_and_modules)
       ]
       tree << item
@@ -163,16 +187,16 @@ class RDoc::Generator::SHtml
   def add_file_search_index(index)
     debug_msg "  generating file search index"
 
-    @files.select { |file| 
-      file.document_self 
+    @files.select { |file|
+      file.document_self
     }.sort.each do |file|
       index[:searchIndex].push( search_string(file.name) )
       index[:longSearchIndex].push( search_string(file.path) )
       index[:info].push([
-        file.name, 
-        file.path, 
-        file.path, 
-        '', 
+        file.name,
+        file.path,
+        file.path,
+        '',
         snippet(file.comment),
         TYPE_FILE
       ])
@@ -183,7 +207,7 @@ class RDoc::Generator::SHtml
   def add_class_search_index(index)
     debug_msg "  generating class search index"
 
-    @classes.select { |klass| 
+    @classes.select { |klass|
       klass.document_self_or_methods
     }.sort.each do |klass|
       modulename = klass.module? ? '' : (klass.superclass ? (String === klass.superclass ? klass.superclass : klass.superclass.full_name) : '')
@@ -191,10 +215,10 @@ class RDoc::Generator::SHtml
       index[:longSearchIndex].push( search_string(klass.parent.full_name) )
       files = klass.in_files.map{ |file| file.absolute_name }
       index[:info].push([
-        klass.name, 
-        files.include?(klass.parent.full_name) ? files.first : klass.parent.full_name, 
-        klass.path, 
-        modulename ? " < #{modulename}" : '', 
+        klass.name,
+        files.include?(klass.parent.full_name) ? files.first : klass.parent.full_name,
+        klass.path,
+        modulename ? " < #{modulename}" : '',
         snippet(klass.comment),
         TYPE_CLASS
       ])
@@ -205,23 +229,27 @@ class RDoc::Generator::SHtml
   def add_method_search_index(index)
     debug_msg "  generating method search index"
 
-    list = @classes.map { |klass| 
+    list = @classes.map do |klass|
       klass.method_list
-    }.flatten.sort{ |a, b| a.name == b.name ? a.parent.full_name <=> b.parent.full_name : a.name <=> b.name }.select { |method| 
-      method.document_self 
-    }
-    unless @options.show_all
-      list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
+    end.flatten.sort do |a, b| 
+      a.name == b.name ? 
+        a.parent.full_name <=> b.parent.full_name : 
+        a.name <=> b.name 
+    end.select do |method|
+      method.document_self
+    end.find_all do |m| 
+      m.visibility == :public || m.visibility == :protected || 
+      m.force_documentation
     end
 
     list.each do |method|
       index[:searchIndex].push( search_string(method.name) + '()' )
       index[:longSearchIndex].push( search_string(method.parent.full_name) )
       index[:info].push([
-        method.name, 
-        method.parent.full_name, 
-        method.path, 
-        method.params, 
+        method.name,
+        method.parent.full_name,
+        method.path,
+        method.params,
         snippet(method.comment),
         TYPE_METHOD
       ])

data/lib/sdoc/generator/template/direct/_context.rhtml

@@ -26,9 +26,7 @@
 
     <% 
         list = context.method_list
-        unless @options.show_all
-            list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
-        end
+        list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
     %>
     <% unless list.empty? %>
     <div class="sectiontitle">Methods</div>
@@ -118,7 +116,7 @@
         next if visibilities.empty?
         visibilities.each do |visibility, methods|
             next if methods.empty? 
-            next unless @options.show_all || visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
+            next unless visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
             %>
             <div class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> methods</div>
             <% methods.each do |method| %>
@@ -149,6 +147,7 @@
                     <p class="source-link">
                         Source: <a href="javascript:toggleSource('<%= method.aref %>_source')" id="l_<%= method.aref %>_source">show</a>
                         <% 
+                            if options.github
                             if markup =~ /File\s(\S+), line (\d+)/
                                 path = $1
                                 line = $2.to_i
@@ -157,7 +156,7 @@
                             if github
                         %>
                         | <a href="<%= "#{github}#L#{line}" %>" target="_blank" class="github_url">on GitHub</a>
-                        <% end %>
+                        <% end end %>
                     </p>
                     <div id="<%= method.aref %>_source" class="dyn-source">
                         <pre><%= method.markup_code %></pre>

data/lib/sdoc/generator/template/shtml/_context.rhtml

@@ -24,9 +24,7 @@
 
     <% 
         list = context.method_list
-        unless @options.show_all
-            list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
-        end
+        list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
     %>
     <% unless list.empty? %>
     <div class="sectiontitle">Methods</div>
@@ -109,7 +107,7 @@
         next if visibilities.empty?
         visibilities.each do |visibility, methods|
             next if methods.empty? 
-            next unless @options.show_all || visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
+            next unless visibility == :public || visibility == :protected || methods.any? {|m| m.force_documentation }
             %>
             <div class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> methods</div>
             <% methods.each do |method| %>
@@ -141,6 +139,7 @@
                     <p class="source-link">
                         Source: <a href="javascript:toggleSource('<%= method.aref %>_source')" id="l_<%= method.aref %>_source">show</a>
                         <% 
+                            if options.github
                             if markup =~ /File\s(\S+), line (\d+)/
                                 path = $1
                                 line = $2.to_i
@@ -149,7 +148,7 @@
                             if github
                         %>
                         | <a href="<%= "#{github}#L#{line}" %>" target="_blank" class="github_url">on GitHub</a>
-                        <% end %>
+                        <% end end %>
                     </p>
                     <div id="<%= method.aref %>_source" class="dyn-source">
                         <pre><%= method.markup_code %></pre>

data/lib/sdoc/merge.rb

@@ -2,7 +2,13 @@ require 'optparse'
 require 'pathname'
 require 'fileutils'
 
-require 'sdoc/json_backend'
+if Gem.available? "json"
+  gem "json", ">= 1.1.3"
+else
+  gem "json_pure", ">= 1.1.3"
+end
+require 'json'
+
 require 'sdoc/templatable'
 
 class SDoc::Merge
@@ -16,7 +22,7 @@ class SDoc::Merge
     @op_dir = 'doc'
     @title = ''
     @directories = []
-    template_dir = RDoc::Generator::SHtml.template_dir('merge')
+    template_dir = RDoc::Generator::SDoc.template_dir_for('merge')
 		@template_dir = Pathname.new File.expand_path(template_dir)
   end
   
@@ -51,8 +57,9 @@ class SDoc::Merge
         @title = v
       end
       
-      opt.on("-u", "--urls [URLS]", "Paths to merged docs. If you \n" +
-                   "set this files and classes won't be actualy copied to merged build") do |v|
+      opt.on("-u", "--urls [URLS]", "Paths to merged docs. If you",
+                   "set this files and classes won't be actualy",
+                   "copied to merged build") do |v|
         @urls = v.split(' ').map{|name| name.strip }
       end
     end

data/lib/sdoc/templatable.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require "sdoc"
 
 module SDoc::Templatable

data/sdoc.gemspec

@@ -1,94 +1,35 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{sdoc}
-  s.version = "0.2.20"
+  s.name = "sdoc"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Volodya Kolesnikov"]
-  s.date = %q{2010-08-23}
-  s.email = %q{voloko@gmail.com}
-  s.executables = ["sdoc", "sdoc-merge"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/sdoc",
-     "bin/sdoc-merge",
-     "lib/rdoc/discover.rb",
-     "lib/sdoc.rb",
-     "lib/sdoc/c_parser_fix.rb",
-     "lib/sdoc/generator/shtml.rb",
-     "lib/sdoc/generator/template/direct/_context.rhtml",
-     "lib/sdoc/generator/template/direct/class.rhtml",
-     "lib/sdoc/generator/template/direct/file.rhtml",
-     "lib/sdoc/generator/template/direct/index.rhtml",
-     "lib/sdoc/generator/template/direct/resources/apple-touch-icon.png",
-     "lib/sdoc/generator/template/direct/resources/css/main.css",
-     "lib/sdoc/generator/template/direct/resources/css/panel.css",
-     "lib/sdoc/generator/template/direct/resources/css/reset.css",
-     "lib/sdoc/generator/template/direct/resources/favicon.ico",
-     "lib/sdoc/generator/template/direct/resources/i/arrows.png",
-     "lib/sdoc/generator/template/direct/resources/i/results_bg.png",
-     "lib/sdoc/generator/template/direct/resources/i/tree_bg.png",
-     "lib/sdoc/generator/template/direct/resources/js/jquery-1.3.2.min.js",
-     "lib/sdoc/generator/template/direct/resources/js/jquery-effect.js",
-     "lib/sdoc/generator/template/direct/resources/js/main.js",
-     "lib/sdoc/generator/template/direct/resources/js/searchdoc.js",
-     "lib/sdoc/generator/template/direct/resources/panel/index.html",
-     "lib/sdoc/generator/template/merge/index.rhtml",
-     "lib/sdoc/generator/template/shtml/_context.rhtml",
-     "lib/sdoc/generator/template/shtml/class.rhtml",
-     "lib/sdoc/generator/template/shtml/file.rhtml",
-     "lib/sdoc/generator/template/shtml/index.rhtml",
-     "lib/sdoc/generator/template/shtml/resources/apple-touch-icon.png",
-     "lib/sdoc/generator/template/shtml/resources/css/main.css",
-     "lib/sdoc/generator/template/shtml/resources/css/panel.css",
-     "lib/sdoc/generator/template/shtml/resources/css/reset.css",
-     "lib/sdoc/generator/template/shtml/resources/favicon.ico",
-     "lib/sdoc/generator/template/shtml/resources/i/arrows.png",
-     "lib/sdoc/generator/template/shtml/resources/i/results_bg.png",
-     "lib/sdoc/generator/template/shtml/resources/i/tree_bg.png",
-     "lib/sdoc/generator/template/shtml/resources/js/jquery-1.3.2.min.js",
-     "lib/sdoc/generator/template/shtml/resources/js/main.js",
-     "lib/sdoc/generator/template/shtml/resources/js/searchdoc.js",
-     "lib/sdoc/generator/template/shtml/resources/panel/index.html",
-     "lib/sdoc/github.rb",
-     "lib/sdoc/helpers.rb",
-     "lib/sdoc/json_backend.rb",
-     "lib/sdoc/merge.rb",
-     "lib/sdoc/templatable.rb",
-     "sdoc.gemspec"
-  ]
-  s.homepage = %q{http://github.com/voloko/sdoc}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.authors = ["Vladimir Kolesnikov"]
+  s.date = %q{2010-10-05}
+  s.description = %q{rdoc generator html with javascript search index.}
   s.summary = %q{rdoc html with javascript search index.}
+  s.homepage = %q{http://github.com/voloko/sdoc}
+  s.email = %q{voloko@gmail.com}
+
+  s.platform                  = Gem::Platform::RUBY
+  s.rubygems_version          = %q{1.3.6}
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = ["README.rdoc"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdoc>, ["= 2.4.3"])
-      s.add_runtime_dependency(%q<json>, [">= 1.1.3"])
-    else
-      s.add_dependency(%q<rdoc>, ["= 2.4.3"])
-      s.add_dependency(%q<json>, [">= 1.1.3"])
-    end
+  s.add_runtime_dependency('rdoc', "~> 3")
+  if defined?(JRUBY_VERSION)
+    s.platform = Gem::Platform.new(['universal', 'java', nil])
+    s.add_runtime_dependency("json_pure", ">= 1.1.3")
   else
-    s.add_dependency(%q<rdoc>, ["= 2.4.3"])
-    s.add_dependency(%q<json>, [">= 1.1.3"])
-  end
+    s.add_runtime_dependency("json", ">= 1.1.3")
+  end    
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: sdoc
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 20
-  version: 0.2.20
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
-- Volodya Kolesnikov
+- Vladimir Kolesnikov
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +04:00
+date: 2010-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 5
         segments: 
-        - 2
-        - 4
         - 3
-        version: 2.4.3
+        version: "3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,7 +48,7 @@ dependencies:
         version: 1.1.3
   type: :runtime
   version_requirements: *id002
-description: 
+description: rdoc generator html with javascript search index.
 email: voloko@gmail.com
 executables: 
 - sdoc
@@ -58,10 +56,10 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
 files: 
 - .gitignore
+- .rake_tasks~
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -70,8 +68,7 @@ files:
 - bin/sdoc-merge
 - lib/rdoc/discover.rb
 - lib/sdoc.rb
-- lib/sdoc/c_parser_fix.rb
-- lib/sdoc/generator/shtml.rb
+- lib/sdoc/generator.rb
 - lib/sdoc/generator/template/direct/_context.rhtml
 - lib/sdoc/generator/template/direct/class.rhtml
 - lib/sdoc/generator/template/direct/file.rhtml
@@ -108,7 +105,6 @@ files:
 - lib/sdoc/generator/template/shtml/resources/panel/index.html
 - lib/sdoc/github.rb
 - lib/sdoc/helpers.rb
-- lib/sdoc/json_backend.rb
 - lib/sdoc/merge.rb
 - lib/sdoc/templatable.rb
 - sdoc.gemspec
@@ -135,10 +131,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 

data/lib/sdoc/c_parser_fix.rb

@@ -1,31 +0,0 @@
-require "rdoc/parser/c"
-
-# New RDoc somehow misses class comments.
-# copied this function from "2.2.2" 
-if ['2.4.2', '2.4.3'].include? RDoc::VERSION
-
-  class RDoc::Parser::C
-    def find_class_comment(class_name, class_meth)
-      comment = nil
-      if @content =~ %r{((?>/\*.*?\*/\s+))
-                     (static\s+)?void\s+Init_#{class_name}\s*(?:_\(\s*)?\(\s*(?:void\s*)\)}xmi then
-        comment = $1
-      elsif @content =~ %r{Document-(?:class|module):\s#{class_name}\s*?(?:<\s+[:,\w]+)?\n((?>.*?\*/))}m
-        comment = $1
-      else
-        if @content =~ /rb_define_(class|module)/m then
-          class_name = class_name.split("::").last
-          comments = []
-          @content.split(/(\/\*.*?\*\/)\s*?\n/m).each_with_index do |chunk, index|
-            comments[index] = chunk
-            if chunk =~ /rb_define_(class|module).*?"(#{class_name})"/m then
-              comment = comments[index-1]
-              break
-            end
-          end
-        end
-      end
-      class_meth.comment = mangle_comment(comment) if comment
-    end
-  end
-end

data/lib/sdoc/json_backend.rb

@@ -1,15 +0,0 @@
-require 'rubygems'
-
-## undefined method `to_json' for Array :(
-# if Gem.available? "yajl-ruby"
-#   gem "yajl-ruby", ">= 0.7.6"
-#   require "yajl"
-#   warn "yajl"
-# else
-  if Gem.available? "json"
-    gem "json", ">= 1.1.3"
-  else
-    gem "json_pure", ">= 1.1.3"
-  end
-  require "json"
-# end