merge
This commit is contained in:
did
commit
b132c3bba9
80
Gemfile
Normal file → Executable file
80
Gemfile
Normal file → Executable file
@ -1,73 +1,41 @@
|
||||
source 'http://rubygems.org'
|
||||
#!/usr/bin/env bundle
|
||||
# encoding: utf-8
|
||||
|
||||
# add in all the runtime dependencies
|
||||
source :rubygems
|
||||
|
||||
gem 'rake', '0.9.2'
|
||||
gemspec # Include gemspec dependencies
|
||||
|
||||
gem 'rails', '~> 3.1.3'
|
||||
|
||||
gem 'devise', '~> 1.5.3'
|
||||
gem 'cancan', '~> 1.6.7'
|
||||
|
||||
gem 'mongo', '~> 1.5.2'
|
||||
gem 'bson_ext', '~> 1.5.2'
|
||||
gem 'mongoid', '~> 2.4.2'
|
||||
gem 'locomotive_mongoid_acts_as_tree', '~> 0.1.5.8'
|
||||
gem 'custom_fields', :path => '../gems/custom_fields' # DEV
|
||||
# gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc'
|
||||
gem 'kaminari', '~> 0.13.0'
|
||||
|
||||
gem 'haml', '~> 3.1.3'
|
||||
gem 'sass-rails', '~> 3.1.5'
|
||||
gem 'coffee-script', '~> 2.2.0'
|
||||
gem 'uglifier', '~> 1.0.4'
|
||||
gem 'compass', '~> 0.12.alpha.4'
|
||||
gem 'jquery-rails', '~> 1.0.16'
|
||||
gem 'rails-backbone', '0.5.4'
|
||||
gem 'codemirror-rails', '~> 2.21'
|
||||
gem 'locomotive-tinymce-rails', '~> 3.4.7'
|
||||
gem 'locomotive-aloha-rails', '~> 0.20.1'
|
||||
gem 'flash_cookie_session', '~> 1.1.1'
|
||||
|
||||
gem 'locomotive_liquid', '2.2.2', :require => 'liquid'
|
||||
gem 'formtastic', '~> 2.0.2'
|
||||
gem 'responders', '~> 0.6.4'
|
||||
gem 'cells', '~> 3.8.0'
|
||||
gem 'RedCloth', '~> 4.2.8'
|
||||
gem 'sanitize', '~> 2.0.3'
|
||||
gem 'highline', '~> 1.6.2'
|
||||
|
||||
gem 'rmagick', '2.12.2', :require => 'RMagick'
|
||||
gem 'carrierwave-mongoid', '~> 0.1.3'
|
||||
gem 'fog', '~> 1.0.0'
|
||||
gem 'dragonfly', '~> 0.9.8'
|
||||
gem 'rack-cache', '~> 1.1', :require => 'rack/cache'
|
||||
gem 'mimetype-fu', '~> 0.1.2'
|
||||
gem 'actionmailer-with-request', '~> 0.3.0', :require => 'actionmailer_with_request'
|
||||
gem 'httparty', '~> 0.8.1'
|
||||
gem 'SystemTimer', :platforms => :ruby_18
|
||||
|
||||
# The rest of the dependencies are for use when in the locomotive dev environment
|
||||
# The rest of the dependencies are for use when in the locomotive development environment
|
||||
|
||||
group :development do
|
||||
gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
|
||||
gem 'rspec-rails', '2.6.1' # in order to have rspec tasks and generators
|
||||
gem 'custom_fields', :path => '../gems/custom_fields' # Locale
|
||||
# gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
|
||||
|
||||
gem 'rspec-rails', '2.6.1' # In order to have rspec tasks and generators
|
||||
gem 'rspec-cells'
|
||||
|
||||
gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
|
||||
end
|
||||
|
||||
group :test do
|
||||
gem 'cucumber-rails'
|
||||
gem 'launchy'
|
||||
|
||||
gem 'autotest', :platforms => :mri
|
||||
gem 'ZenTest', :platforms => :mri
|
||||
|
||||
gem 'growl-glue'
|
||||
|
||||
gem 'cucumber-rails'
|
||||
gem 'rspec-rails', '2.6.1'
|
||||
gem 'factory_girl_rails', '~> 1.3.0'
|
||||
gem 'pickle'
|
||||
gem 'xpath', '~> 0.1.4'
|
||||
gem 'capybara'
|
||||
gem 'database_cleaner'
|
||||
gem 'shoulda-matchers'
|
||||
|
||||
gem 'launchy'
|
||||
gem 'factory_girl_rails', '~> 1.3.0'
|
||||
gem 'pickle'
|
||||
gem 'mocha', '0.9.12' # :git => 'git://github.com/floehopper/mocha.git'
|
||||
|
||||
gem 'capybara'
|
||||
|
||||
gem 'xpath', '~> 0.1.4'
|
||||
|
||||
gem 'database_cleaner'
|
||||
end
|
||||
81
locomotive_cms.gemspec
Normal file → Executable file
81
locomotive_cms.gemspec
Normal file → Executable file
@ -1,4 +1,6 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
#!/usr/bin/env gem build
|
||||
# encoding: utf-8
|
||||
|
||||
lib = File.expand_path('../lib/', __FILE__)
|
||||
$:.unshift lib unless $:.include?(lib)
|
||||
|
||||
@ -15,51 +17,54 @@ Gem::Specification.new do |s|
|
||||
s.description = 'Locomotive is a next generation CMS system with sexy admin tools, liquid templating, and inline editing powered by mongodb and rails 3.1'
|
||||
|
||||
s.required_rubygems_version = '>= 1.3.6'
|
||||
s.rubyforge_project = 'nowarning'
|
||||
|
||||
s.add_dependency 'rails', '~> 3.1.3'
|
||||
s.add_dependency 'rake', '~> 0.9.2'
|
||||
|
||||
s.add_dependency 'devise', '~> 1.5.3'
|
||||
s.add_dependency 'cancan', '~> 1.6.7'
|
||||
s.add_dependency 'rails', '~> 3.1.3'
|
||||
|
||||
s.add_dependency 'mongo', '~> 1.5.2'
|
||||
s.add_dependency 'bson_ext', '~> 1.5.2'
|
||||
s.add_dependency 'mongoid', '~> 2.4.2'
|
||||
s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.8'
|
||||
s.add_dependency 'devise', '~> 1.5.3'
|
||||
s.add_dependency 'cancan', '~> 1.6.7'
|
||||
|
||||
s.add_dependency 'custom_fields', '~> 2.0.0.rc2'
|
||||
s.add_dependency 'mongo', '~> 1.5.2'
|
||||
s.add_dependency 'bson_ext', '~> 1.5.2'
|
||||
s.add_dependency 'mongoid', '~> 2.4.2'
|
||||
s.add_dependency 'locomotive_mongoid_acts_as_tree', '~> 0.1.5.8'
|
||||
|
||||
s.add_dependency 'kaminari', '~> 0.13.0'
|
||||
s.add_dependency 'custom_fields', '~> 2.0.0.rc2'
|
||||
|
||||
s.add_dependency 'haml', '~> 3.1.3'
|
||||
s.add_dependency 'sass-rails', '~> 3.1.5'
|
||||
s.add_dependency 'coffee-script', '~> 2.2.0'
|
||||
s.add_dependency 'uglifier', '~> 1.2.2'
|
||||
s.add_dependency 'compass', '~> 0.12.alpha.4'
|
||||
s.add_dependency 'jquery-rails', '~> 1.0.16'
|
||||
s.add_dependency 'rails-backbone', '0.5.4'
|
||||
s.add_dependency 'codemirror-rails', '~> 2.21'
|
||||
s.add_dependency 'locomotive-tinymce-rails', '~> 3.4.7'
|
||||
s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1'
|
||||
s.add_dependency 'flash_cookie_session', '~> 1.1.1'
|
||||
s.add_dependency 'kaminari', '~> 0.13.0'
|
||||
|
||||
s.add_dependency 'locomotive_liquid', '2.2.2'
|
||||
s.add_dependency 'formtastic', '~> 2.0.2'
|
||||
s.add_dependency 'responders', '~> 0.6.4'
|
||||
s.add_dependency 'cells', '~> 3.8.0'
|
||||
s.add_dependency 'RedCloth', '~> 4.2.8'
|
||||
s.add_dependency 'sanitize', '~> 2.0.3'
|
||||
s.add_dependency 'highline', '~> 1.6.2'
|
||||
s.add_dependency 'haml', '~> 3.1.3'
|
||||
s.add_dependency 'sass-rails', '~> 3.1.5'
|
||||
s.add_dependency 'coffee-script', '~> 2.2.0'
|
||||
s.add_dependency 'uglifier', '~> 1.2.2'
|
||||
s.add_dependency 'compass', '~> 0.12.alpha.4'
|
||||
s.add_dependency 'jquery-rails', '~> 1.0.16'
|
||||
s.add_dependency 'rails-backbone', '~> 0.5.4'
|
||||
s.add_dependency 'codemirror-rails', '~> 2.21'
|
||||
s.add_dependency 'locomotive-tinymce-rails', '~> 3.4.7'
|
||||
s.add_dependency 'locomotive-aloha-rails', '~> 0.20.1'
|
||||
s.add_dependency 'flash_cookie_session', '~> 1.1.1'
|
||||
|
||||
s.add_dependency 'rmagick', '2.12.2'
|
||||
s.add_dependency 'carrierwave-mongoid', '~> 0.1.3'
|
||||
s.add_dependency 'fog', '~> 1.0.0'
|
||||
s.add_dependency 'dragonfly', '~> 0.9.8'
|
||||
s.add_dependency 'rack-cache', '~> 1.1'
|
||||
s.add_dependency 'mimetype-fu', '~> 0.1.2'
|
||||
s.add_dependency 'locomotive_liquid', '2.2.2'
|
||||
s.add_dependency 'formtastic', '~> 2.0.2'
|
||||
s.add_dependency 'responders', '~> 0.6.4'
|
||||
s.add_dependency 'cells', '~> 3.8.0'
|
||||
s.add_dependency 'RedCloth', '~> 4.2.8'
|
||||
s.add_dependency 'sanitize', '~> 2.0.3'
|
||||
s.add_dependency 'highline', '~> 1.6.2'
|
||||
|
||||
s.add_dependency 'actionmailer-with-request', '~> 0.3.0'
|
||||
s.add_dependency 'httparty', '~> 0.8.1'
|
||||
s.add_dependency 'rmagick', '~> 2.12.2'
|
||||
s.add_dependency 'carrierwave-mongoid', '~> 0.1.3'
|
||||
s.add_dependency 'fog', '~> 1.0.0'
|
||||
s.add_dependency 'dragonfly', '~> 0.9.8'
|
||||
s.add_dependency 'rack-cache', '~> 1.1'
|
||||
s.add_dependency 'mimetype-fu', '~> 0.1.2'
|
||||
|
||||
s.add_dependency 'httparty', '~> 0.8.1'
|
||||
s.add_dependency 'actionmailer-with-request', '~> 0.3.0'
|
||||
|
||||
s.add_dependency 'SystemTimer' if RUBY_VERSION =~ /1.8/
|
||||
|
||||
s.files = Dir[ 'Gemfile',
|
||||
'{app}/**/*',
|
||||
@ -75,4 +80,4 @@ Gem::Specification.new do |s|
|
||||
'README.textile'
|
||||
]
|
||||
|
||||
end
|
||||
end
|
||||
@ -32,14 +32,6 @@ RSpec.configure do |config|
|
||||
end
|
||||
|
||||
config.before(:each) do
|
||||
if self.described_class != Locomotive::Import::Job
|
||||
DatabaseCleaner.clean
|
||||
end
|
||||
end
|
||||
|
||||
config.before(:all) do
|
||||
if self.described_class == Locomotive::Import::Job
|
||||
DatabaseCleaner.clean
|
||||
end
|
||||
DatabaseCleaner.clean
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user