aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--Gemfile79
-rw-r--r--Guardfile10
3 files changed, 28 insertions, 66 deletions
diff --git a/.gitignore b/.gitignore
index 02200c0..e6ba9fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,7 @@ capybara-*html
.rbenv-version
Gemfile.lock
-.rbx \ No newline at end of file
+.rbx
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile
diff --git a/Gemfile b/Gemfile
index d75e67c..860091b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,66 +1,30 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
gemspec
-git 'https://github.com/refinery/refinerycms.git', :branch => 'master' do
- gem 'refinerycms'
- gem 'refinerycms-testing', :group => [:development, :test]
-end
-
-gem 'refinerycms-i18n', :github => 'refinery/refinerycms-i18n', :branch => 'master'
-gem 'refinerycms-settings', :github => 'refinery/refinerycms-settings', :branch => 'master'
-
-group :development, :test do
- require 'rbconfig'
-
- gem 'guard-rspec', '~> 1.1.0'
-
- 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-testing', '~> 2.1.0', :group => :test
- 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']
- if RbConfig::CONFIG['target_os'] =~ /darwin/i
- gem 'rb-fsevent', '~> 0.9.1'
- gem 'ruby_gntp', '~> 0.3.4'
- end
- if RbConfig::CONFIG['target_os'] =~ /linux/i
- gem 'rb-inotify', '~> 0.8.8'
- gem 'libnotify', '~> 0.7.4'
- gem 'therubyracer', '~> 0.10.1'
- 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']
- if RbConfig::CONFIG['target_os'] =~ /darwin/i
- gem 'ruby_gntp', '~> 0.3.4'
- end
- if RbConfig::CONFIG['target_os'] =~ /linux/i
- gem 'rb-inotify', '~> 0.8.8'
- gem 'libnotify', '~> 0.7.4'
- 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'
@@ -69,3 +33,8 @@ group :assets do
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
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index b8bb85a..0000000
--- a/Guardfile
+++ /dev/null
@@ -1,10 +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/controllers/#{m[1]}_#{m[2]}_spec.rb", "spec/features/#{m[1]}_spec.rb"] }
- watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
- watch('spec/spec_helper.rb') { "spec" }
- # Capybara feature specs
- watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/features/#{m[1]}_spec.rb" }
-end