install_generator 0.0.1 → 0.0.2

data/install_generator.gemspec

@@ -1,7 +1,7 @@
 require 'rubygems'
 SPEC = Gem::Specification.new do |spec|
 	spec.name="install_generator"
-	spec.version="0.0.1"
+	spec.version="0.0.2"
 	spec.author="Eugen Minciu"
 	spec.email="minciue@gmail.com"
 	spec.homepage="http://www.tufat.com/oslink.php"

data/install_generator.rb

@@ -3,50 +3,51 @@ class InstallGenerator < Rails::Generator::NamedBase
     record do |m| 
       
       #Controller
-      m.template "controllers/install_controller.rb", "app/controllers/#{file_name}_controller.rb", :collision => :ask
+      m.template "controllers/install_controller.rb", "app/controllers/#{file_name}_controller.rb"
 
       #Models
-      m.file "models/database.rb", "app/models/database.rb", :collision => :ask 
-      m.file "models/mail_server.rb", "app/models/mail_server.rb", :collision => :ask
-      m.file "models/site_config.rb", "app/models/site_config.rb", :collision => :ask
+      m.file "models/database.rb", "app/models/database.rb"
+      m.file "models/mail_server.rb", "app/models/mail_server.rb"
+      m.file "models/site_config.rb", "app/models/site_config.rb"
 
       #Helpers
-      m.template "helpers/install_helper.rb", "app/helpers/#{file_name}_helper.rb", :collision => :ask
+      m.template "helpers/install_helper.rb", "app/helpers/#{file_name}_helper.rb"
 
       #Tests
-      m.file "test/unit/database_test.rb", "test/unit/database_test.rb", :collision => :ask
-      m.file "test/unit/mail_server_test.rb", "test/unit/mail_server_test.rb", :collision => :ask
-      m.file "test/unit/site_config_test.rb", "test/unit/site_config_test.rb", :collision => :ask
+      m.file "test/unit/database_test.rb", "test/unit/database_test.rb"
+      m.file "test/unit/mail_server_test.rb", "test/unit/mail_server_test.rb"
+      m.file "test/unit/site_config_test.rb", "test/unit/site_config_test.rb"
       
       #Views
       m.directory "app/views/#{file_name}"
-      m.file "views/install/confirm_options.rhtml", "app/views/#{file_name}/confirm_options.rhtml", :collision => :ask
-      m.file "views/install/config_mail.rhtml", "app/views/#{file_name}/config_mail.rhtml", :collision => :ask
-      m.file "views/install/select_db.rhtml", "app/views/#{file_name}/select_db.rhtml", :collision => :ask
-      m.file "views/install/show_authentication_options.rhtml", "app/views/#{file_name}/show_authentication_options.rhtml", :collision => :ask
-      m.file "views/install/show_db_options.rhtml", "app/views/#{file_name}/show_db_options.rhtml", :collision => :ask
-      m.file "views/install/welcome.rhtml", "app/views/#{file_name}/welcome.rhtml", :collision => :ask
-      m.file "views/install/select_language.rhtml", "app/views/#{file_name}/select_language.rhtml", :collision => :ask
-      m.file "views/install/read_site_settings.rhtml", "app/views/#{file_name}/read_site_settings.rhtml", :collision => :ask
-      m.file "views/install/save_options.rhtml", "app/views/#{file_name}/save_options.rhtml", :collision => :ask
+      m.file "views/install/confirm_options.rhtml", "app/views/#{file_name}/confirm_options.rhtml"
+      m.file "views/install/config_mail.rhtml", "app/views/#{file_name}/config_mail.rhtml"
+      m.file "views/install/select_db.rhtml", "app/views/#{file_name}/select_db.rhtml"
+      m.file "views/install/show_authentication_options.rhtml", "app/views/#{file_name}/show_authentication_options.rhtml"
+      m.file "views/install/show_db_options.rhtml", "app/views/#{file_name}/show_db_options.rhtml"
+      m.file "views/install/welcome.rhtml", "app/views/#{file_name}/welcome.rhtml"
+      m.file "views/install/select_language.rhtml", "app/views/#{file_name}/select_language.rhtml"
+      m.file "views/install/read_site_settings.rhtml", "app/views/#{file_name}/read_site_settings.rhtml"
+      m.file "views/install/save_options.rhtml", "app/views/#{file_name}/save_options.rhtml"
 
       # Partials
-      m.file "views/install/_db_form.rhtml", "app/views/#{file_name}/_db_form.rhtml", :collision => :ask
-      m.file "views/install/_mail_form.rhtml", "app/views/#{file_name}/_mail_form.rhtml", :collision => :ask
-      m.file "views/install/_site_settings_form.rhtml", "app/views/#{file_name}/_site_settings_form.rhtml", :collision => :ask
+      m.file "views/install/_db_form.rhtml", "app/views/#{file_name}/_db_form.rhtml"
+      m.file "views/install/_mail_form.rhtml", "app/views/#{file_name}/_mail_form.rhtml"
+      m.file "views/install/_site_settings_form.rhtml", "app/views/#{file_name}/_site_settings_form.rhtml"
 
       #Layouts
-      m.file "views/layouts/install.rhtml", "app/views/layouts/#{file_name}.rhtml", :collision => :ask
+      m.file "views/layouts/install.rhtml", "app/views/layouts/#{file_name}.rhtml"
 
       #Languages
       m.directory "lang"
-      m.file "lang/en.yml", "lang/en.yml", :collision => :ask
-      m.file "lang/ro.yml", "lang/ro.yml", :collision => :ask
+      m.file "lang/en.yml", "lang/en.yml"
+      m.file "lang/ro.yml", "lang/ro.yml"
 
       #Extra files
-      m.file "LICENSE", "doc/LICENSE_FOR_INSTALL_GENERATOR", :collision => :ask
-      m.file "INSTALL", "doc/INSTALL_FOR_INSTALL_GENERATOR", :collision => :ask
-      m.file "README", "doc/README_FOR_INSTALL_GENERATOR", :collision => :ask
+      m.file "LICENSE", "doc/LICENSE_FOR_INSTALL_GENERATOR"
+      m.file "INSTALL", "doc/INSTALL_FOR_INSTALL_GENERATOR"
+      m.file "README", "doc/README_FOR_INSTALL_GENERATOR"
+      m.file "ChangeLog", "doc/ChangeLog_FOR_INSTALL_GENERATOR"
       
     end
   end

data/templates/ChangeLog

@@ -0,0 +1,10 @@
+install_generator 0.0.2
+* Updated the installation instructions
+* The installer doesn't set up the Settings plugin on its own when you save
+* This was removed to cut down on some time.
+* Added a ChangeLog
+* Fixed a stupid mistake that would redirect you in the wrong place if you didn't agree to the license
+* Fixed a typo in the mail authentication form that caused a valid to fail if
+any authentication besides 'none' was selected.
+* Fixed some typos and bugs that caused the installer not to save properly.
+* Fixed a bug that made the installer unable to save its configuration

data/templates/INSTALL

@@ -11,12 +11,13 @@ GLoc.set_kcode
 GLoc.load_localized_strings
 
 3) Install the Settings plugin for your Ruby on Rails application
-Don't bother to generate the settings migration or migrate the database
-That will be done by the installer at the end automatically
+You also have to generate the settings migration or migrate the database
 
   $ ruby script/plugin source http://beautifulpixel.textdriven.com/svn/plugins/settings
   $ ruby script/plugin install settings
+  $ ruby script/generate settings_migration
+  $ rake db:migrate
 
 4) Install the installer generator and add it to your application
   # gem install --remote install_generator
-  $ ruby script/generate install
+  $ ruby script/generate install Install

data/templates/controllers/install_controller.rb

@@ -76,16 +76,21 @@ class <%= class_name %>Controller < ApplicationController
   def confirm_options
     @back_action = :read_site_settings
     @forward_action = :save_options
+
     @db = load_db
     @mail = load_mailserver
-
     @site = load_site_settings
+
     redirect_to_form(:read_site_settings) unless @site.valid?
   end
 
   # Save the configuration options
   # Databases migrations are automatically performed
   def save_options
+    @db = load_db
+    @mail = load_mailserver
+    @site=load_site_settings
+
     @db.save
     @mail.save
     @site.save
@@ -127,7 +132,7 @@ class <%= class_name %>Controller < ApplicationController
   def redirect_to_license
     begin 
       flash[:notice]=l(:must_agree_to_license)
-      redirect_to :action => 'index' 
+      redirect_to :action => 'welcome' 
     end unless session[:license_agreed]==true
   end
 

data/templates/lang/en.yml

@@ -35,7 +35,7 @@ admin_email: Administrator's email
 admin_password: Administrator's password
 description: Description
 site_information: Site information
-congratulation_settings_saved: Congratulations, your settings have been sucessfully saved!
+congratulations_settings_saved: Congratulations, your settings have been sucessfully saved!
 dont_match: Don't Match
 confirmation_password: Password (confirm) 
 admin_confirmation_password: Administrator's password (confirmation)

data/templates/models/database.rb

@@ -77,6 +77,8 @@ class Database < ActiveRecord::Base
     @databases['production']=@production
     # TODO : only have the next line execute if we're in a development environment
     @databases['development']='production'
+    # This should reload the database configuration because neither WEBrick or Mongrel reload the database configuration from 'config/database.yml'
+    ActiveRecord::Base.establish_connection(@production)
 
     begin
       File.open(file, 'w') do |out|

data/templates/models/site_config.rb

@@ -20,8 +20,8 @@ class SiteConfig < ActiveRecord::Base
 
   # Save the options. This requires the settings plugin to be installed
   def save
-    system("ruby script/generate settings_migration")
     system("rake db:migrate")
+
     Settings.title=@title
     Settings.admin_username=@admin_username
     Settings.admin_name=@admin_name

data/templates/views/install/show_authentication_options.rhtml

@@ -6,5 +6,5 @@
 <%= password_field :mail, :password %><br />
 
 <%= l(:confirmation_password) %>:
-<%= password_field :mail, :password %><br />
+<%= password_field :mail, :confirmation_password %><br />
 <% end if (@auth != 'none') -%>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: install_generator
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2006-07-28 00:00:00 +03:00
+  version: 0.0.2
+date: 2006-07-30 00:00:00 +03:00
 summary: Generates a web-based installer for Ruby on Rails applications
 require_paths: 
 - .
@@ -30,7 +30,7 @@ authors:
 - Eugen Minciu
 files: 
 - ./USAGE
-- ./install_generator-0.0.1.gem
+- ./install_generator-0.0.2.gem
 - ./install_generator.rb
 - ./install_generator.gemspec
 - ./templates
@@ -45,6 +45,7 @@ files:
 - ./templates/models
 - ./templates/helpers
 - ./templates/INSTALL
+- ./templates/ChangeLog
 - ./templates/lang/en.yml
 - ./templates/lang/ro.yml
 - ./templates/test/unit