suspenders 0.3.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (0.3)
+    suspenders (0.3.2)
       bundler (>= 1.0.7)
       rails (= 3.1.1)
 
@@ -66,7 +66,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     polyglot (0.3.2)
     rack (1.3.5)
@@ -93,7 +93,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdiscount (1.6.8)
     rdoc (3.11)
       json (~> 1.4)

data/README.md

@@ -51,6 +51,25 @@ Suspenders also comes with:
 * Rails' flashes set up and in application layout.
 * A few nice time formats.
 
+Heroku
+------
+
+You can optionally create Heroku staging and production apps:
+
+    suspenders app --heroku true
+
+This has the same effect as running:
+
+    heroku create app-staging --remote staging --stack cedar
+    heroku create app-production --remote production --stack cedar
+
+Clearance
+---------
+
+You can optionally not include Clearance:
+
+    suspenders app --clearance false
+
 Dependencies
 ------------
 

data/Rakefile

@@ -1,98 +1,8 @@
-require 'rubygems'
-require 'rake'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
-require 'date'
-
-TEST_PROJECT = 'test_project'
-SUSPENDERS_GEM_VERSION = '0.3.1'
-
-#############################################################################
-#
-# Testing functions
-#
-#############################################################################
 
 Cucumber::Rake::Task.new
 
 desc 'Run the test suite'
 task :default => ['cucumber']
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  SUSPENDERS_GEM_VERSION
-end
-
-def date
-  Date.today.to_s
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push --tags"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-task :build => :gemspec do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-task :gemspec do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end

data/features/creating_a_heroku_app.feature

@@ -0,0 +1,9 @@
+@disable-bundler
+Feature: Creating a Heroku app when suspending a project
+
+  Scenario: User uses the --heroku=true command line argument
+    When I suspend a project called "test_project" with:
+      | argument | value |
+      | --heroku | true  |
+    Then the "test_project-production" heroku app should exist
+    And the "test_project-production" heroku app should exist

data/features/skipping_clearance.feature

@@ -0,0 +1,13 @@
+@disable-bundler
+Feature: Skipping clearance
+  As a developer
+  I want to suspend an app without clearance
+  So that I can build apps without users, or with other authentication libraries
+
+  Scenario: Passing --clearance=false
+    When I suspend a project called "test_project" with:
+      | argument    | value |
+      | --clearance | false  |
+    And I cd to the "test_project" root
+    Then "clearance" should not be installed
+    And I can cleanly rake the project

data/features/step_definitions/gem_steps.rb

@@ -0,0 +1,5 @@
+Then /^"(.*)" should not be installed$/ do |gem_name|
+  in_current_dir do
+    system("bundle show #{gem_name}").should be_false
+  end
+end

data/features/step_definitions/heroku_steps.rb

@@ -0,0 +1,3 @@
+Then /^the "([^"]*)" heroku app should exist$/ do |app_name|
+  FakeHeroku.should have_created_app(app_name)
+end

data/features/step_definitions/{shell.rb → shell_steps.rb}

@@ -1,13 +1,5 @@
 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|
   in_current_dir do
     run "bundle exec rake #{task_name}"
@@ -39,6 +31,25 @@ When 'I suspend a project called "$project_name"' do |project_name|
   assert_exit_status(0)
 end
 
+When /^I suspend a project called "([^"]*)" with:$/ do |project_name, arguments_table|
+  suspenders_bin = File.expand_path(File.join('..', '..', 'bin', 'suspenders'), File.dirname(__FILE__))
+  arguments = arguments_table.hashes.inject([]) do |accum, argument|
+    accum << "#{argument['argument']}=#{argument['value']}"
+  end.join
+  run "#{suspenders_bin} #{project_name} #{arguments}"
+  assert_exit_status(0)
+end
+
 When 'I cd to the "$test_project" root' do |dirname|
   cd dirname
 end
+
+Then 'I can cleanly rake the project' do
+  steps %{
+    And I run the rake task "db:create"
+    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

data/features/support/bin/heroku

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join('..', '..', 'support', 'fake_heroku'), File.dirname(__FILE__))
+
+FakeHeroku.new(ARGV).run!

data/features/support/env.rb

@@ -0,0 +1,15 @@
+Before do
+  ENV['TESTING'] = 'true'
+end
+
+Before do
+  @aruba_timeout_seconds = 560
+end
+
+After do
+  FakeHeroku.clear!
+end
+
+After do
+  FileUtils.rm_rf('test_project')
+end

data/features/support/fake_heroku.rb

@@ -0,0 +1,21 @@
+class FakeHeroku
+  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'heroku_commands'), File.dirname(__FILE__))
+
+  def initialize(args)
+    @args = args
+  end
+
+  def run!
+    File.open(RECORDER, 'a') do |file|
+      file.write @args.join(' ')
+    end
+  end
+
+  def self.clear!
+    FileUtils.rm_rf(RECORDER)
+  end
+
+  def self.has_created_app?(app_name)
+    File.open(RECORDER, 'r').read.include?("create #{app_name}")
+  end
+end

data/lib/suspenders/app_builder.rb

@@ -14,7 +14,11 @@ module Suspenders
       remove_file 'public/images/rails.png'
     end
 
-    def setup_staging
+    def raise_delivery_errors
+      replace_in_file "config/environments/development.rb", "raise_delivery_errors = false", "raise_delivery_errors = true"
+    end
+
+    def setup_staging_environment
       run "cp config/environments/production.rb config/environments/staging.rb"
     end
 
@@ -49,7 +53,7 @@ module Suspenders
     end
 
     def create_database
-      rake "db:create"
+      bundle_command('exec rake db:create')
     end
 
     def include_custom_gems
@@ -123,6 +127,22 @@ module Suspenders
       end
     end
 
+    def init_git
+      run "git init"
+      run "git add -A ."
+      run "git commit -m 'Initial commit - suspended project'"
+    end
+
+    def create_heroku_apps
+      path_additions = ''
+      if ENV['TESTING']
+        support_bin = File.expand_path(File.join('..', '..', '..', 'features', 'support', 'bin'))
+        path_addition = "PATH=#{support_bin}:$PATH"
+      end
+      run "#{path_addition} heroku create #{app_name}-production --remote=production --stack=cedar"
+      run "#{path_addition} heroku create #{app_name}-staging    --remote=staging    --stack=cedar"
+    end
+
     def copy_miscellaneous_files
       copy_file "errors.rb", "config/initializers/errors.rb"
       copy_file "time_formats.rb", "config/initializers/time_formats.rb"
@@ -143,6 +163,10 @@ module Suspenders
         :after => /include Clearance::User\n/
     end
 
+    def add_email_validator
+      copy_file "email_validator.rb", "app/validators/email_validator.rb"
+    end
+
     def include_clearance_matchers
       create_file "spec/support/clearance.rb", "require 'clearance/testing'"
     end
@@ -153,5 +177,9 @@ module Suspenders
       end
 
     end
+
+    def add_clearance_gem
+      insert_into_file("Gemfile", "\ngem 'clearance'", :after => /gem 'jquery-rails'/)
+    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -10,6 +10,12 @@ module Suspenders
     class_option :skip_test_unit, :type => :boolean, :aliases => "-T", :default => true,
                                   :desc => "Skip Test::Unit files"
 
+    class_option :heroku, :type => :boolean, :aliases => "-H", :default => false,
+                          :desc => "Create staging and production heroku apps"
+
+    class_option :clearance, :type => :boolean, :aliases => "-C", :default => true,
+                             :desc => "Add the clearance Rails authentication library"
+
     def finish_template
       invoke :suspenders_customization
       super
@@ -17,7 +23,8 @@ module Suspenders
 
     def suspenders_customization
       invoke :remove_files_we_dont_need
-      invoke :setup_staging
+      invoke :setup_development_environment
+      invoke :setup_staging_environment
       invoke :create_suspenders_views
       invoke :create_common_javascripts
       invoke :add_jquery_ui
@@ -25,11 +32,11 @@ module Suspenders
       invoke :customize_gemfile
       invoke :configure_app
       invoke :setup_stylesheets
-      invoke :setup_gitignore
       invoke :copy_miscellaneous_files
       invoke :setup_root_route
       invoke :set_active_record_whitelist_attributes
-      invoke :set_attr_accessibles_on_user
+      invoke :setup_git
+      invoke :create_heroku_apps
       invoke :outro
     end
 
@@ -38,9 +45,14 @@ module Suspenders
       build(:remove_public_images_rails)
     end
 
-    def setup_staging
+    def setup_development_environment
+      say "Setting up the development environment"
+      build(:raise_delivery_errors)
+    end
+
+    def setup_staging_environment
       say "Setting up the staging environment"
-      build(:setup_staging)
+      build(:setup_staging_environment)
     end
 
     def create_suspenders_views
@@ -71,6 +83,10 @@ module Suspenders
 
     def customize_gemfile
       build(:include_custom_gems)
+      if options[:clearance]
+        build(:add_clearance_gem)
+      end
+      bundle_command('install')
     end
 
     def configure_app
@@ -79,10 +95,20 @@ module Suspenders
       build(:configure_action_mailer)
       build(:generate_rspec)
       build(:generate_cucumber)
-      build(:generate_clearance)
       build(:install_factory_girl_steps)
-      build(:include_clearance_matchers)
+      build(:add_email_validator)
       build(:setup_default_rake_task)
+      build(:setup_clearance)
+    end
+
+    def setup_clearance
+      if options[:clearance]
+        build(:generate_clearance)
+        build(:include_clearance_matchers)
+        if using_active_record?
+          build(:set_attr_accessibles_on_user)
+        end
+      end
     end
 
     def setup_stylesheets
@@ -90,11 +116,27 @@ module Suspenders
       build(:setup_stylesheets)
     end
 
+    def setup_git
+      say "Initializing git and initial commit"
+      invoke :setup_gitignore
+      invoke :init_git
+    end
+
+    def create_heroku_apps
+      if options['heroku']
+        say "Creating heroku apps"
+        build(:create_heroku_apps)
+      end
+    end
+
     def setup_gitignore
-      say "Ignore the right files"
       build(:gitignore_files)
     end
 
+    def init_git
+      build(:init_git)
+    end
+
     def copy_miscellaneous_files
       say "Copying miscellaneous support files"
       build(:copy_miscellaneous_files)
@@ -112,19 +154,17 @@ module Suspenders
       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
       say "Congratulations! You just pulled our suspenders."
       say "Remember to run 'rails generate airbrake' with your API key."
     end
 
+    def run_bundle
+      # Let's not: We'll bundle manually at the right spot
+    end
+
     protected
+
     def get_builder_class
       Suspenders::AppBuilder
     end
@@ -132,8 +172,5 @@ module Suspenders
     def using_active_record?
       !options[:skip_active_record]
     end
-
   end
 end
-
-

data/lib/suspenders/version.rb

@@ -0,0 +1,3 @@
+module Suspenders
+  VERSION = '0.3.2'
+end

data/suspenders.gemspec

@@ -1,11 +1,14 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "suspenders/version"
 
-  s.name    = 'suspenders'
-  s.version = '0.3.1'
-  s.date    = '2011-10-28'
+Gem::Specification.new do |s|
+  s.name     = 'suspenders'
+  s.version  = Suspenders::VERSION
+  s.date     = Date.today.strftime('%Y-%m-%d')
+  s.authors  = ["thoughtbot"]
+  s.email    = 'support@thoughtbot.com'
+  s.homepage = 'http://github.com/thoughtbot/suspenders'
 
   s.summary     = "Generate a Rails app using thoughtbot's best practices."
   s.description = <<-HERE
@@ -14,51 +17,19 @@ thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
 rush to build something amazing; don't use it if you like missing deadlines.
   HERE
 
-  s.authors  = ["thoughtbot"]
-  s.email    = 'support@thoughtbot.com'
-  s.homepage = 'http://github.com/thoughtbot/suspenders'
-
-  s.executables = ["suspenders"]
-  s.default_executable = 'suspenders'
+  s.files = `git ls-files`.split("\n").
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency('rails', '3.1.1')
   s.add_dependency('bundler', '>= 1.0.7')
+
   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
-    bin/suspenders
-    features/rake_clean.feature
-    features/step_definitions/shell.rb
-    lib/suspenders/actions.rb
-    lib/suspenders/app_builder.rb
-    lib/suspenders/generators/app_generator.rb
-    suspenders.gemspec
-    templates/Gemfile_additions
-    templates/Procfile
-    templates/README_FOR_SUSPENDERS
-    templates/_flashes.html.erb
-    templates/_javascript.html.erb
-    templates/errors.rb
-    templates/factory_girl_steps.rb
-    templates/import_scss_styles
-    templates/javascripts/prefilled_input.js
-    templates/postgresql_database.yml.erb
-    templates/suspenders_gitignore
-    templates/suspenders_layout.html.erb.erb
-    templates/time_formats.rb
-  ]
-  # = MANIFEST =
-
-  s.test_files = s.files.select {|path| path =~ /^features/ }
 end

data/templates/Gemfile_additions

@@ -1,6 +1,5 @@
 gem 'thin'
 gem 'sass'
-gem 'clearance', '~> 0.13.0'
 gem 'high_voltage'
 gem 'paperclip'
 gem 'formtastic'

data/templates/email_validator.rb

@@ -0,0 +1,7 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+      record.errors[attribute] << (options[:message] || "is not an email")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161798380 !ruby/object:Gem::Requirement
+  requirement: &70184024161620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161798380
+  version_requirements: *70184024161620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161797800 !ruby/object:Gem::Requirement
+  requirement: &70184024160860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *2161797800
+  version_requirements: *70184024160860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2161797320 !ruby/object:Gem::Requirement
+  requirement: &70184024153740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2161797320
+  version_requirements: *70184024153740
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2161796760 !ruby/object:Gem::Requirement
+  requirement: &70184024152920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *2161796760
+  version_requirements: *70184024152920
 description: ! 'Suspenders is a base Rails project that you can upgrade. It is used
   by
 
@@ -78,17 +78,26 @@ files:
 - README.md
 - Rakefile
 - bin/suspenders
+- features/creating_a_heroku_app.feature
 - features/rake_clean.feature
-- features/step_definitions/shell.rb
+- features/skipping_clearance.feature
+- features/step_definitions/gem_steps.rb
+- features/step_definitions/heroku_steps.rb
+- features/step_definitions/shell_steps.rb
+- features/support/bin/heroku
+- features/support/env.rb
+- features/support/fake_heroku.rb
 - lib/suspenders/actions.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/version.rb
 - suspenders.gemspec
 - templates/Gemfile_additions
 - templates/Procfile
 - templates/README_FOR_SUSPENDERS
 - templates/_flashes.html.erb
 - templates/_javascript.html.erb
+- templates/email_validator.rb
 - templates/errors.rb
 - templates/factory_girl_steps.rb
 - templates/import_scss_styles
@@ -110,18 +119,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 804092796871748007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 804092796871748007
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files:
+- features/creating_a_heroku_app.feature
 - features/rake_clean.feature
-- features/step_definitions/shell.rb
+- features/skipping_clearance.feature
+- features/step_definitions/gem_steps.rb
+- features/step_definitions/heroku_steps.rb
+- features/step_definitions/shell_steps.rb
+- features/support/bin/heroku
+- features/support/env.rb
+- features/support/fake_heroku.rb