radiant 0.5.2 → 0.6.0

data/app/views/admin/page/filter_reference.rjs

@@ -0,0 +1,5 @@
+page.replace_html 'filter-reference', filter_reference(@filter_name)
+page.replace_html 'filter-type', @display_name
+page << "center($('filter-reference-popup'));"
+page.assign 'last_filter', @filter_name
+page.show 'filter-reference-popup'

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

@@ -1,169 +1,4 @@
-<% content_for('page_scripts') do -%>
-    var SiteMap = Class.create();
-    SiteMap.prototype = Object.extend({}, RuledTable.prototype); // Inherit from RuledTable
-    Object.extend(SiteMap.prototype, {
-    
-      expandedRows: <%= expanded_rows.to_json %>,
-
-      onRowSetup: function(row) {
-        Event.observe(row, 'click', this.onMouseClickRow.bindAsEventListener(this), false);
-      },
-      
-      onMouseClickRow: function(event) {
-        var element = Event.element(event);
-        if (this.isExpander(element)) {
-          var row = Event.findElement(event, 'tr');
-          if (this.hasChildren(row)) {
-            this.toggleBranch(row, element);
-          }
-        }
-      },
-      
-      hasChildren: function(row) {
-        return ! /\bno-children\b/.test(row.className);
-      },
-      
-      isExpander: function(element) {
-        return (element.tagName.strip().downcase() == 'img') && /\bexpander\b/i.test(element.className);
-      },
-      
-      isExpanded: function(row) {
-        return /\bchildren-visible\b/i.test(row.className);
-      },
-      
-      isRow: function(element) {
-        return element.tagName && (element.tagName.strip().downcase() == 'tr');
-      },
-      
-      extractLevel: function(row) {
-        if (/level-(\d+)/i.test(row.className))
-          return RegExp.$1.toInteger();
-      },
-      
-      extractPageId: function(row) {
-        if (/page-(\d+)/i.test(row.id))
-          return RegExp.$1.toInteger();
-      },
-      
-      getExpanderImageForRow: function(row) {
-        var images = $A(row.getElementsByTagName('img', row));
-        var expanders = [];
-        images.each(function(image){
-          expanders.push(image);
-        }.bind(this));
-        return expanders.first();
-      },     
-      
-      saveExpandedCookie: function() {
-        document.cookie = "expanded_rows="+this.expandedRows.join(",")+"; path=/admin";
-      }, 
-      
-      hideBranch: function(row, img) {
-        var level = this.extractLevel(row);
-        var sibling = row.nextSibling;
-        while(sibling != null) {
-          if (this.isRow(sibling)) {
-            if (this.extractLevel(sibling) <= level) break;
-            Element.hide(sibling);
-          }
-          sibling = sibling.nextSibling;
-        }
-        var pageId = this.extractPageId(row);
-        var newExpanded = [];
-        for(i=0; i < this.expandedRows.length; i++)
-            if(this.expandedRows[i] != pageId)
-                newExpanded.push(this.expandedRows[i]);
-        this.expandedRows = newExpanded;
-        this.saveExpandedCookie();
-        if (img == null)
-          img = this.getExpanderImageForRow(row);
-        img.src = img.src.replace(/collapse/, 'expand');
-        Element.removeClassName(row, 'children-visible');
-        Element.addClassName(row, 'children-hidden');
-      },
-      
-      showBranchInternal: function(row, img) {
-        var level = this.extractLevel(row);
-        var sibling = row.nextSibling;
-        var children = false;
-        var childOwningSiblings = [];        
-        while(sibling != null) {
-          if (this.isRow(sibling)) {
-            var siblingLevel = this.extractLevel(sibling);
-            if (siblingLevel <= level) break;
-            if (siblingLevel == level + 1) {
-              Element.show(sibling);
-              if(sibling.className.match(/children-visible/)) {
-                childOwningSiblings.push(sibling);
-              } else {
-                this.hideBranch(sibling);
-              }
-            }
-            children = true;
-          }
-          sibling = sibling.nextSibling;
-        }
-        if (!children)
-          this.getBranch(row);
-        if (img == null)
-          img = this.getExpanderImageForRow(row);          
-        img.src = img.src.replace(/expand/, 'collapse');
-        for(i=0; i < childOwningSiblings.length; i++) {
-            this.showBranch(childOwningSiblings[i], null);            
-        }        
-        Element.removeClassName(row, 'children-hidden');
-        Element.addClassName(row, 'children-visible');
-      },
-      
-      showBranch: function(row, img) {
-        this.showBranchInternal(row, img);
-        this.expandedRows.push(this.extractPageId(row));
-        this.saveExpandedCookie();
-      },
-      
-      getBranch: function(row) {
-        var level = this.extractLevel(row).toString();
-        var id = this.extractPageId(row).toString();
-        new Ajax.Updater(
-          row,
-          '<%= admin_url %>/ui/pages/children/' + id + '/' + level,
-          {
-            asynchronous: true,
-            insertion: Insertion.After,
-            onLoading: function(request) {
-              Element.show('busy-' + id);
-              this.updating = true;
-            }.bind(this),
-            onComplete: function(request) {
-              var sibling = row.nextSibling;
-              while (sibling != null) {
-                if (this.isRow(sibling)) {
-                  var siblingLevel = this.extractLevel(sibling);
-                  if (siblingLevel <= level) break;
-                  this.setupRow(sibling);
-                }
-                sibling = sibling.nextSibling;
-              }
-              this.updating = false;
-              Effect.Fade('busy-' + id);
-            }.bind(this)
-          }
-        );
-      },
-      
-      toggleBranch: function(row, img) {
-        if (! this.updating) {
-          if (this.isExpanded(row)) {
-            this.hideBranch(row, img);
-          } else {
-            this.showBranch(row, img);
-          }
-        }
-      }
-
-    });
-<% end -%>
-
+<% include_javascript 'sitemap' -%>
 <h1>Pages</h1>
 
 <table id="site-map" class="index" cellpadding="0" cellspacing="0" border="0">
@@ -192,8 +27,8 @@
 <form action="<%= clear_cache_url %>" method="post">
   <p>
 <% unless @homepage -%>
-    <%= link_to image_tag('new-homepage', :alt => 'New Homepage'), homepage_new_url %>
+    <%= link_to image('new-homepage', :alt => 'New Homepage'), homepage_new_url %>
 <% end -%>
-    <%= image_submit_tag 'clear-page-cache' %>
+    <%= image_submit 'clear-page-cache' %>
   </p>
 </form>

data/app/views/admin/page/tag_reference.rjs

@@ -0,0 +1,5 @@
+page.replace_html 'tag-reference', tag_reference(@class_name)
+page.replace_html 'page-type', @display_name
+page << "center($('tag-reference-popup'));"
+page.assign 'last_type', @class_name
+page.show 'tag-reference-popup'

data/app/views/admin/snippet/{new.rhtml → edit.rhtml}

@@ -5,6 +5,7 @@
 <% end -%>
 
 <form method="post">
+  <%= hidden_field "snippet", "lock_version" %>
   <div class="form-area">
     <p class="title">
       <label for="snippet_name">Name</label>
@@ -16,7 +17,7 @@
       <%= 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) %>
+      <%= select_tag "snippet[filter_id]", options_for_select([['none', '']] + TextFilter.descendants.map { |f| f.filter_name }.sort, @snippet.filter_id) %>
     </p>
     <%= updated_stamp @snippet %>
   </div>

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

@@ -14,10 +14,10 @@
 <% for snippet in @snippets -%>
     <tr class="node level-1">
       <td class="snippet">
-        <%= image_tag "snippet", :class => "icon", :alt => 'snippet-icon', :title => '', :align => 'center' %>
+        <%= image "snippet", :class => "icon", :alt => 'snippet-icon', :title => '', :align => 'center' %>
         <%= link_to snippet.name, snippet_edit_url(:id => snippet) %></span>
       </td>
-      <td class="remove"><%= link_to image_tag('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet) %></td>
+      <td class="remove"><%= link_to image('remove', :alt => 'Remove Snippet'), snippet_remove_url(:id => snippet) %></td>
     </tr>
 <% end -%>
 <% else -%>
@@ -33,4 +33,4 @@
 // ]]>
 </script>
 
-<p><%= link_to image_tag('new-snippet', :alt => 'New Snippet'), snippet_new_url %></p>
+<p><%= link_to image('new-snippet', :alt => 'New Snippet'), snippet_new_url %></p>

data/app/views/admin/user/{new.rhtml → edit.rhtml}

@@ -5,6 +5,7 @@
 <% end -%>
 
 <form method="post">
+  <%= hidden_field "user", "lock_version" %>
   <table class="fieldset" cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td class="label"><label for="user_name">Name</label></td>
@@ -27,7 +28,7 @@
       <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="label"><label for="user_password_confirmation">Confirm&nbsp;Password</label></td>
       <td class="field"><%= password_field "user", "password_confirmation", :class => 'textbox', :value => '', :maxlength => 40 %></td>
     </tr>
     <tr>
@@ -38,6 +39,11 @@
       </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 class="optional" for="user_notes">Notes</label></td>
+      <td class="field"><%= text_area "user", "notes", :size => '40x4' %></td>
+      <td class="help">Optional.</td>
+    </tr>
   </table>
   <%= updated_stamp @user %>
   <p class="buttons">

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

@@ -24,7 +24,7 @@
         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>
+      <td class="remove"><%=  user.id != session['user'].id ? link_to(image('remove', :alt => 'Remove User'), user_remove_url(:id => user)) : image('remove-disabled', :alt => 'Remove') %></td>
     </tr>
 <% end -%>
 <% else -%>
@@ -40,4 +40,4 @@
 // ]]>
 </script>
 
-<p><%= link_to image_tag('new-user', :alt => 'New User'), user_new_url %></p>
+<p><%= link_to image('new-user', :alt => 'New User'), user_new_url %></p>

data/app/views/layouts/application.rhtml

@@ -4,14 +4,12 @@
   <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' %>
+<% @stylesheets.each do |stylesheet| -%>
+    <%= stylesheet_link_tag stylesheet %>
+<% end -%>
+<% @javascripts.each do |script| -%>
+    <%= javascript_include_tag script %>
+<% end -%>
     <!--[if lt IE 7]>
     <script defer type="text/javascript" src="/javascripts/pngfix.js"></script>
     <![endif]-->
@@ -29,47 +27,57 @@
 <% end -%>
   </head>
   <body>
-    <div id="header">
-      <div id="site-title"><%= link_to_unless_current title, admin_url %></div>
-      <div id="site-subtitle"><%= subtitle %></div>
+    <div id="page">
+      <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">
-        <%= links_for_navigation %>
-      </div>
+        <div id="navigation">
+          <%= links_for_navigation %>
+        </div>
 <% end -%>
-    </div>
-    <hr class="hidden" />
-    <div id="main">
-<% if flash[:notice] -%>
-      <div id="notice">
-        <p><%= flash[:notice] %></p>
       </div>
+      <hr class="hidden" />
+      <div id="main">
+<% if flash[:notice] -%>
+        <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">
-<%= yield%>
+        <div id="content">
+<%= yield %>
+        </div>
       </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">
+      <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 %><% if Radiant.loaded_via_gem? %> (gem)<% end %>.</p>
+        <p id="site-links">
 <% if logged_in? -%>
   <% if admin? -%>
-        <%= nav_link_to 'Users', user_index_url %>
+          <%= nav_link_to 'Users', user_index_url %>
+          <span class="separator"> | </span>
+          <%= nav_link_to 'Extensions', extension_index_url %>
   <% else -%>
-        <%= nav_link_to 'Preferences', user_preferences_url %>
+          <%= nav_link_to 'Preferences', user_preferences_url %>
   <% end -%>
-        <span class="separator"> | </span>
-        <%= nav_link_to 'Log Out', logout_url %>
-        <span class="separator"> | </span>
+          <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>
+          <%= link_to image('view-site.gif', :alt => 'View Site', :title => '', :align => 'center'), homepage_url %>
+        </p>
+      </div>
     </div>
+<% if @content_for_popups -%>
+    <div id="popups">
+<%= yield :popups %>
+    </div>
+<% end -%>
   </body>
 </html>

data/bin/radiant

@@ -1,430 +1,53 @@
 #!/usr/bin/env ruby
 
-autoload 'OptionParser', 'optparse'
-autoload 'Radiant',      File.join(File.dirname(__FILE__), "..", "lib", "radiant")
-autoload 'ConsoleUtils', File.join(File.dirname(__FILE__), "..", "lib", "console_utils")
+require File.join(File.dirname(__FILE__), '..', 'config', 'boot')
 
-class RadiantCommandApplication
-  include ConsoleUtils
-  
-  def self.run(args = ARGV)
-    new.run(args)
-  end
-  
-  def initialize
-    @ignore = %w( . .. .svn )
-    @radiant_root = File.expand_path(clean_path(File.join(File.dirname(__FILE__), '..')))
-  end
-  
-  def run(args = [])
-    parse_args(args)
-    determine_application_type if [:normal, :upgrade].include?(@mode)
-    send "run_#{@mode}"
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')
+
+require 'lib/ruby_version_check'
+Signal.trap("INT") { puts; exit }
+
+require 'lib/radiant'
+if ARGV.any? { |arg| %w(--version -v).any? { |flag| arg == flag } }
+  puts "Radiant #{Radiant::Version}"
+  exit 0
+end
+
+app_path = ARGV.first
+
+require 'lib/rails_generator'
+require 'rails_generator/scripts/generate'
+
+class Rails::Generator::Base
+
+  def self.use_application_sources!
+    reset_sources
+    sources << Rails::Generator::PathSource.new(:builtin, "#{File.dirname(__FILE__)}/../lib/generators")
   end
-  
-  private
-  
-    def parse_args(args)
-      args = args.dup
-      
-      @overwrite = false
-      @dirname = args.pop unless args.last =~ /^-/
-      @dirname = clean_path(@dirname) unless @dirname.nil?
-      @mode = :normal
-      
-      @opts = OptionParser.new do |opts|
-        opts.banner =  "Usage: #{File.basename($0)} [options] PATH"
-        opts.separator "Create a Radiant application at PATH."
-        opts.separator ""
-      
-        opts.separator "Options:\n"
-      
-        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
-    
-      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
-  
-    def run_normal
-      announce "Unpacking Radiant #{ @application_type }..." do
-        send "unpack_radiant_#{ @application_type }"
-        make_scripts_executable
-      end
-      puts "Done."
-      output_additional_instructions
-    end
-    
-    def run_upgrade
-      case
-      when current_version.nil?
-        announce_not_installed
-      when current_version == latest_version
-        announce_already_upgraded
-      else
-        @backups = @overwrite || ask_yes_or_no("Would you like to create backups of files that Radiant replaces", :no) if @backups.nil?
-        versions = ['0.5.1', '0.5.2']
-        index_of_current_version = versions.index(current_version) || -1
-        versions.each do |version|
-          if versions.index(version) > index_of_current_version
-            announce "Upgrading Radiant to version #{version}..." do
-              send "upgrade_#{ @application_type }_to_#{ version.gsub('.', '_') }"
-              if version == latest_version
-                change_rails_gem_version_in_environment_to '1.1.6'
-                change_radiant_gem_version_in_instance_config_to(latest_version) if @application_type == :instance
-              end
-            end
-          end
-        end
-        puts "Done."
-      end
-    end
-    
-    def run_version
-      puts latest_version
-    end
-    
-    def run_current_version
-      if current_version
-        puts current_version
-      else
-        announce_not_installed
-      end
-    end
-    
-    def run_help
-      puts
-      puts @opts
-    end
-    
-    def determine_application_type
-      if @mode == :normal
-        @application_type ||= :instance
-      else
-        if File.exists? instance_config_filename
-          @application_type ||= :instance
-        else
-          @application_type ||= :application
-        end
-      end
-    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 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
-  
-    def make_scripts_executable
-      (
-        Dir[File.join(@dirname, 'public', 'dispatch.*')] +
-        Dir[File.join(@dirname, 'script', '**/*')]
-      ).each do |filename|
-        make_executable(filename)
-      end
-    end
-  
-    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
-  
-    def instance_config_filename
-      File.join(@dirname, 'config', 'instance.yml')
-    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 remove_instance_config
-      remove_file instance_config_filename, :force => true
-    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), :force => true
-    end
-    
-    def invalid_option
-      puts "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
-  
-    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 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
+
+  def add_general_options!(opt)
+    opt.separator ''
+    opt.separator 'Radiant Info:'
+    opt.on('-v', '--version', 'Show the Radiant version number and quit.')
+    opt.on('-h', '--help', 'Show this help message and quit.') { |v| options[:help] = v }
+
+    opt.separator ''
+    opt.separator 'General Options:'
+
+    opt.on('-p', '--pretend', 'Run but do not make any changes.') { |v| options[:pretend] = v }
+    opt.on('-f', '--force', 'Overwrite files that already exist.') { options[:collision] = :force }
+    opt.on('-s', '--skip', 'Skip files that already exist.') { options[:collision] = :skip }
+    opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v }
+    opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v }
+    opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
+      options[:svn] = `svn status`.inject({}) do |opt, e|
+        opt[e.chomp[7..-1]] = true
+        opt
       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'))
-    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'))
-    end
-    
-    def upgrade_instance_to_0_5_2
-      upgrade_files %{
-        overwrite! CHANGELOG
-      }
-    end
-    
-    def upgrade_application_to_0_5_2
-      upgrade_files %{
-        overwrite  bin/radiant
-        overwrite! CHANGELOG
-        overwrite  lib/tasks/release.rake
-        overwrite  lib/radiant.rb
-      }
-    end
-end
+  end
 
-trap('INT') do
-  puts
-  exit
 end
 
-RadiantCommandApplication.run
+Rails::Generator::Base.use_application_sources!
+Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'instance')