Changeset 459 for trunk/Rakefile

Timestamp:

08/15/08 19:28:50 (5 months ago)

Author:

deveiant

Message:

• Updated the build system
• Started conversion of unit tests for Arrow::Session to Rspec

Files:

• trunk/Rakefile (modified) (13 diffs)

trunk/Rakefile

@@ -39 +39 @@
 DOCSDIR       = BASEDIR + 'docs'
 PKGDIR        = BASEDIR + 'pkg'
-RAKE_TASKDIR  = BASEDIR + 'rake'
 
 PKG_NAME      = 'arrow'
-PKG_SUMMARY   = ''
+PKG_SUMMARY   = 'A mod_ruby web application framework'
 VERSION_FILE  = LIBDIR + 'arrow.rb'
 PKG_VERSION   = VERSION_FILE.read[ /VERSION = '(\d+\.\d+\.\d+)'/, 1 ]
@@ -48 +47 @@
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
-RELEASE_NAME  = "RELEASE_#{PKG_VERSION.gsub(/\./, '_')}"
-
 ARTIFACTS_DIR = Pathname.new( ENV['CC_BUILD_ARTIFACTS'] || 'artifacts' )
 
@@ -62 +59 @@
 TEST_FILES    = Pathname.glob( TESTDIR + '**/*.tests.rb' ).delete_if {|item| item =~ /\.svn/ }
 
-RELEASE_FILES = FileList[ TEXT_FILES + SPEC_FILES + TEST_FILES + LIB_FILES + EXT_FILES ]
-
+RAKE_TASKDIR  = BASEDIR + 'rake'
+RAKE_TASKLIBS = Pathname.glob( RAKE_TASKDIR + '*.rb' )
+
+LOCAL_RAKEFILE = BASEDIR + 'Rakefile.local'
+
+EXTRA_PKGFILES = []
+EXTRA_PKGFILES.concat Pathname.glob( BASEDIR + 'applets/**/*.rb' ).delete_if {|item| item =~ /\.svn/ } 
+EXTRA_PKGFILES.concat Pathname.glob( BASEDIR + 'docs/manual/**' ).delete_if {|item| item =~ /\.svn/ } 
+
+RELEASE_FILES = TEXT_FILES + 
+    SPEC_FILES + 
+    TEST_FILES + 
+    LIB_FILES + 
+    EXT_FILES + 
+    RAKE_TASKLIBS +
+    EXTRA_PKGFILES
+
+RELEASE_FILES << LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
+
+COVERAGE_MINIMUM = ENV['COVERAGE_MINIMUM'] ? Float( ENV['COVERAGE_MINIMUM'] ) : 85.0
 RCOV_EXCLUDES = 'spec,tests,/Library/Ruby,/var/lib,/usr/local/lib'
 RCOV_OPTS = [
@@ -80 +95 @@
 SVN_TAGS_DIR     = 'tags'
 
+SVN_DOTDIR       = BASEDIR + '.svn'
+SVN_ENTRIES      = SVN_DOTDIR + 'entries'
+
+
 ### Load some task libraries that need to be loaded early
 require RAKE_TASKDIR + 'helpers.rb'
@@ -96 +115 @@
     '-i', '.',
     '-m', 'README',
-    '-W', 'http://deveiate.org/projects/Arrow/browser/trunk/'
+    '-W', 'http://deveiate.org/projects/Arrow//browser/trunk/'
   ]
 
@@ -107 +126 @@
 PROJECT_PUBDIR = "/usr/local/www/public/code"
 PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
-PROJECT_SCPURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
+PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
+PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
+
+# Rubyforge stuff
+RUBYFORGE_GROUP = 'deveiate'
+RUBYFORGE_PROJECT = 'arrow'
 
 # Gem dependencies: gemname => version
@@ -129 +153 @@
     gem.summary           = PKG_SUMMARY
     gem.description       = <<-EOD
-    A mod_ruby web application framework
+    Arrow is a web application framework for mod_ruby. It was designed to make
+    development of web applications under Apache easier and more fun without
+    sacrificing the power of being able to access the native Apache API.
     EOD
 
     gem.authors           = 'Michael Granger'
     gem.email             = 'ged@FaerieMUD.org'
-    gem.homepage          = 'http://deveiate.org/projects/Arrow'
-    gem.rubyforge_project = 'deveiate'
+    gem.homepage          = 'http://deveiate.org/projects/Arrow/'
+    gem.rubyforge_project = RUBYFORGE_PROJECT
 
     gem.has_rdoc          = true
@@ -155 +181 @@
 end
 
+$trace = Rake.application.options.trace ? true : false
+$dryrun = Rake.application.options.dryrun ? true : false
+
 
 # Load any remaining task libraries
-Pathname.glob( RAKE_TASKDIR + '*.rb' ).each do |tasklib|
-    RELEASE_FILES.include( tasklib )
-
+RAKE_TASKLIBS.each do |tasklib|
     next if tasklib =~ %r{/(helpers|svn|verifytask)\.rb$}
     begin
@@ -174 +201 @@
 end
 
-$trace = Rake.application.options.trace ? true : false
-$dryrun = Rake.application.options.dryrun ? true : false
-
 # Load any project-specific rules defined in 'Rakefile.local' if it exists
-LOCAL_RAKEFILE = BASEDIR + 'Rakefile.local'
-if LOCAL_RAKEFILE.exist?
-    import LOCAL_RAKEFILE 
-    RELEASE_FILES.include( LOCAL_RAKEFILE.to_s )
-end
+import LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
 
 
@@ -190 +210 @@
 
 ### Default task
-task :default  => [:clean, :spec, :rdoc, :package]
+task :default  => [:clean, :local, :spec, :rdoc, :package]
+
+### Task the local Rakefile can append to -- no-op by default
+task :local
 
 
@@ -197 +220 @@
 CLOBBER.include 'artifacts', 'coverage.info', PKGDIR
 
-
-### Cruisecontrol task
+# Target to hinge on ChangeLog updates
+file SVN_ENTRIES
+
+### Task: changelog
+file 'ChangeLog' => SVN_ENTRIES.to_s do |task|
+    log "Updating #{task.name}"
+
+    changelog = make_svn_changelog()
+    File.open( task.name, 'w' ) do |fh|
+        fh.print( changelog )
+    end
+end
+
+
+### Task: cruise (Cruisecontrol task)
 desc "Cruisecontrol build"
 task :cruise => [:clean, :spec, :package] do |task|
@@ -205 +241 @@
     artifact_dir.mkpath
     
-    $stderr.puts "Copying coverage stats..."
-    FileUtils.cp_r( 'coverage', artifact_dir )
+    coverage = BASEDIR + 'coverage'
+    if coverage.exist? && coverage.directory?
+        $stderr.puts "Copying coverage stats..."
+        FileUtils.cp_r( 'coverage', artifact_dir )
+    end
     
     $stderr.puts "Copying packages..."
@@ -213 +252 @@
 
 
+desc "Update the build system to the latest version"
+task :update_build do
+    log "Updating the build system"
+    sh 'svn', 'up', RAKE_TASKDIR
+    log "Updating the Rakefile"
+    sh 'rake', '-f', RAKE_TASKDIR + 'Metarakefile'
+end
+