doc 0.2.8 → 0.3.0

data/doc.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'doc'
-  s.version     = '0.2.8'
+  s.version     = '0.3.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/base_task.rb

@@ -70,6 +70,10 @@ module Doc
       @state = :failed
     end
 
+    def symlink_to(path)
+      (path / doc_dir.basename).make_symlink(doc_dir.relative_path_from(path))
+    end
+
     def succeeded?
       @state == :succeeded
     end

data/lib/doc/merger.rb

@@ -34,7 +34,7 @@ module Doc
 
       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).to_s.strip }.join(' ')
+      task_urls = succeded_tasks.map{ |task| task.doc_dir.relative_path_from(doc_dir) }.join(' ')
 
       cmd = Command.new('sdoc-merge', "_#{loaded_gem_version('sdoc')}_")
       cmd.add "--op=#{doc_dir}"
@@ -45,5 +45,16 @@ module Doc
 
       cmd.run
     end
+
+    def symlink_children_to(path)
+      tasks.reject(&:failed?).each do |task|
+        task.symlink_to(path)
+      end
+    end
+
+    def symlink_to(path)
+      symlink_children_to(path)
+      super
+    end
   end
 end

data/lib/doc/root_merger.rb

@@ -11,7 +11,9 @@ module Doc
     def run
       super
       if succeeded?
-        (doc_dir / documentor.docs_dir.basename).make_symlink(documentor.docs_dir.relative_path_from(doc_dir))
+        public_doc_dir = doc_dir / documentor.docs_dir.basename
+        public_doc_dir.mkpath
+        symlink_children_to(public_doc_dir)
       end
     end
   end

metadata

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