ludy 0.1.11 → 0.1.13

data/tasks/rubyforge.rake

@@ -1,23 +1,23 @@
 # $Id$
 
-if PROJ.rubyforge_name && HAVE_RUBYFORGE
+if PROJ.rubyforge.name.valid? && HAVE_RUBYFORGE
 
 require 'rubyforge'
 require 'rake/contrib/sshpublisher'
 
 namespace :gem do
   desc 'Package and upload to RubyForge'
-  task :release => [:clobber, :package] do |t|
+  task :release => [:clobber, 'gem:package'] do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
-    pkg = "pkg/#{PROJ.spec.full_name}"
+    pkg = "pkg/#{PROJ.gem._spec.full_name}"
 
     if $DEBUG then
-      puts "release_id = rf.add_release #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
-      puts "rf.add_file #{PROJ.rubyforge_name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
+      puts "release_id = rf.add_release #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, #{PROJ.version.inspect}, \"#{pkg}.tgz\""
+      puts "rf.add_file #{PROJ.rubyforge.name.inspect}, #{PROJ.name.inspect}, release_id, \"#{pkg}.gem\""
     end
 
-    rf = RubyForge.new
+    rf = RubyForge.new.configure
     puts 'Logging in'
     rf.login
 
@@ -26,12 +26,12 @@ namespace :gem do
     c['release_changes'] = PROJ.changes if PROJ.changes
     c['preformatted'] = true
 
-    files = [(PROJ.need_tar ? "#{pkg}.tgz" : nil),
-             (PROJ.need_zip ? "#{pkg}.zip" : nil),
+    files = [(PROJ.gem.need_tar ? "#{pkg}.tgz" : nil),
+             (PROJ.gem.need_zip ? "#{pkg}.zip" : nil),
              "#{pkg}.gem"].compact
 
     puts "Releasing #{PROJ.name} v. #{PROJ.version}"
-    rf.add_release PROJ.rubyforge_name, PROJ.name, PROJ.version, *files
+    rf.add_release PROJ.rubyforge.name, PROJ.name, PROJ.version, *files
   end
 end  # namespace :gem
 
@@ -44,9 +44,9 @@ namespace :doc do
     )
 
     host = "#{config['username']}@rubyforge.org"
-    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
-    remote_dir << PROJ.rdoc_remote_dir if PROJ.rdoc_remote_dir
-    local_dir = PROJ.rdoc_dir
+    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge.name}/"
+    remote_dir << PROJ.rdoc.remote_dir if PROJ.rdoc.remote_dir
+    local_dir = PROJ.rdoc.dir
 
     Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
   end

data/tasks/setup.rb

@@ -6,92 +6,117 @@ require 'rake/clean'
 require 'fileutils'
 require 'ostruct'
 
-PROJ = OpenStruct.new
-
-PROJ.name = nil
-PROJ.summary = nil
-PROJ.description = nil
-PROJ.changes = nil
-PROJ.authors = nil
-PROJ.email = nil
-PROJ.url = nil
-PROJ.version = ENV['VERSION'] || '0.0.0'
-PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS .svn/ ^pkg/ ^doc/)
-PROJ.release_name = ENV['RELEASE']
-PROJ.history_file = 'History.txt'
-PROJ.manifest_file = 'Manifest.txt'
-PROJ.readme_file = 'README.txt'
-
-# Rspec
-PROJ.specs = FileList['spec/**/*_spec.rb']
-PROJ.spec_opts = []
-
-# Test::Unit
-PROJ.tests = FileList['test/**/test_*.rb']
-PROJ.test_file = 'test/all.rb'
-PROJ.test_opts = []
-
-# Rcov
-PROJ.rcov_dir = 'coverage'
-PROJ.rcov_opts = %w[--sort coverage -T]
-PROJ.rcov_threshold = 90.0
-PROJ.rcov_threshold_exact = false
-
-# Rdoc
-PROJ.rdoc_opts = []
-PROJ.rdoc_include = %w(^lib/ ^bin/ ^ext/ .txt$)
-PROJ.rdoc_exclude = %w(extconf.rb$)
-PROJ.rdoc_main = nil
-PROJ.rdoc_dir = 'doc'
-PROJ.rdoc_remote_dir = nil
-
-# Extensions
-PROJ.extensions = FileList['ext/**/extconf.rb']
-PROJ.ruby_opts = %w(-w)
-PROJ.libs = []
-%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
+class OpenStruct; undef :gem; end
+
+PROJ = OpenStruct.new(
+  # Project Defaults
+  :name => nil,
+  :summary => nil,
+  :description => nil,
+  :changes => nil,
+  :authors => nil,
+  :email => nil,
+  :url => "\000",
+  :version => ENV['VERSION'] || '0.0.0',
+  :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
+  :release_name => ENV['RELEASE'],
+
+  # System Defaults
+  :ruby_opts => %w(-w),
+  :libs => [],
+  :history_file => 'History.txt',
+  :manifest_file => 'Manifest.txt',
+  :readme_file => 'README.txt',
+
+  # Announce
+  :ann => OpenStruct.new(
+    :file => 'announcement.txt',
+    :text => nil,
+    :paragraphs => [],
+    :email => {
+      :from     => nil,
+      :to       => %w(ruby-talk@ruby-lang.org),
+      :server   => 'localhost',
+      :port     => 25,
+      :domain   => ENV['HOSTNAME'],
+      :acct     => nil,
+      :passwd   => nil,
+      :authtype => :plain
+    }
+  ),
+
+  # Gem Packaging
+  :gem => OpenStruct.new(
+    :dependencies => [],
+    :executables => nil,
+    :extensions => FileList['ext/**/extconf.rb'],
+    :files => nil,
+    :need_tar => true,
+    :need_zip => false,
+    :extras => {}
+  ),
+
+  # File Annotations
+  :notes => OpenStruct.new(
+    :exclude => %w(^tasks/setup\.rb$),
+    :extensions => %w(.txt .rb .erb) << '',
+    :tags => %w(FIXME OPTIMIZE TODO)
+  ),
+
+  # Rcov
+  :rcov => OpenStruct.new(
+    :dir => 'coverage',
+    :opts => %w[--sort coverage -T],
+    :threshold => 90.0,
+    :threshold_exact => false
+  ),
+
+  # Rdoc
+  :rdoc => OpenStruct.new(
+    :opts => [],
+    :include => %w(^lib/ ^bin/ ^ext/ \.txt$),
+    :exclude => %w(extconf\.rb$),
+    :main => nil,
+    :dir => 'doc',
+    :remote_dir => nil
+  ),
+
+  # Rubyforge
+  :rubyforge => OpenStruct.new(
+    :name => "\000"
+  ),
 
-# Gem Packaging
-PROJ.files = nil
-PROJ.executables = nil
-PROJ.dependencies = []
-PROJ.need_tar = true
-PROJ.need_zip = false
-PROJ.post_install_message = nil
-
-# File Annotations
-PROJ.annotation_exclude = %w(^tasks/setup.rb$)
-PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
-PROJ.annotation_tags = %w(FIXME OPTIMIZE TODO)
-
-# Subversion Repository
-PROJ.svn = false
-PROJ.svn_root = nil
-PROJ.svn_trunk = 'trunk'
-PROJ.svn_tags = 'tags'
-PROJ.svn_branches = 'branches'
-
-# Announce
-PROJ.ann_file = 'announcement.txt'
-PROJ.ann_text = nil
-PROJ.ann_paragraphs = []
-PROJ.ann_email = {
-  :from     => nil,
-  :to       => %w(ruby-talk@ruby-lang.org),
-  :server   => 'localhost',
-  :port     => 25,
-  :domain   => ENV['HOSTNAME'],
-  :acct     => nil,
-  :passwd   => nil,
-  :authtype => :plain
-}
+  # Rspec
+  :spec => OpenStruct.new(
+    :files => FileList['spec/**/*_spec.rb'],
+    :opts => []
+  ),
+
+  # Subversion Repository
+  :svn => OpenStruct.new(
+    :root => nil,
+    :path => '',
+    :trunk => 'trunk',
+    :tags => 'tags',
+    :branches => 'branches'
+  ),
+
+  # Test::Unit
+  :test => OpenStruct.new(
+    :files => FileList['test/**/test_*.rb'],
+    :file  => 'test/all.rb',
+    :opts  => []
+  )
+)
 
 # Load the other rake files in the tasks folder
 rakefiles = Dir.glob('tasks/*.rake').sort
 rakefiles.unshift(rakefiles.delete('tasks/post_load.rake')).compact!
 import(*rakefiles)
 
+# Setup the project libraries
+%w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
+
 # Setup some constants
 WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
 
@@ -105,6 +130,7 @@ def quiet( &block )
 ensure
   STDOUT.reopen io.first
   STDERR.reopen io.last
+  $stdout, $stderr = STDOUT, STDERR
 end
 
 DIFF = if WIN32 then 'diff.exe'
@@ -120,6 +146,7 @@ SUDO = if WIN32 then ''
        end
 
 RCOV = WIN32 ? 'rcov.bat' : 'rcov'
+RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
 GEM  = WIN32 ? 'gem.bat'  : 'gem'
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
@@ -130,6 +157,10 @@ GEM  = WIN32 ? 'gem.bat'  : 'gem'
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
+HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and
+            system("svn --version 2>&1 > #{DEV_NULL}"))
+HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and
+            system("git --version 2>&1 > #{DEV_NULL}"))
 
 # Reads a file at +path+ and spits out an array of the +paragraphs+
 # specified.
@@ -169,7 +200,7 @@ def depend_on( name, version = nil )
   spec = Gem.source_index.find_name(name).last
   version = spec.version.to_s if version.nil? and !spec.nil?
 
-  PROJ.dependencies << case version
+  PROJ.gem.dependencies << case version
     when nil; [name]
     when %r/^\d/; [name, ">= #{version}"]
     else [name, version] end
@@ -224,4 +255,14 @@ def manifest_files
   files.sort!
 end
 
+# We need a "valid" method thtat determines if a string is suitable for use
+# in the gem specification.
+#
+class Object
+  def valid?
+    return !(self.empty? or self == "\000") if self.respond_to?(:to_str)
+    return false
+  end
+end
+
 # EOF

data/tasks/spec.rake

@@ -8,16 +8,16 @@ namespace :spec do
   desc 'Run all specs with basic output'
   Spec::Rake::SpecTask.new(:run) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
     t.ruby_opts = PROJ.ruby_opts
-    t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
-    t.spec_files = PROJ.specs
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
     t.libs += PROJ.libs
   end
 
@@ -25,21 +25,22 @@ namespace :spec do
     desc 'Run all specs with RCov'
     Spec::Rake::SpecTask.new(:rcov) do |t|
       t.ruby_opts = PROJ.ruby_opts
-      t.spec_opts = PROJ.spec_opts
-      t.spec_files = PROJ.specs
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
       t.libs += PROJ.libs
       t.rcov = true
-      t.rcov_dir = PROJ.rcov_dir
-      t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
     end
 
     RCov::VerifyTask.new(:verify) do |t| 
-      t.threshold = PROJ.rcov_threshold
-      t.index_html = File.join(PROJ.rcov_dir, 'index.html')
-      t.require_exact_threshold = PROJ.rcov_threshold_exact
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
     end
 
     task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
   end
 
 end  # namespace :spec
@@ -49,8 +50,6 @@ task :spec => 'spec:run'
 
 task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(spec:clobber_rcov)
-
 end  # if HAVE_SPEC_RAKE_SPECTASK
 
 # EOF

data/tasks/svn.rake

@@ -1,32 +1,36 @@
 # $Id$
 
+if HAVE_SVN
 
-if PROJ.svn and system("svn --version 2>&1 > #{DEV_NULL}")
-
-unless PROJ.svn_root
+unless PROJ.svn.root
   info = %x/svn info ./
   m = %r/^Repository Root:\s+(.*)$/.match(info)
-  PROJ.svn_root = (m.nil? ? '' : m[1])
+  PROJ.svn.root = (m.nil? ? '' : m[1])
 end
-PROJ.svn_root = File.join(PROJ.svn_root, PROJ.svn) if String === PROJ.svn
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
 
 namespace :svn do
 
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
   desc 'Show tags from the SVN repository'
-  task :show_tags do |t|
-    tags = %x/svn list #{File.join(PROJ.svn_root, PROJ.svn_tags)}/
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
     tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
     puts tags
   end
 
   desc 'Create a new tag in the SVN repository'
-  task :create_tag do |t|
+  task :create_tag => 'svn:prereqs' do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
 
-    trunk = File.join(PROJ.svn_root, PROJ.svn_trunk)
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
     tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(PROJ.svn_root, PROJ.svn_tags, tag)
+    tag = File.join(svn.root, svn.tags, tag)
     msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
 
     puts "Creating SVN tag '#{tag}'"
@@ -39,6 +43,6 @@ end  # namespace :svn
 
 task 'gem:release' => 'svn:create_tag'
 
-end  # if PROJ.svn
+end  # if PROJ.svn.path
 
 # EOF

data/tasks/test.rake

@@ -6,19 +6,19 @@ namespace :test do
 
   Rake::TestTask.new(:run) do |t|
     t.libs = PROJ.libs
-    t.test_files = if test(?f, PROJ.test_file) then [PROJ.test_file]
-                   else PROJ.tests end
+    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+                   else PROJ.test.files end
     t.ruby_opts += PROJ.ruby_opts
-    t.ruby_opts += PROJ.test_opts
+    t.ruby_opts += PROJ.test.opts
   end
 
   if HAVE_RCOV
     desc 'Run rcov on the unit tests'
     task :rcov => :clobber_rcov do
-      opts = PROJ.rcov_opts.dup << '-o' << PROJ.rcov_dir
+      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
       opts = opts.join(' ')
-      files = if test(?f, PROJ.test_file) then [PROJ.test_file]
-              else PROJ.tests end
+      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+              else PROJ.test.files end
       files = files.join(' ')
       sh "#{RCOV} #{files} #{opts}"
     end

data/test/ludy/test_paginator.rb

@@ -49,7 +49,7 @@ class TestPaginator < Test::Unit::TestCase
   end
   def test_offset_bug
     a = (0..9).to_a
-    pager = ArrayPaginator.new a
+    pager = Ludy::ArrayPaginator.new a
     pager.per_page = 5
     assert_equal 5, pager[1].size
     assert_equal 5, pager[2].size
@@ -71,4 +71,14 @@ class TestPaginator < Test::Unit::TestCase
   def test_for_array
     for_pager Ludy::ArrayPaginator.new(TestPaginator.data)
   end
+  def test_null_paginator
+    nullpage = Ludy::NullPage.instance
+    assert_equal 0, nullpage.page
+    assert_nil nullpage.next
+    assert_equal 0, nullpage.size
+    assert_equal [], nullpage.data
+    assert_equal nullpage.object_id, nullpage.pager.page(0).object_id
+    assert_nil Ludy::Paginator.null.page(1)
+    assert_equal nullpage.object_id, Ludy::Page.null.object_id
+  end
 end