suspenders 0.2.5 → 0.2.6

data/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+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: `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
+a test!
+
+4. Make the test pass.
+
+5. Push to your fork and submit a pull request.
+
+
+At this point you're waiting on us. We like to at least comment on, if not
+accept, pull requests within three business days (and, typically, one business
+day). We may suggest some changes or improvements or alternatives.
+
+Some things that will increase the chance that your pull request is accepted,
+taken straight from the Ruby on Rails guide:
+
+* Use Rails idioms and helpers
+* Include tests that fail without your code, and pass with it
+* Update the documentation, the surrounding one, examples elsewhere, guides,
+  whatever is affected by your contribution
+
+Syntax:
+
+* Two spaces, no tabs.
+* No trailing whitespace. Blank lines should not have any space.
+* Prefer &&/|| over and/or.
+* my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+* 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!

data/README.md

@@ -41,10 +41,10 @@ It includes application gems like:
 
 And testing gems like:
 
-* [Cucumber, Capybara, and Akephalos](http://robots.thoughtbot.com/post/1658763359/thoughtbot-and-the-holy-grail) for integration testing, including Javascript behavior
+* [Cucumber, Capybara, and Capybara Webkit](http://robots.thoughtbot.com/post/4583605733/capybara-webkit) for integration testing, including Javascript behavior
 * [RSpec](https://github.com/rspec/rspec) for awesome, readable isolation testing
 * [Factory Girl](https://github.com/thoughtbot/factory_girl) for easier creation of test data
-* [Shoulda](http://github.com/thoughtbot/shoulda) for frequently needed Rails and RSpec matchers
+* [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
 
@@ -65,6 +65,11 @@ Issues
 
 If you have problems, please create a [Github issue](https://github.com/thoughtbot/suspenders/issues).
 
+Contributing
+------------
+
+Please see CONTRIBUTING.md for details.
+
 Credits
 -------
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'cucumber/rake/task'
 require 'date'
 
 TEST_PROJECT = 'test_project'
-SUSPENDERS_GEM_VERSION = '0.2.5'
+SUSPENDERS_GEM_VERSION = '0.2.6'
 
 #############################################################################
 #
@@ -20,10 +20,11 @@ namespace :test do
 end
 
 namespace :test_project do
-  desc 'Suspend a new project. Pass REPO=... to change the Suspenders repo.'
+  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)
-    sh './bin/suspenders', 'create', TEST_PROJECT, ENV['REPO'].to_s
+    repo = (ENV['REPO'].to_s || "file://#{Dir.pwd}").to_s
+    sh "./bin/suspenders", 'create', TEST_PROJECT, repo
   end
 
   desc 'Remove a suspended project'

data/bin/suspenders

@@ -12,7 +12,7 @@ end
 case ARGV[0]
 when 'create', '--create'
   begin
-    Suspenders::Create.run!(ARGV[1])
+    Suspenders::Create.run!(ARGV[1], ARGV[2])
   rescue Suspenders::InvalidInput => e
     error_with_message(e.message)
   end

data/lib/create.rb

@@ -5,26 +5,33 @@ require File.expand_path(File.dirname(__FILE__) + "/errors")
 
 module Suspenders
   class Create
-    attr_accessor :project_path
+    attr_accessor :project_path, :repo
 
-    def self.run!(project_path)
-      creator = self.new(project_path)
+    def self.run!(project_path, repo)
+      creator = self.new(project_path, repo)
       creator.create_project!
     end
 
-    def initialize(project_path)
+    def initialize(project_path, repo)
       self.project_path = project_path
       validate_project_path
       validate_project_name
+      self.repo = repo if present?(repo)
     end
 
     def create_project!
-      exec(<<-COMMAND)
-        rails new #{project_path} \
+      command = <<-COMMAND
+        rails #{rails_version} new #{project_path} \
           --template=#{template} \
           --skip-test-unit \
           --skip-prototype
       COMMAND
+      command_with_repo = if repo
+                            "REPO='#{repo}' #{command}"
+                          else
+                            command
+                          end
+      exec(command_with_repo)
     end
 
     private
@@ -50,5 +57,23 @@ module Suspenders
     def template
       File.expand_path(File.dirname(__FILE__) + "/../template/suspenders.rb")
     end
+
+    def gemfile
+      File.expand_path(File.dirname(__FILE__) + "/../template/trout/Gemfile")
+    end
+
+    def rails_version
+      gemfile_contents = File.read(gemfile)
+      gemfile_contents =~ /gem "rails", "(.*)"/
+      if $1.nil? || $1 == ''
+        ''
+      else
+        "_#{$1}_"
+      end
+    end
+
+    def present?(string)
+      string && string != ''
+    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.2.5'
-  s.date    = '2011-06-01'
+  s.version = '0.2.6'
+  s.date    = '2011-07-26'
 
   s.summary     = "Generate a Rails app using thoughtbot's best practices."
   s.description = <<-HERE
@@ -16,7 +16,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
 
   s.authors  = ["thoughtbot"]
   s.email    = 'support@thoughtbot.com'
-  s.homepage = 'http://github.com/thoughtbot/suspenders-gem'
+  s.homepage = 'http://github.com/thoughtbot/suspenders'
 
   s.executables = ["suspenders"]
   s.default_executable = 'suspenders'
@@ -24,19 +24,20 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency('rails', '3.0.7')
+  s.add_dependency('rails', '3.0.9')
   s.add_dependency('bundler', '>= 1.0.7')
   s.add_dependency('trout', '>= 0.3.0')
+  s.add_development_dependency('cucumber', '~> 1.0.2')
 
   # = MANIFEST =
   s.files = %w[
+    CONTRIBUTING.md
     LICENSE
     README.md
     Rakefile
     bin/suspenders
     features/rake_clean.feature
     features/step_definitions/shell.rb
-    features/support/env.rb
     lib/create.rb
     lib/errors.rb
     suspenders.gemspec
@@ -44,9 +45,10 @@ rush to build something amazing; don't use it if you like missing deadlines.
     template/files/_flashes.html.erb
     template/files/_javascript.html.erb
     template/files/body_class_helper.rb
+    template/files/cucumber_assertions_hack
     template/files/errors.rb
     template/files/factory_girl_steps.rb
-    template/files/mysql_database.yml.erb
+    template/files/postgresql_database.yml.erb
     template/files/suspenders_gitignore
     template/files/suspenders_layout.html.erb.erb
     template/files/time_formats.rb

data/template/files/_flashes.html.erb

@@ -1,5 +1,5 @@
 <div id="flash">
   <% flash.each do |key, value| -%>
-    <div id="flash_<%= key %>"><%=h value %></div>
+    <div id="flash_<%= key %>"><%= value %></div>
   <% end -%>
 </div>

data/template/files/cucumber_assertions_hack

@@ -0,0 +1,4 @@
+if RUBY_VERSION =~ /1.8/
+  require 'test/unit/testresult'
+  Test::Unit.run = true
+end

data/template/files/{mysql_database.yml.erb → postgresql_database.yml.erb}

@@ -1,12 +1,10 @@
 development: &default
-  adapter: mysql
+  adapter: postgresql
   database: <%= app_name %>_development
-  username: root
-  password:
-  host: localhost
-  encoding: utf8
+  pool: 5
+  timeout: 5000
 
 test: &TEST
   <<: *default
   database: <%= app_name %>_test
-
+  min_messages: warning

data/template/files/suspenders_gitignore

@@ -7,4 +7,3 @@ rerun.txt
 tags
 !.keep
 vendor/bundler_gems
-.rvmrc

data/template/suspenders.rb

@@ -43,7 +43,11 @@ def download_file(uri_string, destination)
 end
 
 def origin
-  "git://github.com/thoughtbot/suspenders.git"
+  if ENV['REPO'].present?
+    ENV['REPO']
+  else
+    "git://github.com/thoughtbot/suspenders.git"
+  end
 end
 
 def trout(destination_path)
@@ -85,9 +89,9 @@ copy_file "README_FOR_SUSPENDERS", "doc/README_FOR_SUSPENDERS"
 
 say "Get ready for bundler... (this will take a while)"
 
-say "Let's use MySQL"
+say "Let's use PostgreSQL"
 
-template "mysql_database.yml.erb", "config/database.yml", :force => true
+template "postgresql_database.yml.erb", "config/database.yml", :force => true
 rake "db:create"
 
 say "Setting up plugins"
@@ -118,7 +122,7 @@ replace_in_file "spec/spec_helper.rb", "mock_with :rspec", "mock_with :mocha"
 
 inject_into_file "features/support/env.rb",
                  %{Capybara.save_and_open_page_path = 'tmp'\n} +
-                 %{Capybara.javascript_driver = :akephalos\n},
+                 %{Capybara.javascript_driver = :webkit\n},
                  :before => %{Capybara.default_selector = :css}
 
 rake "flutie:install"
@@ -126,6 +130,7 @@ rake "flutie:install"
 say "Ignore the right files"
 
 concat_file "suspenders_gitignore", ".gitignore"
+concat_file "cucumber_assertions_hack", "features/support/env.rb"
 
 ["app/models",
  "app/views/pages",
@@ -139,7 +144,7 @@ concat_file "suspenders_gitignore", ".gitignore"
  "spec/controllers",
  "spec/helpers",
  "spec/support/matchers",
- "spec/support/helpers",
+ "spec/support/mixins",
  "spec/support/shared_examples"].each do |dir|
   empty_directory_with_gitkeep dir
 end

data/template/trout/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "rails", "~> 3.0.7"
+gem "rails", "3.0.9"
 gem "rack"
 gem "clearance", "~> 0.11.1"
 gem "sass"
@@ -10,18 +10,17 @@ gem "RedCloth", :require => "redcloth"
 gem "paperclip"
 gem "validation_reflection"
 gem "formtastic"
-gem "mysql"
+gem "pg"
 gem "flutie", "~> 1.1.8"
 gem "dynamic_form"
 gem "jquery-rails"
-gem "rake", "0.8.7"
+gem "rake", "0.9.2"
 
 # RSpec needs to be in :development group to expose generators
 # and rake tasks without having to type RAILS_ENV=test.
 group :development, :test do
   gem "rspec-rails", "~> 2.6.1"
   gem "ruby-debug",   :platforms => :mri_18
-  gem "ruby-debug19", :platforms => :mri_19
 end
 
 group :test do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: suspenders
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - thoughtbot
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-07-26 00:00:00 -04:00
+default_executable: suspenders
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -25,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 21
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 9
+        version: 3.0.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -65,6 +66,22 @@ dependencies:
         version: 0.3.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :development
+  version_requirements: *id004
 description: |
   Suspenders is a base Rails project that you can upgrade. It is used by
   thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
@@ -79,13 +96,13 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files: 
+- CONTRIBUTING.md
 - LICENSE
 - README.md
 - Rakefile
 - bin/suspenders
 - features/rake_clean.feature
 - features/step_definitions/shell.rb
-- features/support/env.rb
 - lib/create.rb
 - lib/errors.rb
 - suspenders.gemspec
@@ -93,16 +110,18 @@ files:
 - template/files/_flashes.html.erb
 - template/files/_javascript.html.erb
 - template/files/body_class_helper.rb
+- template/files/cucumber_assertions_hack
 - template/files/errors.rb
 - template/files/factory_girl_steps.rb
-- template/files/mysql_database.yml.erb
+- template/files/postgresql_database.yml.erb
 - template/files/suspenders_gitignore
 - template/files/suspenders_layout.html.erb.erb
 - template/files/time_formats.rb
 - template/suspenders.rb
 - template/trout/Gemfile
 - template/trout/public/javascripts/prefilled_input.js
-homepage: http://github.com/thoughtbot/suspenders-gem
+has_rdoc: true
+homepage: http://github.com/thoughtbot/suspenders
 licenses: []
 
 post_install_message: 
@@ -131,11 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Generate a Rails app using thoughtbot's best practices.
 test_files: 
 - features/rake_clean.feature
 - features/step_definitions/shell.rb
-- features/support/env.rb

data/features/support/env.rb

@@ -1 +0,0 @@
-require 'spec/expectations'