Changeset 462

Timestamp:

10/03/08 10:56:35 (7 weeks ago)

Author:

deveiant

Message:

• Updated build system
• Fixed the formvalidator log message in Arrow::Applet.

Location:

trunk

Files:

• Rakefile (modified) (10 diffs)
• lib/arrow/applet.rb (modified) (1 diff)
• project.yml (modified) (1 diff)

trunk/Rakefile

@@ -35 +35 @@
 ### Config constants
 BASEDIR       = Pathname.new( __FILE__ ).dirname.relative_path_from( Pathname.getwd )
+BINDIR        = BASEDIR + 'bin'
 LIBDIR        = BASEDIR + 'lib'
 EXTDIR        = BASEDIR + 'ext'
@@ -40 +41 @@
 PKGDIR        = BASEDIR + 'pkg'
 
-PKG_NAME      = 'arrow'
+PROJECT_NAME  = 'Arrow'
+PKG_NAME      = PROJECT_NAME.downcase
 PKG_SUMMARY   = 'A mod_ruby web application framework'
 VERSION_FILE  = LIBDIR + 'arrow.rb'
@@ -50 +52 @@
 
 TEXT_FILES    = %w( Rakefile ChangeLog README LICENSE ).collect {|filename| BASEDIR + filename }
+BIN_FILES     = Pathname.glob( BINDIR + '*' ).delete_if {|item| item =~ /\.svn/ }
 LIB_FILES     = Pathname.glob( LIBDIR + '**/*.rb' ).delete_if {|item| item =~ /\.svn/ }
 EXT_FILES     = Pathname.glob( EXTDIR + '**/*.{c,h,rb}' ).delete_if {|item| item =~ /\.svn/ }
 
 SPECDIR       = BASEDIR + 'spec'
-SPEC_FILES    = Pathname.glob( SPECDIR + '**/*_spec.rb' ).delete_if {|item| item =~ /\.svn/ }
+SPECLIBDIR    = SPECDIR + 'lib'
+SPEC_FILES    = Pathname.glob( SPECDIR + '**/*_spec.rb' ).delete_if {|item| item =~ /\.svn/ } +
+                Pathname.glob( SPECLIBDIR + '**/*.rb' ).delete_if {|item| item =~ /\.svn/ }
 
 TESTDIR       = BASEDIR + 'tests'
@@ -71 +76 @@
     SPEC_FILES + 
     TEST_FILES + 
+    BIN_FILES +
     LIB_FILES + 
     EXT_FILES + 
@@ -110 +116 @@
 
 # Documentation constants
+RDOCDIR = DOCSDIR + 'api'
 RDOC_OPTIONS = [
     '-w', '4',
@@ -140 +147 @@
 }
 
+# Developer Gem dependencies: gemname => version
+DEVELOPMENT_DEPENDENCIES = {
+    'amatch'      => '>= 0.2.3',
+    'rake'        => '>= 0.8.1',
+    'rcodetools'  => '>= 0.7.0.0',
+    'rcov'        => '>= 0',
+    'RedCloth'    => '>= 4.0.3',
+    'rspec'       => '>= 0',
+    'rubyforge'   => '>= 0',
+    'termios'     => '>= 0',
+    'text-format' => '>= 1.0.0',
+    'tmail'       => '>= 1.2.3.1',
+    'ultraviolet' => '>= 0.10.2',
+    'libxml-ruby' => '>= 0.8.3',
+}
+
 # Non-gem requirements: packagename => version
 REQUIREMENTS = {
@@ -165 +188 @@
     gem.has_rdoc          = true
     gem.rdoc_options      = RDOC_OPTIONS
+
+    gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
+    
 
     gem.files             = RELEASE_FILES.
@@ -173 +199 @@
     DEPENDENCIES.each do |name, version|
         version = '>= 0' if version.length.zero?
-        gem.add_dependency( name, version )
+        gem.add_runtime_dependency( name, version )
+    end
+    
+    # Developmental dependencies don't work as of RubyGems 1.2.0
+    unless Gem::Version.new( Gem::RubyGemsVersion ) <= Gem::Version.new( "1.2.0" )
+        DEVELOPMENT_DEPENDENCIES.each do |name, version|
+            version = '>= 0' if version.length.zero?
+            gem.add_development_dependency( name, version )
+        end
     end
     
@@ -180 +214 @@
     end
 end
+
+# Manual-generation config
+MANUALDIR = DOCSDIR + 'manual'
 
 $trace = Rake.application.options.trace ? true : false
@@ -236 +273 @@
 ### Task: cruise (Cruisecontrol task)
 desc "Cruisecontrol build"
-task :cruise => [:clean, :spec, :package] do |task|
+task :cruise => [:clean, 'spec:quiet', :package] do |task|
     raise "Artifacts dir not set." if ARTIFACTS_DIR.to_s.empty?
     artifact_dir = ARTIFACTS_DIR.cleanpath

trunk/lib/arrow/applet.rb

@@ -690 +690 @@
         # Create a new validator object, map the request args into a regular
         # hash, and then send them to the validaator with the applicable profile
-        self.log.debug "Creating form validator for profile: %p" % profile
+        self.log.debug "Creating form validator for profile: %p" % [ profile ]
 
         params = {}

trunk/project.yml

@@ -21 +21 @@
 - applets/**/*.rb
 - docs/manual/**
+dev_dependencies: {}
+
 author_email: ged@FaerieMUD.org