@@ -1,4 +1,5 @@ config/database.yml +config/database.yml.bak log/ log/* *.swp .gitignore @@ -135,19 +135,6 @@ ActiveRecord::Schema.define(:version => 20090125222830) do t.string "configurable_type" end - create_table "media_player_playlist_items", :force => true do |t| - t.integer "media_player_id" - t.string "playlist_item_song_file_name" - t.string "playlist_item_song_content_type" - t.integer "playlist_item_song_file_size" - end - - add_index "media_player_playlist_items", ["media_player_id"], :name => "index_media_player_playlist_items_on_media_player_id" - - create_table "media_players", :force => true do |t| - t.string "name" - end - create_table "menu_entries", :force => true do |t| t.string "name" t.string "link" @@ -194,6 +181,7 @@ ActiveRecord::Schema.define(:version => 20090125222830) do t.string "name" t.string "title" t.string "full_title" + t.string "status" t.text "body" t.datetime "created_at" t.datetime "updated_at" @@ -204,7 +192,6 @@ ActiveRecord::Schema.define(:version => 20090125222830) do t.boolean "published", :default => true t.boolean "linked", :default => true t.boolean "show_sub_menu", :default => false - t.string "status" t.datetime "publish_at" t.datetime "expires_on" end @@ -227,11 +214,6 @@ ActiveRecord::Schema.define(:version => 20090125222830) do t.string "display_type" end - create_table "plugin_schema_info", :id => false, :force => true do |t| - t.string "plugin_name" - t.integer "version" - end - create_table "posts", :force => true do |t| t.integer "user_id" t.integer "topic_id" db/schema.rb @@ -23,7 +23,11 @@ module Ansuz theme = @themes.detect{|t| t == theme_choice} if( theme ) @state = :theme_installed - return SiteSetting.find_or_create_by_name(:default).update_attribute(:user_theme_name, theme) + begin + return SiteSetting.find_or_create_by_name(:default).update_attribute(:user_theme_name, theme) + rescue + STDERR.puts "Badness happened trying to set the default theme. SQLite does this a lot." + end else @state = :invalid_theme @stdout.puts "[ansuz] invalid theme." @@ -62,7 +66,7 @@ module Ansuz config["socket"] = get_user_response_for("[ansuz] Socket (/var/run/mysqld/mysqld.sock): ", "/var/run/mysqld/mysqld.sock") config["database"] = get_user_response_for("[ansuz] Database Name Prefix (ansuz):", "ansuz") else - config["database"] = get_user_response_for("[ansuz] Database Location (db/development.sqlite):", "db") + config["database"] = get_user_response_for("[ansuz] Database Location (db/development.sqlite):", "db/") end create_config_for_environment(["production","development","test"], config) @@ -88,16 +92,17 @@ module Ansuz create_database end - @stdout.puts "[ansuz] Migrating tables .." + @stdout.puts "[ansuz] Migrating plugins .." Kernel.silence_stream(@stdout) do - migrate_database + migrate_plugins end - @stdout.puts "[ansuz] Migrating plugins .." + @stdout.puts "[ansuz] Migrating tables .." Kernel.silence_stream(@stdout) do - migrate_plugins + migrate_database end + # Create public/uploads directory for FCKeditor create_fckeditor_uploads_dir lib/ansuz/installer.rb @@ -29,18 +29,20 @@ describe Ansuz::Installer do @installer.state.should == :user_doesnt_want_database_yaml end + # You may be tempted to use sqlite for tests, but then you'd be in a world of pain. SQLite - is - the - devil it "should prompt the user if he/she wants a database.yml created for them" do @stdin.write "y\n" @installer.create_db_config "pooptown" - @stdin.write "sqlite" - #@stdin.write "localhost" - #@stdin.write "root" - #@stdin.write "" - #@stdin.write "database" + @stdin.write "mysql\n" + @stdin.write "localhost" + @stdin.write "root" + @stdin.write "" + @stdin.write "\n" @installer.state.should == :database_yaml_created_successfully end it "should run all the necessary rake tasks to get ansuz running" do + @stdin.write "y\n" @installer.install @installer.state.should == :installation_complete File.exists?( File.join(RAILS_ROOT, "db", "schema.rb" )).should == true spec/ansuz_installer_spec.rb 9f9b5a0222e39e11773fdb6f8d4408d1d9492a6d James Cook james@isotope11.com http://github.com/knewter/ansuz/commit/8c0a31046989424ffe5e7dbeb0af0f05bab226ec 8c0a31046989424ffe5e7dbeb0af0f05bab226ec 2009-01-29T17:27:02-08:00 2009-01-29T17:27:02-08:00 fixed more nastiness in installer. gave up on sqlite being useful. abade8fbf72c63469852aed0ee77b5c44c309f0f James Cook james@isotope11.com