Permalink
Browse files

Clean up Gemfile. Allow to specify additional gems in .gemfile. Remov…

…e Guardfile.
  • Loading branch information...
1 parent 8db4e52 commit e1c80926fb2269cc5a6e2649544942ad236f7a20 @ugisozols ugisozols committed Jul 18, 2013
Showing with 32 additions and 67 deletions.
  1. +4 −1 .gitignore
  2. +28 −54 Gemfile
  3. +0 −12 Guardfile
View
@@ -1,3 +1,6 @@
.DS_Store
Gemfile.lock
-spec/dummy
+spec/dummy
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile
View
82 Gemfile
@@ -2,69 +2,43 @@ source 'http://rubygems.org'
gemspec
-gem 'refinerycms', :git => 'git://github.com/refinery/refinerycms.git'
-gem 'refinerycms-settings', :git => 'git://github.com/refinery/refinerycms-settings.git'
-gem 'refinerycms-i18n', :git => 'git://github.com/refinery/refinerycms-i18n.git'
-gem 'refinerycms-acts-as-indexed', :git => 'git://github.com/refinery/refinerycms-acts-as-indexed.git'
-
-group :development, :test do
- gem 'refinerycms-testing', :git => 'git://github.com/refinery/refinerycms.git'
- gem 'guard-rspec', '~> 0.6.0'
- gem "capybara-email", "~> 2.1.2"
-
- platforms :jruby do
- gem 'activerecord-jdbcsqlite3-adapter'
- gem 'activerecord-jdbcmysql-adapter'
- gem 'activerecord-jdbcpostgresql-adapter'
- gem 'jruby-openssl'
- end
-
- unless defined?(JRUBY_VERSION)
- gem 'sqlite3'
- gem 'mysql2'
- gem 'pg'
- end
+gem 'refinerycms', :github => 'refinery/refinerycms'
+gem 'refinerycms-settings', :github => 'refinery/refinerycms-settings'
+gem 'refinerycms-i18n', '~> 2.1.0'
+gem 'refinerycms-acts-as-indexed', '~> 1.0.0'
+
+group :test do
+ gem 'refinerycms-testing', '~> 2.1.0'
+ gem 'capybara-email', '~> 2.1.2'
+end
- platforms :mswin, :mingw do
- gem 'win32console'
- gem 'rb-fchange', '~> 0.0.5'
- gem 'rb-notifu', '~> 0.0.4'
- end
+# Database Configuration
+unless ENV['TRAVIS']
+ gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+ gem 'sqlite3', :platform => :ruby
+end
- platforms :ruby do
- unless ENV['TRAVIS']
- require 'rbconfig'
- if RbConfig::CONFIG['target_os'] =~ /darwin/i
- gem 'rb-fsevent', '>= 0.3.9'
- gem 'ruby_gntp'
- end
- if RbConfig::CONFIG['target_os'] =~ /linux/i
- gem 'rb-inotify', '>= 0.5.1'
- gem 'libnotify', '~> 0.1.3'
- gem 'therubyracer', '~> 0.9.9'
- end
- end
- end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+ gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+ gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+ gem 'mysql2', :platform => :ruby
+end
- platforms :jruby do
- unless ENV['TRAVIS']
- require 'rbconfig'
- if RbConfig::CONFIG['target_os'] =~ /darwin/i
- gem 'ruby_gntp'
- end
- if RbConfig::CONFIG['target_os'] =~ /linux/i
- gem 'rb-inotify', '>= 0.5.1'
- gem 'libnotify', '~> 0.1.3'
- end
- end
- end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+ gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+ gem 'pg', :platform => :ruby
end
+gem 'jruby-openssl', :platform => :jruby
+
# Refinery/rails should pull in the proper versions of these
group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+ eval File.read(local_gemfile)
+end
View
@@ -1,12 +0,0 @@
-guard 'rspec', :version => 2, :cli => "--color" do
- watch(%r{^spec/.+_spec\.rb$})
- watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
- watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
- watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
- watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
- watch('spec/spec_helper.rb') { "spec" }
- watch('config/routes.rb') { "spec/routing" }
- watch('app/controllers/application_controller.rb') { "spec/controllers" }
- # Capybara request specs
- watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
-end

0 comments on commit e1c8092

Please sign in to comment.