doc 0.3.0 → 0.4.0

data/doc.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'doc'
-  s.version     = '0.3.0'
+  s.version     = '0.4.0'
   s.summary     = %q{Get all ruby documentation in one place}
   s.description = %Q{Generate `Rakefile` with `docr` and get searchable documentation for ruby, rails, gems, plugins and all other ruby code in one place}
   s.homepage    = "http://github.com/toy/#{s.name}"

data/lib/doc/merger.rb

@@ -33,19 +33,23 @@ module Doc
       in_progress_message "Merging #{title}"
 
       succeded_tasks = tasks.reject(&:failed?)
-      task_titles = succeded_tasks.map{ |task| task.title.gsub(',', '_') }.join(',')
-      task_urls = succeded_tasks.map{ |task| task.doc_dir.relative_path_from(doc_dir) }.join(' ')
+      task_titles = succeded_tasks.map{ |task| task.title.gsub(',', '_') }
+      task_urls = succeded_tasks.map{ |task| task_url(task) }
 
       cmd = Command.new('sdoc-merge', "_#{loaded_gem_version('sdoc')}_")
       cmd.add "--op=#{doc_dir}"
       cmd.add "--title=#{title}"
-      cmd.add "--names=#{task_titles}"
-      cmd.add "--urls=#{task_urls}"
+      cmd.add "--names=#{task_titles.join(',')}"
+      cmd.add "--urls=#{task_urls.join(' ')}"
       cmd.add *succeded_tasks.map(&:doc_dir)
 
       cmd.run
     end
 
+    def task_url(task)
+      task.doc_dir.relative_path_from(doc_dir)
+    end
+
     def symlink_children_to(path)
       tasks.reject(&:failed?).each do |task|
         task.symlink_to(path)

data/lib/doc/root_merger.rb

@@ -4,6 +4,10 @@ module Doc
       documentor.public_dir
     end
 
+    def public_doc_dir
+      doc_dir / documentor.docs_dir.basename
+    end
+
     def progress_message
       'building docs'
     end
@@ -11,10 +15,13 @@ module Doc
     def run
       super
       if succeeded?
-        public_doc_dir = doc_dir / documentor.docs_dir.basename
         public_doc_dir.mkpath
         symlink_children_to(public_doc_dir)
       end
     end
+
+    def task_url(task)
+      documentor.docs_dir.basename / task.doc_dir.basename
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: doc
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ivan Kuchin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-01-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sdoc