bakeware 1.1.7 → 1.1.8

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    bakeware (1.1.7)
-      bundler (>= 1.1)
+    bakeware (1.1.8)
+      bundler (>= 1.3)
       hub (~> 1.10.2)
       rails (>= 3.2.12)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.12)
       actionpack (= 3.2.12)
@@ -42,25 +42,24 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.0.0)
+    builder (3.0.4)
     childprocess (0.3.1)
       ffi (~> 1.0.6)
-    cucumber (1.1.9)
+    cucumber (1.2.3)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.9.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)
-    gherkin (2.9.3)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     hike (1.2.1)
     hub (1.10.4)
     i18n (0.6.2)
     journey (1.0.4)
-    json (1.6.6)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -106,7 +105,6 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    term-ansicolor (1.0.7)
     thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
@@ -120,4 +118,4 @@ PLATFORMS
 DEPENDENCIES
   aruba (~> 0.4.11)
   bakeware!
-  cucumber (~> 1.1.9)
+  cucumber (~> 1.2.3)

data/README.md

@@ -24,12 +24,13 @@ Lean Mode
 
 This is the default mode. Comes with
 
-* [Airbrake](/airbrake/airbrake) for exception notification
-* [haml](/haml/haml) for haml - because we should all use it
-* [newrelic_rpm](/newrelic/rpm) for analytics about the performance of your app
-* [pg](/ged/ruby-pg) for PostgreSQL 
+* [Airbrake](https://github.com/airbrake/airbrake) for exception notification
+* [haml](https://github.com/haml/haml) for haml - because we should all use it
+* [newrelic_rpm](https://github.com/newrelic/rpm) for analytics about the performance of your app
+* [pg](https://github.com/ged/ruby-pg) for PostgreSQL 
+* [rack-timeout](https://github.com/kch/rack-timeout) for killing a zombie process
 
-As well as some other development tools (like pry-rails).
+As well as some other development tools (like pry-rails, better_errors, binding_of_caller).
 
 Meaty Mode
 ---------
@@ -40,21 +41,21 @@ You can optionally opt for Meaty mode:
 
 This comes with:    
 
-* [Airbrake](/airbrake/airbrake) for exception notification
-* [asset_sync](/rumblelabs/asset_sync) syncing assets between rails and s3
-* [aws-sdk](/aws/aws-sdk-ruby) for the amazon sdk
-* [challah](/ovenbits/challah) for simple and effective authentication
-* [challah-facebook](/jdtornow/challah-facebook) extends Challah for FB authentication
-* [Compass](/chriseppstein/compass) for Sass mixins and standardization
-* [haml](/haml/haml) for haml - because we all should use it
-* [hirefireapp](/meskyanichi/hirefireapp) for auto scaling dynos on heroku
-* [newrelic_rpm](/newrelic/rpm) for analytics about the performance of your app
-* [Paperclip](/thoughtbot/paperclip) for file uploads
-* [pg](/ged/ruby-pg) for PostgreSQL
-* [rack-timeout](/kch/rack-timeout) for killing your app's hung processes before heroku times out (set to 29 seconds)
-* [redis](/antirez/redis) for redis
-* [resque](/defunkt/resque) for resque background processing
-* [Unicorn](/defunkt/unicorn) for a better http server
+* [Airbrake](https://github.com/airbrake/airbrake) for exception notification
+* [asset_sync](https://github.com/rumblelabs/asset_sync) syncing assets between rails and s3
+* [aws-sdk](https://github.com/aws/aws-sdk-ruby) for the amazon sdk
+* [challah](https://github.com/ovenbits/challah) for simple and effective authentication
+* [challah-facebook](https://github.com/jdtornow/challah-facebook) extends Challah for FB authentication
+* [Compass](https://github.com/chriseppstein/compass) for Sass mixins and standardization
+* [haml](https://github.com/haml/haml) for haml - because we all should use it
+* [hirefireapp](https://github.com/meskyanichi/hirefireapp) for auto scaling dynos on heroku
+* [newrelic_rpm](https://github.com/newrelic/rpm) for analytics about the performance of your app
+* [Paperclip](https://github.com/thoughtbot/paperclip) for file uploads
+* [pg](https://github.com/ged/ruby-pg) for PostgreSQL
+* [rack-timeout](https://github.com/kch/rack-timeout) for killing your app's hung processes before heroku times out (set to 29 seconds)
+* [redis](https://github.com/antirez/redis) for redis
+* [resque](https://github.com/defunkt/resque) for resque background processing
+* [Unicorn](https://github.com/defunkt/unicorn) for a better http server
 
 
 Testing
@@ -62,11 +63,11 @@ Testing
 
 Bakeware also comes with testing gems, including (but not limited to):
 
-* [Factory Girl](/thoughtbot/factory_girl) for test data
-* [mocha](/freerange/mocha) for mocking and stubbing
-* [simplecov](/colszowka/simplecov) for testing coverage analytics
-* [Timecop](/jtrupiano/timecop) for testing time
-* [turn](/TwP/turn) for better test reporting
+* [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
+* [mocha](https://github.com/freerange/mocha) for mocking and stubbing
+* [simplecov](https://github.com/colszowka/simplecov) for testing coverage analytics
+* [Timecop](https://github.com/jtrupiano/timecop) for testing time
+* [turn](https://github.com/TwP/turn) for better test reporting
 
 We don't use RSpec often, and even less often do we use minitest. So manually include those if you want.
 
@@ -118,7 +119,7 @@ Dependencies
 Some gems included in Bakeware have native extensions. You should have GCC installed on your
 machine before generating an app with Bakeware.
 
-Use [OS X GCC Installer](/kennethreitz/osx-gcc-installer/) for Snow Leopard
+Use [OS X GCC Installer](https://github.com/kennethreitz/osx-gcc-installer/) for Snow Leopard
 (OS X 10.6).
 
 Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.action)
@@ -129,7 +130,7 @@ PostgreSQL needs to be installed and running for the `db:create` rake task.
 Issues
 ------
 
-If you have problems, please create a [Github Issue](/courtsimas/bakeware/issues).
+If you have problems, please create a [Github Issue](https://github.com/courtsimas/bakeware/issues).
 
 Contributing
 ------------

data/bakeware.gemspec

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "bakeware/version"
+require 'bakeware/version'
+require 'date'
 
 Gem::Specification.new do |s|
   s.name     = 'bakeware'
@@ -27,9 +28,9 @@ We use it at Oven Bits for most of our apps. YMMV, but we get decent mileage out
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency 'rails', '>= 3.2.12'
-  s.add_dependency 'bundler', '>= 1.1'
+  s.add_dependency 'bundler', '>= 1.3'
   s.add_dependency 'hub', '~> 1.10.2'
 
-  s.add_development_dependency 'cucumber', '~> 1.1.9'
+  s.add_development_dependency 'cucumber', '~> 1.2.3'
   s.add_development_dependency 'aruba', '~> 0.4.11'
 end

data/features/step_definitions/bakeware_steps.rb

@@ -2,39 +2,30 @@ require 'aruba/cucumber'
 
 When 'I run rake' do
   in_current_dir do
-    run 'bundle exec rake'
+    run_simple 'bundle exec rake'
   end
 end
 
 When 'I run the rake task "$task_name"' do |task_name|
   in_current_dir do
-    run "bundle exec rake #{task_name}"
+    run_simple "bundle exec rake #{task_name}"
   end
 end
 
 When 'I generate "$generator_with_args"' do |generator_with_args|
   in_current_dir do
-    run "bundle exec rails generate #{generator_with_args}"
+    run_simple "bundle exec rails generate #{generator_with_args}"
   end
 end
 
-Then 'I see a successful response in the shell' do
-  assert_exit_status(0)
-end
-
-When 'I drop and create the required databases' do
-  in_current_dir do
-    run 'bundle exec rake db:drop RAILS_ENV=test'
-    run 'bundle exec rake db:drop'
-    run 'bundle exec rake db:create RAILS_ENV=test'
-    run 'bundle exec rake db:create'
-  end
+Given 'I ensure no databases exist for the "$project_name"' do |project_name|
+  run "dropdb #{project_name}_development"
+  run "dropdb #{project_name}_test"
 end
 
 When 'I bake a project called "$project_name"' do |project_name|
   bakeware_bin = File.expand_path(File.join('..', '..', 'bin', 'bakeware'), File.dirname(__FILE__))
-  run "#{bakeware_bin} #{project_name}"
-  assert_exit_status(0)
+  run_simple "#{bakeware_bin} #{project_name}"
 end
 
 When /^I bake a project called "([^"]*)" with:$/ do |project_name, arguments_table|
@@ -42,8 +33,7 @@ When /^I bake a project called "([^"]*)" with:$/ do |project_name, arguments_tab
   arguments = arguments_table.hashes.inject([]) do |accum, argument|
     accum << "#{argument['argument']}=#{argument['value']}"
   end.join
-  run "#{bakeware_bin} #{project_name} #{arguments}"
-  assert_exit_status(0)
+  run_simple "#{bakeware_bin} #{project_name} #{arguments}"
 end
 
 When 'I cd to the "$test_project" root' do |dirname|
@@ -56,20 +46,19 @@ Then 'I can cleanly rake the project' do
     And I run the rake task "db:migrate"
     And I run the rake task "db:test:prepare"
     And I run the rake task "cucumber"
-    Then I see a successful response in the shell
   }
 end
 
+Then /^"(.*)" should not be installed$/ do |gem_name|
+  in_current_dir do
+    system("bundle show #{gem_name} 2>&1 > /dev/null").should be_false
+  end
+end
+
 Then /^the "([^"]*)" Heroku app should exist$/ do |app_name|
   FakeHeroku.should have_created_app(app_name)
 end
 
 Then /^the "([^"]*)" Github repo should exist$/ do |repo_name|
   FakeGithub.should have_created_repo(repo_name)
-end
-
-Then 'unicorn should be installed' do
-  in_current_dir do
-    system("bundle show unicorn 2>&1 > /dev/null").should be_true
-  end
-end
+end

data/lib/bakeware/app_builder.rb

@@ -20,8 +20,8 @@ module Bakeware
     end
 
     def provide_setup_script
-      copy_file 'script_setup', 'script/setup'
-      run 'chmod a+x script/setup'
+      copy_file 'bin_setup', 'bin/setup'
+      run 'chmod a+x bin/setup'
     end
 
     def setup_staging_environment
@@ -99,25 +99,32 @@ module Bakeware
       copy_file 'asset_sync', 'config/initializers/asset_sync.rb'
       copy_file 'timeout', 'config/initializers/timeout.rb'
       copy_file 'Procfile', 'Procfile'
-      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
       inject_into_file 'Procfile', "worker: env QUEUE=* bundle exec rake resque:work",
         :after => "\n"
       replace_in_file 'Procfile',
         'web: bundle exec rails server thin -p $PORT','web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb'
     end
 
+    def enable_database_cleaner
+      copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
+    end
+
     def configure_time_zone
-      time_zone_config = <<-RUBY
+      config = <<-RUBY
     config.active_record.default_timezone = :utc
       RUBY
-      inject_into_class "config/application.rb", "Application", time_zone_config
+      inject_into_class "config/application.rb", "Application", config
     end
 
     def configure_time_formats
       remove_file 'config/locales/en.yml'
       copy_file 'config_locales_en.yml', 'config/locales/en.yml'
     end
-
+    
+    def configure_rack_timeout
+      copy_file 'rack_timeout.rb', 'config/initializers/rack_timeout.rb'
+    end
+    
     def configure_action_mailer
       action_mailer_host 'development', "#{app_name}.local"
       action_mailer_host 'test', 'www.example.com'
@@ -130,13 +137,14 @@ module Bakeware
     end
 
     def setup_foreman
-      copy_file 'sample.env', 'sample.env'
+      copy_file 'sample.env', '.sample.env'
     end
 
     def setup_stylesheets
       copy_file 'app/assets/stylesheets/application.css',
         'app/assets/stylesheets/application.css.scss'
       remove_file 'app/assets/stylesheets/application.css'
+      concat_file 'import_scss_styles', 'app/assets/stylesheets/application.css.scss'
       create_file 'app/assets/stylesheets/_screen.scss'
     end
 
@@ -161,6 +169,7 @@ module Bakeware
       path_addition = override_path_for_tests
       run "#{path_addition} heroku create #{app_name} --remote=production"
       run "#{path_addition} heroku create #{app_name}-staging --remote=staging"
+      run "#{path_addition} heroku config:add RACK_ENV=staging RAILS_ENV=staging --remote=staging" 
     end
 
     def create_github_repo(repo_name)
@@ -200,6 +209,10 @@ module Bakeware
     def add_email_validator
       copy_file 'email_validator.rb', 'app/validators/email_validator.rb'
     end
+    
+    def disable_xml_params
+      copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
+    end
 
     def setup_default_rake_task
       # append_file 'Rakefile' do

data/lib/bakeware/generators/app_generator.rb

@@ -58,7 +58,11 @@ module Bakeware
 
     def setup_test_environment
       say 'Setting up the test environment'
-      #still need some database cleaners in here
+      # build :enable_factory_girl_syntax
+      # build :test_factories_first
+      # build :generate_rspec
+      # build :configure_rspec
+      build :enable_database_cleaner
       build :setup_guard_spork
     end
 
@@ -114,6 +118,9 @@ module Bakeware
       build :configure_action_mailer
       build :configure_time_zone
       build :configure_time_formats
+      build :configure_rack_timeout
+      
+      build :disable_xml_params
 
       build :add_email_validator
       build :setup_default_rake_task

data/lib/bakeware/version.rb

@@ -1,3 +1,3 @@
 module Bakeware
-  VERSION = '1.1.7'
+  VERSION = '1.1.8'
 end

data/templates/Gemfile_additions

@@ -2,20 +2,29 @@ gem 'airbrake'
 gem 'thin'
 gem 'pg'
 gem 'haml'
+gem 'rack-timeout'
 
 group :development do
   gem 'foreman'
   gem 'mailcatcher'
   gem 'pry-rails'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+end
+
+group :assets do
+  gem 'coffee-rails'
+  gem 'uglifier'
 end
 
 group :development, :test do
+  gem 'factory_girl_rails'
   gem 'guard'
   gem 'guard-spork'
 end
 
 group :test do
-  gem 'factory_girl_rails'
+  gem 'cane'
   gem 'mocha', :require => false
   gem 'shoulda-context'
   gem 'shoulda-matchers'

data/templates/Procfile

@@ -1 +1 @@
-web: bundle exec rails server thin -p $PORT
+web: bundle exec rails server thin -p $PORT -e $RACK_ENV

data/templates/{script_setup → bin_setup}

@@ -5,4 +5,7 @@
 
 bundle install --binstubs=bin/stubs
 bundle exec rake db:setup
-cp sample.env .env
+
+if [ ! -f .env ]; then
+  cp .sample.env .env
+fi

data/templates/database_cleaner_rspec.rb

@@ -0,0 +1,21 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:deletion)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :deletion
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/templates/disable_xml_params.rb

@@ -0,0 +1,3 @@
+# Protect against injection attacks
+# http://www.kb.cert.org/vuls/id/380039
+ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/rack_timeout.rb

@@ -0,0 +1 @@
+Rack::Timeout.timeout = (ENV['TIMEOUT_IN_SECONDS'] || 20).to_i 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bakeware
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hub
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,10 @@ files:
 - templates/asset_sync
 - templates/bakeware_gitignore
 - templates/bakeware_layout.html.erb.erb
+- templates/bin_setup
 - templates/config_locales_en.yml
+- templates/database_cleaner_rspec.rb
+- templates/disable_xml_params.rb
 - templates/email_validator.rb
 - templates/errors.rb
 - templates/import_scss_styles
@@ -142,9 +145,9 @@ files:
 - templates/newrelic_config
 - templates/override_recipient_smtp.rb
 - templates/postgresql_database.yml.erb
+- templates/rack_timeout.rb
 - templates/s3yml
 - templates/sample.env
-- templates/script_setup
 - templates/simplecov_init.rb
 - templates/time_formats.rb
 - templates/timeout