Gemfile in fat_free_crm-0.13.6 vs Gemfile in fat_free_crm-0.14.0

- old
+ new

@@ -1,16 +1,22 @@ source 'https://rubygems.org' # Uncomment the database that you have configured in config/database.yml # ---------------------------------------------------------------------- -# gem 'mysql2' -# gem 'sqlite3' -gem 'pg' +case ENV['CI'] && ENV['DB'] +when "mysql"; gem "mysql2" +when "sqlite"; gem "sqlite3" +when "postgres"; gem "pg" +else + # gem 'mysql2' + # gem 'sqlite3' + gem 'pg' +end # Removes a gem dependency def remove(name) - @dependencies.reject! {|d| d.name == name } + @dependencies.reject! { |d| d.name == name } end # Replaces an existing gem dependency (e.g. from gemspec) with an alternate source. def gem(name, *args) remove(name) @@ -18,17 +24,17 @@ end # Bundler no longer treats runtime dependencies as base dependencies. # The following code restores this behaviour. # (See https://github.com/carlhuda/bundler/issues/1041) -spec = Bundler.load_gemspec( File.expand_path("../fat_free_crm.gemspec", __FILE__) ) +spec = Bundler.load_gemspec(File.expand_path("../fat_free_crm.gemspec", __FILE__)) spec.runtime_dependencies.each do |dep| gem dep.name, *(dep.requirement.as_list) end # Remove premailer auto-require -gem 'premailer', :require => false +gem 'premailer', require: false # Remove fat_free_crm dependency, to stop it from being auto-required too early. remove 'fat_free_crm' group :development do @@ -43,46 +49,40 @@ #~ gem 'capistrano-chruby' #~ gem 'capistrano-rbenv' gem 'guard' gem 'guard-rspec' gem 'guard-rails' - gem 'rb-inotify', :require => false - gem 'rb-fsevent', :require => false - gem 'rb-fchange', :require => false + gem 'rb-inotify', require: false + gem 'rb-fsevent', require: false + gem 'rb-fchange', require: false end end group :development, :test do - gem 'rspec-rails', '~> 2' + gem 'rspec-rails' + gem 'rspec-activemodel-mocks' gem 'headless' - gem 'debugger', :platforms => 'mri_19' unless ENV["CI"] - gem 'byebug', :platforms => ['mri_20', 'mri_21'] unless ENV["CI"] + gem 'byebug' gem 'pry-rails' unless ENV["CI"] + gem 'factory_girl_rails' end group :test do gem 'capybara' gem 'selenium-webdriver' gem 'database_cleaner' gem "acts_as_fu" - gem 'factory_girl_rails' gem 'zeus' unless ENV["CI"] - gem 'coveralls', :require => false gem 'timecop' end group :heroku do - gem 'unicorn', :platform => :ruby + gem 'unicorn', platform: :ruby gem 'rails_12factor' end -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - gem 'uglifier', '>= 1.0.3' - gem 'execjs' - gem 'therubyracer', :platform => :ruby unless ENV["CI"] -end - -gem 'turbo-sprockets-rails3' +gem 'sass-rails' +gem 'coffee-rails' +gem 'uglifier' +gem 'execjs' +gem 'therubyracer', platform: :ruby unless ENV["CI"] +gem 'nokogiri', '>= 1.6.8'