da-suspenders 1.0.3 → 1.1.0

data/.gitignore

@@ -1,4 +1,5 @@
-*.swp
-pkg
-test_project
-.rake_tasks
+*.swp
+pkg
+test_project
+.rake_tasks
+.DS_Store

data/CHANGELOG.md

@@ -1,31 +1,40 @@
-## 1.0.3 (2011-06-10)
-
-### Fixed
- * Explicit dependency on Rails 3.0.7 in gemspec.
-
-
-## 1.0.2 (2011-06-10)
-
-### New / Changed
- * Additional entries in Gemfile (all commented out by default): Devise, CanCan, CarrierWave, RMagick.
- * Localized labels for will_paginate.
- * Updated gems: Rails (3.0.7), Compass (0.11.1), Formtastic (1.2.3).
- * Explicit dependency on rake 0.8.7 (to avoid problems with rake 0.9.x).
- 
-### Fixed
- * Fixed missing version requirement for will_paginate.
-
-
-## 1.0.1 (2011-02-16)
-
-### New / Changed
- * Timestamped migrations are now disabled per default.
- * Inject code into `features/support/paths.rb` (generated by Cucumber) to enable literal paths like `/foo/bar/2` in web steps.
- 
-### Fixed
- * Fixed link to the internet explorer stylesheet (generated by Sass) in `app/views/layouts/application.html.erb`.
- * Fixed deprecation warnings because of <% %> style block helpers.
-
-
-## 1.0.0 (2011-02-14)
+## 1.1.0 (2011-10-12)
+
+### New / Changed
+ * Updated to use Rails 3.1.1:
+ ** Removed sprockets and jrails (no longer needed)
+ * ie6.css and ie7.css instead of only one common ie.css (inspired by Formtastic)
+ * Switched from Hoptoad Notifier to Airbrake.
+ * Pass in REPO to specify the da-suspenders repo (defaults to local dir for testing).
+
+## 1.0.3 (2011-06-10)
+
+### Fixed
+ * Explicit dependency on Rails 3.0.7 in gemspec.
+
+
+## 1.0.2 (2011-06-10)
+
+### New / Changed
+ * Additional entries in Gemfile (all commented out by default): Devise, CanCan, CarrierWave, RMagick.
+ * Localized labels for will_paginate.
+ * Updated gems: Rails (3.0.7), Compass (0.11.1), Formtastic (1.2.3).
+ * Explicit dependency on rake 0.8.7 (to avoid problems with rake 0.9.x).
+ 
+### Fixed
+ * Fixed missing version requirement for will_paginate.
+
+
+## 1.0.1 (2011-02-16)
+
+### New / Changed
+ * Timestamped migrations are now disabled per default.
+ * Inject code into `features/support/paths.rb` (generated by Cucumber) to enable literal paths like `/foo/bar/2` in web steps.
+ 
+### Fixed
+ * Fixed link to the internet explorer stylesheet (generated by Sass) in `app/views/layouts/application.html.erb`.
+ * Fixed deprecation warnings because of <% %> style block helpers.
+
+
+## 1.0.0 (2011-02-14)
  * Initial Release

data/LICENSE

@@ -1,21 +1,21 @@
-The MIT License
-
-Copyright (c) 2010 Mike Burns
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License
+
+Copyright (c) 2010 Mike Burns
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,66 +1,64 @@
-DA-Suspenders is a base Rails application that you can upgrade.
-
-This is a fork of [thoughtbot's original Suspenders](https://github.com/thoughtbot/suspenders/), customized to our needs.
-
-
-## Installation
-
-First install the da-suspenders gem:
-
-    gem install da-suspenders
-
-Then run:
-
-    da-suspenders create projectname
-
-This will create a Rails 3 app in `projectname'. This script creates a 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) 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 DA-Suspenders'
-[template/trout/Gemfile](https://github.com/die-antwort/da-suspenders/blob/master/template/trout/Gemfile), which will be copied into your projectname/Gemfile.
-
-It includes application gems like:
-
-* [Compass](https://github.com/chriseppstein/compass), a [Sass-based](http://sass-lang.com/) CSS Meta-Framework
-* [Sprockets](https://github.com/sstephenson/sprockets) for JavaScript dependency management and concatenation
-* [will_paginate](https://github.com/mislav/will_paginate/wiki/) for easy pagination
-* Our fork of [jRails](https://github.com/die-antwort/jrails), which brings you [jQuery](https://github.com/jquery/jquery) and [jQuery UI](https://github.com/jquery/jquery-ui) via Sprockets
-* [Paperclip](https://github.com/thoughtbot/paperclip) or [CarrierWave](https://github.com/jnicklas/carrierwave) for file uploads
-* [Formtastic](https://github.com/justinfrench/formtastic) for better forms
-* [Devise](https://github.com/plataformatec/devise) and [CanCan](https://github.com/ryanb/cancan) for authentication and authorization
-* [AppConfig](https://github.com/die-antwort/app_config) for simple application configuration
-* [Hoptoad Notifier](https://github.com/thoughtbot/hoptoad_notifier) for exception notification
-
-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
-* [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
-* [Timecop](https://github.com/jtrupiano/timecop) for dealing with time
-
-Some gems are commented out by default in the Gemfile – just uncomment the ones you want to use.
-
-
-
-## Other goodies
-
-DA-Suspenders also comes with:
-
-* Additional staging environment.
-* German localization and timezone setting.
-* Rails' flashes set up and in application layout.
-
-See [template/files](https://github.com/die-antwort/da-suspenders/blob/master/template/trout) to see what is installed via Trout.
-
-
-## Credits
-
-DA-Suspenders is created by [DIE ANTWORT](http://www.die-antwort.eu), based on Suspenders created and funded by [thoughtbot, inc](http://thoughtbot.com/community).
+DA-Suspenders is a base Rails application that you can upgrade.
+
+This is a fork of [thoughtbot's original Suspenders](https://github.com/thoughtbot/suspenders/), customized to our needs.
+
+
+## Installation
+
+First install the da-suspenders gem:
+
+    gem install da-suspenders
+
+Then run:
+
+    da-suspenders create projectname
+
+This will create a Rails 3 app in `projectname'. This script creates a 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) 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 DA-Suspenders'
+[template/trout/Gemfile](https://github.com/die-antwort/da-suspenders/blob/master/template/trout/Gemfile), which will be copied into your projectname/Gemfile.
+
+It includes application gems like:
+
+* [Compass](https://github.com/chriseppstein/compass), a [Sass-based](http://sass-lang.com/) CSS Meta-Framework
+* [will_paginate](https://github.com/mislav/will_paginate/wiki/) for easy pagination
+* [Paperclip](https://github.com/thoughtbot/paperclip) or [CarrierWave](https://github.com/jnicklas/carrierwave) for file uploads
+* [Formtastic](https://github.com/justinfrench/formtastic) for better forms
+* [Devise](https://github.com/plataformatec/devise) and [CanCan](https://github.com/ryanb/cancan) for authentication and authorization
+* [AppConfig](https://github.com/die-antwort/app_config) for simple application configuration
+* [Airbrake](https://github.com/thoughtbot/airbrake) for exception notification
+
+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
+* [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
+* [Timecop](https://github.com/jtrupiano/timecop) for dealing with time
+
+Some gems are commented out by default in the Gemfile – just uncomment the ones you want to use.
+
+
+
+## Other goodies
+
+DA-Suspenders also comes with:
+
+* Additional staging environment.
+* German localization and timezone setting.
+* Rails' flashes set up and in application layout.
+
+See [template/files](https://github.com/die-antwort/da-suspenders/blob/master/template/trout) to see what is installed via Trout.
+
+
+## Credits
+
+DA-Suspenders is created by [DIE ANTWORT](http://www.die-antwort.eu), based on Suspenders created and funded by [thoughtbot, inc](http://thoughtbot.com/community).

data/Rakefile

@@ -1,40 +1,41 @@
-require "bundler"
-require "cucumber/rake/task"
-
-Bundler::GemHelper.install_tasks
-
-#############################################################################
-#
-# Testing functions
-#
-#############################################################################
-
-Cucumber::Rake::Task.new
-
-TEST_PROJECT = "test_project"
-
-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.'
-  task :generate do
-    FileUtils.rm_rf(TEST_PROJECT)
-    sh 'ruby', 'bin/da-suspenders', 'create', TEST_PROJECT, ENV['REPO'].to_s
-  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']
-
+require "bundler"
+require "cucumber/rake/task"
+
+Bundler::GemHelper.install_tasks
+
+#############################################################################
+#
+# Testing functions
+#
+#############################################################################
+
+Cucumber::Rake::Task.new
+
+TEST_PROJECT = "test_project"
+
+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'] || "file://#{Dir.pwd}").to_s
+    sh 'ruby', 'bin/da-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']
+

data/bin/da-suspenders

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

data/da-suspenders.gemspec

@@ -1,26 +1,26 @@
-require File.expand_path("../lib/da-suspenders/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = 'da-suspenders'
-  s.version     = DaSuspenders::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["thoughtbot", "Stefan Daschek"]
-  s.email       = 'stefan@die-antwort.eu'
-  s.homepage    = 'http://github.com/die-antwort/da-suspenders'
-  s.summary     = "Generate a Rails app using DIE ANTWORT's best practices."
-  s.description = "DIE ANTWORT's fork of thoughtbot's original Suspenders. Suspenders is an upgradeable base Rails project."
-
-  s.required_rubygems_version = ">= 1.3.6"
-
-  s.add_dependency('rails', '3.0.7')
-  s.add_dependency('bundler', '~> 1.0.10')
-  s.add_dependency('trout', '~> 0.3')
-
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.test_files   = s.files.select{ |path| path =~ /^features/ }
-  s.require_path = 'lib'
-
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md LICENSE]
-end
+require File.expand_path("../lib/da-suspenders/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = 'da-suspenders'
+  s.version     = DaSuspenders::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["thoughtbot", "Stefan Daschek"]
+  s.email       = 'stefan@die-antwort.eu'
+  s.homepage    = 'http://github.com/die-antwort/da-suspenders'
+  s.summary     = "Generate a Rails app using DIE ANTWORT's best practices."
+  s.description = "DIE ANTWORT's fork of thoughtbot's original Suspenders. Suspenders is an upgradeable base Rails project."
+
+  s.required_rubygems_version = ">= 1.3.6"
+
+  s.add_dependency('rails', '3.0.7')
+  s.add_dependency('bundler', '~> 1.0.10')
+  s.add_dependency('trout', '~> 0.3')
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.test_files   = s.files.select{ |path| path =~ /^features/ }
+  s.require_path = 'lib'
+
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = %w[README.md LICENSE]
+end

data/features/running_cucumber.feature

@@ -1,18 +1,18 @@
-Feature: Running cucumber in the generated project
-  
-  Scenario: jQuery and Modernizr work in the generated project
-    Given I drop and create the required databases
-    And I generate "scaffold user username:string"
-    And I run the rake task "db:migrate"
-    And I create a file named "features/js_test.feature" with:
-      """
-      Feature: Javascript
-        @javascript
-        Scenario: Test jQuery and Modernizr
-          When I go to "the users page"
-          Then the javascript expression "$('html').hasClass('js')" should return "true"
-          And the javascript expression "$('html').hasClass('no-js')" should return "false"
-      """
-    When I run the rake task "cucumber"
-    Then I see a successful response in the shell
+Feature: Running cucumber in the generated project
+  
+  Scenario: jQuery and Modernizr work in the generated project
+    Given I drop and create the required databases
+    And I generate "scaffold user username:string"
+    And I run the rake task "db:migrate"
+    And I create a file named "features/js_test.feature" with:
+      """
+      Feature: Javascript
+        @javascript
+        Scenario: Test jQuery and Modernizr
+          When I go to "the users page"
+          Then the javascript expression "$('html').hasClass('js')" should return "true"
+          And the javascript expression "$('html').hasClass('no-js')" should return "false"
+      """
+    When I run the rake task "cucumber"
+    Then I see a successful response in the shell
   

data/features/step_definitions/shell.rb

@@ -1,30 +1,30 @@
-When 'I run the rake task "$task_name"' do |task_name|
-  Dir.chdir('test_project') do
-    system("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}")
-  end
-end
-
-When 'I create a file named "$filename" with:' do |filename, content|
-  File.open("test_project/#{filename}", "w") do |file|
-    file.write(content)
-  end
-end
-
-Then 'I see a successful response in the shell' do
-  $?.to_i.should == 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")
-  end
-end
+When 'I run the rake task "$task_name"' do |task_name|
+  Dir.chdir('test_project') do
+    system("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}")
+  end
+end
+
+When 'I create a file named "$filename" with:' do |filename, content|
+  File.open("test_project/#{filename}", "w") do |file|
+    file.write(content)
+  end
+end
+
+Then 'I see a successful response in the shell' do
+  $?.to_i.should == 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")
+  end
+end