Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Started porting this to an engine #1

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 3 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# Ignore bundler config
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3

# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

# Ignore redis dumps, etc
/.redis/*

# Ignore .env custom environment variables
/.env
Gemfile.lock
spec/dummy/log/
spec/dummy/db/*.sqlite3
3 changes: 2 additions & 1 deletion .rvmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
rvm 1.9.3-p0@rails32-subscription-site --create
rvm use [email protected]

72 changes: 25 additions & 47 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,54 +1,32 @@
source 'https://rubygems.org'

gem 'rails', '3.2.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails'
gem 'haml', '3.1.4'
gem 'haml-rails', '0.3.4'
gem 'unicorn', '4.2.0'
gem 'friendly_id', "4.0.0"
gem 'draper', '0.10.0'
gem 'stripe'
gem 'bootstrap-sass'
gem 'simple_form', '2.0.1'
gem 'dalli', '1.1.5'
gem 'redis', '2.2.2'
# use git repo for resque to have latest sinatra fix.
gem 'resque', require: 'resque/server', git: 'https://github.com/defunkt/resque.git'
gem 'newrelic_rpm'
gemspec

group :production, :staging do
gem 'pg'
end

group :development, :test do
gem 'sqlite3'
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'
# 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'
end
# group :development do
# gem 'rspec-rails', '2.8.1'
# gem 'rb-fsevent', '0.9.0'
# gem 'growl', '1.0.3'
# gem 'guard-rspec', '0.6.0'
# gem 'guard-spork', '0.5.2'
# gem 'foreman'
# gem 'letter_opener'
# gem 'heroku'
# end

group :development do
gem 'rspec-rails', '2.8.1'
gem 'rb-fsevent', '0.9.0'
gem 'growl', '1.0.3'
gem 'guard-rspec', '0.6.0'
gem 'guard-spork', '0.5.2'
gem 'foreman'
gem 'letter_opener'
gem 'heroku'
end

group :test do
gem 'rspec-rails', '2.8.1'
gem 'factory_girl_rails', '1.6.0'
gem 'database_cleaner', '0.7.1'
gem 'capybara', '1.1.2'
gem 'fakeweb', '1.3.0'
end
# group :test do
# gem 'rspec-rails', '2.8.1'
# gem 'factory_girl_rails', '1.6.0'
# gem 'database_cleaner', '0.7.1'
# gem 'capybara', '1.1.2'
# gem 'fakeweb', '1.3.0'
# end
250 changes: 0 additions & 250 deletions Gemfile.lock

This file was deleted.

23 changes: 12 additions & 11 deletions Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ end

guard 'rspec', :version => 2, :cli => '--drb' do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }

# Rails example
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch(%r{^app/(.*)(\.erb|\.haml)$}) { |m| "spec/#{m[1]}#{m[2]}_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/#{m[2]}s/#{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/requests" }
watch('app/controllers/application_controller.rb') { "spec/requests" }
watch(%r{^spec/dummy/app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
watch(%r{^spec/dummy/app/(.*)(\.erb|\.haml)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch(%r{^spec/dummy/app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{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/requests" }
watch('spec/dummy/app/controllers/application_controller.rb') { "spec/requests" }

# Capybara request specs
watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
watch(%r{^spec/dummy/app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
end
Loading