Skip to content

Commit

Permalink
Interim fix for activerecord 2.0 problems
Browse files Browse the repository at this point in the history
git-svn-id: http://junebug.rubyforge.org/svn/wiki/trunk@117 6cb1f131-7020-0410-9d7d-f19630c53dbb
  • Loading branch information
tmyrtle committed Jan 13, 2008
1 parent 1b7e5ed commit 4ec7c63
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 7 deletions.
6 changes: 6 additions & 0 deletions History.txt
@@ -1,3 +1,9 @@
= 0.0.37 2008-01-13

Be sure to read the release notes

* Since activerecord 2.0 breaks code, set dependency on earlier version. Interim solution until Junebug is ported to AR 2.0.

= 0.0.36 2007-12-08

* Make ASCIIMathML support optional (annoying warning msgs on safari)
Expand Down
21 changes: 21 additions & 0 deletions RELEASE_NOTES.txt
@@ -1,3 +1,24 @@
= 0.0.37 2008-01-13

Active record 2.0 caused major breakage, and I haven't had the time to put together a fix until the code is ported to AR2.0. For now, I've tied the code to a specific earlier AR version that works.

To upgrade an existing system, you need to do the following:

Edit the Rakefile in your wiki directory to read:

--------------------------
$:.unshift "../lib"

require 'rubygems'
require 'rake'

gem 'activesupport', '<=1.4.4'
require 'junebug/tasks'
---------------------------

Then, run "rake update:everything" and then you should be able to restart your wiki.


= 0.0.36 2007-12-08

ASCIIMathML support is made optional, since it inserts annoying warning messages on browsers that do not support mathml (like safari).
Expand Down
5 changes: 3 additions & 2 deletions Rakefile
Expand Up @@ -47,11 +47,12 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
#p.changes - A description of the release's latest changes.
#p.spec_extras - A hash of extra values to set in the gemspec.
p.extra_deps = [
['mongrel', '>=1.0'],
['mongrel', '<=1.1.2'],
['camping', '>=1.5'],
['daemons', '>=1.0.4'],
['sqlite3-ruby', '>=1.2'],
['activerecord', '>=1.15.1']
['activerecord', '<=1.15.6'],
['activesupport', '<=1.4.4']
]
end

Expand Down
1 change: 1 addition & 0 deletions deploy/Rakefile
Expand Up @@ -3,6 +3,7 @@ $:.unshift "../lib"
require 'rubygems'
require 'rake'

gem 'activesupport', '<=1.4.4'
require 'junebug/tasks'


Expand Down
1 change: 1 addition & 0 deletions deploy/wiki
Expand Up @@ -4,6 +4,7 @@ $:.unshift File.dirname(__FILE__) + "/../lib"
require 'rubygems'
require 'daemons'
require 'fileutils'
gem 'activesupport', '<=1.4.4'
require 'junebug/config'

JUNEBUG_ROOT = ENV['JUNEBUG_ROOT'] = File.dirname(File.expand_path(__FILE__))
Expand Down
3 changes: 3 additions & 0 deletions lib/junebug.rb
@@ -1,6 +1,9 @@
$:.unshift File.dirname(__FILE__) # for running in foreground in dev
$KCODE = 'u'
require 'rubygems'
gem 'activesupport', '<=1.4.4'
gem 'activerecord', '<=1.15.6'
gem 'mongrel', '<=1.1.2'
gem 'camping', '>=1.5'
require 'camping/session'

Expand Down
2 changes: 1 addition & 1 deletion lib/junebug/models.rb
@@ -1,4 +1,4 @@
require 'active_record'
# require 'active_record'
require 'junebug/ext/acts_as_versioned'

module Junebug::Models
Expand Down
2 changes: 0 additions & 2 deletions lib/junebug/tasks/dump.rake
@@ -1,6 +1,4 @@
require 'junebug'
require 'junebug/models'
require 'active_record'

namespace :dump do

Expand Down
3 changes: 2 additions & 1 deletion lib/junebug/tasks/update.rake
Expand Up @@ -14,10 +14,11 @@ namespace :update do
cp_r File.join(junebug_root, 'deploy', 'public'), '.'
end

desc "Update rakefile"
desc "Update rakefile and wiki-runner"
task :rakefile do
junebug_root = Junebug::Config.rootdir
cp File.join(junebug_root, 'deploy', 'Rakefile'), '.'
cp File.join(junebug_root, 'deploy', 'wiki'), '.'
end

desc "Update help pages"
Expand Down
2 changes: 1 addition & 1 deletion lib/junebug/version.rb
Expand Up @@ -2,7 +2,7 @@ module Junebug #:nodoc:
module VERSION #:nodoc:
MAJOR = 0
MINOR = 0
TINY = 36
TINY = 37

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down

0 comments on commit 4ec7c63

Please sign in to comment.