suspenders 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27340b81e493ade21202e7a1b247dd548e61c453
-  data.tar.gz: 8cc95ce37937ae93471c04be89a1aac784bd91a0
+  metadata.gz: ca9b05977b2bd1059a7d8f10ddfc7c797cdb6e54
+  data.tar.gz: 0854bdf533abed015ced2096ff37d44cf7830e8a
 SHA512:
-  metadata.gz: 35f830ebbfdfa1bb83feb5f7a02aa13f540134efaee0e5226b277dedb1660a425f780e4c221a41e9453a387c28e587ced29daab641bc3d155b25054c943574a5
-  data.tar.gz: f4d537d591b6e01d3d4c2d015fd1128ca4f8369bf0116ca51b2ab06ed4724f4bd50fea6960af64ebca7d82f229ce49ab5fc7e1d2ec7c19e7de3783d3b8c312d1
+  metadata.gz: d5677d15f7c00172890b334718abdb2c9f09e9ec4c7415032684dab5f4bee688b94b1dd245a82f33417bff3a7e3c5089d7011c239fe516c322d9b70cdf15e455
+  data.tar.gz: 5a564a4598fe4baafcd7168c3a5d3ce868d054f12a64a2d0bee140b84d0675dac8f5e418272567aabf677e430664f418582218367fa1cb67abd94af5cd4f8399

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    suspenders (1.15.0)
-      bitters
+    suspenders (1.16.0)
+      bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.1.4)
 
@@ -68,7 +68,7 @@ GEM
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -108,7 +108,7 @@ GEM
     rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0)
-    sass (3.3.9)
+    sass (3.3.14)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -124,7 +124,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)

data/NEWS.md

@@ -1,3 +1,17 @@
+1.16.0 (August 16, 2014)
+
+* Use the 3.x series of RSpec.
+* Use the 0.10.x series of Bitters.
+* Improve documentation in generated README for machine setup via `bin/setup`
+  and https://github.com/thoughtbot/laptop script.
+* Remove Foreman from `Gemfile`.
+* Use i18n-tasks for missing or unused translations.
+* Raise on missing translations in development environment. Fail fast!
+* Prevent empty div when there are no flashes.
+* Pick random port when generating Rails app so multiple apps can be run via
+  Foreman on a development machine at the same time.
+* Add `normalize-rails` gem for resetting browser styles.
+
 1.15.0 (July 9, 2014)
 
 * Use Rails 4.1.4.

data/README.md

@@ -1,6 +1,7 @@
 # Suspenders [![Build Status](https://secure.travis-ci.org/thoughtbot/suspenders.png?branch=master)](http://travis-ci.org/thoughtbot/suspenders)
 
-Suspenders is the base Rails application used at [thoughtbot](http://thoughtbot.com/community).
+Suspenders is the base Rails application used at
+[thoughtbot](http://thoughtbot.com).
 
   ![Suspenders boy](http://media.tumblr.com/1TEAMALpseh5xzf0Jt6bcwSMo1_400.png)
 
@@ -17,9 +18,6 @@ Then run:
 
 This will create a Rails app in `projectname` using the latest version of Rails.
 
-By default this script creates a new git repository. See below if you
-want to use it against an existing repo.
-
 Gemfile
 -------
 
@@ -41,6 +39,7 @@ It includes application gems like:
 * [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 * [jQuery Rails](https://github.com/rails/jquery-rails) for jQuery
 * [Neat](https://github.com/thoughtbot/neat) for semantic grids
+* [Normalize](https://necolas.github.io/normalize.css/) for resetting browser styles
 * [Postgres](https://github.com/ged/ruby-pg) for access to the Postgres database
 * [Rack Timeout](https://github.com/kch/rack-timeout) to abort requests that are
   taking too long
@@ -177,7 +176,7 @@ Contributing
 
 To update Suspenders' Ruby version, change `.ruby-version` and `.travis.yml`.
 
-Please see CONTRIBUTING.md for further details.
+Please see [CONTRIBUTING.md](CONTRIBUTING.md) for further details.
 
 Credits
 -------

data/lib/suspenders/actions.rb

@@ -9,6 +9,10 @@ module Suspenders
       File.open(path, "w") { |file| file.write(contents) }
     end
 
+    def uncomment_in_file(path, uncommented)
+      replace_in_file(path, "# #{uncommented}", uncommented)
+    end
+
     def action_mailer_host(rails_env, host)
       host_config = "config.action_mailer.default_url_options = { host: '#{host}' }"
       configure_environment(rails_env, host_config)

data/lib/suspenders/app_builder.rb

@@ -15,7 +15,7 @@ module Suspenders
       action_on_unpermitted_parameters = <<-RUBY
 
   # Raise an ActionController::UnpermittedParameters exception when
-  # a parameter is not explcitly permitted but is passed anyway.
+  # a parameter is not explicitly permitted but is passed anyway.
   config.action_controller.action_on_unpermitted_parameters = :raise
       RUBY
       inject_into_file(
@@ -26,7 +26,7 @@ module Suspenders
     end
 
     def provide_setup_script
-      copy_file 'bin_setup', 'bin/setup'
+      template 'bin_setup.erb', 'bin/setup', port_number: port_number
       run 'chmod a+x bin/setup'
     end
 
@@ -183,8 +183,13 @@ end
       template 'travis.yml.erb', '.travis.yml'
     end
 
-    def configure_i18n_in_specs
-      copy_file 'i18n.rb', 'spec/support/i18n.rb'
+    def configure_i18n_for_development_environment
+      raise_on_missing_translations_in("development")
+    end
+
+    def configure_i18n_tasks
+      run "cp $(i18n-tasks gem-path)/templates/rspec/i18n_spec.rb spec/"
+      copy_file "config_i18n_tasks.yml", "config/i18n-tasks.yml"
     end
 
     def configure_background_jobs_for_rspec
@@ -214,7 +219,7 @@ end
     end
 
     def configure_action_mailer
-      action_mailer_host 'development', "#{app_name}.local"
+      action_mailer_host 'development', "localhost:#{port_number}"
       action_mailer_host 'test', 'www.example.com'
       action_mailer_host 'staging', "staging.#{app_name}.com"
       action_mailer_host 'production', "#{app_name}.com"
@@ -356,6 +361,12 @@ fi
 
     private
 
+    def raise_on_missing_translations_in(environment)
+      config = 'config.action_view.raise_on_missing_translations = true'
+
+      uncomment_in_file("config/environments/#{environment}.rb", config)
+    end
+
     def override_path_for_tests
       if ENV['TESTING']
         support_bin = File.expand_path(File.join('..', '..', 'spec', 'fakes', 'bin'))
@@ -370,5 +381,9 @@ fi
     def generate_secret
       SecureRandom.hex(64)
     end
+
+    def port_number
+      @port_number ||= [3000, 4000, 5000, 6000, 7000, 8000, 9000].sample
+    end
   end
 end

data/lib/suspenders/generators/app_generator.rb

@@ -71,6 +71,7 @@ module Suspenders
       build :provide_setup_script
       build :provide_dev_prime_task
       build :configure_generators
+      build :configure_i18n_for_development_environment
     end
 
     def setup_test_environment
@@ -82,7 +83,7 @@ module Suspenders
       build :enable_database_cleaner
       build :configure_spec_support_features
       build :configure_travis
-      build :configure_i18n_in_specs
+      build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
     end
 

data/lib/suspenders/version.rb

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

data/spec/features/new_project_spec.rb

@@ -62,6 +62,28 @@ feature 'Suspend a new project with default configuration' do
       to include(%{window.analytics.load("<%= ENV["SEGMENT_IO_KEY"] %>");})
   end
 
+  scenario "raises on missing translations in development" do
+    run_suspenders
+
+    environment_file =
+      IO.read("#{project_path}/config/environments/development.rb")
+    expect(environment_file).to match(
+      /^ +config.action_view.raise_on_missing_translations = true$/
+    )
+  end
+
+  scenario "specs for missing or unused translations" do
+    run_suspenders
+
+    expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
+  end
+
+  scenario "config file for i18n tasks" do
+    run_suspenders
+
+    expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/suspenders.gemspec

@@ -27,7 +27,7 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters'
+  s.add_dependency 'bitters', '~> 0.10.0'
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 

data/templates/Gemfile.erb

@@ -9,8 +9,10 @@ gem "delayed_job_active_record"
 gem "email_validator"
 gem "flutie"
 gem "high_voltage"
+gem "i18n-tasks"
 gem "jquery-rails"
 gem "neat", "~> 1.5.1"
+gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "rack-timeout"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
@@ -22,7 +24,6 @@ gem "uglifier"
 gem "unicorn"
 
 group :development do
-  gem "foreman"
   gem "spring"
   gem "spring-commands-rspec"
 end
@@ -33,7 +34,7 @@ group :development, :test do
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "pry-rails"
-  gem "rspec-rails", "~> 2.14.0"
+  gem "rspec-rails", "~> 3.0.0"
 end
 
 group :test do

data/templates/README.md.erb

@@ -4,15 +4,25 @@
 Getting Started
 ---------------
 
-This repository comes equipped with a self-setup script:
+After you have cloned this repo, run this setup script to set up your machine
+with the necessary dependencies to run and test this app:
 
     % ./bin/setup
 
+It assumes you have a machine equipped with Ruby, Postgres, etc. If not, set up
+your machine with [this script].
+
+[this script]: https://github.com/thoughtbot/laptop
+
 After setting up, you can run the application using [foreman]:
 
     % foreman start
 
-[foreman]: http://ddollar.github.io/foreman/
+If you don't have `foreman`, see [Foreman's install instructions][foreman]. It
+is [purposefully excluded from the project's `Gemfile`][exclude].
+
+[foreman]: https://github.com/ddollar/foreman
+[exclude]: https://github.com/ddollar/foreman/pull/437#issuecomment-41110407
 
 Guidelines
 ----------

data/templates/_flashes.html.erb

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

data/templates/{bin_setup → bin_setup.erb}

@@ -21,4 +21,10 @@ bundle exec rake dev:prime
 mkdir -p .git/safe
 
 # Pick a port for Foreman
-echo "port: 7000" > .foreman
+echo "port: <%= config[:port_number] %>" > .foreman
+
+# Print warning if Foreman is not installed
+if ! command -v foreman &>/dev/null; then
+  echo "foreman is not installed."
+  echo "See https://github.com/ddollar/foreman for install instructions."
+fi

data/templates/config_i18n_tasks.yml

@@ -0,0 +1,12 @@
+search:
+  paths:
+    - "app/controllers"
+    - "app/helpers"
+    - "app/presenters"
+    - "app/views"
+
+ignore_unused:
+  - activerecord.*
+  - date.*
+  - simple_form.*
+  - time.*

data/templates/development_seeds.rb

@@ -4,7 +4,6 @@ if Rails.env.development?
   namespace :dev do
     desc "Seed data for development environment"
     task prime: "db:setup" do
-      FactoryGirl.find_definitions
       include FactoryGirl::Syntax::Methods
 
       # create(:user, email: "user@example.com", password: "password")

data/templates/spec_helper.rb

@@ -10,6 +10,7 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |file| require file }
 
 module Features
   # Extend this module in spec/support/features/*.rb
+  include Formulaic::Dsl
 end
 
 RSpec.configure do |config|
@@ -18,10 +19,9 @@ RSpec.configure do |config|
   end
 
   config.include Features, type: :feature
-  config.include Formulaic::Dsl, type: :feature
   config.infer_base_class_for_anonymous_controllers = false
+  config.infer_spec_type_from_file_location!
   config.order = "random"
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.use_transactional_fixtures = false
 end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,6 @@ files:
 - spec/support/fake_heroku.rb
 - spec/support/suspenders.rb
 - suspenders.gemspec
-- templates/Brewfile
 - templates/Gemfile.erb
 - templates/Procfile
 - templates/README.md.erb
@@ -165,7 +164,8 @@ files:
 - templates/action_mailer.rb
 - templates/application.css.scss
 - templates/background_jobs_rspec.rb
-- templates/bin_setup
+- templates/bin_setup.erb
+- templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml
 - templates/database_cleaner_rspec.rb
 - templates/development_seeds.rb

data/templates/Brewfile

@@ -1,2 +0,0 @@
-install postgres --no-python
-install qt imagemagick