move to gem bundler

.gitignore

@@ -12,4 +12,7 @@
 /public/avatars/*
 /public/files/*
 /public/headers/*
-/public/themes/*
+/public/themes/*
+bin/*
+vendor/bundler_gems/*
+!vendor/bundler_gems/cache/

Gemfile

@@ -0,0 +1,19 @@
+clear_sources
+source "http://gems.rubyforge.org"
+source "http://gems.github.com" # for ambethia-smtp-tls
+
+bundle_path "vendor/bundler_gems"
+
+gem "rails", "2.3.5"
+gem "paperclip", "2.3.0"
+gem "right_aws", "1.9.0"
+gem "right_http_connection", "1.2.4"
+gem "searchlogic", "2.3.9"
+gem "will_paginate", "2.3.11"
+gem "ambethia-smtp-tls", "1.1.2"
+
+only :test do
+  gem "faker", "0.3.1"
+  gem "mocha", "0.9.8"
+  gem "machinist", "1.0.6"
+end

config/environment.rb

@@ -1,22 +1,14 @@
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 require File.join(File.dirname(__FILE__), 'boot')
 
-Rails::Initializer.run do |config|  
-  require 'open-uri'
+Rails::Initializer.run do |config|
   require 'yaml'
 
   config.time_zone = 'UTC'
   config.i18n.default_locale = :en
   config.active_record.partial_updates = true
   config.frameworks -= [ :active_resource ]
-
-  config.gem 'mislav-will_paginate', :version => '2.3.11', :lib => 'will_paginate', :source => 'http://gems.github.com'
-  config.gem 'ambethia-smtp-tls', :version => '1.1.2', :lib => "smtp-tls", :source => 'http://gems.github.com'
-  config.gem 'searchlogic', :version => '2.3.5'
-  config.gem 'thoughtbot-paperclip', :version => '2.2.9.2', :lib => 'paperclip', :source => 'http://gems.github.com'
-  config.gem 'right_aws', :version => '1.9.0' # TODO change to aws-s3 when paperclip does; right_aws 1.10.0 acts funny
-  config.gem 'right_http_connection', :version => '1.2.4'
-
+
   # support yaml and heroku config
   CONFIG = (YAML.load_file('config/config.yml')[RAILS_ENV] rescue {}).merge(ENV)
 

config/environments/development.rb

@@ -1,7 +1,8 @@
+Bundler.require_env RAILS_ENV
 config.cache_classes = false
 config.whiny_nils = true
 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.logger = Logger.new(config.log_path, 2, 20.megabytes)
+config.logger = Logger.new(config.log_path, 2, 20.megabytes)

config/environments/production.rb

@@ -1,3 +1,4 @@
+Bundler.require_env RAILS_ENV
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching = true
@@ -15,4 +16,4 @@
     :authentication => CONFIG['smtp_authentication'].to_sym,
     :enable_starttls_auto => CONFIG['smtp_enable_starttls_auto']
   }
-end
+end

config/environments/test.rb

@@ -1,10 +1,9 @@
+Bundler.require_env RAILS_ENV
 config.cache_classes = true
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching = false
 config.action_view.cache_template_loading = true
 config.action_controller.allow_forgery_protection = false
 config.action_mailer.delivery_method = :test
-config.logger = Logger.new(config.log_path, 2, 20.megabytes)
-config.gem 'faker', :version => '0.3.1'
-config.gem 'notahat-machinist', :version => '1.0.3', :lib => 'machinist', :source => 'http://gems.github.com'
+config.logger = Logger.new(config.log_path, 2, 20.megabytes)

config/preinitializer.rb

@@ -0,0 +1 @@
+require "#{File.dirname(__FILE__)}/../vendor/bundler_gems/environment"

lib/paperclip_support.rb

@@ -1,7 +1,6 @@
 module PaperclipSupport
   def self.included(klass)
     klass.class_eval do
-
       require 'open-uri'
 
       attr_accessible :attachment, :attachment_url
@@ -38,7 +37,6 @@ def io.original_filename; base_uri.path.split('/').last; end
         io.original_filename.blank? ? nil : io
       rescue # catch url errors with validations instead of exceptions (Errno::ENOENT, OpenURI::HTTPError, etc...)
       end
-
     end
   end
 end