suspenders 0.3 → 0.3.1

data/CONTRIBUTING.md

@@ -3,10 +3,7 @@ We love pull requests. Here's a quick guide:
 1. Fork the repo.
 
 2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `REPO=path/to/.git bundle && rake`.
-
-Note that you must include the `REPO` environment variable pointing at your local
-`.git` repository in order to generate the test application required by tests.
+to know that you have a clean slate: `bundle && rake`
 
 3. Add a test for your change. Only refactoring and documentation changes
 require no new tests. If you are adding functionality or fixing a bug, we need
@@ -38,4 +35,4 @@ Syntax:
 * a = b and not a=b.
 * Follow the conventions you see used in the source already.
 
-And in case we didn't emphasize it enough: we love tests!
+And in case we didn't emphasize it enough: we love tests!

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,126 @@
+PATH
+  remote: .
+  specs:
+    suspenders (0.3)
+      bundler (>= 1.0.7)
+      rails (= 3.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.2)
+      rack (~> 1.0)
+    builder (3.0.0)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    cucumber (1.1.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.0.9)
+    gherkin (2.5.4)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    polyglot (0.3.2)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    term-ansicolor (1.0.7)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.30)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aruba (~> 0.4.6)
+  cucumber (~> 1.1.0)
+  suspenders!

data/README.md

@@ -1,4 +1,4 @@
-Suspenders is a base Rails application that you can upgrade.
+Suspenders is the base Rails application used at [thoughtbot](http://thoughtbot.com/community).
 
   ![Suspenders boy](http://media.tumblr.com/1TEAMALpseh5xzf0Jt6bcwSMo1_400.png)
 
@@ -11,25 +11,17 @@ First install the suspenders gem:
 
 Then run:
 
-    suspenders create projectname
+    suspenders projectname
 
 This will create a Rails 3.1 app in `projectname'. This script creates a new
 new git repository. It is not meant to be used against an existing repo.
 
-Suspenders uses [Trout](https://github.com/thoughtbot/trout) to make it
-easier to maintain a base version of special files like Gemfile and Procfile
-in Suspenders.
-
-Whenever you want to get the latest and greatest Suspenders' Gemfile, run:
-
-    trout update Gemfile
-
 Gemfile
 -------
 
 To see the latest and greatest gems, look at Suspenders'
-[template/trout/Gemfile](https://github.com/thoughtbot/suspenders/blob/master/template/trout/Gemfile),
-which will be copied into your projectname/Gemfile.
+[template/Gemfile_additions](https://github.com/thoughtbot/suspenders/blob/master/templates/Gemfile_additions),
+which will be appended to the default generated projectname/Gemfile.
 
 It includes application gems like:
 
@@ -48,6 +40,7 @@ And testing gems like:
 * [Shoulda Matchers](http://github.com/thoughtbot/shoulda-matchers) for frequently needed Rails and RSpec matchers
 * [Timecop](https://github.com/jtrupiano/timecop) for dealing with time
 * [Bourne](https://github.com/thoughtbot/bourne) and Mocha for stubbing and spying
+* [email_spec](https://github.com/bmabey/email-spec) for testing emails.
 
 Other goodies
 -------------
@@ -58,14 +51,11 @@ Suspenders also comes with:
 * Rails' flashes set up and in application layout.
 * A few nice time formats.
 
-See [template/files](https://github.com/thoughtbot/suspenders/blob/master/template/files) to
-see what is generated one-time.
-
 Dependencies
 ------------
 
 Some gems included in Suspenders have native extensions. You should have GCC installed on your
-machine before running Suspenders.
+machine before generating an app with Suspenders.
 
 If you're running OS X, we recommend the [GCC OSX installer](https://github.com/kennethreitz/osx-gcc-installer).
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'cucumber/rake/task'
 require 'date'
 
 TEST_PROJECT = 'test_project'
-SUSPENDERS_GEM_VERSION = '0.2.6'
+SUSPENDERS_GEM_VERSION = '0.3.1'
 
 #############################################################################
 #
@@ -14,31 +14,8 @@ SUSPENDERS_GEM_VERSION = '0.2.6'
 
 Cucumber::Rake::Task.new
 
-namespace :test do
-  desc "A full suspenders app's test suite"
-  task :full => ['test_project:generate', 'cucumber', 'test_project:destroy']
-end
-
-namespace :test_project do
-  desc 'Suspend a new project. Pass REPO=... to change the Suspenders repo (defaults to dir with Rakefile).'
-  task :generate do
-    FileUtils.rm_rf(TEST_PROJECT)
-    repo = (ENV['REPO'].to_s || "file://#{Dir.pwd}").to_s
-    sh "./bin/suspenders", 'create', TEST_PROJECT, repo
-  end
-
-  desc 'Remove a suspended project'
-  task :destroy do
-    FileUtils.cd TEST_PROJECT
-    sh "rake db:drop RAILS_ENV=development"
-    sh "rake db:drop RAILS_ENV=test"
-    FileUtils.cd '..'
-    FileUtils.rm_rf TEST_PROJECT
-  end
-end
-
 desc 'Run the test suite'
-task :default => ['test:full']
+task :default => ['cucumber']
 
 #############################################################################
 #

data/features/rake_clean.feature

@@ -1,6 +1,9 @@
+@disable-bundler
 Feature: Rake works in the suspended project
 
   Scenario: Running rake in the suspended project
+    When I suspend a project called "test_project"
+    And I cd to the "test_project" root
     When I drop and create the required databases
     And I run the rake task "db:create"
     And I run the rake task "db:migrate"
@@ -10,6 +13,7 @@ Feature: Rake works in the suspended project
 
   Scenario: Making a spec then running rake
     When I drop and create the required databases
+    And I suspend a project called "test_project"
     And I generate "model post title:string"
     And I run the rake task "db:migrate"
     And I run the rake task "db:test:prepare"

data/features/step_definitions/shell.rb

@@ -1,24 +1,44 @@
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 60
+end
+
+After do
+  FileUtils.rm_rf('test_project')
+end
+
 When 'I run the rake task "$task_name"' do |task_name|
-  Dir.chdir('test_project') do
-    system("rake #{task_name}")
+  in_current_dir do
+    run "bundle exec rake #{task_name}"
   end
 end
 
 When 'I generate "$generator_with_args"' do |generator_with_args|
-  Dir.chdir('test_project') do
-    system("rails generate #{generator_with_args}")
+  in_current_dir do
+    run "bundle exec rails generate #{generator_with_args}"
   end
 end
 
 Then 'I see a successful response in the shell' do
-  $?.to_i.should == 0
+  assert_exit_status(0)
 end
 
 When 'I drop and create the required databases' do
-  Dir.chdir('test_project') do
-    system("rake db:drop RAILS_ENV=test")
-    system("rake db:drop")
-    system("rake db:create RAILS_ENV=test")
-    system("rake db:create")
+  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
 end
+
+When 'I suspend a project called "$project_name"' do |project_name|
+  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
+  run "#{suspenders_bin} #{project_name}"
+  assert_exit_status(0)
+end
+
+When 'I cd to the "$test_project" root' do |dirname|
+  cd dirname
+end

data/lib/suspenders/app_builder.rb

@@ -133,8 +133,25 @@ module Suspenders
       route "root :to => 'Clearance::Sessions#new'"
     end
 
-    def migrate_database
-      rake "db:migrate"
+    def set_active_record_whitelist_attributes
+      inject_into_class "config/application.rb", "Application", "    config.active_record.whitelist_attributes = true\n"
+    end
+
+    def set_attr_accessibles_on_user
+      inject_into_file "app/models/user.rb",
+        "  attr_accessible :email, :password\n",
+        :after => /include Clearance::User\n/
+    end
+
+    def include_clearance_matchers
+      create_file "spec/support/clearance.rb", "require 'clearance/testing'"
+    end
+
+    def setup_default_rake_task
+      append_file "Rakefile" do
+        "task(:default).clear\ntask :default => [:spec, :cucumber]"
+      end
+
     end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -28,7 +28,8 @@ module Suspenders
       invoke :setup_gitignore
       invoke :copy_miscellaneous_files
       invoke :setup_root_route
-      invoke :migrate_database
+      invoke :set_active_record_whitelist_attributes
+      invoke :set_attr_accessibles_on_user
       invoke :outro
     end
 
@@ -80,6 +81,8 @@ module Suspenders
       build(:generate_cucumber)
       build(:generate_clearance)
       build(:install_factory_girl_steps)
+      build(:include_clearance_matchers)
+      build(:setup_default_rake_task)
     end
 
     def setup_stylesheets
@@ -102,9 +105,18 @@ module Suspenders
       build(:setup_root_route)
     end
 
-    def migrate_database
-      say "Migrating database"
-      build(:migrate_database)
+    def set_active_record_whitelist_attributes
+      if using_active_record?
+        say "Setting up active_record.whitelist_attributes"
+        build(:set_active_record_whitelist_attributes)
+      end
+    end
+
+    def set_attr_accessibles_on_user
+      if using_active_record?
+        say "Setting up writable attributes on user"
+        build(:set_attr_accessibles_on_user)
+      end
     end
 
     def outro
@@ -117,6 +129,10 @@ module Suspenders
       Suspenders::AppBuilder
     end
 
+    def using_active_record?
+      !options[:skip_active_record]
+    end
+
   end
 end
 

data/suspenders.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name    = 'suspenders'
-  s.version = '0.3'
-  s.date    = '2011-10-21'
+  s.version = '0.3.1'
+  s.date    = '2011-10-28'
 
   s.summary     = "Generate a Rails app using thoughtbot's best practices."
   s.description = <<-HERE
@@ -26,11 +26,14 @@ rush to build something amazing; don't use it if you like missing deadlines.
 
   s.add_dependency('rails', '3.1.1')
   s.add_dependency('bundler', '>= 1.0.7')
-  s.add_development_dependency('cucumber', '~> 1.0.2')
+  s.add_development_dependency('cucumber', '~> 1.1.0')
+  s.add_development_dependency('aruba', '~> 0.4.6')
 
   # = MANIFEST =
   s.files = %w[
     CONTRIBUTING.md
+    Gemfile
+    Gemfile.lock
     LICENSE
     README.md
     Rakefile

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153397980 !ruby/object:Gem::Requirement
+  requirement: &2161798380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153397980
+  version_requirements: *2161798380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153397500 !ruby/object:Gem::Requirement
+  requirement: &2161797800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,29 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153397500
+  version_requirements: *2161797800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153396900 !ruby/object:Gem::Requirement
+  requirement: &2161797320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153396900
+  version_requirements: *2161797320
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: &2161796760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+  type: :development
+  prerelease: false
+  version_requirements: *2161796760
 description: ! 'Suspenders is a base Rails project that you can upgrade. It is used
   by
 
@@ -61,6 +72,8 @@ extra_rdoc_files:
 - LICENSE
 files:
 - CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile