da-suspenders 1.2.2 → 1.2.3

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 test_project
 .rake_tasks
 .DS_Store
+Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.3 (2012-02-10)
+ * Updated Modernizr to v2.5.2.
+ * Added our fork of "trout" to the Gemfile.
+ * Use compass-rails gem (pre-release) instead of requiring it directly from Github. 
+ 
 ## 1.2.2 (2012-02-07)
  * Added "Aristo" theme for jQuery UI (via the jquery-rails-aristo gem).
  * Added "da-js" JavaScript library.

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in da-js.gemspec
+gemspec

data/README.md

@@ -23,12 +23,14 @@ If you want to create an app using [Mongoid](http://mongoid.org/) pass the `--wi
 
 ### Trout
 
-Suspenders uses [Trout](https://github.com/thoughtbot/trout) to make it easier to maintain a base version of special files (like Gemfile) in Suspenders.
+DA-Suspenders uses [Trout](https://github.com/die-antwort/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 DA-Suspenders' Gemfile, run:
-
-    trout update Gemfile
+Whenever you want to get the latest and greatest files from DA-Suspenders’, run:
 
+    trout update-all
+    
+You can use `trout list` to check which files are tracked by Trout, and `trout update FILENAME` if you want to update just a single file only.     
+    
 
 ## Gemfile
 

data/Rakefile

@@ -20,7 +20,7 @@ end
 
 namespace :test_project do
   desc 'Suspend a new project. Pass WITH_MONGOID=1 to use mongoid. Pass REPO=... to change the Suspenders repo (defaults to dir with Rakefile).'
-  task :generate do
+  task :generate => :clean_env do
     FileUtils.rm_rf(TEST_PROJECT)
     repo = (ENV['REPO'] || "file://#{Dir.pwd}").to_s
     with_mongoid = ENV["WITH_MONGOID"] ? "--with-mongoid" : ""
@@ -28,10 +28,9 @@ namespace :test_project do
   end
 
   desc 'Remove a suspended project'
-  task :destroy do
+  task :destroy => :clean_env do
     FileUtils.cd TEST_PROJECT
-    sh "rake db:drop RAILS_ENV=development"
-    sh "rake db:drop RAILS_ENV=test"
+    sh "bundle exec rake db:drop"
     FileUtils.cd '..'
     FileUtils.rm_rf TEST_PROJECT
   end
@@ -40,3 +39,8 @@ end
 desc 'Run the test suite'
 task :default => ['test:full']
 
+task :clean_env do
+  # Make sure to have a non-bundled ENV for generating the test project, even when running via "bundle exec rake ..."
+  ENV["RUBYOPT"] = nil
+  ENV["BUNDLE_GEMFILE"] = nil
+end

data/da-suspenders.gemspec

@@ -16,6 +16,10 @@ Gem::Specification.new do |s|
   s.add_dependency('bundler', '~> 1.0.10')
   s.add_dependency('trout', '~> 0.3')
 
+  s.add_development_dependency('rake', '~> 0.9.2')
+  s.add_development_dependency('cucumber')
+  s.add_development_dependency('rspec-expectations')
+  
   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/ }

data/features/running_cucumber.feature

@@ -1,5 +1,8 @@
 Feature: Running cucumber in the generated project
   
+  Background:
+    Given I have a clean environment 
+    
   Scenario: The generated project works correctly
     Given I drop and create the required databases
     And I generate "scaffold user username:string"

data/features/step_definitions/shell.rb

@@ -1,6 +1,12 @@
+Given 'I have a clean environment' do
+  # Make sure to have a non-bundled ENV, even when running via "bundle exec cucumber ..."
+  ENV["RUBYOPT"] = nil
+  ENV["BUNDLE_GEMFILE"] = nil
+end
+
 When 'I run the rake task "$task_name"' do |task_name|
   Dir.chdir('test_project') do
-    system("rake #{task_name}")
+    system("bundle exec rake #{task_name}")
   end
 end
 
@@ -22,9 +28,7 @@ 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")
+    system("bundle exec rake db:drop")
+    system("bundle exec rake db:create")
   end
 end

data/lib/da-suspenders/version.rb

@@ -1,3 +1,3 @@
 module DaSuspenders
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/template/trout/Gemfile

@@ -11,10 +11,10 @@ group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => 'no_rails_integration'
-  gem 'compass-rails', :git => 'git://github.com/Compass/compass-rails.git'
+  gem 'compass-rails', '~> 1.0.0.rc.2'
 end
 
+gem "trout", :git => "git://github.com/die-antwort/trout.git"
 gem "app_config", :git => "git://github.com/die-antwort/app_config.git"
 gem "formtastic", ">= 2.1.0.beta1"
 gem "airbrake"

data/template/trout/config/initializers/errors.rb

@@ -1,4 +1,6 @@
 require 'net/smtp'
+require 'net/http'
+
 # Example:
 #   begin
 #     some http call

data/template/trout/vendor/assets/javascripts/modernizr.js

@@ -1,5 +1,5 @@
 /*!
- * Modernizr v2.5.1
+ * Modernizr v2.5.2
  * www.modernizr.com
  *
  * Copyright (c) Faruk Ates, Paul Irish, Alex Sexton
@@ -24,7 +24,7 @@
 
 window.Modernizr = (function( window, document, undefined ) {
 
-    var version = '2.5.1',
+    var version = '2.5.2',
 
     Modernizr = {},
     
@@ -76,6 +76,8 @@ window.Modernizr = (function( window, document, undefined ) {
 
     classes = [],
 
+    slice = classes.slice,
+
     featureName, // used in testing loop
 
 
@@ -110,7 +112,9 @@ window.Modernizr = (function( window, document, undefined ) {
       // Opera will act all quirky when injecting elements in documentElement when page is served as xml, needs fakebody too. #270
       fakeBody.innerHTML += style;
       fakeBody.appendChild(div);
-      docElement.appendChild(fakeBody);
+      if(!body){
+          docElement.appendChild(fakeBody);
+      }
 
       ret = callback(div, rule);
       // If this is done after page load we don't want to remove the body so check if body exists
@@ -205,6 +209,7 @@ window.Modernizr = (function( window, document, undefined ) {
     // http://es5.github.com/#x15.3.4.5
 
     if (!Function.prototype.bind) {
+      
       Function.prototype.bind = function bind(that) {
         
         var target = this;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: da-suspenders
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - thoughtbot
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -65,6 +65,50 @@ dependencies:
         version: "0.3"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec-expectations
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: DIE ANTWORT's fork of thoughtbot's original Suspenders. Suspenders is an upgradeable base Rails project.
 email: stefan@die-antwort.eu
 executables: 
@@ -77,6 +121,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile