radiant 0.5.0 → 0.5.1

data/app/views/admin/snippet/new.rhtml

@@ -5,24 +5,24 @@
 <% end -%>
 
 <form method="post">
-	<div class="form-area">
-		<p class="title">
-			<label for="snippet_name">Name</label>
-			<%= text_field "snippet", "name", :class => 'textbox', :maxlength => 100 %>
-		</p>
+  <div class="form-area">
+    <p class="title">
+      <label for="snippet_name">Name</label>
+      <%= text_field "snippet", "name", :class => 'textbox', :maxlength => 100 %>
+    </p>
 
-		<p class="content">
-		  <label for="snippet_content">Body</label>
-		  <%= text_area "snippet", "content", :class => "textarea", :style => "width: 100%" %></p>
-		<p>
-		  <label for="snippet_filter">Filter</label>
+    <p class="content">
+      <label for="snippet_content">Body</label>
+      <%= text_area "snippet", "content", :class => "textarea", :style => "width: 100%" %></p>
+    <p>
+      <label for="snippet_filter">Filter</label>
       <%= select_tag "snippet[filter_id]", options_for_select([['none', '']] + TextFilter.find_all.map { |f| f.registered_id }, @snippet.filter_id) %>
-		</p>
+    </p>
     <%= updated_stamp @snippet %>
   </div>
-	<p class="buttons">
-		<%= save_model_button(@snippet) %> <%= save_model_and_continue_editing_button(@snippet) %> or <%= link_to "Cancel", snippet_index_url %>
-	</p>
+  <p class="buttons">
+    <%= save_model_button(@snippet) %> <%= save_model_and_continue_editing_button(@snippet) %> or <%= link_to "Cancel", snippet_index_url %>
+  </p>
 </form>
 
 <%= focus 'snippet_name' %>

data/app/views/admin/snippet/remove.rhtml

@@ -2,15 +2,15 @@
 <p>Are you sure you want to <strong class="warning">permanently remove</strong> the following snippet?</p>
 
 <table id="snippets" class="index" cellpadding="0" cellspacing="0" border="0">
-	<tbody>
-	  <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
-	    <td class="snippet">
-	      <%= @snippet.name %>
-	    </td>
-	  </tr>
-	</tbody>
+  <tbody>
+    <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
+      <td class="snippet">
+        <%= @snippet.name %>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 <form method="post">
-	<p class="buttons"><%= submit_tag "Delete Snippet", :class => 'button' %> or <%= link_to 'Cancel', snippet_index_url %></p>
+  <p class="buttons"><%= submit_tag "Delete Snippet", :class => 'button' %> or <%= link_to 'Cancel', snippet_index_url %></p>
 </form>

data/app/views/admin/user/index.rhtml

@@ -1,38 +1,38 @@
 <h1>Users</h1>
 
 <table id="users" class="index" cellpadding="0" cellspacing="0" border="0">
-	<thead>
-		<tr>
-			<th class="user">Name / Login</th>
-			<th class="roles">Roles</th>
-			<th class="modify">Modify</th>
-		</tr>
-	</thead>
-	<tbody>
+  <thead>
+    <tr>
+      <th class="user">Name / Login</th>
+      <th class="roles">Roles</th>
+      <th class="modify">Modify</th>
+    </tr>
+  </thead>
+  <tbody>
 <% unless @users.empty? -%>
 <% for user in @users -%>
-	  <tr class="node level-1">
-	    <td class="user">
-	      <%= link_to user.name, user_edit_url(:id => user) %>
-	      <small class="login"><%= user.login %></small>
-	    </td>
-	    <td class="roles">
-	      <%=
+    <tr class="node level-1">
+      <td class="user">
+        <%= link_to user.name, user_edit_url(:id => user) %>
+        <small class="login"><%= user.login %></small>
+      </td>
+      <td class="roles">
+        <%=
         roles = []
         roles << 'Administrator' if user.admin?
         roles << 'Developer' if user.developer?
         roles.join(', ')
         %>
-	    </td>
-	    <td class="remove"><%=  user.id != session[:user].id ? link_to(image_tag('remove', :alt => 'Remove User'), user_remove_url(:id => user)) : image_tag('remove-disabled', :alt => 'Remove') %></td>
-	  </tr>
+      </td>
+      <td class="remove"><%=  user.id != session[:user].id ? link_to(image_tag('remove', :alt => 'Remove User'), user_remove_url(:id => user)) : image_tag('remove-disabled', :alt => 'Remove') %></td>
+    </tr>
 <% end -%>
 <% else -%>
     <tr>
       <td colspan="3" class="note">No Users</td>
     </tr>
 <% end -%>
-	</tbody>
+  </tbody>
 </table>
 <script type="text/javascript">
 // <![CDATA[

data/app/views/admin/user/new.rhtml

@@ -8,41 +8,41 @@
   <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td class="label"><label for="user_name">Name</label></td>
-  		<td class="field"><%= text_field "user", "name", :class => 'textbox', :maxlength => 100 %></td>
-  		<td class="help">Required.</td>
+      <td class="field"><%= text_field "user", "name", :class => 'textbox', :maxlength => 100 %></td>
+      <td class="help">Required.</td>
     </tr>
     <tr>
-  		<td class="label"><label class="optional" for="user_email">E-mail</label></td>
-  		<td class="field"><%= text_field "user", "email", :class => 'textbox', :maxlength => 255 %></td>
-  		<td class="help">Optional. Please use a valid e-mail address.</td>
-  	</tr>
+      <td class="label"><label class="optional" for="user_email">E-mail</label></td>
+      <td class="field"><%= text_field "user", "email", :class => 'textbox', :maxlength => 255 %></td>
+      <td class="help">Optional. Please use a valid e-mail address.</td>
+    </tr>
     <tr>
       <td class="label"><label for="user_login">Username</label></td>
-  	  <td class="field"><%= text_field "user", "login", :class => 'textbox', :maxlength => 40 %></td>
-  	  <td class="help">At least 3 characters. Must be unique.</td>
-  	</tr>
+      <td class="field"><%= text_field "user", "login", :class => 'textbox', :maxlength => 40 %></td>
+      <td class="help">At least 3 characters. Must be unique.</td>
+    </tr>
+    <tr>
+      <td class="label"><label for="user_password">Password</label></td>
+      <td class="field"><%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></td>
+      <td class="help" rowspan="2">At least 5 characters. <% unless @user.new_record? %>Leave password blank for it to remain unchanged.<% end %></td>
+    </tr>
     <tr>
-    	<td class="label"><label for="user_password">Password</label></td>
-    	<td class="field"><%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></td>
-    	<td class="help" rowspan="2">At least 5 characters. <% unless @user.new_record? %>Leave password blank for it to remain unchanged.<% end %></td>
+      <td class="label"><label for="user_password_confirmation">Confirm Password</label></td>
+      <td class="field"><%= password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40 %></td>
     </tr>
     <tr>
-    	<td class="label"><label for="user_password_confirmation">Confirm Password</label></td>
-    	<td class="field"><%= password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40 %></td>
+      <td class="label"><label for="user_admin">Roles</label></td>
+      <td class="field">
+        <span class="checkbox"><%= check_box "user", "admin" %>&nbsp;Administrator</span>
+        <span class="checkbox"><%= check_box "user", "developer" %>&nbsp;Developer</span>
+      </td>
+      <td class="help">Roles restrict user privileges and turn parts of the administrative interface on or off.</td>
     </tr>
-	  <tr>
-  	  <td class="label"><label for="user_admin">Roles</label></td>
-  		<td class="field">
-  		  <span class="checkbox"><%= check_box "user", "admin" %>&nbsp;Administrator</span>
-  		  <span class="checkbox"><%= check_box "user", "developer" %>&nbsp;Developer</span>
-  		</td>
-  		<td class="help">Roles restrict user privileges and turn parts of the administrative interface on or off.</td>
-		</tr>
-	</table>
+  </table>
   <%= updated_stamp @user %>
-	<p class="buttons">
-		<%= save_model_button(@user) %> <%= save_model_and_continue_editing_button(@user) %> or <%= link_to "Cancel", user_index_url %>
-	</p>
+  <p class="buttons">
+    <%= save_model_button(@user) %> <%= save_model_and_continue_editing_button(@user) %> or <%= link_to "Cancel", user_index_url %>
+  </p>
 </form>
 
 <%= focus 'user_name' %>

data/app/views/admin/user/preferences.rhtml

@@ -3,27 +3,27 @@
 <form method="post">
   <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
     <tr>
-    	<td class="label"><label for="user_password">Password</label></td>
-    	<td class="field"><%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></td>
-    	<td class="help" rowspan="2">At least 5 characters. <% unless @user.new_record? %>Leave password blank for it to remain unchanged.<% end %></td>
+      <td class="label"><label for="user_password">Password</label></td>
+      <td class="field"><%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></td>
+      <td class="help" rowspan="2">At least 5 characters. <% unless @user.new_record? %>Leave password blank for it to remain unchanged.<% end %></td>
     </tr>
     <tr>
-    	<td class="label"><label for="user_password_confirmation">Confirm Password</label></td>
-    	<td class="field"><%= password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40 %></td>
+      <td class="label"><label for="user_password_confirmation">Confirm Password</label></td>
+      <td class="field"><%= password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40 %></td>
     </tr>
     <tr>
-  		<td class="label"><label for="user_email">E-mail</label></td>
-  		<td class="field"><%= text_field "user", "email", :class => 'textbox', :maxlength => 255 %></td>
-  		<td class="help">Optional.</td>
-  	</tr>
+      <td class="label"><label for="user_email">E-mail</label></td>
+      <td class="field"><%= text_field "user", "email", :class => 'textbox', :maxlength => 255 %></td>
+      <td class="help">Optional.</td>
+    </tr>
   </table>
-	<p class="buttons">
-		<%= submit_tag 'Save Changes' %> or <%= link_to "Cancel", admin_url %>
-	</p>
+  <p class="buttons">
+    <%= submit_tag 'Save Changes' %> or <%= link_to "Cancel", admin_url %>
+  </p>
 </form>
 
 <script type="text/javascript">
 // <![CDATA[
-	Field.focus('user_password');
+  Field.focus('user_password');
 // ]]>
 </script>

data/app/views/admin/user/remove.rhtml

@@ -2,15 +2,15 @@
 <p>Are you sure you want to <strong class="warning">permanently remove</strong> the following user?</p>
 
 <table id="users" class="index" cellpadding="0" cellspacing="0" border="0">
-	<tbody>
-	  <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
-	    <td class="user">
-	      <%= @user.name %>
-	    </td>
-	  </tr>
-	</tbody>
+  <tbody>
+    <tr class="node level-1" onmouseover="Element.addClassName(this, 'highlight');" onmouseout="Element.removeClassName(this, 'highlight');">
+      <td class="user">
+        <%= @user.name %>
+      </td>
+    </tr>
+  </tbody>
 </table>
 
 <form method="post">
-	<p class="buttons"><%= submit_tag "Delete User", :class => 'button' %> or <%= link_to 'Cancel', user_index_url %></p>
+  <p class="buttons"><%= submit_tag "Delete User", :class => 'button' %> or <%= link_to 'Cancel', user_index_url %></p>
 </form>

data/app/views/admin/welcome/login.rhtml

@@ -38,13 +38,13 @@
   <h1>Please Login</h1>
 
   <form method="post">
-  	<p><label for="user_login">Username</label>
-  		<%= text_field "user", "login", :class => 'textbox', :value => '', :maxlength => 40 %></p>
-  	<p><label for="user_password">Password</label>
-  		<%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></p>
-  	<p class="buttons">
-  		<%= submit_tag 'Login', :class => 'button' %>
-  	</p>
+    <p><label for="user_login">Username</label>
+      <%= text_field "user", "login", :class => 'textbox', :value => '', :maxlength => 40 %></p>
+    <p><label for="user_password">Password</label>
+      <%= password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 %></p>
+    <p class="buttons">
+      <%= submit_tag 'Login', :class => 'button' %>
+    </p>
   </form>
 </div>
 

data/app/views/layouts/application.rhtml

@@ -1,75 +1,75 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-		<title><%= @page_title || default_page_title %></title>
-		<%= stylesheet_link_tag 'admin' %>
-		<%= javascript_include_tag 'prototype' %>
-		<%= javascript_include_tag 'string' %>
-		<%= javascript_include_tag 'effects' %>
-		<%= javascript_include_tag 'dragdrop' %>
-		<%= javascript_include_tag 'controls' %>
-		<%= javascript_include_tag 'tabcontrol' %>
-		<%= javascript_include_tag 'ruledtable' %>
-		<!--[if lt IE 7]>
-		<script defer type="text/javascript" src="/javascripts/pngfix.js"></script>
-		<![endif]-->
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title><%= @page_title || default_page_title %></title>
+    <%= stylesheet_link_tag 'admin' %>
+    <%= javascript_include_tag 'prototype' %>
+    <%= javascript_include_tag 'string' %>
+    <%= javascript_include_tag 'effects' %>
+    <%= javascript_include_tag 'dragdrop' %>
+    <%= javascript_include_tag 'controls' %>
+    <%= javascript_include_tag 'tabcontrol' %>
+    <%= javascript_include_tag 'ruledtable' %>
+    <!--[if lt IE 7]>
+    <script defer type="text/javascript" src="/javascripts/pngfix.js"></script>
+    <![endif]-->
 <% if @content_for_page_scripts -%>
-		<script type="text/javascript">
-		// <![CDATA[
+    <script type="text/javascript">
+    // <![CDATA[
 <%= @content_for_page_scripts %>
-		// ]]>
-		</script>
+    // ]]>
+    </script>
 <% end -%>
 <% if @content_for_page_css -%>
-		<style type="text/css" media="screen">
+    <style type="text/css" media="screen">
 <%= @content_for_page_css -%>
-		</style>
+    </style>
 <% end -%>
-	</head>
-	<body>
-		<div id="header">
-			<div id="site-title"><%= link_to_unless_current title, admin_url %></div>
-			<div id="site-subtitle"><%= subtitle %></div>
+  </head>
+  <body>
+    <div id="header">
+      <div id="site-title"><%= link_to_unless_current title, admin_url %></div>
+      <div id="site-subtitle"><%= subtitle %></div>
 <% if logged_in? -%>
-			<div id="navigation">
+      <div id="navigation">
         <%= links_for_navigation %>
-			</div>
+      </div>
 <% end -%>
-		</div>
-		<hr class="hidden" />
-		<div id="main">
+    </div>
+    <hr class="hidden" />
+    <div id="main">
 <% if flash[:notice] -%>
-			<div id="notice">
-				<p><%= flash[:notice] %></p>
-			</div>
+      <div id="notice">
+        <p><%= flash[:notice] %></p>
+      </div>
 <% end -%>
 <% if flash[:error] -%>
-			<div id="error">
-				<p><%= flash[:error] %></p>
-			</div>
+      <div id="error">
+        <p><%= flash[:error] %></p>
+      </div>
 <% end -%>
-			<div id="content">
+      <div id="content">
 <%= yield%>
-			</div>
-		</div>
-		<hr class="hidden" />
-		<div id="footer">
-			<p>This site was made with Ruby and is powered by <a href="http://radiantcms.org">Radiant CMS</a>.</p>
-			<p id="site-links">
+      </div>
+    </div>
+    <hr class="hidden" />
+    <div id="footer">
+      <p>This site was made with Ruby and is powered by <a href="http://radiantcms.org">Radiant CMS</a> version <%= Radiant::Version %>.</p>
+      <p id="site-links">
 <% if logged_in? -%>
   <% if admin? -%>
-				<%= nav_link_to 'Users', user_index_url %>
+        <%= nav_link_to 'Users', user_index_url %>
   <% else -%>
         <%= nav_link_to 'Preferences', user_preferences_url %>
   <% end -%>
         <span class="separator"> | </span>
-				<%= nav_link_to 'Log Out', logout_url %>
-				<span class="separator"> | </span>
+        <%= nav_link_to 'Log Out', logout_url %>
+        <span class="separator"> | </span>
 <% end -%>
-				<%= link_to image_tag('view-site.gif', :alt => 'View Site', :title => '', :align => 'center'), homepage_url %>
-			</p>
-		</div>
-	</body>
+        <%= link_to image_tag('view-site.gif', :alt => 'View Site', :title => '', :align => 'center'), homepage_url %>
+      </p>
+    </div>
+  </body>
 </html>

data/bin/radiant

@@ -1,305 +1,408 @@
 #!/usr/bin/env ruby
 
 autoload 'OptionParser', 'optparse'
-autoload 'FileUtils', 'fileutils'
-autoload 'Pathname', 'pathname'
-autoload 'Radiant', File.join(File.dirname(__FILE__), "..", "lib", "radiant")
+autoload 'Radiant',      File.join(File.dirname(__FILE__), "..", "lib", "radiant")
+autoload 'ConsoleUtils', File.join(File.dirname(__FILE__), "..", "lib", "console_utils")
 
 class RadiantCommandApplication
+  include ConsoleUtils
+  
   def self.run(args = ARGV)
     new.run(args)
   end
   
   def initialize
-    @indent = 0
-    @out = $stdout
-    @in = $stdin
     @ignore = %w( . .. .svn )
     @radiant_root = File.expand_path(clean_path(File.join(File.dirname(__FILE__), '..')))
   end
   
   def run(args = [])
     parse_args(args)
-    if @help
-      puts
-      puts @opts
-    else
-      announce "Unpacking Radiant #{@type}..." do
-        case @type
-        when :application
-          unpack_radiant_application
-        when :instance
-          unpack_radiant_instance
-        end
-        make_scripts_executable
-      end
-      puts "Done."
-      output_additional_instructions
-    end
+    determine_application_type if [:normal, :upgrade].include?(@mode)
+    send "run_#{@mode}"
   end
   
   private
   
-  def parse_args(args)
-    args = args.dup
-    
-    @type = :instance
-    @overwrite = false
-    @dirname = args.pop unless args.last =~ /^-/
-    @dirname = clean_path(@dirname) unless @dirname.nil?
-    @help = @dirname.nil?
-    
-    @opts = OptionParser.new do |opts|
-      opts.banner =  "Usage: #{File.basename($0)} [options] path"
-      opts.separator "Create a Radiant application at path."
-      opts.separator ""
+    def parse_args(args)
+      args = args.dup
       
-      opts.separator "Options:\n"
+      @overwrite = false
+      @dirname = args.pop unless args.last =~ /^-/
+      @dirname = clean_path(@dirname) unless @dirname.nil?
+      @mode = :normal
       
-      opts.on(
-        "-u", "--unpack",
-        "Completely unpack Radiant in the current directory and cause it to ",
-        "run in 'application' mode. Without this flag Radiant is unpacked in ",
-        "'instance' mode, which basically means that the `radiant` command ",
-        "only unpacks the files necessary to run the application and all ",
-        "other files are 'linked' in at run time. Where the files are linked ",
-        "in from depends on whether you run the `radiant` command from a gem ",
-        "or another unpacked Radiant install.\n"
-      ) do |type|
-        @type = :application
-      end
+      @opts = OptionParser.new do |opts|
+        opts.banner =  "Usage: #{File.basename($0)} [options] PATH"
+        opts.separator "Create a Radiant application at PATH."
+        opts.separator ""
       
-      opts.on("-f", "--force", "Overwrite files in path without prompting.\n") do |type|
-        @overwrite = true
-      end
+        opts.separator "Options:\n"
       
-      opts.on("-?", "--help", "Display this message.\n") do
-        @help = true
+        opts.on("--upgrade",
+          "Upgrade an existing install to the latest version. It is highly",
+          "recommended that you back up your installation before upgrading.\n") do
+          @mode = :upgrade
+        end
+      
+        opts.on("--unpack",
+          "Completely unpack Radiant and cause it to run in 'application' mode. ",
+          "Without this flag Radiant is unpacked in 'instance' mode, which ",
+          "basically means that the `radiant` command only unpacks the files ",
+          "necessary to run the application and all other files are 'linked' in ",
+          "at run time. Where the files are linked in from depends on whether ",
+          "you run the `radiant` command from a gem or another unpacked ",
+          "Radiant install.\n") do
+          @application_type = :application
+        end
+      
+        opts.on("-f", "--force", "Overwrites and delete files in PATH without prompting.\n") do |type|
+          @overwrite = true
+        end
+        
+        opts.on("--no-backups", "Turn file backups off during an upgrade.\n") do
+          @backups = false
+        end
+      
+        opts.on("-v", "--version", "Display the Radiant version number for this command.\n") do
+          @mode = :version
+        end
+        
+        opts.on("--current-version", "Display the Radiant version number for the install at PATH.\n") do
+          @mode = :current_version
+        end
+      
+        opts.on("-?", "--help", "Display this message.\n") do
+          @mode = :help
+        end
       end
-    end
     
-    begin
-      @opts.parse(args)
-    rescue OptionParser::ParseError => e
-      puts e.message.capitalize
-      @help = true
+      begin
+        @opts.parse(args)
+        if @dirname.nil? and [:normal, :upgrade, :current_version].include?(@mode)
+          puts 'Invalid path.'
+          @mode = :help
+        end
+      rescue OptionParser::ParseError => e
+        puts e.message.capitalize
+        @mode = :help
+      end
     end
-  end
   
-  def unpack_radiant_application
-    %w( cache log vendor/plugins ).each do |path|
-      make_path(File.join(@dirname, path))
+    def run_normal
+      announce "Unpacking Radiant #{ @application_type }..." do
+        send "unpack_radiant_#{ @application_type }"
+        make_scripts_executable
+      end
+      puts "Done."
+      output_additional_instructions
     end
-    remove_instance_config
-    remove_config_stub('routes')
-    copy_files @radiant_root, @dirname
-  end
-  
-  def unpack_radiant_instance
-    %w( cache config db log public script vendor/plugins ).each do |path|
-      make_path(File.join(@dirname, path))
+    
+    def run_upgrade
+      case
+      when current_version.nil?
+        announce_not_installed
+      when current_version == latest_version
+        announce_already_upgraded
+      else
+        announce "Upgrading Radiant to version #{ latest_version }..." do
+          @backups = @overwrite || ask_yes_or_no("Would you like to create backups of files that Radiant replaces", :no) if @backups.nil?
+          send "upgrade_#{ @application_type }_to_0_5_1"
+          change_radiant_gem_version_in_instance_config_to(latest_version) if @application_type == :instance 
+        end
+        puts "Done."
+      end
     end
-    %w(
-      config/boot.rb
-      config/database.mysql.yml
-      config/database.sqlite.yml
-      config/database.postgresql.yml
-      config/environment.rb
-      config/environments/development.rb
-      config/environments/production.rb
-      config/environments/test.rb
-      script/server
-      script/setup_database
-      script/about
-      script/plugin
-      script/process/reaper
-      script/process/spawner
-      script/process/spinner
-      script/runner
-      README
-      CHANGELOG
-      CONTRIBUTORS
-      LICENSE
-    ).each do |file|
-      copy_file File.join(@radiant_root, file), File.join(@dirname, file)
+    
+    def run_version
+      puts latest_version
     end
-    %w( public ).each do |path|
-      copy_files File.join(@radiant_root, path), File.join(@dirname, path)
+    
+    def run_current_version
+      if current_version
+        puts current_version
+      else
+        announce_not_installed
+      end
     end
-    create_instance_config
-    create_config_stub('routes')
-  end
-  
-  def make_scripts_executable
-    (
-      Dir[File.join(@dirname, 'script', '**/*')] +
-      Dir[File.join(@dirname, 'public', 'dispatch.*')]
-    ).each do |filename|
-      make_executable(filename)
+    
+    def run_help
+      puts
+      puts @opts
     end
-  end
-  
-  def output_additional_instructions
-    puts
-    puts "Now, if this is a new install:"
-    puts
-    puts " 1. Create a MySQL/PostgreSQL/SQLite database for your Web site."
-    puts
-    puts " 2. Create config/database.yml for your database setup. (There are"
-    puts "    several examples in the config directory.)"
-    puts
-    puts " 3. Run the database setup script:"
-    puts
-    puts "      % script/setup_database production"
-    puts
-    puts " 4. Start it like a normal Rails application. To test execute:"
-    puts
-    puts "      % script/server production"
-    puts
-    puts "    And open your Web browser on port 3000 (http://localhost:3000)."
-    puts
-    puts "See the README for more details."
-  end
-  
-  def instance_config_filename
-    File.join(@dirname, 'config', 'instance.yml')
-  end
-  
-  def create_instance_config
-    text = gem? ? "Gem Version: #{ Radiant::Version }" : "Radiant Root: #{@radiant_root}"
-    create_file instance_config_filename, text
-  end
-  
-  def remove_instance_config
-    remove_file instance_config_filename
-  end
-  
-  def config_stub_filename(filename)
-    File.join(@dirname, 'config', filename + '.rb')
-  end
-  
-  def create_config_stub(filename)
-    make_path File.join(@dirname, 'config', File.dirname(filename))
-    create_file config_stub_filename(filename), %{require File.join(RADIANT_ROOT, "config", "#{filename}") }
-  end
-  
-  def remove_config_stub(filename)
-    remove_file config_stub_filename(filename)
-  end
-  
-  def announce(text)
-    puts text
-    @indent += 1
-    yield
-    @indent -= 1
-  end
-  
-  def copy_files(from, to)
-    make_path(to)
-    Dir.foreach(from) do |file|
-      unless @ignore.include?(file)
-        full_name = File.join(from, file)
-        if File.directory?(full_name)
-          copy_files full_name, File.join(to, file)
+    
+    def determine_application_type
+      if @mode == :normal
+        @application_type ||= :instance
+      else
+        if File.exists? instance_config_filename
+          @application_type ||= :instance
         else
-          copy_file full_name, File.join(to, file)
+          @application_type ||= :application
         end
       end
     end
-  end
-  
-  def copy_file(from, to)
-    return if not @overwrite and (File.file?(to) and not ask_yes_or_no("overwrite #{to}"))
-    make_path(File.dirname(to))
-    FileUtils.cp from, to
-    puts "created #{to}"
-  end
+    
+    def announce_not_installed
+      puts 'Cannot detect that Radiant is installed in this directory!'
+    end
+    
+    def announce_already_upgraded
+      puts "Your Radiant install is already at the latest version (#{ latest_version })."
+    end
+    
+    def unpack_radiant_application
+      %w( cache log vendor/plugins ).each do |path|
+        make_path(File.join(@dirname, path))
+      end
+      remove_instance_config
+      remove_config_stub('routes')
+      copy_files @radiant_root, @dirname
+    end
   
-  def make_dir(dir)
-    unless File.directory?(dir)
-      FileUtils.mkdir dir
-      puts "created #{dir}"
+    def unpack_radiant_instance
+      %w( cache config db log public script vendor/plugins ).each do |path|
+        make_path(File.join(@dirname, path))
+      end
+      %w(
+        CHANGELOG
+        config/boot.rb
+        config/database.mysql.yml
+        config/database.postgresql.yml
+        config/database.sqlite.yml
+        config/environment.rb
+        config/environments/development.rb
+        config/environments/production.rb
+        config/environments/test.rb
+        CONTRIBUTORS
+        LICENSE
+        README
+        script/about
+        script/console
+        script/plugin
+        script/process/reaper
+        script/process/spawner
+        script/process/spinner
+        script/runner
+        script/server
+        script/setup_database
+        script/version
+      ).each do |file|
+        copy_file File.join(@radiant_root, file), File.join(@dirname, file)
+      end
+      %w( public ).each do |path|
+        copy_files File.join(@radiant_root, path), File.join(@dirname, path)
+      end
+      create_instance_config
+      create_config_stub('routes')
     end
-  end
   
-  def make_path(path)
-    unless File.directory?(path)
-      parts = path.split(%r{\\|/})
-      if parts.size > 1
-        parts.pop
-        make_path File.join(*parts)
+    def make_scripts_executable
+      (
+        Dir[File.join(@dirname, 'public', 'dispatch.*')] +
+        Dir[File.join(@dirname, 'script', '**/*')]
+      ).each do |filename|
+        make_executable(filename)
       end
-      make_dir path
     end
-  end
   
-  def create_file(filename, text)
-    open(filename, 'w+') do |file|
-      file.puts text
+    def output_additional_instructions
+      puts
+      puts "Now, if this is a fresh install do the following:"
+      puts
+      puts " 1. Create a MySQL/PostgreSQL/SQLite database for your Web site."
+      puts
+      puts " 2. Create config/database.yml for your database setup. (There are"
+      puts "    several examples in the config directory.)"
+      puts
+      puts " 3. Run the database setup script:"
+      puts
+      puts "      % script/setup_database production"
+      puts
+      puts " 4. Start it like a normal Rails application. To test execute:"
+      puts
+      puts "      % script/server production"
+      puts
+      puts "    And open your Web browser on port 3000 (http://localhost:3000)."
+      puts
+      puts "See the README for additional details."
     end
-    puts "created #{filename}"
-  end
   
-  def remove_file(file)
-    if File.file?(file)
-      FileUtils.rm file
-      puts "removed #{file}"
+    def instance_config_filename
+      File.join(@dirname, 'config', 'instance.yml')
     end
-  end
   
-  def make_executable(filename)
-    FileUtils.chmod(0775, filename)
-    puts "made #{filename} executable"
-  end
+    def create_instance_config(options = {})
+      version = options.delete(:version) || Radiant::Version
+      text = gem? ? "Gem Version: #{ version }" : "Radiant Root: #{@radiant_root}"
+      create_file instance_config_filename, text, options
+    end
   
-  def clean_path(path)
-    Pathname.new(path).cleanpath(true).to_s unless path.nil?
-  end
+    def remove_instance_config
+      remove_file instance_config_filename, :force => true
+    end
   
-  def print(*args)
-    @out << args
-    @out.flush
-  end
+    def config_stub_filename(filename)
+      File.join(@dirname, 'config', filename + '.rb')
+    end
   
-  def puts(*args)
-    args << '' if args.size == 0
-    print *(args.map { |a| "#{'  ' * @indent}#{a}\n" })
-  end
+    def create_config_stub(filename)
+      make_path File.join(@dirname, 'config', File.dirname(filename))
+      create_file config_stub_filename(filename), %{require File.join(RADIANT_ROOT, "config", "#{filename}") }
+    end
   
-  def gets
-    @in.gets
-  end
+    def remove_config_stub(filename)
+      remove_file config_stub_filename(filename), :force => true
+    end
+    
+    def invalid_option
+      puts "Invalid option."
+    end
   
-  def ask_yes_or_no(question, default = :yes)
-    prompt = (default == :yes) ? "[Yn]" : "[yN]"
-    loop do
-      print "#{question}? #{prompt} "
-      case gets.strip.downcase
-      when "yes", "y"
-        break true
-      when "no", "n"
-        break false
-      when ""
-        break default == :yes
-      else
-        invalid_option
-      end
+    def gem?
+      parent_dir = File.expand_path(File.join(@radiant_root, '..'))
+      last_part = parent_dir.split(%r{\\|/}).pop
+      last_part.downcase == 'gems'
     end
-  end
   
-  def invalid_option
-    puts "Invalid option."
-  end
+    def current_version
+      @current_version ||= begin
+        version_script = File.join(@dirname, 'script/version')
+        if File.exists?(version_script)
+          version_string = IO.popen(version_script).read.to_s.strip
+          $1 if version_string =~ /Radiant (\d[\d\.]+)/
+        else
+          '0.5.0' if File.directory? File.join(@dirname, 'config')
+        end
+      end
+    end
   
-  def gem?
-    parent_dir = File.expand_path(File.join(@radiant_root, '..'))
-    last_part = parent_dir.split(%r{\\|/}).pop
-    last_part.downcase == 'gems'
-  end
+    def latest_version
+      Radiant::Version.to_s
+    end
+    
+    def file_sub(filename, pattern, substitution)
+      lines = read_file(filename)
+      if lines.sub! pattern, substitution
+        write_file(filename, lines)
+        true
+      else
+        false
+      end
+    end
+    
+    def change_rails_gem_version_in_environment_to(version)
+      filename = File.join(@dirname, 'config/environment.rb')
+      if file_sub(filename, /RAILS_GEM_VERSION\s*=\s*'\d[\.\d]+'/m, "RAILS_GEM_VERSION = '#{version}'")
+        puts "updated Rails version to #{version} in config/environment.rb"
+      else
+        print "> failed to update Rails version to #{version} in config/environment.rb\n#{ indentation }you may need to do this yourself\n"
+      end
+    end
+    
+    def change_radiant_gem_version_in_instance_config_to(version)
+      filename = File.join(@dirname, 'config/instance.yml')
+      if file_sub(filename, /Gem Version\s*:\s*\d[\.\d]+/m, "Gem Version: #{version}")
+        puts "updated Radiant version to #{version} in config/instance.yml"
+      else
+        print "> failed to update Radiant version to #{version} in config/instance.yml\n#{ indentation }you may need to do this yourself\n"
+      end
+    end
+    
+    def upgrade_files(lines)
+      lines = lines.split("\n").map { |l| l.strip }.reject { |l| l.empty? }
+      lines.each do |line|
+        command, filename = line.split(/\s+/, 2)
+        prompt = !(command =~ /!$/)
+        to = File.join(@dirname, filename)
+        case command
+        when /^(overwrite|create)/
+          command = $1
+          from = File.join(@radiant_root, filename)
+          backup_file(filename) if @backups and File.file?(to) and (@overwrite or ask_yes_or_no("backup #{filename}"))
+          if command == 'overwrite'
+            copy_file from, to, :overwrite => (@overwrite or !prompt)
+          else
+            copy_file from, to
+          end
+        when /^remove/
+          unless prompt
+            remove_file to, :force => true
+          else
+            remove_file to
+          end
+        else
+          raise 'unknown upgrade command'
+        end
+      end
+    end
+    
+    def upgrade_instance_to_0_5_1
+      upgrade_files %{
+        overwrite! CHANGELOG
+        overwrite! CONTRIBUTORS
+        create     public/.htaccess
+        create     public/images/layout.png
+        overwrite! public/images/new-layout.png
+        create     script/console
+        create     script/version
+      }
+      make_executable(File.join(@dirname, 'script/version'))
+      change_rails_gem_version_in_environment_to '1.1.5'
+    end
+    
+    def upgrade_application_to_0_5_1
+      upgrade_files %{
+        overwrite  app/controllers/application.rb
+        overwrite  app/helpers/admin/page_helper.rb
+        overwrite  app/helpers/application_helper.rb
+        overwrite  app/models/page_context.rb
+        overwrite  app/models/response_cache.rb
+        overwrite  app/views/admin/layout/index.rhtml
+        overwrite  app/views/admin/layout/new.rhtml
+        overwrite  app/views/admin/layout/remove.rhtml
+        overwrite  app/views/admin/page/index.rhtml
+        overwrite  app/views/admin/page/remove.rhtml
+        overwrite  app/views/admin/page/_node.rhtml
+        overwrite  app/views/admin/page/_part.rhtml
+        overwrite  app/views/admin/snippet/index.rhtml
+        overwrite  app/views/admin/snippet/new.rhtml
+        overwrite  app/views/admin/snippet/remove.rhtml
+        overwrite  app/views/admin/user/index.rhtml
+        overwrite  app/views/admin/user/new.rhtml
+        overwrite  app/views/admin/user/preferences.rhtml
+        overwrite  app/views/admin/user/remove.rhtml
+        overwrite  app/views/admin/welcome/login.rhtml
+        overwrite  app/views/layouts/application.rhtml
+        overwrite  bin/radiant
+        overwrite! CHANGELOG
+        overwrite! CONTRIBUTORS
+        overwrite  db/migrate/001_create_radiant_tables.rb
+        overwrite  db/migrate/002_insert_initial_data.rb
+        overwrite  db/schema.rb
+        create     lib/console_utils.rb
+        overwrite  lib/tasks/release.rake
+        overwrite  lib/radiant.rb
+        create     public/.htaccess
+        create     public/images/layout.png
+        overwrite! public/images/new-layout.png
+        create     script/console
+        create     script/version
+        overwrite  test/fixtures/pages.yml
+        remove!    test/fixtures/pages.yml.rej
+        overwrite  test/functional/admin/page_controller_test.rb
+        overwrite  test/functional/site_controller_test.rb
+        overwrite  test/unit/page_context_test.rb
+        remove!    test/unit/page_context_test.rb.rej
+      }
+      make_executable(File.join(@dirname, 'script/version'))
+      change_rails_gem_version_in_environment_to '1.1.5'
+    end
 end
 
 trap('INT') do
   puts
   exit
 end
-RadiantCommandApplication.run
+
+RadiantCommandApplication.run