suspenders 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ae0ed5179635c5fa49f27586042a26a82a02e1
-  data.tar.gz: ed728df580f72a76f0f5a686481f3c37df9cb491
+  metadata.gz: 882af1bdc2849fffc3eaf89406d2de93e41f1350
+  data.tar.gz: f0b38ba8288c17fc6fea2af7e6c92958bbb69687
 SHA512:
-  metadata.gz: 35be178ed3056e2f25af279292ef5b62bb5998e101acc9e657ce67b95c3cd8751a4a3d47dc16775048f28fc9d72a9dc7c22ef81a480e9d1de8f9546628ebaedb
-  data.tar.gz: 57cafa13f02ee9a92fc10e7c52b4ead9565564c0021ddabad67b9e8b7dc56daec65cf4f20adf5825ec183c980c9f3319493ca801261aff294563f2cc1c93ea5e
+  metadata.gz: 0635d62cb601a1e58e9fd0924c795daea57aaabf928e420a522551e415a0ad3e1c72ffb420fae93fff0c3ed6a26f307750e0ec1252866c806806f514f43aba82
+  data.tar.gz: 8837be9363862c3ec9e93380275308ce01ecb8573bda06e5de1deb89f887d15278125b04f0af38a830ff8f9601bf4537ee9921e6bc060beabc304a034758b6af

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.2

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.1.2
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    suspenders (1.13.0)
+    suspenders (1.14.0)
+      bitters
       bundler (~> 1.3)
-      rails (~> 4.1.0)
+      rails (= 4.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -35,32 +36,36 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    aruba (0.5.3)
+    aruba (0.5.4)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    builder (3.1.4)
-    capybara (2.2.0)
+    bitters (0.10.0)
+      bourbon (>= 3.2)
+      sass (>= 3.2)
+      thor
+    bourbon (4.0.2)
+      sass (~> 3.3)
+      thor
+    builder (3.2.2)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.9)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.3)
+    cucumber (1.3.15)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12.0)
-      multi_json (~> 1.7.5)
-      multi_test (~> 0.0.1)
-    diff-lcs (1.2.4)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    ffi (1.9.0)
-    ffi (1.9.0-x86-mingw32)
-    gherkin (2.12.0)
-      multi_json (~> 1.3)
-    gherkin (2.12.0-x86-mingw32)
+    ffi (1.9.3)
+    gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
     i18n (0.6.9)
@@ -69,15 +74,13 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mini_portile (0.6.0)
     minitest (5.3.4)
-    multi_json (1.7.9)
-    multi_test (0.0.1)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    nokogiri (1.6.1-x86-mingw32)
-      mini_portile (~> 0.5.0)
-    polyglot (0.3.4)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    polyglot (0.3.5)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -97,14 +100,15 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.0)
+    rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.99.0)
+    sass (3.3.8)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -120,18 +124,17 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
-  aruba (~> 0.5.2)
-  capybara
+  aruba (~> 0.5)
+  capybara (~> 2.2, >= 2.2.0)
   cucumber (~> 1.2)
-  rspec
+  rspec (~> 2.0)
   suspenders!

data/NEWS.md

@@ -1,3 +1,11 @@
+1.14.0 (June 11, 2014)
+
+* Set up Bitters during Suspenders setup. http://bitters.bourbon.io/
+* Remove SimpleCov.
+* Force Suspenders to use a particular Rails version (4.1.1).
+* Use RSpec 2.x until Travis/Capybara issues resolve.
+* Set `viewport` to `initial-scale=1`.
+
 1.13.0 (May 29, 2014)
 
 * Remove `FactoryGirl.lint` in `before(:suite)` in order to avoid paying and

data/README.md

@@ -31,6 +31,7 @@ It includes application gems like:
 
 * [Airbrake](https://github.com/airbrake/airbrake) for exception notification
 * [Bourbon](https://github.com/thoughtbot/bourbon) for Sass mixins
+* [Bitters](https://github.com/thoughtbot/bitters) for scaffold application styles
 * [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
   processing
 * [Email Validator](https://github.com/balexand/email_validator) for email

data/lib/suspenders/app_builder.rb

@@ -247,6 +247,10 @@ end
         'app/assets/stylesheets/application.css.scss'
     end
 
+    def install_bitters
+      run "bitters install --path app/assets/stylesheets"
+    end
+
     def gitignore_files
       remove_file '.gitignore'
       copy_file 'suspenders_gitignore', '.gitignore'
@@ -325,6 +329,7 @@ fi
       meta_tags =<<-EOS
   <meta charset='utf-8' />
   <meta name='ROBOTS' content='NOODP' />
+  <meta name='viewport' content='initial-scale=1' />
       EOS
 
       %w(500 404 422).each do |page|

data/lib/suspenders/generators/app_generator.rb

@@ -31,6 +31,7 @@ module Suspenders
       invoke :setup_coffeescript
       invoke :configure_app
       invoke :setup_stylesheets
+      invoke :install_bitters
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
@@ -134,6 +135,11 @@ module Suspenders
       build :setup_stylesheets
     end
 
+    def install_bitters
+      say 'Install Bitters'
+      build :install_bitters
+    end
+
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'

data/lib/suspenders/version.rb

@@ -1,4 +1,5 @@
 module Suspenders
+  RAILS_VERSION = '4.1.1'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.13.0'
+  VERSION = '1.14.0'
 end

data/suspenders.gemspec

@@ -4,11 +4,7 @@ require 'suspenders/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.required_ruby_version = "~> #{Suspenders::RUBY_VERSION}"
-  s.add_dependency 'bundler', '~> 1.3'
-  s.add_dependency 'rails', '~> 4.1.0'
-  s.add_development_dependency 'aruba', '~> 0.5.2'
-  s.add_development_dependency 'cucumber', '~> 1.2'
+  s.required_ruby_version = ">= #{Suspenders::RUBY_VERSION}"
   s.authors = ['thoughtbot']
   s.date = Date.today.strftime('%Y-%m-%d')
 
@@ -30,6 +26,13 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.summary = "Generate a Rails app using thoughtbot's best practices."
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'capybara'
+
+  s.add_dependency 'bitters'
+  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'rails', Suspenders::RAILS_VERSION
+
+  s.add_development_dependency 'aruba', '~> 0.5'
+  s.add_development_dependency 'cucumber', '~> 1.2'
+  s.add_development_dependency 'rspec', '~> 2.0'
+  s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
 end

data/templates/Gemfile.erb

@@ -13,7 +13,7 @@ gem 'jquery-rails'
 gem 'neat', '~> 1.5.1'
 gem 'pg'
 gem 'rack-timeout'
-gem 'rails', '~> 4.1.0'
+gem 'rails', '<%= Suspenders::RAILS_VERSION %>'
 gem 'recipient_interceptor'
 gem 'sass-rails', '~> 4.0.3'
 gem 'simple_form'
@@ -32,7 +32,7 @@ group :development, :test do
   gem 'dotenv-rails'
   gem 'factory_girl_rails'
   gem 'pry-rails'
-  gem 'rspec-rails', '>= 2.14'
+  gem 'rspec-rails', '~> 2.14.0'
 end
 
 group :test do
@@ -41,7 +41,6 @@ group :test do
   gem 'formulaic'
   gem 'launchy'
   gem 'shoulda-matchers', require: false
-  gem 'simplecov', require: false
   gem 'timecop'
   gem 'webmock'
 end

data/templates/application.css.scss

@@ -1,8 +1,6 @@
 @charset 'utf-8';
 
-///////////////////////////////////////////////////////////////////////////////
-
 @import 'bourbon';
+@import 'base/grid-settings';
 @import 'neat';
-
-///////////////////////////////////////////////////////////////////////////////
+@import 'base/base';

data/templates/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'simplecov'
-SimpleCov.start 'rails'
-
 ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../../config/environment', __FILE__)

data/templates/suspenders_layout.html.erb.erb

@@ -3,6 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />
+  <meta name="viewport" content="initial-scale=1" />
   <title><%%= title %></title>
   <%%= stylesheet_link_tag :application, :media => 'all' %>
   <%%= csrf_meta_tags %>

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bitters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -28,30 +42,30 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +84,36 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.0
 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
@@ -176,9 +196,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.1
+      version: 2.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="