da-suspenders 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.1 (2012-06-14)
+ * Update to Rails 3.2.6
+ * Now works with Ruby 1.9 (added encoding comments where necessary)
+ * Use bootstrap-sass instead of anjlab-bootstrap-rails
+ * Use da-js ~> 0.1.0 
+ 
 ## 1.3.0 (2012-04-01)
  * Use twitter bootstrap instead of jQuery UI.
  * Update compass-rails to ~> 1.0. 

data/README.md

@@ -39,7 +39,7 @@ To see the latest and greatest gems, look at DA-Suspenders'
 
 It includes application gems like:
 
-* [bootstrap-rails](https://github.com/anjlab/bootstrap-rails), bringing [Twitter Bootstrap](http://twitter.github.com/bootstrap/) to the Rails asset pipeline.
+* [bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass), bringing [Twitter Bootstrap](http://twitter.github.com/bootstrap/) to the Rails asset pipeline.
 * [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

data/da-suspenders.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency('rails', '3.2.2')
+  s.add_dependency('rails', '3.2.6')
   s.add_dependency('bundler', '>= 1.0.10')
   s.add_dependency('trout', '~> 0.3')
 

data/features/running_cucumber.feature

@@ -37,7 +37,7 @@ Feature: Running cucumber in the generated project
       end
 
       Then /^it should contain bootstrap$/ do
-        page.should have_content "Bootstrap v2"
+        page.should have_content "/bootstrap-sass-2."
       end
       """
     When I run the rake task "cucumber"

data/lib/da-suspenders/version.rb

@@ -1,3 +1,3 @@
 module DaSuspenders
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/template/trout/Gemfile

@@ -1,28 +1,27 @@
-source :rubygems
+source 'https://rubygems.org'
+
+gem "rails", "3.2.6"
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem "rails", "3.2.2"
-gem "json"
-gem "jquery-rails"
 gem "mysql2"
 
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+  
   gem 'uglifier', '>= 1.0.3'
   gem 'compass-rails', '~> 1.0'
 end
 
-gem "trout", :git => "git://github.com/die-antwort/trout.git"
-gem "app_config", :git => "git://github.com/die-antwort/app_config.git"
-gem "simple_form"
-gem "airbrake"
-gem "will_paginate", "~> 3.0"
-gem 'anjlab-bootstrap-rails', '~> 2.0', :require => 'bootstrap-rails'
-gem "da-js"
-
-# Optional gems (from Rails 3.2 default Gemfile):
+gem "jquery-rails"
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
@@ -30,16 +29,24 @@ gem "da-js"
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'
 
-# Use unicorn as the web server
+# Use unicorn as the app server
 # gem 'unicorn'
 
 # Deploy with Capistrano
 # gem 'capistrano'
 
 # To use debugger
-# gem 'ruby-debug'
+# gem 'debugger'
 
 
+gem "trout", :git => "git://github.com/die-antwort/trout.git"
+gem "app_config", :git => "git://github.com/die-antwort/app_config.git"
+gem "simple_form"
+gem "airbrake"
+gem "will_paginate", "~> 3.0"
+gem "bootstrap-sass", "~> 2.0.3"
+gem "da-js", "~> 0.1.0"
+
 # More optional gems that we use quite often
 
 # gem "paperclip"

data/template/trout/app/assets/stylesheets/application.css.scss

@@ -1,8 +1,7 @@
-//= require bootstrap
-//
 //= require_self
 //= require_tree .
 
+@import 'bootstrap';
 @import 'compass/utilities';
 @import 'compass/css3';
 

data/template/trout/lib/templates/rails/scaffold_controller/controller.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   def index

metadata

@@ -1,124 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: da-suspenders
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - thoughtbot
 - Stefan Daschek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70165356037060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
-        version: 3.2.2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70165356037060
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70165356036340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: trout
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70165356036340
+- !ruby/object:Gem::Dependency
+  name: trout
+  requirement: &70165356035620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70165356035620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70165356035160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70165356035160
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70165356034780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70165356034780
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &70165356016020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: DIE ANTWORT's fork of thoughtbot's original Suspenders. Suspenders is an upgradeable base Rails project.
+  prerelease: false
+  version_requirements: *70165356016020
+description: DIE ANTWORT's fork of thoughtbot's original Suspenders. Suspenders is
+  an upgradeable base Rails project.
 email: stefan@die-antwort.eu
-executables: 
+executables:
 - da-suspenders
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -153,40 +122,30 @@ files:
 - template/trout/vendor/assets/javascripts/modernizr.js
 homepage: http://github.com/die-antwort/da-suspenders
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Generate a Rails app using DIE ANTWORT's best practices.
-test_files: 
+test_files:
 - features/running_cucumber.feature
 - features/step_definitions/shell.rb
 - features/support/env.rb