@@ -1,109 +1,46 @@ -# Don't change this file! -# Configure your app in config/environment.rb and config/environments/*.rb +# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb -RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) +unless defined?(RAILS_ROOT) + root_path = File.join(File.dirname(__FILE__), '..') -module Rails - class << self - def boot! - unless booted? - preinitialize - pick_boot.run - end - end - - def booted? - defined? Rails::Initializer - end - - def pick_boot - (vendor_rails? ? VendorBoot : GemBoot).new - end - - def vendor_rails? - File.exist?("#{RAILS_ROOT}/vendor/rails") - end - - def preinitialize - load(preinitializer_path) if File.exist?(preinitializer_path) - end - - def preinitializer_path - "#{RAILS_ROOT}/config/preinitializer.rb" - end - end - - class Boot - def run - load_initializer - Rails::Initializer.run(:set_load_path) - end - end - - class VendorBoot < Boot - def load_initializer - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) - end + unless RUBY_PLATFORM =~ /(:?mswin|mingw)/ + require 'pathname' + root_path = Pathname.new(root_path).cleanpath(true).to_s end - class GemBoot < Boot - def load_initializer - self.class.load_rubygems - load_rails_gem - require 'initializer' - end - - def load_rails_gem - if version = self.class.gem_version - gem 'rails', version - else - gem 'rails' - end - rescue Gem::LoadError => load_error - $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.) - exit 1 - end - - class << self - def rubygems_version - Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion - end + RAILS_ROOT = root_path +end - def gem_version - if defined? RAILS_GEM_VERSION - RAILS_GEM_VERSION - elsif ENV.include?('RAILS_GEM_VERSION') - ENV['RAILS_GEM_VERSION'] - else - parse_gem_version(read_environment_rb) - end - end +unless defined?(Rails::Initializer) + if File.directory?("#{RAILS_ROOT}/vendor/rails") + require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" + else + require 'rubygems' - def load_rubygems - require 'rubygems' + environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join + environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/ + rails_gem_version = $1 - unless rubygems_version >= '0.9.4' - $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.) - exit 1 - end + if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version + # Asking for 1.1.6 will give you 1.1.6.5206, if available -- makes it easier to use beta gems + rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last - rescue LoadError - $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org) + if rails_gem + gem "rails", "=#{rails_gem.version.version}" + require rails_gem.full_gem_path + '/lib/initializer' + else + STDERR.puts %(Cannot find gem for Rails ~>#{version}.0: + Install the missing gem with 'gem install -v=#{version} rails', or + change environment.rb to define RAILS_GEM_VERSION with your desired version. + ) exit 1 end - - def parse_gem_version(text) - $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ - end - - private - def read_environment_rb - File.read("#{RAILS_ROOT}/config/environment.rb") - end + else + gem "rails" + require 'initializer' end end + require 'yaml' + Rails::Initializer.run(:set_load_path) + APP_CONFIG = YAML.load_file("#{RAILS_ROOT}/config/config.yml")[RAILS_ENV] end - -# All that for this: -Rails.boot! config/boot.rb @@ -1,67 +1,18 @@ -# Be sure to restart your server when you modify this file +RAILS_GEM_VERSION = '2.0.2' +ENV['RAILS_ENV'] ||= 'production' -# Uncomment below to force Rails into production mode when -# you don't control web/app server and can't set it the proper way -# ENV['RAILS_ENV'] ||= 'production' - -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION - -# Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - # See Rails::Configuration for more options. - - # Skip frameworks you're not going to use. To use Rails without a database - # you must remove the Active Record framework. - # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - - # Specify gems that this application depends on. - # They can then be installed with "rake gems:install" on new installations. - # config.gem "bj" - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" - # config.gem "aws-s3", :lib => "aws/s3" - - # Only load the plugins named here, in the order given. By default, all plugins - # in vendor/plugins are loaded in alphabetical order. - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Add additional load paths for your own custom dirs - # config.load_paths += %W( #{RAILS_ROOT}/extras ) - - # Force all environments to use the same logger level - # (by default production uses :info, the others :debug) - # config.log_level = :debug - - # Make Time.zone default to the specified zone, and make Active Record store time values - # in the database in UTC, and return them converted to the specified local zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Uncomment to use default local time. - config.time_zone = 'UTC' - - # Your secret key for verifying cookie session data integrity. - # If you change this key, all old sessions will become invalid! - # Make sure the secret is at least 30 characters and all random, - # no regular words or you'll be exposed to dictionary attacks. - config.action_controller.session = { - :session_key => '_bookqueue_session', - :secret => '19a72d0ed7a6265bcf61e40c67e6deb41b6cd053f43afb4452d523ff84bd8a6148dfd062c1a1350f34269603c7630d7e4f359335c28115eb0f1726ce17f15496' - } + config.action_controller.session = { :session_key => "_myapp_session", :secret => "some secret phrase of at least 30 characters" } + config.load_paths += Dir["#{RAILS_ROOT}/vendor/gems/**"].map do |dir| + File.directory?(lib = "#{dir}/lib") ? lib : dir + end +end - # Use the database for sessions instead of the cookie-based default, - # which shouldn't be used to store highly confidential information - # (create the session table with "rake db:sessions:create") - # config.action_controller.session_store = :active_record_store +require('twitter') +require('twitter/console') - # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql +twitter_config = File.join(File.dirname(__FILE__), '..', 'config', 'twitter.yml') +TWITTER = Twitter::Client.from_config(twitter_config) - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector -end config/environment.rb @@ -8,10 +8,14 @@ config.cache_classes = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true +# Enable the breakpoint server that script/breakpointer connects to +#config.breakpoint_server = true + # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true -config.action_view.debug_rjs = true config.action_controller.perform_caching = false +config.action_view.cache_template_extensions = false +config.action_view.debug_rjs = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false \ No newline at end of file config/environments/development.rb @@ -10,13 +10,9 @@ config.cache_classes = true # Full error reports are disabled and caching is turned on config.action_controller.consider_all_requests_local = false config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true - -# Use a different cache store in production -# config.cache_store = :mem_cache_store # Enable serving of images, stylesheets, and javascripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" # Disable delivery errors, bad email addresses will be ignored -# config.action_mailer.raise_delivery_errors = false +# config.action_mailer.raise_delivery_errors = false \ No newline at end of file config/environments/production.rb @@ -13,10 +13,7 @@ config.whiny_nils = true config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false -# Disable request forgery protection in test environment -config.action_controller.allow_forgery_protection = false - -# Tell Action Mailer not to deliver emails to the real world. +# Tell ActionMailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. -config.action_mailer.delivery_method = :test +config.action_mailer.delivery_method = :test \ No newline at end of file config/environments/test.rb @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/about' +require 'commands/about' \ No newline at end of file script/about @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/console' +require 'commands/console' \ No newline at end of file script/console @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/destroy' +require 'commands/destroy' \ No newline at end of file script/destroy @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/generate' +require 'commands/generate' \ No newline at end of file script/generate @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/plugin' +require 'commands/plugin' \ No newline at end of file script/plugin @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/runner' +require 'commands/runner' \ No newline at end of file script/runner @@ -1,3 +1,3 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/boot' -require 'commands/server' +require 'commands/server' \ No newline at end of file script/server config/initializers/inflections.rb config/initializers/mime_types.rb config/initializers/new_rails_defaults.rb public/422.html script/dbconsole script/performance/request 15e4d53520083be1ace7e1bc15355e0098feaae8 rodrigo franco (caffo) caffeine@gmail.com http://github.com/caffo/bookqueue/commit/b5b2be2173dd380a4b8fd0a4ff8939784c18290d b5b2be2173dd380a4b8fd0a4ff8939784c18290d 2008-09-14T16:25:31-07:00 2008-09-14T16:25:31-07:00 Revert "project update to 2.1" This reverts commit 15e4d53520083be1ace7e1bc15355e0098feaae8. 22d5765106f1f742edd6c22e52eb18f58bf05175 rodrigo franco (caffo) caffeine@gmail.com