sdoc_all 1.0.2.2 → 1.0.4

data/.autotest

@@ -0,0 +1,8 @@
+=begin
+Autotest.add_hook :reset do |at|
+  at.clear_mappings
+  at.add_mapping(/\.rb$/) do |filename, _|
+    Dir.glob('spec/**/*_spec.rb')
+  end
+end
+=end

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+pkg
+doc
+*.gem
+*.swp

data/Manifest

@@ -17,6 +17,7 @@ lib/sdoc_all/parts/plugins.rb
 lib/sdoc_all/parts/rails.rb
 lib/sdoc_all/parts/ruby.rb
 lib/sdoc_all/task.rb
+lib/shell_escape.rb
 lib/tasks/sdoc_all_rake.rb
 spec/sdoc_all/file_list_spec.rb
 spec/sdoc_all/gems_spec.rb

data/README.rdoc

@@ -66,6 +66,11 @@ to build stdlib documentation for every group not fully present in ruby document
       version: 1.8.6
       stdlib: true
 
+to integrate stdlib to main ruby documentation use
+  - ruby:
+      version: 1.8.6
+      stdlib: integrate
+
 === rails
 choose rails version
   - rails: 2.3.2

data/Rakefile

@@ -1,28 +1,36 @@
-require 'pathname'
-require 'rubygems'
-require 'rake'
-require 'rake/clean'
-require 'fileutils'
-require 'echoe'
+begin
+  require 'jeweler'
 
-version = YAML.load_file(File.join(File.dirname(__FILE__), 'VERSION.yml')).join('.') rescue nil
+  name = 'sdoc_all'
+  summary = 'Documentation for everything'
+  description = 'Command line tool to get documentation for ruby, rails, gems and plugins in one place'
 
-echoe = Echoe.new('sdoc_all', version) do |p|
-  p.author = 'toy'
-  p.summary = 'documentation for everything'
-  p.description = 'Command line tool to get documentation for ruby, rails, gems and plugins in one place'
-  p.email = 'ivan@workisfun.ru'
-  p.url = 'http://github.com/toy/sdoc_all'
-  p.runtime_dependencies << 'activesupport'
-  p.runtime_dependencies << 'rake'
-  p.runtime_dependencies << 'progress >=0.0.8'
-  p.runtime_dependencies << 'sdoc'
-  p.project = 'toytoy'
-end
+  jewel = Jeweler::Tasks.new do |j|
+    j.name = name
+    j.summary = summary
+    j.description = description
+    j.homepage = "http://github.com/toy/#{name}"
+    j.authors = ["Boba Fat"]
+    j.add_dependency 'activesupport'
+    j.add_dependency 'colored'
+    j.add_dependency 'progress', '>= 0.0.8'
+    j.add_dependency 'rake'
+    j.add_dependency 'rubigen'
+    j.add_dependency 'sdoc'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  require 'pathname'
+  desc "Replace system gem with symlink to this folder"
+  task 'ghost' do
+    gem_path = Pathname(Gem.searcher.find(name).full_gem_path)
+    current_path = Pathname('.').expand_path
+    cmd = gem_path.writable? && gem_path.parent.writable? ? %w() : %w(sudo)
+    system(*cmd + %W[rm -r #{gem_path}])
+    system(*cmd + %W[ln -s #{current_path} #{gem_path}])
+  end
 
-desc "Replace system gem with symlink to this folder"
-task 'ghost' do
-  path = Gem.searcher.find(echoe.name).full_gem_path
-  system 'sudo', 'rm', '-r', path
-  symlink File.expand_path('.'), path
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -0,0 +1 @@
+1.0.4

data/bin/sdoc-all

@@ -4,8 +4,8 @@ require 'rubygems'
 require 'rubigen'
 
 if %w(-v --version).include? ARGV.first
-  version = YAML.load_file(File.join(File.dirname(__FILE__), '../VERSION.yml'))
-  puts "#{File.basename($0)} #{version.join('.')}"
+  version = YAML.load_file(Pathname(__FILE__).dirname.parent + 'VERSION.yml').join('.')
+  puts "#{File.basename($0)} #{version}"
   exit(0)
 end
 

data/lib/sdoc_all.rb

@@ -7,6 +7,7 @@ require 'rubygems'
 require 'activesupport'
 require 'rake'
 require 'progress'
+require 'colored'
 
 __DIR__ = File.dirname(__FILE__)
 $:.unshift(__DIR__) unless $:.include?(__DIR__) || $:.include?(File.expand_path(__DIR__))
@@ -25,6 +26,16 @@ class Pathname
   end
 end
 
+class String
+  def shrink(max_length)
+    if length > max_length
+      "#{self[0, max_length - 1]}…"
+    else
+      self
+    end
+  end
+end
+
 class SdocAll
   module ClassMethods
     def update?
@@ -52,14 +63,18 @@ class SdocAll
     end
 
     def run(options = {})
+      Base.dry_run! if options[:dry_run]
+      Base.verbose_level = options[:verbose_level]
+      Progress.lines = true if Base.verbose_level >= 1
       begin
         read_config
         tasks = Base.tasks(:update => update? || options[:update])
 
         if last_build_sdoc_version.nil? || last_build_sdoc_version != current_sdoc_version
+          puts "sdoc version changed - rebuilding all docs".red unless last_build_sdoc_version.nil?
           Base.remove_if_present(Base.docs_path)
         else
-          Dir.chdir(Base.docs_path) do
+          Base.chdir(Base.docs_path) do
             to_delete = Dir.glob('*')
             tasks.each do |task|
               to_delete -= task.occupied_doc_pathes
@@ -70,15 +85,17 @@ class SdocAll
           end
         end
 
-        tasks.each_with_progress('docs') do |task|
-          task.run(options)
+        tasks.with_progress('sdoc').each do |task|
+          Progress.start(task.title) do
+            task.run(options)
+          end
         end
 
         config_hash = Digest::SHA1.hexdigest(tasks.map(&:config_hash).inspect + title.to_s)
         created_hash = config_hash_path.read rescue nil
 
         if config_hash != created_hash
-          Dir.chdir(Base.docs_path) do
+          Base.chdir(Base.docs_path) do
             paths = []
             titles = []
             urls = []
@@ -114,7 +131,7 @@ class SdocAll
           end
         end
       rescue ConfigError => e
-        STDERR.puts "\e[1;31m#{e.to_s}\e[0m"
+        abort e.to_s.red.bold
       end
     end
 
@@ -135,7 +152,7 @@ class SdocAll
 
       if config[:sdoc] && config[:sdoc].is_a?(Array) && config[:sdoc].length > 0
         errors = []
-        config[:sdoc].each do |entry|
+        config[:sdoc].with_progress('reading config').each do |entry|
           begin
             if entry.is_a?(Hash)
               if entry.length == 1

data/lib/sdoc_all/base.rb

@@ -1,3 +1,5 @@
+require 'shell_escape'
+
 class SdocAll
   class Base
     attr_reader :config
@@ -33,6 +35,19 @@ class SdocAll
       DOCS_PATH = BASE_PATH + 'docs'
       PUBLIC_PATH = BASE_PATH + 'public'
 
+      def dry_run!
+        @@dry_run = true
+      end
+      def dry_run?
+        defined?(@@dry_run) && @@dry_run
+      end
+      def verbose_level=(val)
+        @@verbose_level = val
+      end
+      def verbose_level
+        defined?(@@verbose_level) ? @@verbose_level : 0
+      end
+
       def base_path
         BASE_PATH
       end
@@ -88,7 +103,7 @@ class SdocAll
 
       def tasks(options = {})
         @@tasks = []
-        entries.each do |entry|
+        entries.with_progress('configuring').each do |entry|
           entry.add_tasks(options)
         end
         subclasses.values.each do |subclass|
@@ -115,14 +130,60 @@ class SdocAll
       end
 
       def system(*args)
-        escaped_args = args.map(&:to_s).map{ |arg| arg[/[^a-z0-9\/\-.]/i] ? arg.inspect : arg }
-        command = escaped_args.join(' ')
-        puts "Executing #{command.length > 250 ? "#{command[0, 247]}..." : command}"
-        Kernel.system(*args)
+        command = args.length == 1 ? args.first : ShellEscape.command(*args)
+        if verbose_level >= 1
+          puts [dirs.last && "cd #{dirs.last}", command].compact.join('; ').shrink(250).blue
+        end
+        unless dry_run?
+          if verbose_level >= 2
+            Kernel.system(*args)
+          else
+            rd, wr = IO::pipe
+
+            pid = fork{
+              rd.close
+              STDOUT.reopen(wr)
+              STDERR.reopen(wr)
+              wr.close
+              exec(*args)
+            }
+
+            wr.close
+            begin
+              true while line = rd.gets
+            ensure
+              rd.close unless rd.closed?
+              Process.wait(pid)
+            end
+          end
+          unless $?.success?
+            if $?.signaled?
+              raise SignalException.new($?.termsig)
+            else
+              abort("failed: #{command}")
+            end
+          end
+        end
       end
 
       def remove_if_present(path)
-        FileUtils.remove_entry(path) if File.exist?(path)
+        path = Pathname(path)
+        if path.exist?
+          puts "rm -r #{ShellEscape.word(path)}".magenta
+          FileUtils.remove_entry(path) unless dry_run?
+        end
+      end
+
+      def dirs
+        @@dirs ||= []
+      end
+
+      def chdir(path, &block)
+        path = Pathname(path)
+        dirs.push(path.expand_path)
+        Dir.chdir(path, &block)
+      ensure
+        dirs.pop
       end
 
       def with_env(key, value)
@@ -131,6 +192,25 @@ class SdocAll
       ensure
         ENV[key] = old_value
       end
+
+      def output_for_verbose_level(n)
+        if verbose_level >= n
+          yield
+        else
+          old_stdout = $stdout
+          old_stderr = $stderr
+          dev_null = File.open('/dev/null', 'w')
+          begin
+            $stdout = dev_null
+            $stderr = dev_null
+            yield
+          ensure
+            $stdout = old_stdout
+            $stderr = old_stderr
+            dev_null.close
+          end
+        end
+      end
     end
     extend ClassMethods
   end

data/lib/sdoc_all/parts/paths.rb

@@ -66,7 +66,7 @@ class SdocAll
 
         if entry[:paths]
           paths = FileList.new
-          Dir.chdir(path) do
+          Base.chdir(path) do
             entry[:paths].each do |glob|
               m = /^([+-]?)(.*)$/.match(glob)
               if m[1] == '-'

data/lib/sdoc_all/parts/plugins.rb

@@ -21,9 +21,11 @@ class SdocAll
     end
 
     def add_tasks(options = {})
-      plugins = config[:path].children.map do |path|
-        path if path.directory?
-      end.compact
+      plugins = Base.chdir(config[:path]) do
+        Pathname.glob('*').map do |path|
+          config[:path] + path if path.directory?
+        end.compact
+      end
 
       plugins.delete_if{ |plugin| !config[:only].include?(plugin.basename.to_s.downcase) } if config[:only]
       plugins.delete_if{ |plugin| config[:exclude].include?(plugin.basename.to_s.downcase) }
@@ -31,7 +33,7 @@ class SdocAll
       if config[:update] && options[:update]
         plugins.each do |plugin|
           if (plugin + '.git').directory?
-            Dir.chdir(plugin) do
+            Base.chdir(plugin) do
               Base.system('git fetch origin && git reset --hard origin')
             end
           end
@@ -40,7 +42,7 @@ class SdocAll
 
       plugins.each do |plugin|
         paths = FileList.new
-        Dir.chdir(plugin) do
+        Base.chdir(plugin) do
           paths.include('lib/**/*.rb')
           paths.include('README*')
           paths.include('CHANGELOG*')

data/lib/sdoc_all/parts/rails.rb

@@ -35,7 +35,7 @@ class SdocAll
       self.class.used_sources << path
 
       paths = FileList.new
-      Dir.chdir(path) do
+      Base.chdir(path) do
         File.open('vendor/rails/railties/lib/tasks/documentation.rake') do |f|
           true until f.readline['Rake::RDocTask.new("rails")']
           until (line = f.readline.strip) == '}'

data/lib/sdoc_all/parts/ruby.rb

@@ -22,7 +22,6 @@ class SdocAll
         version = `#{binary} -e 'print "\#{RUBY_VERSION}-p\#{RUBY_PATCHLEVEL}"'`
         if $?.success? && version[/^\d+\.\d+\.\d+-p\d+$/]
           config[:version] = version
-          puts "binary `#{binary}` is of version #{version}"
         else
           raise ConfigError.new("binary `#{binary}` failed or does not seem to be ruby binary as version returned is #{version.inspect}")
         end
@@ -63,54 +62,68 @@ class SdocAll
       end
       self.class.used_sources << src_path
 
-      task_options = {
-        :src_path => src_path,
-        :doc_path => "ruby-#{version}",
-        :title => "ruby-#{version}"
-      }
-      task_options[:index] = config[:index] if config[:index]
-      Base.add_task(task_options)
-
-      if config[:stdlib]
+      if config[:stdlib] == 'integrate'
         stdlib_config = download_and_get_stdlib_config(:update => config[:update] && options[:update])
-
-        stdlib_tasks = []
-        Dir.chdir(src_path) do
-          main_files_to_document = get_files_to_document
+        paths = FileList.new
+        Base.chdir(src_path) do
+          paths.add(get_ruby_files_to_document)
           stdlib_config['targets'].each do |target|
             name = target['target']
-
-            paths = FileList.new
-            paths.include("{lib,ext}/#{name}/**/README*")
-            paths.include("{lib,ext}/#{name}.{c,rb}")
-            paths.include("{lib,ext}/#{name}/**/*.{c,rb}")
-            paths.resolve
-            paths.reject! do |path|
-              [%r{/extconf.rb\Z}, %r{/test/(?!unit)}, %r{/tests/}, %r{/sample}, %r{/demo/}].any?{ |pat| pat.match path }
-            end
-
-            if paths.present? && (paths - main_files_to_document).present?
-              stdlib_tasks << {
-                :src_path => src_path,
-                :doc_path => name.gsub(/[^a-z0-9\-_]/i, '-'),
-                :paths => paths.to_a,
-                :main => target['mainpage'],
-                :title => name
-              }
+            paths.add(get_stdlib_files_to_document(name))
+          end
+          paths.resolve
+        end
+        task_options = {
+          :src_path => src_path,
+          :doc_path => "ruby-#{version}_with_stdlib",
+          :title => "ruby-#{version} +stdlib",
+          :paths => paths.to_a
+        }
+        task_options[:index] = config[:index] if config[:index]
+        Base.add_task(task_options)
+      else
+        task_options = {
+          :src_path => src_path,
+          :doc_path => "ruby-#{version}",
+          :title => "ruby-#{version}"
+        }
+        task_options[:index] = config[:index] if config[:index]
+        Base.add_task(task_options)
+
+        if config[:stdlib]
+          stdlib_config = download_and_get_stdlib_config(:update => config[:update] && options[:update])
+
+          stdlib_tasks = []
+          Base.chdir(src_path) do
+            main_files_to_document = get_ruby_files_to_document
+            stdlib_config['targets'].each do |target|
+              name = target['target']
+
+              paths = get_stdlib_files_to_document(name)
+
+              if paths.present? && (paths - main_files_to_document).present?
+                stdlib_tasks << {
+                  :src_path => src_path,
+                  :doc_path => name.gsub(/[^a-z0-9\-_]/i, '-'),
+                  :paths => paths.to_a,
+                  :main => target['mainpage'],
+                  :title => name
+                }
+              end
             end
           end
+          Base.add_merge_task(
+            :doc_path => "ruby-stdlib-#{version}",
+            :title => "ruby-stdlib-#{version}",
+            :tasks_options => stdlib_tasks.sort_by{ |task| task[:title].downcase }
+          )
         end
-        Base.add_merge_task(
-          :doc_path => "ruby-stdlib-#{version}",
-          :title => "ruby-stdlib-#{version}",
-          :tasks_options => stdlib_tasks.sort_by{ |task| task[:title].downcase }
-        )
       end
     end
 
   private
 
-    def get_files_to_document(dir = nil)
+    def get_ruby_files_to_document(dir = nil)
       files = []
 
       dot_document_name = '.document'
@@ -122,7 +135,7 @@ class SdocAll
       end.each do |glob|
         Pathname.glob(dir ? dir + glob : glob) do |path|
           if path.directory?
-            files.concat(get_files_to_document(path))
+            files.concat(get_ruby_files_to_document(path))
           else
             files << path.to_s
           end
@@ -132,6 +145,18 @@ class SdocAll
       files
     end
 
+    def get_stdlib_files_to_document(name)
+      paths = FileList.new
+      paths.include("{lib,ext}/#{name}/**/README*")
+      paths.include("{lib,ext}/#{name}.{c,rb}")
+      paths.include("{lib,ext}/#{name}/**/*.{c,rb}")
+      paths.resolve
+      paths.reject! do |path|
+        [%r{/extconf.rb\Z}, %r{/test/(?!unit)}, %r{/tests/}, %r{/sample}, %r{/demo/}].any?{ |pat| pat.match path }
+      end
+      paths
+    end
+
     def download_and_get_stdlib_config(options = {})
       stdlib_config_url = 'http://stdlib-doc.rubyforge.org/svn/trunk/data/gendoc.yaml'
       if options[:update] || (config = get_stdlib_config).nil?
@@ -181,36 +206,40 @@ class SdocAll
       end
 
       def download_matching_archive(version)
-        Net::FTP.open('ftp.ruby-lang.org') do |ftp|
-          remote_path = Pathname('/pub/ruby')
-          ftp.debug_mode = true
-          ftp.passive = true
-          ftp.login
-          ftp.chdir(remote_path)
-
-          tar = nil
-
-          dirs, files = [], []
-          ftp.list('*').map do |line|
-            full_path = remote_path + line.split.last
-            (line.starts_with?('d') ? dirs : files) << full_path
-          end
-
-          tar_bz2_matcher = /(^|\/)ruby-.*\.tar\.bz2$/
-
-          unless tar = last_matching_ruby_archive(version, files.grep(tar_bz2_matcher)) || last_matching_ruby_archive(version, files)
-            dirs = dirs.sort_by{ |dir| s = dir.basename.to_s; v = s.to_f; [v, s] }.reverse.
-                        select{ |dir| dir.basename.to_s[/^\d/] && dir.basename.to_s.starts_with?(version[0, 3]) }
-            dirs.each do |dir|
-              files = ftp.nlst(dir)
-              break if tar = last_matching_ruby_archive(version, files.grep(tar_bz2_matcher)) || last_matching_ruby_archive(version, files)
-            end
-          end
-
-          if tar
-            dest = sources_path.parent + tar.name
-            unless dest.exist? && dest.size == ftp.size(tar.path)
-              ftp.getbinaryfile(tar.path, dest)
+        Progress.start("downloading ruby #{version}") do
+          output_for_verbose_level(2) do
+            Net::FTP.open('ftp.ruby-lang.org') do |ftp|
+              remote_path = Pathname('/pub/ruby')
+              ftp.debug_mode = true
+              ftp.passive = true
+              ftp.login
+              ftp.chdir(remote_path)
+
+              tar = nil
+
+              dirs, files = [], []
+              ftp.list('*').map do |line|
+                full_path = remote_path + line.split.last
+                (line.starts_with?('d') ? dirs : files) << full_path
+              end
+
+              tar_bz2_matcher = /(^|\/)ruby-.*\.tar\.bz2$/
+
+              unless tar = last_matching_ruby_archive(version, files.grep(tar_bz2_matcher)) || last_matching_ruby_archive(version, files)
+                dirs = dirs.sort_by{ |dir| s = dir.basename.to_s; v = s.to_f; [v, s] }.reverse.
+                            select{ |dir| dir.basename.to_s[/^\d/] && dir.basename.to_s.starts_with?(version[0, 3]) }
+                dirs.each do |dir|
+                  files = ftp.nlst(dir)
+                  break if tar = last_matching_ruby_archive(version, files.grep(tar_bz2_matcher)) || last_matching_ruby_archive(version, files)
+                end
+              end
+
+              if tar
+                dest = sources_path.parent + tar.name
+                unless dest.exist? && dest.size == ftp.size(tar.path)
+                  ftp.getbinaryfile(tar.path, dest)
+                end
+              end
             end
           end
         end

data/lib/sdoc_all/task.rb

@@ -23,7 +23,10 @@ class SdocAll
       return true unless full_doc_path.exist?
 
       created_hash = config_hash_path.read rescue nil
-      return true if created_hash != config_hash
+      if created_hash != config_hash
+        puts "#{title}: config changed, rebuilding".red
+        return true
+      end
     end
 
     def run_if_clobber
@@ -63,7 +66,7 @@ class SdocAll
         cmd << '-T' << 'direct'
 
         if src_path.directory?
-          Dir.chdir(src_path) do
+          Base.chdir(src_path) do
             cmd << '-m' << main if main
             Base.system(*cmd + paths)
           end
@@ -96,9 +99,12 @@ class SdocAll
         src_path.find do |path|
           Find.prune if path.directory? && path.basename.to_s[0] == ?.
           latest = [latest, path.mtime, path.ctime].max
-          break unless latest < created
+          break if latest >= created
         end
       end
+      if created && latest >= created
+        puts "#{title}: files changed since last build".red
+      end
       created.nil? || latest >= created
     end
 
@@ -129,11 +135,13 @@ class SdocAll
 
     def run(options = {})
       run_if_clobber do
-        tasks.each_with_progress(title) do |task|
-          task.run(options)
+        tasks.each do |task|
+          Progress.start(task.title) do
+            task.run(options)
+          end
         end
 
-        Dir.chdir(Base.docs_path) do
+        Base.chdir(Base.docs_path) do
           cmd = %w(sdoc-merge)
           cmd << '-o' << Base.docs_path + doc_path
           cmd << '-t' << title

data/lib/shell_escape.rb

@@ -0,0 +1,64 @@
+# escape.rb - escape/unescape library for several formats
+#
+# Copyright (C) 2006,2007 Tanaka Akira  <akr@fsij.org>
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#  1. Redistributions of source code must retain the above copyright notice, this
+#     list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+
+# Escape module provides several escape functions.
+# * shell command
+# modified to work only with shell
+module ShellEscape
+  module_function
+
+  # Escape.shell_command composes
+  # a sequence of words to
+  # a single shell command line.
+  # All shell meta characters are quoted and
+  # the words are concatenated with interleaving space.
+  def command(*args)
+    args.map{ |arg| word(arg) } * ' '
+  end
+
+  # Escape.shell_single_word quotes shell meta characters.
+  #
+  # The result string is always single shell word, even if
+  # the argument is "".
+  def word(word)
+    word = word.to_s
+    if word.empty?
+      "''"
+    elsif %r{\A[0-9A-Za-z+,./:=@_-]+\z} =~ word
+      word
+    else
+      result = ''
+      word.scan(/('+)|[^']+/) {
+        if $1
+          result << %q{\'} * $1.length
+        else
+          result << "'#{$&}'"
+        end
+      }
+      result
+    end
+  end
+end

data/lib/tasks/sdoc_all_rake.rb

@@ -2,9 +2,18 @@ require 'sdoc_all'
 
 task :default => :run
 
-desc "Build/update documentation"
+def run_options
+  dry_run = ENV['DRY_RUN']
+  verbose_level = ENV['VERBOSE_LEVEL'].to_i
+  {
+    :dry_run => dry_run,
+    :verbose_level => dry_run ? 2 : verbose_level
+  }
+end
+
+desc "Build/update documentation (DRY_RUN=true to skip execution of commands (sets VERBOSE_LEVEL to 1), VERBOSE_LEVEL: 0 (default) - only progress and explanations, 1 - output commands to be executed, 2 - output result of command execution)"
 task :run do
-  SdocAll.run
+  SdocAll.run(run_options)
 end
 
 desc "Clobber documentation"
@@ -16,6 +25,6 @@ end
 namespace :run do
   desc "Force update sources, before building/updating"
   task :update do
-    SdocAll.run(:update => true)
+    SdocAll.run(run_options.merge(:update => true))
   end
 end

data/sdoc_all.gemspec

@@ -1,24 +1,72 @@
+# 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_all}
-  s.version = "1.0.2.2"
+  s.version = "1.0.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["toy"]
-  s.date = %q{2009-09-21}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Boba Fat"]
+  s.date = %q{2009-12-30}
   s.default_executable = %q{sdoc-all}
   s.description = %q{Command line tool to get documentation for ruby, rails, gems and plugins in one place}
-  s.email = %q{ivan@workisfun.ru}
   s.executables = ["sdoc-all"]
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/sdoc-all", "lib/sdoc_all.rb", "lib/sdoc_all/base.rb", "lib/sdoc_all/config_error.rb", "lib/sdoc_all/file_list.rb", "lib/sdoc_all/generator/sdoc_all/sdoc_all_generator.rb", "lib/sdoc_all/generator/sdoc_all/templates/Rakefile", "lib/sdoc_all/generator/sdoc_all/templates/config.yml", "lib/sdoc_all/parts/gems.rb", "lib/sdoc_all/parts/paths.rb", "lib/sdoc_all/parts/plugins.rb", "lib/sdoc_all/parts/rails.rb", "lib/sdoc_all/parts/ruby.rb", "lib/sdoc_all/task.rb", "lib/tasks/sdoc_all_rake.rb"]
-  s.files = ["LICENSE", "Manifest", "README.rdoc", "Rakefile", "VERSION.yml", "bin/sdoc-all", "lib/sdoc_all.rb", "lib/sdoc_all/base.rb", "lib/sdoc_all/config_error.rb", "lib/sdoc_all/file_list.rb", "lib/sdoc_all/generator/sdoc_all/sdoc_all_generator.rb", "lib/sdoc_all/generator/sdoc_all/templates/Rakefile", "lib/sdoc_all/generator/sdoc_all/templates/config.yml", "lib/sdoc_all/parts/gems.rb", "lib/sdoc_all/parts/paths.rb", "lib/sdoc_all/parts/plugins.rb", "lib/sdoc_all/parts/rails.rb", "lib/sdoc_all/parts/ruby.rb", "lib/sdoc_all/task.rb", "lib/tasks/sdoc_all_rake.rb", "spec/sdoc_all/file_list_spec.rb", "spec/sdoc_all/gems_spec.rb", "spec/sdoc_all/paths_spec.rb", "spec/sdoc_all/plugins_spec.rb", "spec/sdoc_all/rails_spec.rb", "spec/sdoc_all/ruby_spec.rb", "spec/sdoc_all_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "sdoc_all.gemspec"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".autotest",
+     ".gitignore",
+     "LICENSE",
+     "Manifest",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/sdoc-all",
+     "lib/sdoc_all.rb",
+     "lib/sdoc_all/base.rb",
+     "lib/sdoc_all/config_error.rb",
+     "lib/sdoc_all/file_list.rb",
+     "lib/sdoc_all/generator/sdoc_all/sdoc_all_generator.rb",
+     "lib/sdoc_all/generator/sdoc_all/templates/Rakefile",
+     "lib/sdoc_all/generator/sdoc_all/templates/config.yml",
+     "lib/sdoc_all/parts/gems.rb",
+     "lib/sdoc_all/parts/paths.rb",
+     "lib/sdoc_all/parts/plugins.rb",
+     "lib/sdoc_all/parts/rails.rb",
+     "lib/sdoc_all/parts/ruby.rb",
+     "lib/sdoc_all/task.rb",
+     "lib/shell_escape.rb",
+     "lib/tasks/sdoc_all_rake.rb",
+     "sdoc_all.gemspec",
+     "spec/sdoc_all/file_list_spec.rb",
+     "spec/sdoc_all/gems_spec.rb",
+     "spec/sdoc_all/paths_spec.rb",
+     "spec/sdoc_all/plugins_spec.rb",
+     "spec/sdoc_all/rails_spec.rb",
+     "spec/sdoc_all/ruby_spec.rb",
+     "spec/sdoc_all_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
   s.homepage = %q{http://github.com/toy/sdoc_all}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sdoc_all", "--main", "README.rdoc"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{toytoy}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{documentation for everything}
+  s.summary = %q{Documentation for everything}
+  s.test_files = [
+    "spec/sdoc_all/file_list_spec.rb",
+     "spec/sdoc_all/gems_spec.rb",
+     "spec/sdoc_all/paths_spec.rb",
+     "spec/sdoc_all/plugins_spec.rb",
+     "spec/sdoc_all/rails_spec.rb",
+     "spec/sdoc_all/ruby_spec.rb",
+     "spec/sdoc_all_spec.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -26,19 +74,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<colored>, [">= 0"])
       s.add_runtime_dependency(%q<progress>, [">= 0.0.8"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<rubigen>, [">= 0"])
       s.add_runtime_dependency(%q<sdoc>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<colored>, [">= 0"])
       s.add_dependency(%q<progress>, [">= 0.0.8"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rubigen>, [">= 0"])
       s.add_dependency(%q<sdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<colored>, [">= 0"])
     s.add_dependency(%q<progress>, [">= 0.0.8"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rubigen>, [">= 0"])
     s.add_dependency(%q<sdoc>, [">= 0"])
   end
 end
+

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: sdoc_all
 version: !ruby/object:Gem::Version 
-  version: 1.0.2.2
+  version: 1.0.4
 platform: ruby
 authors: 
-- toy
+- Boba Fat
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 +04:00
-default_executable: 
+date: 2009-12-30 00:00:00 +03:00
+default_executable: sdoc-all
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: colored
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -42,6 +42,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.8
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rubigen
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sdoc
   type: :runtime
@@ -53,7 +73,7 @@ dependencies:
         version: "0"
     version: 
 description: Command line tool to get documentation for ruby, rails, gems and plugins in one place
-email: ivan@workisfun.ru
+email: 
 executables: 
 - sdoc-all
 extensions: []
@@ -61,27 +81,14 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-- bin/sdoc-all
-- lib/sdoc_all.rb
-- lib/sdoc_all/base.rb
-- lib/sdoc_all/config_error.rb
-- lib/sdoc_all/file_list.rb
-- lib/sdoc_all/generator/sdoc_all/sdoc_all_generator.rb
-- lib/sdoc_all/generator/sdoc_all/templates/Rakefile
-- lib/sdoc_all/generator/sdoc_all/templates/config.yml
-- lib/sdoc_all/parts/gems.rb
-- lib/sdoc_all/parts/paths.rb
-- lib/sdoc_all/parts/plugins.rb
-- lib/sdoc_all/parts/rails.rb
-- lib/sdoc_all/parts/ruby.rb
-- lib/sdoc_all/task.rb
-- lib/tasks/sdoc_all_rake.rb
 files: 
+- .autotest
+- .gitignore
 - LICENSE
 - Manifest
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - bin/sdoc-all
 - lib/sdoc_all.rb
 - lib/sdoc_all/base.rb
@@ -96,7 +103,9 @@ files:
 - lib/sdoc_all/parts/rails.rb
 - lib/sdoc_all/parts/ruby.rb
 - lib/sdoc_all/task.rb
+- lib/shell_escape.rb
 - lib/tasks/sdoc_all_rake.rb
+- sdoc_all.gemspec
 - spec/sdoc_all/file_list_spec.rb
 - spec/sdoc_all/gems_spec.rb
 - spec/sdoc_all/paths_spec.rb
@@ -106,19 +115,13 @@ files:
 - spec/sdoc_all_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- sdoc_all.gemspec
 has_rdoc: true
 homepage: http://github.com/toy/sdoc_all
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Sdoc_all
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -131,14 +134,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
-rubyforge_project: toytoy
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: documentation for everything
-test_files: []
-
+summary: Documentation for everything
+test_files: 
+- spec/sdoc_all/file_list_spec.rb
+- spec/sdoc_all/gems_spec.rb
+- spec/sdoc_all/paths_spec.rb
+- spec/sdoc_all/plugins_spec.rb
+- spec/sdoc_all/rails_spec.rb
+- spec/sdoc_all/ruby_spec.rb
+- spec/sdoc_all_spec.rb
+- spec/spec_helper.rb

data/VERSION.yml

@@ -1 +0,0 @@
-[1, 0, 2, 2]