radiant  --database mysql test
# edit config/database.yml
rake production db:bootstrap
radiant --database mysql test
rake production db:bootstrap
git clone git://github.com/radiant/radiant-reorder-extension.git vendor/extensions/reorder
cd vendor/plugins/reorder/
git reset --hard 22ed6cdbb5bd8a3a98badf661f5b0c3bae5f29b0
rake production radiant:extensions:reorder:migrate
rake production radiant:extensions:reorder:update
git clone git://github.com/kbingman/paperclipped.git vendor/extensions/paperclipped
rake production db:migrate:extensions
rake production radiant:extensions:paperclipped:update
git clone git://github.com/MrGossett/radiant_page_meta_extension.git vendor/extensions/page_meta
rake production db:migrate:extensions
# http://github.com/radiant/radiant-reorder-extension/tree/master
# http://www.nabble.com/PageAttachments-migration-looking-for-Admin::PagesController-td21080134.html
# http://github.com/kbingman/paperclipped/tree/master
# Needs sudo apt-get install imagemagick librmagick-ruby1.8


I made a couple changes for my setup:

#!/bin/sh
radiant --database sqlite3 $1
cd $1
echo "
production:
  adapter: sqlite3
  database: db/production.sqlite3
test:
  adapter: sqlite3
  database: db/test.sqlite3
development:
  production
" > config/database.yml

svn export http://dev.radiantcms.org/svn/radiant/trunk/extensions/shards vendor/extensions/00_shards
svn export http://svn.seancribbs.com/svn/rails/plugins/extensions/page_attachments vendor/extensions/page_attachments
svn export https://secure.svnrepository.com/s_swanki/open/radiant/extensions/page_meta/tags/v0.1.5 vendor/extensions/page_meta
svn export http://dev.radiantcms.org/svn/radiant/trunk/extensions/reorder/ vendor/extensions/reorder
rake radiant:freeze:edge
vendor/radiant/script/plugin install acts_as_list
rake production db:bootstrap
rake production db:migrate:extensions
rake production radiant:extensions:page_attachments:update
rake production radiant:extensions:reorder:update

Technorati Tags: ide, rails, javascript

Technorati Tags: rails, windows

Streamlined is a framework, on top of Rails, that allows you to quickly generate interfaces for your ActiveRecord models. It started as a way to generate Administrative backends, but has become more general purpose over time.

Check the screencasts, it seems very functional.

Technorati Tags: rails

Haven’t really gone down the Modx path yet, so I’ll look at Radiant instead as rails is my prefered web platform. Looks a big rough around the edges at the moment, but has a usable first version.  Couple things I’d probably like to see as major features for my requirements are: i) some sort of assets (pictures, pdfs, or other static files) management interface and ii) a WYSIWYG editor.

The first I might even add myself if the code looks easily.  The second is probably just a matter of time.

Unfortunately it is a difficult merge due to whitespace formating changes. So it hides any of the real code changes that might have occured. In fact after the merge I had to unrevert some of the changes I made in my local trunk. svk smerge doesn’t seem to be able to view conflicts on a line by line base.

I have svk sync running on crontab, so to mirror branch in the local svk repository is pretty much constantly up to date. Star merging these changes into the local svk development branch and then onto my svn and svk working copies is the next job.


[nic@shell:~/tmp/shlg-tracks] svk smerge -C /tracks/mirror/trunk/tracks /tracks/local/shlg-tracks/
Auto-merging (102, 109) /mirror/trunk/tracks to /local/shlg-tracks (base /mirror/trunk/tracks:102).
U app/helpers/application_helper.rb
U app/helpers/feed_helper.rb
U app/helpers/todo_helper.rb
U app/helpers/login_helper.rb
C app/models/todo.rb
C app/controllers/application.rb
G app/controllers/feed_controller.rb
C app/controllers/context_controller.rb
C app/controllers/todo_controller.rb
C app/controllers/project_controller.rb
U app/views/layouts/standard.rhtml
U app/views/context/_show_items.rhtml
U app/views/context/show.rhtml
C app/views/todo/list.rhtml
U app/views/todo/_show_items.rhtml
U app/views/todo/_action_edit_form.rhtml
U app/views/project/_show_items.rhtml
U app/views/project/show.rhtml
U README_FIRST.txt
U Rakefile
A doc/README_FOR_APP
A doc/CHANGELOG
D doc/CHANGENOTES.txt
D doc/README.txt
U public/javascripts/prototype.js
U public/javascripts/calendar-setup.js
U public/javascripts/calendar.js
U public/javascripts/toggle_notes.js
U public/stylesheets/standard.css
D README_LOGIN
New merge ticket: a4c988fc-2ded-0310-b66e-134b36920a42:/trunk/tracks:103
Empty merge.
6 conflicts found.


svk seems to use the same status codes for smerge as svn status. Note, ‘G’ is documented here. In summary from svk help up:

A Added
D Deleted
U Updated
C Conflict
G Merged
g Merged without actual change

Next step is to actually merge the changes from the mirror. svk smerge -l smerges the updates from the mirror “using the logs of merged revisions as commit message”. If there is a conflict, you are given the option of chosing your or their revisions.


[nic@shell:~/tmp/shlg-tracks] svk smerge -l /tracks/mirror/trunk/tracks /tracks/local/shlg-tracks/
Auto-merging (102, 109) /mirror/trunk/tracks to /local/shlg-tracks (base /mirror/trunk/tracks:102).
Waiting for editor...
Log message not modified: a)bort, e)dit, c)ommit?c
U app/helpers/application_helper.rb
U app/helpers/feed_helper.rb
U app/helpers/todo_helper.rb
U app/helpers/login_helper.rb
Conflict found in app/models/todo.rb:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] d
--- app/models/todo.rb (YOURS)
+++ app/models/todo.rb (MERGED)
...
Conflict found in app/models/todo.rb:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] t
G app/models/todo.rb
Conflict found in app/controllers/application.rb:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] d
...
New merge ticket: a4c988fc-2ded-0310-b66e-134b36920a42:/trunk/tracks:103
Committed revision 111.


Followed by an update to my working copy.


nic@rails:~/devel/tracks-dev$ svn info
Path: .
URL: https://svn.plumtree.co.nz/repos/tracks/local/shlg-tracks
Repository UUID: 3080eda5-12f9-0310-a60c-bfd680f1e508
Revision: 112
Node Kind: directory
Schedule: normal
Last Changed Author: nic
Last Changed Rev: 112
Last Changed Date: 2005-06-12 13:08:16 +1200 (Sun, 12 Jun 2005)
Properties Last Updated: 2005-06-12 12:53:20 +1200 (Sun, 12 Jun 2005)
nic@rails:~/devel/tracks-dev$ svn up
U app/helpers/application_helper.rb
U app/helpers/feed_helper.rb
U app/helpers/todo_helper.rb
U app/helpers/login_helper.rb
U app/models/todo.rb
U app/controllers/application.rb
U app/controllers/feed_controller.rb
U app/controllers/context_controller.rb
U app/controllers/todo_controller.rb
U app/controllers/project_controller.rb
U app/views/layouts/standard.rhtml
U app/views/context/_show_items.rhtml
U app/views/context/show.rhtml
U app/views/todo/list.rhtml
U app/views/todo/_show_items.rhtml
U app/views/todo/_action_edit_form.rhtml
U app/views/project/_show_items.rhtml
U app/views/project/show.rhtml
U README_FIRST.txt
U Rakefile
A doc/README_FOR_APP
A doc/CHANGELOG
D doc/README.txt
D doc/CHANGENOTES.txt
U public/javascripts/prototype.js
U public/javascripts/calendar-setup.js
U public/javascripts/calendar.js
U public/javascripts/toggle_notes.js
U public/stylesheets/standard.css
D README_LOGIN
U .
Updated to revision 111.


There was only one manual corrections I needed to make were svk smerge got confused by the whitespace updates from the mirror, plus one bit were I had to revert the changes back to the version I had made locally.

I decided that I wanted a seperate subversion repository from the svk default depot for mirror tracks and tracking my changes. So I followed the basic setup for svk: svk depotmap –init. Then added ‘tracks’:/home/svn/tracks via svk depotmap.


[nic@shell:~/] svk depotmap
Waiting for editor...
New depot map saved.
Repository /home/svn/tracks does not exist, create? (y/n)y
[nic@shell:~/] svk depotmap --list
Depot Path
============================================================
// /home/nic/.svk/local
/tracks/ /home/svn/tracks
[nic@shell:~/] svk ls /tracks/mirror/
branches/
tags/
trunk/


Then I setup the mirror for the mainline tracks repository with:


[nic@shell:~/] svk mirror http://www.rousette.org.uk/svn/tracks-repos/ /tracks/mirror/
[nic@shell:~/] svk mirror --list
Path Source
============================================================
/tracks/mirror http://www.rousette.org.uk/svn/tracks-repos
[nic@shell:~/] svk sync /tracks/mirror
Syncing http://www.rousette.org.uk/svn/tracks-repos
Retrieving log information from 1 to 101
Committed revision 2 from revision 1.
...
Committed revision 102 from revision 101.


Finally create the local development branch:


[nic@shell:~] svk cp -p -m'Branch to bring work on Salted Hash Login Genetator version of tracks' /tracks/mirror/trunk/tracks /tracks/local/shlg-tracks
Committed revision 103.
[nic@shell:~/tmp] svk co /tracks/local/shlg-tracks
Syncing /tracks/local/shlg-tracks(/local/shlg-tracks) in /home/nic/tmp/shlg-tracks to 103.
A shlg-tracks/test
A shlg-tracks/test/unit
...


From what I’ve read I can also do this remotely (rails to shell) with:


[nic@rails:~/tmp] svn co svn+ssh://shell/home/svn/tracks/local/shlg-tracks shlg-tracks
A shlg-tracks/test
A shlg-tracks/test/unit
A shlg-tracks/test/unit/user_test.rb
A shlg-tracks/test/unit/context_test.rb
...


Although at this point I’m not 100% sure I can workable use svn to commit back to the svk branch, without corruption.


au BufNewFile,BufRead *.rhtml set syn=eruby


to ~/.vimrc.

While you are at that, make sure you check out HowtoUseVimWithRails.