sdoc_all 1.0.4 → 1.0.5

data/Rakefile

@@ -34,3 +34,10 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/sdoc_all/base.rb

@@ -30,7 +30,7 @@ class SdocAll
       self.class.sources_path
     end
 
-    module ClassMethods
+    class << self
       BASE_PATH = Pathname.new(Dir.pwd).expand_path
       DOCS_PATH = BASE_PATH + 'docs'
       PUBLIC_PATH = BASE_PATH + 'public'
@@ -42,7 +42,7 @@ class SdocAll
         defined?(@@dry_run) && @@dry_run
       end
       def verbose_level=(val)
-        @@verbose_level = val
+        @@verbose_level = val.to_i
       end
       def verbose_level
         defined?(@@verbose_level) ? @@verbose_level : 0
@@ -130,6 +130,7 @@ class SdocAll
       end
 
       def system(*args)
+        args = args.map(&:to_s)
         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
@@ -212,6 +213,5 @@ class SdocAll
         end
       end
     end
-    extend ClassMethods
   end
 end

data/lib/sdoc_all/parts/gems.rb

@@ -65,7 +65,7 @@ class SdocAll
       specs
     end
 
-    module ClassMethods
+    class << self
       def latest_specs
         Gem.source_index.latest_specs
       end
@@ -78,6 +78,5 @@ class SdocAll
         specs
       end
     end
-    extend ClassMethods
   end
 end

data/lib/sdoc_all/parts/paths.rb

@@ -91,14 +91,14 @@ class SdocAll
       @entries ||= []
     end
 
-    module ClassMethods
+    class << self
       def common_path(paths)
         common = nil
         paths.each do |path|
           if common ||= path
             unless path.to_s.starts_with?(common.to_s)
               path.ascend do |path_part|
-                if common.to_s.starts_with?(path_part)
+                if common.to_s.starts_with?(path_part.to_s)
                   common = path_part
                   break
                 end
@@ -109,6 +109,5 @@ class SdocAll
         common = common.parent if common
       end
     end
-    extend ClassMethods
   end
 end

data/lib/sdoc_all/parts/plugins.rb

@@ -21,11 +21,7 @@ class SdocAll
     end
 
     def add_tasks(options = {})
-      plugins = Base.chdir(config[:path]) do
-        Pathname.glob('*').map do |path|
-          config[:path] + path if path.directory?
-        end.compact
-      end
+      plugins = config[:path].children.select(&:directory?)
 
       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) }

data/lib/sdoc_all/parts/rails.rb

@@ -56,7 +56,7 @@ class SdocAll
       )
     end
 
-    module ClassMethods
+    class << self
       def versions
         [].tap do |versions|
           Gem.source_index.search(Gem::Dependency.new('rails', :all)).each do |spec|
@@ -65,6 +65,5 @@ class SdocAll
         end.sort.map(&:to_s)
       end
     end
-    extend ClassMethods
   end
 end

data/lib/sdoc_all/parts/ruby.rb

@@ -178,7 +178,7 @@ class SdocAll
     end
 
     ArchiveInfo = Struct.new(:path, :name, :full_version, :extension, :version)
-    module ClassMethods
+    class << self
       def match_ruby_archive(path)
         name = File.basename(path)
         if match = /^ruby-((\d+\.\d+\.\d+)-p(\d+))(?:\.(tar\.(?:gz|bz2)|zip))$/.match(name)
@@ -225,7 +225,7 @@ class SdocAll
 
               tar_bz2_matcher = /(^|\/)ruby-.*\.tar\.bz2$/
 
-              unless tar = last_matching_ruby_archive(version, files.grep(tar_bz2_matcher)) || last_matching_ruby_archive(version, files)
+              unless tar = last_matching_ruby_archive(version, files.select{ |file| tar_bz2_matcher === file.to_s }) || 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|
@@ -255,6 +255,5 @@ class SdocAll
         archive
       end
     end
-    extend ClassMethods
   end
 end

data/lib/sdoc_all.rb

@@ -1,10 +1,12 @@
+# encoding: utf-8
+
 require 'pathname'
 require 'fileutils'
 require 'find'
 require 'digest'
 
 require 'rubygems'
-require 'activesupport'
+require 'active_support'
 require 'rake'
 require 'progress'
 require 'colored'
@@ -37,7 +39,7 @@ class String
 end
 
 class SdocAll
-  module ClassMethods
+  class << self
     def update?
       @update.nil? || @update
     end
@@ -175,7 +177,6 @@ class SdocAll
       end
     end
   end
-  extend ClassMethods
 end
 
 require 'sdoc_all/base'

data/sdoc_all.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sdoc_all}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   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.date = %q{2010-01-03}
   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.executables = ["sdoc-all"]

data/spec/sdoc_all/file_list_spec.rb

@@ -1,40 +1,38 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe FileList do
-    before do
-      @list = FileList.new
-    end
+describe SdocAll::FileList do
+  before do
+    @list = SdocAll::FileList.new
+  end
 
-    it "should include well" do
-      @list.include('R*')
-      @list.should == %w(Rakefile README.rdoc)
-    end
+  it "should include well" do
+    @list.include('R*')
+    @list.should == %w(Rakefile README.rdoc)
+  end
 
-    it "should exclude well" do
-      @list.include('R*')
-      @list.exclude('Rake*')
-      @list.should == %w(README.rdoc)
-    end
+  it "should exclude well" do
+    @list.include('R*')
+    @list.exclude('Rake*')
+    @list.should == %w(README.rdoc)
+  end
 
-    it "should exclude non existing files from list" do
-      @list.include('R*')
-      @list.include('non existing')
-      @list.should == %w(Rakefile README.rdoc)
-    end
+  it "should exclude non existing files from list" do
+    @list.include('R*')
+    @list.include('non existing')
+    @list.should == %w(Rakefile README.rdoc)
+  end
 
-    it "should exclude duplicates" do
-      @list.include('R*')
-      @list.include('R*')
-      @list.should == %w(Rakefile README.rdoc)
-    end
+  it "should exclude duplicates" do
+    @list.include('R*')
+    @list.include('R*')
+    @list.should == %w(Rakefile README.rdoc)
+  end
 
-    it "should not fail if directory changes after resolve" do
-      @list.include('R*')
-      @list.resolve
-      Dir.original_chdir('lib') do
-        @list.should == %w(Rakefile README.rdoc)
-      end
+  it "should not fail if directory changes after resolve" do
+    @list.include('R*')
+    @list.resolve
+    Dir.original_chdir('lib') do
+      @list.should == %w(Rakefile README.rdoc)
     end
   end
 end

data/spec/sdoc_all/gems_spec.rb

@@ -1,66 +1,64 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe Gems do
-    def gem_mock(name, version)
-      mock(:gem, {
-        :name => name,
-        :version => version,
-        :full_name => "#{name}-#{version.join('.')}",
-        :sort_obj => [name, version],
-        :rdoc_options => [],
-        :full_gem_path => name,
-        :require_paths => [],
-        :extra_rdoc_files => []
-      })
-    end
+describe SdocAll::Gems do
+  def gem_mock(name, version)
+    mock(:gem, {
+      :name => name,
+      :version => version,
+      :full_name => "#{name}-#{version.join('.')}",
+      :sort_obj => [name, version],
+      :rdoc_options => [],
+      :full_gem_path => name,
+      :require_paths => [],
+      :extra_rdoc_files => []
+    })
+  end
 
-    before do
-      one_1 = gem_mock('one', [1])
-      one_2 = gem_mock('one', [2])
-      two_1 = gem_mock('two', [1])
-      two_2 = gem_mock('two', [2])
-      two_3 = gem_mock('two', [3])
-      three = gem_mock('three', [1])
-      four = gem_mock('four', [1])
-      five = gem_mock('five', [1])
+  before do
+    one_1 = gem_mock('one', [1])
+    one_2 = gem_mock('one', [2])
+    two_1 = gem_mock('two', [1])
+    two_2 = gem_mock('two', [2])
+    two_3 = gem_mock('two', [3])
+    three = gem_mock('three', [1])
+    four = gem_mock('four', [1])
+    five = gem_mock('five', [1])
 
-      @all_specs = [one_1, one_2, two_1, two_2, two_3, three, four, five]
-      @latest_specs = [one_2, two_3, three, four, five]
+    @all_specs = [one_1, one_2, two_1, two_2, two_3, three, four, five]
+    @latest_specs = [one_2, two_3, three, four, five]
 
-      Gems.stub!(:latest_specs).and_return(@latest_specs)
-      Gems.stub!(:all_specs).and_return(@all_specs)
-    end
+    SdocAll::Gems.stub!(:latest_specs).and_return(@latest_specs)
+    SdocAll::Gems.stub!(:all_specs).and_return(@all_specs)
+  end
 
-    it "should add one selected tasks" do
-      Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.one-2'))
-      Gems.new('one').add_tasks
-    end
+  it "should add one selected tasks" do
+    SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.one-2'))
+    SdocAll::Gems.new('one').add_tasks
+  end
 
-    it "should add two selected tasks" do
-      Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.one-2'))
-      Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.two-3'))
-      Gems.new(['one', 'two']).add_tasks
-    end
+  it "should add two selected tasks" do
+    SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.one-2'))
+    SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.two-3'))
+    SdocAll::Gems.new(['one', 'two']).add_tasks
+  end
 
-    it "should add tasks except excluded" do
-      Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.four-1'))
-      Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.five-1'))
-      Gems.new(:exclude => ['one', 'two', 'three']).add_tasks
-    end
+  it "should add tasks except excluded" do
+    SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.four-1'))
+    SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'gems.five-1'))
+    SdocAll::Gems.new(:exclude => ['one', 'two', 'three']).add_tasks
+  end
 
-    it "should add tasks for latest gems" do
-      @latest_specs.each do |gem_spec|
-        Base.should_receive(:add_task).with(hash_including(:doc_path => "gems.#{gem_spec.full_name}"))
-      end
-      Gems.new({}).add_tasks
+  it "should add tasks for latest gems" do
+    @latest_specs.each do |gem_spec|
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => "gems.#{gem_spec.full_name}"))
     end
+    SdocAll::Gems.new({}).add_tasks
+  end
 
-    it "should add tasks for all gems" do
-      @all_specs.each do |gem_spec|
-        Base.should_receive(:add_task).with(hash_including(:doc_path => "gems.#{gem_spec.full_name}"))
-      end
-      Gems.new(:versions => 'all').add_tasks
+  it "should add tasks for all gems" do
+    @all_specs.each do |gem_spec|
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => "gems.#{gem_spec.full_name}"))
     end
+    SdocAll::Gems.new(:versions => 'all').add_tasks
   end
 end

data/spec/sdoc_all/paths_spec.rb

@@ -1,117 +1,115 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe Paths do
-    it "should determine common path part" do
-      paths = %w(/aaa/bbb/ccc/ddd/a.rb /aaa/bbb/ccc/ddd/b.rb /aaa/bbb/ccc/readme).map{ |path| Pathname.new(path) }
-      Paths.common_path(paths).should == Pathname.new('/aaa/bbb')
+describe SdocAll::Paths do
+  it "should determine common path part" do
+    paths = %w(/aaa/bbb/ccc/ddd/a.rb /aaa/bbb/ccc/ddd/b.rb /aaa/bbb/ccc/readme).map{ |path| Pathname.new(path) }
+    SdocAll::Paths.common_path(paths).should == Pathname.new('/aaa/bbb')
+  end
+
+  it "should add task for string config" do
+    @roots = {}
+    [:a, :b, :c].each do |sym|
+      @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
+      Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
+    end
+    SdocAll::Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :c).map(&:expand_path)).and_return('/common')
+
+    File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
+    Dir.should_receive(:[]).with('/common/lala/*').and_return(['a', 'b', 'c'])
+    SdocAll::Paths.new('*').add_tasks
+  end
+
+  it "should add task for array of strings config" do
+    @roots = {}
+    [:a, :b, :d, :e].each do |sym|
+      @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
+      Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
+    end
+    SdocAll::Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :d, :e).map(&:expand_path)).and_return('/common')
+
+    File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
+    File.should_receive(:expand_path).with('**').and_return('/common/common/lala/*')
+    Dir.should_receive(:[]).with('/common/lala/*').and_return(['a', 'b'])
+    Dir.should_receive(:[]).with('/common/common/lala/*').and_return(['d', 'e'])
+    SdocAll::Paths.new(['*', '**']).add_tasks
+  end
+
+  describe "for hash config" do
+    before do
+      @root = mock(:root, :expand_path => mock(:root_exp, :exist? => true, :relative_path_from => "lala/root"))
+      Pathname.should_receive(:new).with('/lalala/lala/root').and_return(@root)
+      SdocAll::Paths.should_receive(:common_path).with([@root.expand_path]).and_return('/common')
+    end
+
+    it "should add task" do
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :title => 'paths: lala/root')
+      SdocAll::Paths.new({:root => '/lalala/lala/root'}).add_tasks
     end
 
-    it "should add task for string config" do
-      @roots = {}
-      [:a, :b, :c].each do |sym|
-        @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
-        Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
-      end
-      Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :c).map(&:expand_path)).and_return('/common')
-
-      File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
-      Dir.should_receive(:[]).with('/common/lala/*').and_return(['a', 'b', 'c'])
-      Paths.new('*').add_tasks
+    it "should add task with main" do
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :main => 'special_readme', :title => 'paths: lala/root')
+      SdocAll::Paths.new({:root => '/lalala/lala/root', :main => 'special_readme'}).add_tasks
     end
 
-    it "should add task for array of strings config" do
-      @roots = {}
-      [:a, :b, :d, :e].each do |sym|
-        @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
-        Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
-      end
-      Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :d, :e).map(&:expand_path)).and_return('/common')
-
-      File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
-      File.should_receive(:expand_path).with('**').and_return('/common/common/lala/*')
-      Dir.should_receive(:[]).with('/common/lala/*').and_return(['a', 'b'])
-      Dir.should_receive(:[]).with('/common/common/lala/*').and_return(['d', 'e'])
-      Paths.new(['*', '**']).add_tasks
+    it "should add task with with one include" do
+      @file_list = mock(:file_list, :resolve => true)
+      SdocAll::FileList.stub!(:new).and_return(@file_list)
+      SdocAll::Base.should_receive(:chdir).with(@root.expand_path).and_yield
+      @file_list.should_receive(:include).with('*.rb')
+      @file_list.should_receive(:to_a).and_return(['a.rb', 'b.rb'])
+
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :paths => ['a.rb', 'b.rb'], :title => 'paths: lala/root')
+      SdocAll::Paths.new({:root => '/lalala/lala/root', :paths => '*.rb'}).add_tasks
     end
 
-    describe "for hash config" do
-      before do
-        @root = mock(:root, :expand_path => mock(:root_exp, :exist? => true, :relative_path_from => "lala/root"))
-        Pathname.should_receive(:new).with('/lalala/lala/root').and_return(@root)
-        Paths.should_receive(:common_path).with([@root.expand_path]).and_return('/common')
-      end
-
-      it "should add task" do
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :title => 'paths: lala/root')
-        Paths.new({:root => '/lalala/lala/root'}).add_tasks
-      end
-
-      it "should add task with main" do
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :main => 'special_readme', :title => 'paths: lala/root')
-        Paths.new({:root => '/lalala/lala/root', :main => 'special_readme'}).add_tasks
-      end
-
-      it "should add task with with one include" do
-        @file_list = mock(:file_list, :resolve => true)
-        FileList.stub!(:new).and_return(@file_list)
-        Dir.should_receive(:chdir).with(@root.expand_path).and_yield
-        @file_list.should_receive(:include).with('*.rb')
-        @file_list.should_receive(:to_a).and_return(['a.rb', 'b.rb'])
-
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :paths => ['a.rb', 'b.rb'], :title => 'paths: lala/root')
-        Paths.new({:root => '/lalala/lala/root', :paths => '*.rb'}).add_tasks
-      end
-
-      it "should add task with with array of includes and excludes" do
-        @file_list = mock(:file_list, :resolve => true)
-        FileList.stub!(:new).and_return(@file_list)
-        Dir.should_receive(:chdir).with(@root.expand_path).and_yield
-        @file_list.should_receive(:include).ordered.with('*.*')
-        @file_list.should_receive(:exclude).ordered.with('*.cgi')
-        @file_list.should_receive(:include).ordered.with('README')
-        @file_list.should_receive(:include).ordered.with('README_*')
-        @file_list.should_receive(:exclude).ordered.with('*.tmp')
-        @file_list.should_receive(:to_a).and_return(['a.rb', 'b.rb', 'README', 'README_en'])
-
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :paths => ['a.rb', 'b.rb', 'README', 'README_en'], :title => 'paths: lala/root')
-        Paths.new({:root => '/lalala/lala/root', :paths => ['*.*', '-*.cgi', '+README', '+README_*', '-*.tmp']}).add_tasks
-      end
+    it "should add task with with array of includes and excludes" do
+      @file_list = mock(:file_list, :resolve => true)
+      SdocAll::FileList.stub!(:new).and_return(@file_list)
+      SdocAll::Base.should_receive(:chdir).with(@root.expand_path).and_yield
+      @file_list.should_receive(:include).ordered.with('*.*')
+      @file_list.should_receive(:exclude).ordered.with('*.cgi')
+      @file_list.should_receive(:include).ordered.with('README')
+      @file_list.should_receive(:include).ordered.with('README_*')
+      @file_list.should_receive(:exclude).ordered.with('*.tmp')
+      @file_list.should_receive(:to_a).and_return(['a.rb', 'b.rb', 'README', 'README_en'])
+
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :paths => ['a.rb', 'b.rb', 'README', 'README_en'], :title => 'paths: lala/root')
+      SdocAll::Paths.new({:root => '/lalala/lala/root', :paths => ['*.*', '-*.cgi', '+README', '+README_*', '-*.tmp']}).add_tasks
     end
+  end
 
-    describe "for array of hashes config" do
-      it "should add task" do
-        @root = mock(:root, :expand_path => mock(:root_exp, :exist? => true, :relative_path_from => "lala/root"))
-        Pathname.should_receive(:new).with('/lalala/lala/root').and_return(@root)
+  describe "for array of hashes config" do
+    it "should add task" do
+      @root = mock(:root, :expand_path => mock(:root_exp, :exist? => true, :relative_path_from => "lala/root"))
+      Pathname.should_receive(:new).with('/lalala/lala/root').and_return(@root)
 
-        @other = mock(:other, :expand_path => mock(:other_exp, :exist? => true, :relative_path_from => "lolo/other"))
-        Pathname.should_receive(:new).with('/lalala/lolo/other').and_return(@other)
+      @other = mock(:other, :expand_path => mock(:other_exp, :exist? => true, :relative_path_from => "lolo/other"))
+      Pathname.should_receive(:new).with('/lalala/lolo/other').and_return(@other)
 
-        Paths.should_receive(:common_path).with([@root, @other].map(&:expand_path)).and_return('/common')
+      SdocAll::Paths.should_receive(:common_path).with([@root, @other].map(&:expand_path)).and_return('/common')
 
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :title => 'paths: lala/root')
-        Base.should_receive(:add_task).with(:doc_path => "paths.lolo.other", :src_path => @other.expand_path, :title => 'paths: lolo/other')
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.root", :src_path => @root.expand_path, :title => 'paths: lala/root')
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lolo.other", :src_path => @other.expand_path, :title => 'paths: lolo/other')
 
-        Paths.new([{:root => '/lalala/lala/root'}, {:root => '/lalala/lolo/other'}]).add_tasks
-      end
+      SdocAll::Paths.new([{:root => '/lalala/lala/root'}, {:root => '/lalala/lolo/other'}]).add_tasks
     end
+  end
 
-    it "should add task for mixed config" do
-      @roots = {}
-      [:a, :b, :c, :d, :e, :f, :g].each do |sym|
-        @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
-        Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
-        Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
-      end
-      Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :c, :d, :e, :f, :g).map(&:expand_path)).and_return('/common')
-
-      File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
-      Dir.should_receive(:[]).with('/common/lala/*').and_return(['b', 'c'])
-      File.should_receive(:expand_path).with('**').and_return('/common/lala/**')
-      Dir.should_receive(:[]).with('/common/lala/**').and_return(['e', 'f'])
-      Paths.new([{:root => 'a'}, '*', {:root => 'd'}, '**', {:root => 'g'}]).add_tasks
+  it "should add task for mixed config" do
+    @roots = {}
+    [:a, :b, :c, :d, :e, :f, :g].each do |sym|
+      @roots[sym] = mock(sym, :expand_path => mock("#{sym}_exp".to_sym, :exist? => true, :relative_path_from => "lala/#{sym}_exp"))
+      Pathname.should_receive(:new).with("#{sym}").and_return(@roots[sym])
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "paths.lala.#{sym}_exp", :src_path => @roots[sym].expand_path, :title => "paths: lala/#{sym}_exp")
     end
+    SdocAll::Paths.should_receive(:common_path).with(@roots.values_at(:a, :b, :c, :d, :e, :f, :g).map(&:expand_path)).and_return('/common')
+
+    File.should_receive(:expand_path).with('*').and_return('/common/lala/*')
+    Dir.should_receive(:[]).with('/common/lala/*').and_return(['b', 'c'])
+    File.should_receive(:expand_path).with('**').and_return('/common/lala/**')
+    Dir.should_receive(:[]).with('/common/lala/**').and_return(['e', 'f'])
+    SdocAll::Paths.new([{:root => 'a'}, '*', {:root => 'd'}, '**', {:root => 'g'}]).add_tasks
   end
 end

data/spec/sdoc_all/plugins_spec.rb

@@ -1,81 +1,80 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe Plugins do
-    def plugin_mock(name, options = {})
-      mock(:plugin, :basename => name, :directory? => !options[:not_directory], :+ => mock(:git_dir, :directory? => !options[:no_git]))
-    end
+describe SdocAll::Plugins do
+  def plugin_mock(name, options = {})
+    mock(:plugin, :basename => name, :directory? => !options[:not_directory], :+ => mock(:git_dir, :directory? => !options[:no_git]))
+  end
+
+  before do
+    @one = mock(:one, :expand_path => mock(:one_expanded, :directory? => true))
+    SdocAll::Base.stub!(:chdir).and_yield
+  end
 
+  describe "path" do
     before do
-      @one = mock(:one, :expand_path => mock(:one_expanded, :directory? => true))
+      @one.stub!(:mkpath)
+      @one.expand_path.stub!(:children).and_return([])
     end
 
-    describe "path" do
-      before do
-        @one.stub!(:mkpath)
-        @one.expand_path.stub!(:children).and_return([])
-      end
-
-      it "should set default path if none given" do
-        Plugins.stub!(:sources_path).and_return('sources/plugins')
-        Pathname.should_receive(:new).with('sources/plugins').and_return(@one)
-        Plugins.new(nil).add_tasks
-      end
+    it "should set default path if none given" do
+      SdocAll::Plugins.stub!(:sources_path).and_return('sources/plugins')
+      Pathname.should_receive(:new).with('sources/plugins').and_return(@one)
+      SdocAll::Plugins.new(nil)
+    end
 
-      it "should asume that lone argument is path" do
-        Pathname.should_receive(:new).with('one').and_return(@one)
-        Plugins.new('one').add_tasks
-      end
+    it "should asume that lone argument is path" do
+      Pathname.should_receive(:new).with('one').and_return(@one)
+      SdocAll::Plugins.new('one')
     end
+  end
 
-    describe "update" do
-      before do
-        @a = plugin_mock('a')
-        @b = plugin_mock('b', :no_git => true)
-        @c = plugin_mock('c', :not_directory => true)
-        @one.expand_path.should_receive(:children).and_return([@a, @b, @c])
-        Pathname.should_receive(:new).with('one').and_return(@one)
-      end
+  describe "update" do
+    before do
+      @a = plugin_mock('a')
+      @b = plugin_mock('b', :no_git => true)
+      @c = plugin_mock('c', :not_directory => true)
+      @one.expand_path.should_receive(:children).and_return([@a, @b, @c])
+      Pathname.should_receive(:new).with('one').and_return(@one)
+    end
 
-      it "should update plugins using git" do
-        Base.should_receive(:system).once.with("git fetch origin && git reset --hard origin")
-        Base.stub!(:add_task)
-        Plugins.new(:path => 'one').add_tasks(:update => true)
-      end
+    it "should update plugins using git" do
+      SdocAll::Base.should_receive(:system).once.with("git fetch origin && git reset --hard origin")
+      SdocAll::Base.stub!(:add_task)
+      SdocAll::Plugins.new(:path => 'one').add_tasks(:update => true)
+    end
 
-      it "should not update plugins when config disables it" do
-        Base.should_not_receive(:system)
-        Base.stub!(:add_task)
-        Plugins.new(:path => 'one', :update => false).add_tasks
-      end
+    it "should not update plugins when config disables it" do
+      SdocAll::Base.should_not_receive(:system)
+      SdocAll::Base.stub!(:add_task)
+      SdocAll::Plugins.new(:path => 'one', :update => false).add_tasks
     end
+  end
 
-    describe "adding" do
-      before do
-        @a = plugin_mock('a')
-        @b = plugin_mock('b')
-        @c = plugin_mock('c')
-        @one.expand_path.should_receive(:children).and_return([@a, @b, @c])
-        Pathname.should_receive(:new).with('one').and_return(@one)
-      end
+  describe "adding" do
+    before do
+      @a = plugin_mock('a')
+      @b = plugin_mock('b')
+      @c = plugin_mock('c')
+      @one.expand_path.should_receive(:children).and_return([@a, @b, @c])
+      Pathname.should_receive(:new).with('one').and_return(@one)
+    end
 
-      it "should add tasks" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.b'))
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.c'))
-        Plugins.new(:path => 'one').add_tasks
-      end
+    it "should add tasks" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.b'))
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.c'))
+      SdocAll::Plugins.new(:path => 'one').add_tasks
+    end
 
-      it "should add only selected tasks" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
-        Plugins.new(:path => 'one', :only => 'a').add_tasks
-      end
+    it "should add only selected tasks" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
+      SdocAll::Plugins.new(:path => 'one', :only => 'a').add_tasks
+    end
 
-      it "should add not excluded tasks" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.c'))
-        Plugins.new(:path => 'one', :exclude => 'b').add_tasks
-      end
+    it "should add not excluded tasks" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.a'))
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'plugins.c'))
+      SdocAll::Plugins.new(:path => 'one', :exclude => 'b').add_tasks
     end
   end
 end

data/spec/sdoc_all/rails_spec.rb

@@ -1,57 +1,55 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe Rails do
+describe SdocAll::Rails do
+  before do
+    SdocAll::Rails.stub!(:versions).and_return(['1.2.3', '1.3.5', '1.5.9'])
+  end
+
+  describe "adding task" do
     before do
-      Rails.stub!(:versions).and_return(['1.2.3', '1.3.5', '1.5.9'])
+      File.should_receive(:open).with('vendor/rails/railties/lib/tasks/documentation.rake')
+    end
+
+    it "should add task" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.3.5'))
+      SdocAll::Rails.new(:version => '1.3.5').add_tasks
+    end
+
+    it "should use latest version if none given" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.5.9'))
+      SdocAll::Rails.new(nil).add_tasks
     end
 
-    describe "adding task" do
-      before do
-        File.should_receive(:open).with('vendor/rails/railties/lib/tasks/documentation.rake')
-      end
-
-      it "should add task" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.3.5'))
-        Rails.new(:version => '1.3.5').add_tasks
-      end
-
-      it "should use latest version if none given" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.5.9'))
-        Rails.new(nil).add_tasks
-      end
-
-      it "should use lone argument as version" do
-        Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.3.5'))
-        Rails.new('1.3.5').add_tasks
-      end
+    it "should use lone argument as version" do
+      SdocAll::Base.should_receive(:add_task).with(hash_including(:doc_path => 'rails-1.3.5'))
+      SdocAll::Rails.new('1.3.5').add_tasks
+    end
+  end
+
+  it "should raise for wrong version" do
+    proc{
+      SdocAll::Rails.new('1.1.1').add_tasks
+    }.should raise_error(SdocAll::ConfigError)
+  end
+
+  describe "creating app" do
+    before do
+      SdocAll::Base.stub!(:add_task)
+      File.stub!(:open)
     end
 
-    it "should raise for wrong version" do
-      proc{
-        Rails.new('1.1.1').add_tasks
-      }.should raise_error(SdocAll::ConfigError)
+    it "should create rails app" do
+      FileTest.should_receive(:directory?).with("sources/rails/1.3.5").and_return(false)
+      SdocAll::Base.should_receive(:remove_if_present).with(Pathname.new("sources/rails/1.3.5"))
+      SdocAll::Base.should_receive(:system).with("rails", Pathname.new("sources/rails/1.3.5"), "--freeze")
+      SdocAll::Rails.new('1.3.5').add_tasks
     end
 
-    describe "creating app" do
-      before do
-        Base.stub!(:add_task)
-        File.stub!(:open)
-      end
-
-      it "should create rails app" do
-        FileTest.should_receive(:directory?).with("sources/rails/1.3.5").and_return(false)
-        Base.should_receive(:remove_if_present).with(Pathname.new("sources/rails/1.3.5"))
-        Base.should_receive(:system).with("rails", Pathname.new("sources/rails/1.3.5"), "--freeze")
-        Rails.new('1.3.5').add_tasks
-      end
-
-      it "should not create rails app if it already exists" do
-        FileTest.should_receive(:directory?).with("sources/rails/1.3.5").and_return(true)
-        Base.should_not_receive(:remove_if_present)
-        Base.should_not_receive(:system)
-        Rails.new('1.3.5').add_tasks
-      end
+    it "should not create rails app if it already exists" do
+      FileTest.should_receive(:directory?).with("sources/rails/1.3.5").and_return(true)
+      SdocAll::Base.should_not_receive(:remove_if_present)
+      SdocAll::Base.should_not_receive(:system)
+      SdocAll::Rails.new('1.3.5').add_tasks
     end
   end
 end

data/spec/sdoc_all/ruby_spec.rb

@@ -1,203 +1,201 @@
 require File.dirname(__FILE__) + '/../spec_helper.rb'
 
-class SdocAll
-  describe Ruby do
-    describe "subroutines" do
-      describe "match_ruby_archive" do
-        it "should return nil if does not match" do
-          Ruby.match_ruby_archive('').should be_nil
-          Ruby.match_ruby_archive('ruby').should be_nil
-          Ruby.match_ruby_archive('ruby-1.2.3-p666.tar').should be_nil
-        end
+describe SdocAll::Ruby do
+  describe "subroutines" do
+    describe "match_ruby_archive" do
+      it "should return nil if does not match" do
+        SdocAll::Ruby.match_ruby_archive('').should be_nil
+        SdocAll::Ruby.match_ruby_archive('ruby').should be_nil
+        SdocAll::Ruby.match_ruby_archive('ruby-1.2.3-p666.tar').should be_nil
+      end
 
-        %w(tar.bz2 tar.gz zip).each do |ext|
-          it "should return info if match" do
-            @archive = Ruby.match_ruby_archive("path/ruby-1.2.3-p666.#{ext}")
-            @archive.should be_an(Ruby::ArchiveInfo)
-            @archive.path.should == "path/ruby-1.2.3-p666.#{ext}"
-            @archive.name.should == "ruby-1.2.3-p666.#{ext}"
-            @archive.full_version.should == "1.2.3-p666"
-            @archive.extension.should == ext
-            @archive.version.should == [1, 2, 3, 666]
-          end
+      %w(tar.bz2 tar.gz zip).each do |ext|
+        it "should return info if match" do
+          @archive = SdocAll::Ruby.match_ruby_archive("path/ruby-1.2.3-p666.#{ext}")
+          @archive.should be_an(SdocAll::Ruby::ArchiveInfo)
+          @archive.path.should == "path/ruby-1.2.3-p666.#{ext}"
+          @archive.name.should == "ruby-1.2.3-p666.#{ext}"
+          @archive.full_version.should == "1.2.3-p666"
+          @archive.extension.should == ext
+          @archive.version.should == [1, 2, 3, 666]
         end
       end
+    end
 
-      describe "last_matching_ruby_archive" do
-        it "should return nil if could nothing match" do
-          Ruby.last_matching_ruby_archive('2.0.0', %w(path/ruby-1.2.3-p666.zip .DS_Store)).should be_nil
-        end
+    describe "last_matching_ruby_archive" do
+      it "should return nil if could nothing match" do
+        SdocAll::Ruby.last_matching_ruby_archive('2.0.0', %w(path/ruby-1.2.3-p666.zip .DS_Store)).should be_nil
+      end
 
-        it "should return latest matching" do
-          @archive = Ruby.last_matching_ruby_archive('2.0.0', %w(
-            path/ruby-1.0.0-p333.zip
-            path/ruby-2.0.0-p444.zip
-            path/ruby-3.0.0-p444.zip
-            path/ruby-2.0.0-p666.zip
-            path/ruby-3.0.0-p666.zip
-            path/ruby-2.0.0-p555.zip
-            path/ruby-3.0.0-p777.zip
-            .DS_Store
-          ))
-          @archive.should be_an(Ruby::ArchiveInfo)
-          @archive.path.should == "path/ruby-2.0.0-p666.zip"
-        end
+      it "should return latest matching" do
+        @archive = SdocAll::Ruby.last_matching_ruby_archive('2.0.0', %w(
+          path/ruby-1.0.0-p333.zip
+          path/ruby-2.0.0-p444.zip
+          path/ruby-3.0.0-p444.zip
+          path/ruby-2.0.0-p666.zip
+          path/ruby-3.0.0-p666.zip
+          path/ruby-2.0.0-p555.zip
+          path/ruby-3.0.0-p777.zip
+          .DS_Store
+        ))
+        @archive.should be_an(SdocAll::Ruby::ArchiveInfo)
+        @archive.path.should == "path/ruby-2.0.0-p666.zip"
       end
+    end
 
-      describe "find_matching_archive" do
-        it "should call last_matching_ruby_archive for all files in sources" do
-          @files = mock(:files)
-          @children = mock(:children)
-          @children.should_receive(:select).and_return(@files)
-          @sources_path = mock(:sources_path, :parent => mock(:parent, :children => @children))
-          Ruby.stub!(:sources_path).and_return(@sources_path)
+    describe "find_matching_archive" do
+      it "should call last_matching_ruby_archive for all files in sources" do
+        @files = mock(:files)
+        @children = mock(:children)
+        @children.should_receive(:select).and_return(@files)
+        @sources_path = mock(:sources_path, :parent => mock(:parent, :children => @children))
+        SdocAll::Ruby.stub!(:sources_path).and_return(@sources_path)
 
-          Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @files)
-          Ruby.find_matching_archive('1.2.3')
-        end
+        SdocAll::Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @files)
+        SdocAll::Ruby.find_matching_archive('1.2.3')
       end
+    end
 
-      describe "download_matching_archive" do
-        before do
-          @ftp = mock(:ftp, :debug_mode= => nil, :passive= => nil, :login => nil)
-          @ftp.should_receive(:chdir).with(Pathname('/pub/ruby'))
-          @list = ['mode user ... ruby-1.2.3.tar.bz2', 'mode user ... ruby-1.2.4.tar.bz2', 'mode user ... ruby-1.2.5.tar.bz2']
-          @paths = [Pathname('/pub/ruby/ruby-1.2.3.tar.bz2'), Pathname('/pub/ruby/ruby-1.2.4.tar.bz2'), Pathname('/pub/ruby/ruby-1.2.5.tar.bz2')]
-          @ftp.should_receive(:list).with('*').and_return(@list)
-          Net::FTP.should_receive(:open).with('ftp.ruby-lang.org').and_yield(@ftp)
-
-          @dest = mock(:dest)
-          @sources_path = mock(:sources_path, :parent => mock(:parent, :children => @children, :+ => @dest))
-          Ruby.stub!(:sources_path).and_return(@sources_path)
-        end
-
-        it "should not download anything if no matces" do
-          @ftp.should_not_receive(:size)
-          @ftp.should_not_receive(:getbinaryfile)
+    describe "download_matching_archive" do
+      before do
+        @ftp = mock(:ftp, :debug_mode= => nil, :passive= => nil, :login => nil)
+        @ftp.should_receive(:chdir).with(Pathname('/pub/ruby'))
+        @list = ['mode user ... ruby-1.2.3.tar.bz2', 'mode user ... ruby-1.2.4.tar.bz2', 'mode user ... ruby-1.2.5.tar.bz2']
+        @paths = [Pathname('/pub/ruby/ruby-1.2.3.tar.bz2'), Pathname('/pub/ruby/ruby-1.2.4.tar.bz2'), Pathname('/pub/ruby/ruby-1.2.5.tar.bz2')]
+        @ftp.should_receive(:list).with('*').and_return(@list)
+        Net::FTP.should_receive(:open).with('ftp.ruby-lang.org').and_yield(@ftp)
+
+        @dest = mock(:dest)
+        @sources_path = mock(:sources_path, :parent => mock(:parent, :children => @children, :+ => @dest))
+        SdocAll::Ruby.stub!(:sources_path).and_return(@sources_path)
+      end
 
-          Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).any_number_of_times.and_return(nil)
-          Ruby.download_matching_archive('1.2.3')
-        end
+      it "should not download anything if no matches" do
+        @ftp.should_not_receive(:size)
+        @ftp.should_not_receive(:getbinaryfile)
 
-        describe "when match" do
-          before do
-            @tar = mock(:tar, :name => 'abc', :path => '/path')
-          end
-
-          it "should download if it does not exist locally" do
-            @dest.stub!(:exist?).and_return(false)
-            @ftp.should_receive(:getbinaryfile)
-
-            Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
-            Ruby.download_matching_archive('1.2.3')
-          end
-
-          it "should download if local file size is not equal to remote" do
-            @dest.stub!(:exist?).and_return(true)
-            @dest.stub!(:size).and_return(1000)
-            @ftp.stub!(:size).and_return(2000)
-            @ftp.should_receive(:getbinaryfile)
-
-            Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
-            Ruby.download_matching_archive('1.2.3')
-          end
-
-          it "should not download if local file size is equal to remote" do
-            @dest.stub!(:exist?).and_return(true)
-            @dest.stub!(:size).and_return(2000)
-            @ftp.stub!(:size).and_return(2000)
-            @ftp.should_not_receive(:getbinaryfile)
-
-            Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
-            Ruby.download_matching_archive('1.2.3')
-          end
-        end
+        SdocAll::Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).any_number_of_times.and_return(nil)
+        SdocAll::Ruby.download_matching_archive('1.2.3')
       end
 
-      describe "find_or_download_matching_archive" do
+      describe "when match" do
         before do
-          @archive = mock(:archive)
+          @tar = mock(:tar, :name => 'abc', :path => '/path')
         end
 
-        it "should immediately return match if update not allowed" do
-          Ruby.should_receive(:find_matching_archive).with('1.2.3').once.and_return(@archive)
-          Ruby.should_not_receive(:download_matching_archive)
+        it "should download if it does not exist locally" do
+          @dest.stub!(:exist?).and_return(false)
+          @ftp.should_receive(:getbinaryfile)
 
-          Ruby.find_or_download_matching_archive('1.2.3', :update => false).should == @archive
+          SdocAll::Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
+          SdocAll::Ruby.download_matching_archive('1.2.3')
         end
 
-        it "should downlaod and return match if update allowed" do
-          Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
-          Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(@archive)
+        it "should download if local file size is not equal to remote" do
+          @dest.stub!(:exist?).and_return(true)
+          @dest.stub!(:size).and_return(1000)
+          @ftp.stub!(:size).and_return(2000)
+          @ftp.should_receive(:getbinaryfile)
 
-          Ruby.find_or_download_matching_archive('1.2.3', :update => true).should == @archive
+          SdocAll::Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
+          SdocAll::Ruby.download_matching_archive('1.2.3')
         end
 
-        it "should downlaod and return match if not found local" do
-          Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(nil, @archive)
-          Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
-
-          Ruby.find_or_download_matching_archive('1.2.3').should == @archive
-        end
-
-        it "should raise if can not find local or downlaod archive" do
-          Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(nil, nil)
-          Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
+        it "should not download if local file size is equal to remote" do
+          @dest.stub!(:exist?).and_return(true)
+          @dest.stub!(:size).and_return(2000)
+          @ftp.stub!(:size).and_return(2000)
+          @ftp.should_not_receive(:getbinaryfile)
 
-          proc{
-            Ruby.find_or_download_matching_archive('1.2.3').should == @archive
-          }.should raise_error(SdocAll::ConfigError)
+          SdocAll::Ruby.should_receive(:last_matching_ruby_archive).with('1.2.3', @paths).and_return(@tar)
+          SdocAll::Ruby.download_matching_archive('1.2.3')
         end
       end
     end
 
-    it "should raise error if version not specified" do
-      proc{ Ruby.new(nil).add_tasks }.should raise_error(SdocAll::ConfigError)
-    end
+    describe "find_or_download_matching_archive" do
+      before do
+        @archive = mock(:archive)
+      end
 
-    it "should raise error if version is blank" do
-      proc{ Ruby.new(:version => ' ').add_tasks }.should raise_error(SdocAll::ConfigError)
-    end
+      it "should immediately return match if update not allowed" do
+        SdocAll::Ruby.should_receive(:find_matching_archive).with('1.2.3').once.and_return(@archive)
+        SdocAll::Ruby.should_not_receive(:download_matching_archive)
 
-    describe "extracting archive and adding task" do
-      before do
-        @path = mock(:path)
-        @sources_path = mock(:sources_path)
-        @archive = mock(:archive, :full_version => '1.2.3-p666', :extension => 'tar.bz2', :path => 'sources/ruby-1.2.3-p666.tar.bz2')
-        @sources_path.should_receive(:+).with('1.2.3-p666').and_return(@path)
-        Ruby.stub!(:sources_path).and_return(@sources_path)
-        Ruby.should_receive(:find_or_download_matching_archive).with('1.2.3')
-        Ruby.should_receive(:find_or_download_matching_archive).with('1.2.3', :update => true).and_return(@archive)
-        Base.stub!(:add_task)
+        SdocAll::Ruby.find_or_download_matching_archive('1.2.3', :update => false).should == @archive
       end
 
-      it "should not extract archive if matching directory already exists" do
-        @path.stub!(:directory?).and_return(true)
-        Base.should_not_receive(:remove_if_present)
-        Base.should_not_receive(:system)
+      it "should downlaod and return match if update allowed" do
+        SdocAll::Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
+        SdocAll::Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(@archive)
 
-        Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+        SdocAll::Ruby.find_or_download_matching_archive('1.2.3', :update => true).should == @archive
       end
 
-      it "should extract archive if matching directory does not exist" do
-        @path.stub!(:directory?).and_return(false)
-        Base.should_receive(:remove_if_present).with(@path)
-        Base.should_receive(:system).with("tar", "-xjf", "sources/ruby-1.2.3-p666.tar.bz2", "-C", @sources_path)
-        @path2 = mock(:path2)
-        @sources_path.should_receive(:+).with('ruby-1.2.3-p666').and_return(@path2)
-        File.should_receive(:rename).with(@path2, @path)
+      it "should downlaod and return match if not found local" do
+        SdocAll::Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(nil, @archive)
+        SdocAll::Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
 
-        Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+        SdocAll::Ruby.find_or_download_matching_archive('1.2.3').should == @archive
       end
 
-      it "should finally add task" do
-        @path.stub!(:directory?).and_return(true)
-        Base.should_not_receive(:remove_if_present)
-        Base.should_not_receive(:system)
-        Base.should_receive(:add_task).with(:doc_path => "ruby-1.2.3-p666", :src_path => @path, :title => 'ruby-1.2.3-p666')
+      it "should raise if can not find local or downlaod archive" do
+        SdocAll::Ruby.should_receive(:find_matching_archive).with('1.2.3').once.ordered.and_return(nil, nil)
+        SdocAll::Ruby.should_receive(:download_matching_archive).with('1.2.3').once.ordered
 
-        Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+        proc{
+          SdocAll::Ruby.find_or_download_matching_archive('1.2.3').should == @archive
+        }.should raise_error(SdocAll::ConfigError)
       end
     end
   end
+
+  it "should raise error if version not specified" do
+    proc{ SdocAll::Ruby.new(nil).add_tasks }.should raise_error(SdocAll::ConfigError)
+  end
+
+  it "should raise error if version is blank" do
+    proc{ SdocAll::Ruby.new(:version => ' ').add_tasks }.should raise_error(SdocAll::ConfigError)
+  end
+
+  describe "extracting archive and adding task" do
+    before do
+      @path = mock(:path)
+      @sources_path = mock(:sources_path)
+      @archive = mock(:archive, :full_version => '1.2.3-p666', :extension => 'tar.bz2', :path => 'sources/ruby-1.2.3-p666.tar.bz2')
+      @sources_path.should_receive(:+).with('1.2.3-p666').and_return(@path)
+      SdocAll::Ruby.stub!(:sources_path).and_return(@sources_path)
+      SdocAll::Ruby.should_receive(:find_or_download_matching_archive).with('1.2.3')
+      SdocAll::Ruby.should_receive(:find_or_download_matching_archive).with('1.2.3', :update => true).and_return(@archive)
+      SdocAll::Base.stub!(:add_task)
+    end
+
+    it "should not extract archive if matching directory already exists" do
+      @path.stub!(:directory?).and_return(true)
+      SdocAll::Base.should_not_receive(:remove_if_present)
+      SdocAll::Base.should_not_receive(:system)
+
+      SdocAll::Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+    end
+
+    it "should extract archive if matching directory does not exist" do
+      @path.stub!(:directory?).and_return(false)
+      SdocAll::Base.should_receive(:remove_if_present).with(@path)
+      SdocAll::Base.should_receive(:system).with("tar", "-xjf", "sources/ruby-1.2.3-p666.tar.bz2", "-C", @sources_path)
+      @path2 = mock(:path2)
+      @sources_path.should_receive(:+).with('ruby-1.2.3-p666').and_return(@path2)
+      File.should_receive(:rename).with(@path2, @path)
+
+      SdocAll::Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+    end
+
+    it "should finally add task" do
+      @path.stub!(:directory?).and_return(true)
+      SdocAll::Base.should_not_receive(:remove_if_present)
+      SdocAll::Base.should_not_receive(:system)
+      SdocAll::Base.should_receive(:add_task).with(:doc_path => "ruby-1.2.3-p666", :src_path => @path, :title => 'ruby-1.2.3-p666')
+
+      SdocAll::Ruby.new(:version => '1.2.3').add_tasks(:update => true)
+    end
+  end
 end

data/spec/sdoc_all_spec.rb

@@ -22,7 +22,7 @@ describe SdocAll do
       SdocAll::Base.stub!(:public_path).and_return(Pathname.new('/public'))
 
       @tasks = []
-      @each = @tasks.should_receive(:each_with_progress)
+      @each = @tasks.should_receive(:each).twice
       %w(a b c).each do |c|
         task = mock(c, :doc_path => "#{c}", :src_path => "/sources/#{c}", :title => "<#{c}>", :config_hash => 'abc')
         task.should_receive(:run)

data/spec/spec.opts

@@ -1 +1 @@
---colour
+--colour -b

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 gem 'rspec'
 require 'spec'
+require 'stringio'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -16,6 +17,8 @@ Spec::Runner.configure do |config|
     Dir.stub!(:chdir).and_yield
     Net::FTP.stub!(:open)
     File.stub!(:symlink)
+    @progress_io = StringIO.new
+    Progress.stub!(:io).and_return(@progress_io)
 
     SdocAll.constants.each do |constant|
       klass = SdocAll.const_get(constant)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sdoc_all
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Boba Fat
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 +03:00
+date: 2010-01-03 00:00:00 +03:00
 default_executable: sdoc-all
 dependencies: 
 - !ruby/object:Gem::Dependency