Bundler Updates

Gemfile

@@ -0,0 +1,59 @@
+source 'http://rubygems.org', 'http://gemcutter.org'
+gem 'rails', '2.3.5'
+gem 'haml', '2.2.21'
+gem 'acts_as_tree', '0.1.1'
+gem 'will_paginate', '2.3.12'
+gem 'vestal_versions', '1.0.2'
+gem 'htmldiff', '0.0.1'
+gem 'ri_cal', '0.8.5'
+gem 'after_commit', '1.0.6'
+gem 'recurrence', '0.1.1'
+gem 'geoip', '0.8.6'
+gem 'email_veracity', '0.5.0'
+gem 'url_store', '0.3.0'
+gem 'thinking-sphinx', '1.3.16'
+gem 'searchlogic', '2.4.12'
+gem 'jintastic', '1.1.0'
+gem 'delayed_job', '2.0.3'
+gem 'ts-delayed-delta', '1.0.4'
+gem 'fastercsv', '1.5.3'
+gem 'daemons'
+gem 'riddle', '1.0.10'
+# gem 'redcloth'
+
+# Bluepill gems
+# gem 'bluepill'
+# gem 'blankslate'  
+# gem 'state_machine'    
+
+group :development do
+  gem 'random_data', '1.5.1'
+  gem 'machinist', '1.0.6'
+  gem 'populator', '0.2.5'
+  gem 'faker', '0.3.1'
+  # gem 'rails-footnotes'
+end
+
+
+# acts_as_tree-0.1.1
+# after_commit-1.0.6
+# delayed_job-2.0.3
+# email_veracity-0.5.0
+# faker-0.3.1
+# fastercsv-1.5.3
+# geoip-0.8.6
+# haml-2.2.21
+# htmldiff-0.0.1
+# jintastic-1.1.0
+# machinist-1.0.6
+# populator-0.2.5
+# random_data-1.5.1
+# recurrence-0.1.1
+# ri_cal-0.8.5
+# riddle-1.0.10
+# searchlogic-2.4.12
+# thinking-sphinx-1.3.16
+# ts-delayed-delta-1.0.4
+# url_store-0.3.0
+# vestal_versions-1.0.2
+# will_paginate-2.3.12

Gemfile.lock

@@ -0,0 +1,90 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.5)
+      actionpack (= 2.3.5)
+    actionpack (2.3.5)
+      activesupport (= 2.3.5)
+      rack (~> 1.0.0)
+    activerecord (2.3.5)
+      activesupport (= 2.3.5)
+    activeresource (2.3.5)
+      activesupport (= 2.3.5)
+    activesupport (2.3.5)
+    acts_as_tree (0.1.1)
+    after_commit (1.0.6)
+      activerecord
+    daemons (1.1.0)
+    delayed_job (2.0.3)
+      daemons
+    email_veracity (0.5.0)
+    faker (0.3.1)
+    fastercsv (1.5.3)
+    formtastic (1.1.0)
+      actionpack (>= 2.3.0)
+      activesupport (>= 2.3.0)
+      i18n (>= 0.4.0)
+    geoip (0.8.6)
+    haml (2.2.21)
+    htmldiff (0.0.1)
+    i18n (0.5.0)
+    jintastic (1.1.0)
+      formtastic
+    machinist (1.0.6)
+    populator (0.2.5)
+    rack (1.0.1)
+    rails (2.3.5)
+      actionmailer (= 2.3.5)
+      actionpack (= 2.3.5)
+      activerecord (= 2.3.5)
+      activeresource (= 2.3.5)
+      activesupport (= 2.3.5)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    random_data (1.5.1)
+    recurrence (0.1.1)
+      activesupport (>= 2.1.1)
+    ri_cal (0.8.5)
+    riddle (1.0.10)
+    searchlogic (2.4.12)
+      activerecord (>= 2.0.0)
+    thinking-sphinx (1.3.16)
+      activerecord (>= 1.15.6)
+      after_commit (>= 1.0.6)
+      riddle (>= 1.0.10)
+    ts-delayed-delta (1.0.4)
+      delayed_job (>= 1.8.4)
+      thinking-sphinx (>= 1.3.6)
+    url_store (0.3.0)
+    vestal_versions (1.0.2)
+      activerecord (>= 2.1.0)
+    will_paginate (2.3.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts_as_tree (= 0.1.1)
+  after_commit (= 1.0.6)
+  daemons
+  delayed_job (= 2.0.3)
+  email_veracity (= 0.5.0)
+  faker (= 0.3.1)
+  fastercsv (= 1.5.3)
+  geoip (= 0.8.6)
+  haml (= 2.2.21)
+  htmldiff (= 0.0.1)
+  jintastic (= 1.1.0)
+  machinist (= 1.0.6)
+  populator (= 0.2.5)
+  rails (= 2.3.5)
+  random_data (= 1.5.1)
+  recurrence (= 0.1.1)
+  ri_cal (= 0.8.5)
+  riddle (= 1.0.10)
+  searchlogic (= 2.4.12)
+  thinking-sphinx (= 1.3.16)
+  ts-delayed-delta (= 1.0.4)
+  url_store (= 0.3.0)
+  vestal_versions (= 1.0.2)
+  will_paginate (= 2.3.12)

config/boot.rb

@@ -36,6 +36,13 @@ def preinitializer_path
   class Boot
     def run
       load_initializer
+
+      Rails::Initializer.class_eval do
+        def load_gems
+          @bundler_loaded ||= Bundler.require :default, Rails.env
+        end
+      end
+
       Rails::Initializer.run(:set_load_path)
     end
   end

config/environment.rb

@@ -10,26 +10,6 @@
 
   config.time_zone = 'UTC'
 
-  config.gem 'haml'
-  config.gem 'acts_as_tree'
-  config.gem 'will_paginate'
-  config.gem 'vestal_versions'
-  config.gem 'htmldiff'
-  config.gem 'ri_cal'
-  config.gem 'recurrence'
-  config.gem 'geoip'
-  config.gem 'email_veracity'
-  config.gem 'url_store'
-  config.gem 'thinking-sphinx', :lib => 'thinking_sphinx'
-  config.gem 'searchlogic'
-  config.gem 'jintastic'
-  config.gem 'delayed_job'
-  config.gem 'ts-delayed-delta', :lib => false
-  config.gem 'fastercsv'
-  config.gem 'blankslate'
-  #config.gem 'bluepill'
-  config.gem 'daemons'
-  #config.gem 'redcloth'
 end
 
 Delayed::Worker.backend = :active_record

config/environments/development.rb

@@ -4,12 +4,5 @@
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
-
 config.action_mailer.raise_delivery_errors = false
-config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-
-config.gem 'machinist'
-config.gem 'populator'
-config.gem 'faker'
-config.gem 'random_data'
-#config.gem 'rails-footnotes'
+config.action_mailer.default_url_options = { :host => 'localhost:3000' }

config/environments/production.rb

@@ -1,13 +1,7 @@
-  #Bluepill gems
-  config.gem 'bluepill'
-  config.gem 'blankslate'  
-  config.gem 'state_machine'    
-
-  config.cache_classes = true
-  config.action_controller.consider_all_requests_local = false
-  config.action_controller.perform_caching             = true
-  config.action_view.cache_template_loading            = true
-
-  config.action_mailer.default_content_type = "text/html"
-  config.action_mailer.default_charset = "utf-8"
-  config.action_mailer.default_url_options = { :host => 'backstage.viridian.railsplayground.net' }
+config.cache_classes = true
+config.action_controller.consider_all_requests_local = false
+config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
+config.action_mailer.default_content_type = "text/html"
+config.action_mailer.default_charset = "utf-8"
+config.action_mailer.default_url_options = { :host => 'backstage.viridian.railsplayground.net' }

config/environments/test.rb

@@ -4,7 +4,4 @@
 config.action_controller.perform_caching             = true
 config.action_view.cache_template_loading            = true
 config.action_controller.allow_forgery_protection    = false
-config.action_mailer.delivery_method = :test
-
-config.gem 'capybara'
-config.gem 'shoulda'
+config.action_mailer.delivery_method = :test

config/preinitializer.rb

@@ -0,0 +1,20 @@
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end