doc 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "doc"
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Kuchin"]
-  s.date = "2011-10-04"
+  s.date = "2011-10-09"
   s.description = "Generate `Rakefile` with `docr` and get searchable documentation for ruby, rails, gems, plugins and all other ruby code in one place"
   s.executables = ["docr"]
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/toy/doc"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Get all ruby documentation in one place"
 
   if s.respond_to? :specification_version then

data/lib/doc/base_task.rb

@@ -72,5 +72,9 @@ module Doc
     def failed?
       @state == :failed
     end
+
+    def loaded_gem_version(gem)
+      Gem.loaded_specs[gem].version
+    end
   end
 end

data/lib/doc/builder.rb

@@ -64,9 +64,7 @@ module Doc
     end
 
     def build
-      cmd = Command.new('sdoc')
-      cmd.add '--format=shtml'
-      cmd.add '--template=direct'
+      cmd = Command.new('sdoc', "_#{loaded_gem_version('sdoc')}_")
       cmd.add '--line-numbers'
       cmd.add '--all'
       cmd.add '--charset=utf-8'

data/lib/doc/configurator/rails.rb

@@ -39,7 +39,7 @@ module Doc
       def paths_to_document_for_version(version)
         code = if version_less_than_3?(version)
           <<-RUBY
-            require 'rake/rdoctask'
+            require 'rdoc/task'
             gem 'rails', ARGV.first
 
             Rake::FileList.class_eval do
@@ -77,7 +77,7 @@ module Doc
           RUBY
         else
           <<-RUBY
-            require 'rake/rdoctask'
+            require 'rdoc/task'
             gem 'rails', ARGV.first
 
             class RDocTaskWithoutDescriptions < Rake::RDocTask

data/lib/doc/merger.rb

@@ -27,7 +27,7 @@ module Doc
       task_titles = succeded_tasks.map{ |task| task.title.gsub(',', '_') }.join(',')
       task_urls = succeded_tasks.map{ |task| task.doc_dir.relative_path_from(doc_dir).to_s.strip }.join(' ')
 
-      cmd = Command.new('sdoc-merge')
+      cmd = Command.new('sdoc-merge', "_#{loaded_gem_version('sdoc')}_")
       cmd.add "--op=#{doc_dir}"
       cmd.add "--title=#{title}"
       cmd.add "--names=#{task_titles}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doc
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sdoc
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Get all ruby documentation in one place