Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update generated engine Gemfile * Remove --format Fuubar from Guardfile * Fix failing specs for newly generated engine
- Loading branch information
Showing
4 changed files
with
33 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
|
@@ -4,34 +4,23 @@ gemspec | ||
|
|
||
gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git' | gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git' | ||
|
|
||
# Refinery/rails should pull in the proper versions of these | # Database Configuration | ||
group :assets do | platforms :jruby do | ||
gem 'sass-rails' | gem 'activerecord-jdbcsqlite3-adapter' | ||
gem 'coffee-rails' | gem 'activerecord-jdbcmysql-adapter' | ||
gem 'uglifier' | gem 'activerecord-jdbcpostgresql-adapter' | ||
gem 'jruby-openssl' | |||
end | end | ||
|
|
||
gem 'jquery-rails' | platforms :ruby do | ||
gem 'sqlite3' | |||
gem 'mysql2' | |||
gem 'pg' | |||
end | |||
|
|
||
group :development, :test do | group :development, :test do | ||
gem 'refinerycms-testing', '~> 2.0.0' | gem 'refinerycms-testing', :git => 'git://github.com/resolve/refinerycms.git' | ||
gem 'factory_girl_rails' | gem 'guard-rspec', '~> 0.6.0' | ||
gem 'generator_spec' | |||
|
|||
require 'rbconfig' | |||
|
|||
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 | |||
|
|
||
platforms :mswin, :mingw do | platforms :mswin, :mingw do | ||
gem 'win32console' | gem 'win32console' | ||
|
@@ -40,25 +29,28 @@ group :development, :test do | ||
end | end | ||
|
|
||
platforms :ruby do | platforms :ruby do | ||
gem 'spork', '0.9.0.rc9' | gem 'spork', '~> 0.9.0.rc' | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. |
|||
gem 'guard-spork' | gem 'guard-spork' | ||
|
|
||
unless ENV['TRAVIS'] | unless ENV['TRAVIS'] | ||
require 'rbconfig' | |||
if RbConfig::CONFIG['target_os'] =~ /darwin/i | if RbConfig::CONFIG['target_os'] =~ /darwin/i | ||
gem 'rb-fsevent', '>= 0.3.9' | gem 'rb-fsevent', '>= 0.3.9' | ||
gem 'growl', '~> 1.0.3' | gem 'ruby_gntp' | ||
end | end | ||
if RbConfig::CONFIG['target_os'] =~ /linux/i | if RbConfig::CONFIG['target_os'] =~ /linux/i | ||
gem 'rb-inotify', '>= 0.5.1' | gem 'rb-inotify', '>= 0.5.1' | ||
gem 'libnotify', '~> 0.1.3' | gem 'libnotify', '~> 0.1.3' | ||
gem 'therubyracer', '~> 0.9.9' | |||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
ugisozols
Author
Member
|
|||
end | end | ||
end | end | ||
end | end | ||
|
|
||
platforms :jruby do | platforms :jruby do | ||
unless ENV['TRAVIS'] | unless ENV['TRAVIS'] | ||
require 'rbconfig' | |||
if RbConfig::CONFIG['target_os'] =~ /darwin/i | if RbConfig::CONFIG['target_os'] =~ /darwin/i | ||
gem 'growl', '~> 1.0.3' | gem 'ruby_gntp' | ||
end | end | ||
if RbConfig::CONFIG['target_os'] =~ /linux/i | if RbConfig::CONFIG['target_os'] =~ /linux/i | ||
gem 'rb-inotify', '>= 0.5.1' | gem 'rb-inotify', '>= 0.5.1' | ||
|
@@ -67,3 +59,13 @@ group :development, :test do | ||
end | end | ||
end | end | ||
end | end | ||
|
|||
# Gems used only for assets and not required | |||
# in production environments by default. | |||
group :assets do | |||
gem 'sass-rails' | |||
gem 'coffee-rails' | |||
gem 'uglifier' | |||
end | |||
|
|||
gem 'jquery-rails', '~> 2.0.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
You probably want 0.9.0. 0.9.0.rc is from 2010.