suspenders 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3d69233667fc34f1e795937ac85a02b7c5d6440
-  data.tar.gz: 23a405772fc9b1ae2d8e7fd5849161ace621bf44
+  metadata.gz: 5ed82bbed26013b10a8da6e00c1bbfd20ae852bd
+  data.tar.gz: dbbb9f4dd43bf2311392125b8739a4672b5e51b9
 SHA512:
-  metadata.gz: cb7312ccc78cc42ea226c3ac331ec0d5b4637db8fe82fab1075a903913dc8f547cec70ab4437f3496459b8dbce6e5c646e220537b1c9797ababe6b5538302088
-  data.tar.gz: 0b5d280d14550eac765f1a3b11e8a28b6054fb249d34f60054dce920698b5795dd0511da66506b0cc1a04d12dd85006f13939b5e1920c9ade8d10da9f88a576b
+  metadata.gz: a730d820d42a75b9e30825e3a8a6f429fd83bd0f89a39074117ec03f1bc7d6092235cb2feef9b9d114e7f61d9fd10b4536189df32c8aa9091f3cd249e63d2bd9
+  data.tar.gz: 2ef3565187f9ba9503679df275bfc4dc1323ce4ae29700750bd3c8ccb5451196e1a6799862f56603f1459e361778a484b1c3e3109e1a35a0627ce80aefef21c4

data/.gitignore

@@ -1,4 +1,4 @@
 *.gem
 *.swp
 /.bundle
-/tmp/dummy
+/tmp

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.3

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    suspenders (1.17.0)
+    suspenders (1.18.0)
       bitters (~> 0.10.0)
       bundler (~> 1.3)
       rails (= 4.1.6)
@@ -40,7 +40,7 @@ GEM
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bitters (0.10.0)
+    bitters (0.10.1)
       bourbon (>= 3.2)
       sass (>= 3.2)
       thor
@@ -106,16 +106,16 @@ GEM
     rspec-expectations (2.99.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.0)
-    sass (3.4.3)
+    sass (3.4.6)
     sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)

data/NEWS.md

@@ -1,3 +1,16 @@
+1.18.0 (October 23, 2014)
+
+* Use Ruby 2.1.3.
+* Move New Relic to all gem groups to more easily
+  [debug Rails performance in development][debug-performance].
+* Make `bin/setup` idempotent, failing fast with install messages.
+* Fix unevaluated app name in generated `en.yml` locale file.
+* Change `File.exists?` to `File.exist?` to fix Ruby warning.
+* Don't include port 6000 as an option for Foreman; Chome considers it unsafe.
+* Git ignore the entire /tmp directory.
+
+[debug-performance]: https://upcase.com/improving-rails-performance
+
 1.17.0 (September 30, 2014)
 
 * Use Rails 4.1.6.

data/README.md

@@ -39,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
+* [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
 * [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
@@ -51,12 +52,6 @@ It includes application gems like:
   translations
 * [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
 
-And gems only for staging and production like:
-
-* [New Relic RPM](https://github.com/newrelic/rpm) for monitoring performance
-* [Rails 12 Factor](https://github.com/heroku/rails_12factor) to make running
-  Rails 4 apps easier on Heroku
-
 And development gems like:
 
 * [Dotenv](https://github.com/bkeepers/dotenv) for loading environment variables
@@ -122,6 +117,8 @@ This:
 * Sets them as `staging` and `production` Git remotes
 * Configures staging with `RACK_ENV` and `RAILS_ENV` environment variables set
   to `staging`
+* Adds the [Rails 12 Factor](https://github.com/heroku/rails_12factor) gem
+  to make running Rails 4 apps easier on Heroku
 
 Git
 ---

data/lib/suspenders/actions.rb

@@ -9,10 +9,6 @@ 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

@@ -212,8 +212,8 @@ end
     end
 
     def configure_time_formats
-      remove_file 'config/locales/en.yml'
-      copy_file 'config_locales_en.yml', 'config/locales/en.yml'
+      remove_file "config/locales/en.yml"
+      template "config_locales_en.yml.erb", "config/locales/en.yml"
     end
 
     def configure_rack_timeout
@@ -289,11 +289,7 @@ end
     def set_heroku_remotes
       remotes = <<-SHELL
 
-# Set up staging and production git remotes.
-git remote add staging git@heroku.com:#{app_name}-staging.git || true
-git remote add production git@heroku.com:#{app_name}-production.git || true
-
-# Join the staging and production apps.
+# Set up the staging and production apps.
 #{join_heroku_app('staging')}
 #{join_heroku_app('production')}
       SHELL
@@ -305,9 +301,10 @@ git remote add production git@heroku.com:#{app_name}-production.git || true
       heroku_app_name = "#{app_name}-#{environment}"
       <<-SHELL
 if heroku join --app #{heroku_app_name} &> /dev/null; then
-  echo 'You are a collaborator on the "#{heroku_app_name}" Heroku app'
+  git remote add #{environment} git@heroku.com:#{heroku_app_name}.git || true
+  printf 'You are a collaborator on the "#{heroku_app_name}" Heroku app\n'
 else
-  echo 'Ask for access to the "#{heroku_app_name}" Heroku app'
+  printf 'Ask for access to the "#{heroku_app_name}" Heroku app\n'
 fi
       SHELL
     end
@@ -366,7 +363,7 @@ fi
     def raise_on_missing_translations_in(environment)
       config = 'config.action_view.raise_on_missing_translations = true'
 
-      uncomment_in_file("config/environments/#{environment}.rb", config)
+      uncomment_lines("config/environments/#{environment}.rb", config)
     end
 
     def override_path_for_tests
@@ -385,7 +382,7 @@ fi
     end
 
     def port_number
-      @port_number ||= [3000, 4000, 5000, 6000, 7000, 8000, 9000].sample
+      @port_number ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
     end
   end
 end

data/lib/suspenders/version.rb

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

data/spec/features/new_project_spec.rb

@@ -102,6 +102,15 @@ feature 'Suspend a new project with default configuration' do
     expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
   end
 
+  scenario "generated en.yml is evaluated" do
+    run_suspenders
+
+    locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
+    app_name = SuspendersTestHelpers::APP_NAME
+
+    expect(locales_en_file).to match(/application: #{app_name.humanize}/)
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/support/suspenders.rb

@@ -20,7 +20,7 @@ module SuspendersTestHelpers
   end
 
   def drop_dummy_database
-    if File.exists?(project_path)
+    if File.exist?(project_path)
       Dir.chdir(project_path) do
         Bundler.with_clean_env do
           `rake db:drop`

data/templates/Gemfile.erb

@@ -12,6 +12,7 @@ gem "high_voltage"
 gem "i18n-tasks"
 gem "jquery-rails"
 gem "neat", "~> 1.5.1"
+gem "newrelic_rpm", ">= 3.7.3"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
 gem "rack-timeout"
@@ -48,5 +49,4 @@ group :test do
 end
 
 group :staging, :production do
-  gem "newrelic_rpm", ">= 3.7.3"
 end

data/templates/bin_setup.erb

@@ -7,6 +7,10 @@
 set -e
 
 # Set up Ruby dependencies via Bundler
+if ! command -v bundle > /dev/null; then
+  gem install bundler --no-document
+fi
+
 bundle install
 
 # Set up configurable environment variables
@@ -21,10 +25,13 @@ bundle exec rake dev:prime
 mkdir -p .git/safe
 
 # Pick a port for Foreman
-echo "port: <%= config[:port_number] %>" > .foreman
+if ! grep -qs 'port' .foreman; then
+  printf 'port: <%= config[:port_number] %>\n' >> .foreman
+fi
 
-# Print warning if Foreman is not installed
+# Error out 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."
+  printf 'Foreman is not installed.\n'
+  printf 'See https://github.com/ddollar/foreman for install instructions.\n'
+  exit 1
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -166,7 +166,7 @@ files:
 - templates/background_jobs_rspec.rb
 - templates/bin_setup.erb
 - templates/config_i18n_tasks.yml
-- templates/config_locales_en.yml
+- templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/development_seeds.rb
 - templates/disable_xml_params.rb
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.1.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.