Changeset 459

Timestamp:

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

Author:

deveiant

Message:

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

Location:

trunk

Files:

• LICENSE (modified) (2 diffs)
• README (modified) (1 diff, 1 prop)
• Rakefile (modified) (13 diffs)
• TODO (modified) (1 prop)
• arrow.css (modified) (1 prop)
• docs/manual/resources/css/deveiate.css (modified) (1 prop)
• docs/manual/resources/css/ie.css (modified) (1 prop)
• docs/manual/resources/css/manual.css (modified) (1 prop)
• docs/manual/resources/css/print.css (modified) (1 prop)
• docs/manual/resources/css/screen.css (modified) (1 prop)
• lib/arrow/session.rb (modified) (1 diff)
• lib/arrow/transaction.rb (modified) (2 diffs)
• project.yml (modified) (1 diff)
• spec/arrow/appletregistry_spec.rb (modified) (1 prop)
• spec/arrow/session_spec.rb (added)

trunk/LICENSE

@@ -1 @@
-== Copyright
-
-Copyright © 2003-2008 The FaerieMUD Consortium.
-
+Copyright (c) 2008, Michael Granger
 All rights reserved.
 
@@ -8 +5 @@
 modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
 
-    * 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.
+  * 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.
 
-    * Neither the name of FaerieMUD nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
+  * Neither the name of the author/s, nor the names of the project's
+    contributors may be used to endorse or promote products derived from this
+    software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"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 COPYRIGHT OWNER OR
-CONTRIBUTORS 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.
-
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.

trunk/README

@@ -99 +99 @@
 
 
- $Id: README,v 1.3 2004/02/14 03:21:29 deveiant Exp $
+ $Id$
 
 

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
+

trunk/lib/arrow/session.rb

@@ -53 +53 @@
     #############################################################
 
-    @config = Arrow::Config.new
+    @config = Arrow::Config.new.session
     class << self
         attr_reader :config

trunk/lib/arrow/transaction.rb

@@ -84 +84 @@
     ### objects.
     def initialize( request, config, broker )
-        @request            = request
-        @config             = config
-        @broker             = broker
-        @handler_status     = Apache::OK
-
-        @serial             = make_transaction_serial( request )
+        @request         = request
+        @config          = config
+        @broker          = broker
+        @handler_status  = Apache::OK
+
+        @serial          = make_transaction_serial( request )
 
         # Stuff that may be filled in later
-        @session            = nil # Lazily-instantiated
-        @applet_path        = nil # Added by the broker
-        @vargs              = nil # Filled in by the applet
-        @data               = {}
-        @request_cookies    = parse_cookies( request )
-        @cookies            = Arrow::CookieSet.new()
+        @session         = nil # Lazily-instantiated
+        @applet_path     = nil # Added by the broker
+        @vargs           = nil # Filled in by the applet
+        @data            = {}
+        @request_cookies = parse_cookies( request )
+        @cookies         = Arrow::CookieSet.new()
 
         # Check for a "RubyOption root_dispatcher true"
@@ -525 +525 @@
     ### Parse cookies from the specified request and return them in a Hash.
     def parse_cookies( request )
-        hash = Arrow::Cookie.parse(request.headers_in['cookie'])
+        hash = Arrow::Cookie.parse( request.headers_in['cookie'] )
         return Arrow::CookieSet.new( hash.values )
     end

trunk/project.yml

@@ -1 +1 @@
 --- 
-project_description: A mod_ruby web application framework
+rubyforge_project: arrow
+project_requirements: 
+  mod_ruby: ">= 1.2.6"
+  Apache: ">= 2.2.6"
+project_description: |-
+  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.
+rubyforge_group: deveiate
 author_name: Michael Granger
-project_homepage: http://deveiate.org/projects/Arrow
+project_homepage: http://deveiate.org/projects/Arrow/
+project_dependencies: 
+  formvalidator: ">= 0.1.4"
+  ruby-cache: ">= 0.3.0"
+  PluginFactory: ">= 1.0.3"
+project_summary: A mod_ruby web application framework
 project_name: Arrow
+additional_pkgfiles: 
+- applets/**/*.rb
+- docs/manual/**
 author_email: ged@FaerieMUD.org
-project_dependencies:
-  ruby-cache: '>= 0.3.0'
-  formvalidator: '>= 0.1.4'
-  PluginFactory: '>= 1.0.3'
-project_requirements:
-  Apache: >= 2.2.6
-  mod_ruby: >= 1.2.6
-