Merge remote-tracking branch 'ffcrm/master'

Conflicts:
	Capfile
	config/settings.default.yml

.gitignore

@@ -1,4 +1,5 @@
 config/*.yml
+config/deploy.rb
 !config/settings.default.yml
 !config/database.mysql.mac.yml
 !config/database.mysql.yml

.travis.yml

@@ -39,8 +39,8 @@ before_script:
   - "export DISPLAY=:99"
   - "sh -e /etc/init.d/xvfb start"
 
-# Run specs, acceptance tests, and ensure that assets can compile without errors
-script: "bundle exec rake spec && bundle exec rake acceptance && RAILS_ENV=production bundle exec rake assets:precompile:primary"
+# Run specs & acceptance tests, and ensure that assets can compile without errors
+script: "bundle exec rake && RAILS_ENV=production bundle exec rake assets:precompile:primary"
 
 # To stop Travis from running tests for a new commit,
 # add the following to your commit message: [ci skip]

Capfile

@@ -1,5 +1,5 @@
 load 'deploy'
 # Uncomment if you are using Rails' asset pipeline
-load 'deploy/assets'
+# load 'deploy/assets'
 Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 load 'config/deploy' # remove this line to skip loading any of the default tasks

Gemfile

@@ -1,5 +1,20 @@
 source :rubygems
 
+# Uncomment the database that you have configured in config/database.yml
+# ----------------------------------------------------------------------
+# gem 'mysql2', '0.3.10'
+# gem 'sqlite3'
+gem 'pg', '~> 0.13.2'
+
+# Allows easy switching between locally developed gems, and gems installed from rubygems.org
+# See README for more info at: https://github.com/ndbroadbent/bundler_local_development
+gem 'bundler_local_development', :group => :development, :require => false
+begin
+  require 'bundler_local_development'
+  Bundler.development_gems = [/^ffcrm_/]
+rescue LoadError
+end
+
 # Removes a gem dependency
 def remove(name)
   @dependencies.reject! {|d| d.name == name }
@@ -11,9 +26,6 @@ def gem(name, *args)
   super
 end
 
-# Load development dependencies from gemspec
-gemspec
-
 # Bundler no longer treats runtime dependencies as base dependencies.
 # The following code restores this behaviour.
 # (See https://github.com/carlhuda/bundler/issues/1041)
@@ -22,23 +34,42 @@ spec.runtime_dependencies.each do |dep|
   gem dep.name, *(dep.requirement.as_list)
 end
 
-gem 'ransack',      :git => "git://github.com/fatfreecrm/ransack.git"
-gem 'chosen-rails', :git => "git://github.com/fatfreecrm/chosen-rails.git"
-gem 'responds_to_parent', :git => "https://github.com/LessonPlanet/responds_to_parent.git"
+# Remove premailer auto-require
+gem 'premailer', :require => false
 
-# Remove fat_free_crm from dependencies, to stop it from being auto-required.
+# Remove fat_free_crm dependency, to stop it from being auto-required too early.
 remove 'fat_free_crm'
 
-gem 'pg', '~> 0.13.2'
-
 group :development, :test do
-  gem 'rspec-rails'
-  gem 'steak', :require => false
+  # Uncomment the following two gems to deploy via Capistrano
+  gem 'capistrano'
+  gem 'capistrano_colors'
+
+  gem 'rspec-rails', '~> 2.9.0'
   gem 'headless'
   unless ENV["CI"]
-    gem 'ruby-debug',   :platform => :mri_18
-    gem 'ruby-debug19', :platform => :mri_19
+    gem 'ruby-debug', :platform => :mri_18
+    gem 'debugger', :platform => :mri_19
   end
+  gem 'pry-rails'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'spork'
+  gem 'database_cleaner'
+  gem 'fuubar'
+  gem "acts_as_fu", "~> 0.0.8"
+
+  if RUBY_VERSION.to_f >= 1.9
+    gem 'factory_girl_rails', '~> 3.0.0'
+  else
+    gem 'factory_girl_rails', '~> 1.7.0'
+  end
+end
+
+group :heroku do
+  gem 'unicorn', :platform => :ruby
 end
 
 
@@ -47,7 +78,9 @@ end
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
+  gem 'execjs'
   gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
   gem 'uglifier',     '>= 1.0.3'
 end
 
+gem 'turbo-sprockets-rails3'