slining 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d9762ac323a494ce17c4118dcd30f012013c88
-  data.tar.gz: 8a2760aab2790ac14eb37db94da78df715067948
+  metadata.gz: dc138d39fcfc49e24940509e4567e4b614beceb8
+  data.tar.gz: 0158607016f6a98afd3715a0fc23665aff656695
 SHA512:
-  metadata.gz: d91d7677e8df1366d44e6d712346ca2cb08ab44ec27da873af7ec61d6b67736cf755afeb320b9da42f543eb934a146d1dc5ff7d9fcb43371bd72737359f4821d
-  data.tar.gz: 99707fa9618fae7608c7cf7d93055c7783d19264f50a5bd1f25065b4884b2dfaf362f1b82c6bc1e3d36b900536181c0ed244bf4ef4af4f8818b9afceb366fec9
+  metadata.gz: 4350f25712e0572315d82f98298fd8daffab9af7c967098bf854210e7e2e6dd91226096ba59c2f606f7cf4723c405919405c8bde171535916017de9cee2660d7
+  data.tar.gz: 3738f26a5bbbad076e0181b194dcede640ab8b4d3013d6d40b04543de39e8fafaa7cbb6b3739afe128f8f3fdedfea8759257a31f1e04cb45d78740d8ee8f709f

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/NEWS.md

@@ -1,3 +1,21 @@
+1.3.0 (December 27, 2015)
+* Ignored `.env.local` instead of `.env` [upstream-8739344046cfbca5b74dcb4d9aba3c6e9c805463]
+* Add lang attribute to html element in layout [upstream-644dc50bed9c1f520a821f38e8555164c1140bd8]
+* Set puma workers to 1 in .sample.env to play well with web-console and ember-cli-rails [upstream-79b83dbbd0959db0502ffbf603ac6ce5b1768517]
+* Generate .env instead of .sample.env [upstream-e308357a07a4d4631cd65af2c5348de8a32b7779]
+* Use `pry-byebug` instead of `byebug` [upstream-6508b6ad3c0640d87f701608a5cc6699988b5b9d]
+* Upgraded rspec-rails, Ruby, and Rails
+* Remove i18n-tasks [upstream-77d3310dd1d531a04aae4e4621fc55ff8168d7e5] [upstream-67c038a2d44b6a44b3a115aadcaedb564cf98dd0]
+* Remove database `host` key for Linux support
+
+[upstream-8739344046cfbca5b74dcb4d9aba3c6e9c805463]: https://github.com/thoughtbot/suspenders/commit/8739344046cfbca5b74dcb4d9aba3c6e9c805463
+[upstream-644dc50bed9c1f520a821f38e8555164c1140bd8]: https://github.com/thoughtbot/suspenders/commit/644dc50bed9c1f520a821f38e8555164c1140bd8
+[upstream-79b83dbbd0959db0502ffbf603ac6ce5b1768517]: https://github.com/thoughtbot/suspenders/commit/79b83dbbd0959db0502ffbf603ac6ce5b1768517
+[upstream-e308357a07a4d4631cd65af2c5348de8a32b7779]: https://github.com/thoughtbot/suspenders/commit/e308357a07a4d4631cd65af2c5348de8a32b7779
+[upstream-6508b6ad3c0640d87f701608a5cc6699988b5b9d]: https://github.com/thoughtbot/suspenders/commit/6508b6ad3c0640d87f701608a5cc6699988b5b9d
+[upstream-77d3310dd1d531a04aae4e4621fc55ff8168d7e5]: https://github.com/thoughtbot/suspenders/commit/77d3310dd1d531a04aae4e4621fc55ff8168d7e5
+[upstream-67c038a2d44b6a44b3a115aadcaedb564cf98dd0]: https://github.com/thoughtbot/suspenders/commit/67c038a2d44b6a44b3a115aadcaedb564cf98dd0
+
 1.2.0 (November 17, 2015)
 * Changed addon references for Heroku [upstream-1]
 * Upgraded to Ruby 2.2.3

data/lib/slining/adapters/heroku.rb

@@ -11,6 +11,7 @@ module Slining
           # Set up the staging and production apps.
           #{command_to_join_heroku_app('staging')}
           #{command_to_join_heroku_app('production')}
+          git config heroku.remote staging
         SHELL
 
         app_builder.append_file "bin/setup", remotes

data/lib/slining/app_builder.rb

@@ -263,11 +263,6 @@ end
       raise_on_missing_translations_in("test")
     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
       run 'rails g delayed_job:active_record'
     end
@@ -327,8 +322,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
     end
 
     def set_up_forego
-      copy_file 'sample.env', '.sample.env'
-      copy_file 'Procfile', 'Procfile'
+      copy_file "Procfile", "Procfile"
     end
 
     def setup_stylesheets

data/lib/slining/generators/app_generator.rb

@@ -103,7 +103,6 @@ module Slining
       build :configure_spec_support_features
       build :configure_ci
       build :configure_i18n_for_test_environment
-      build :configure_i18n_tasks
       build :configure_action_mailer_in_specs
       build :configure_capybara_webkit
     end

data/lib/slining/version.rb

@@ -1,5 +1,5 @@
 module Slining
-  RAILS_VERSION = "4.2.1"
+  RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/slining.gemspec

@@ -30,6 +30,6 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Slining::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'codeclimate-test-reporter'
 end

data/spec/features/heroku_spec.rb

@@ -26,6 +26,7 @@ RSpec.describe "Heroku" do
 
       expect(bin_setup).to include("heroku join --app #{app_name}-production")
       expect(bin_setup).to include("heroku join --app #{app_name}-staging")
+      expect(bin_setup).to include("git config heroku.remote staging")
       expect(File.stat(bin_setup_path)).to be_executable
 
       bin_deploy_path = "#{project_path}/bin/deploy"

data/spec/features/new_project_spec.rb

@@ -30,7 +30,9 @@ RSpec.describe "Slining a new project with default configuration" do
   end
 
   it "copies dotfiles" do
-    expect(File).to exist("#{project_path}/.ctags")
+    %w[.ctags .env].each do |dotfile|
+      expect(File).to exist("#{project_path}/#{dotfile}")
+    end
   end
 
   it "loads secret_key_base from env" do
@@ -98,14 +100,6 @@ RSpec.describe "Slining a new project with default configuration" do
     end
   end
 
-  it "adds specs for missing or unused translations" do
-    expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
-  end
-
-  it "configs i18n-tasks" do
-    expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
-  end
-
   it "evaluates en.yml.erb" do
     locales_en_file = IO.read("#{project_path}/config/locales/en.yml")
     app_name = SliningTestHelpers::APP_NAME
@@ -129,6 +123,12 @@ RSpec.describe "Slining a new project with default configuration" do
     expect(prod_env_file).not_to match(/"HOST"/)
   end
 
+  it "configures language in html element" do
+    layout_path = "/app/views/layouts/application.html.erb"
+    layout_file = IO.read("#{project_path}#{layout_path}")
+    expect(layout_file).to match(/<html lang="en">/)
+  end
+
   it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
     test_config = IO.read("#{project_path}/config/environments/test.rb")
@@ -157,18 +157,9 @@ RSpec.describe "Slining a new project with default configuration" do
   it "adds spring to binstubs" do
     expect(File).to exist("#{project_path}/bin/spring")
 
-    bin_stub_files = [
-      IO.read("#{project_path}/bin/rails"),
-      IO.read("#{project_path}/bin/rake"),
-      IO.read("#{project_path}/bin/rspec"),
-    ]
-
-    spring_line1 = /^ +spring_bin_path = File.expand_path\('\.\.\/spring', __FILE__\)$/
-    spring_line2 = /^ +load spring_bin_path$/
-
-    bin_stub_files.each do |file|
-      expect(file).to match(spring_line1)
-      expect(file).to match(spring_line2)
+    bin_stubs = %w(rake rails rspec)
+    bin_stubs.each do |bin_stub|
+      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match /spring/
     end
   end
 

data/templates/Gemfile.erb

@@ -35,12 +35,11 @@ group :development, :test do
   gem "awesome_print"
   gem "bullet"
   gem "bundler-audit", require: false
-  gem "byebug"
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "i18n-tasks"
+  gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.3.0"
+  gem "rspec-rails", "~> 3.4.0"
 end
 
 group :test do

data/templates/bin_setup.erb

@@ -10,11 +10,6 @@ set -e
 gem install bundler --conservative
 bundle check || bundle install
 
-# Set up configurable environment variables
-if [ ! -f .env ]; then
-  cp .sample.env .env
-fi
-
 # Set up database and add any development seed data
 bin/rake dev:prime
 

data/templates/circle.yml.erb

@@ -1,6 +1,3 @@
-checkout:
-  post:
-    - cp .sample.env .env
 database:
   override:
     - bin/setup

data/templates/{sample.env → dotfiles/.env}

@@ -8,3 +8,4 @@ SMTP_ADDRESS=smtp.example.com
 SMTP_DOMAIN=example.com
 SMTP_PASSWORD=password
 SMTP_USERNAME=username
+WEB_CONCURRENCY=1

data/templates/i18n.rb

@@ -1,3 +1,3 @@
 RSpec.configure do |config|
-  config.include AbstractController::Translation
+  config.include ActionView::Helpers::TranslationHelper
 end

data/templates/postgresql_database.yml.erb

@@ -2,7 +2,6 @@ development: &default
   adapter: postgresql
   database: <%= app_name %>_development
   encoding: utf8
-  host: localhost
   min_messages: warning
   pool: <%%= Integer(ENV.fetch("DB_POOL", 5)) %>
   reaping_frequency: <%%= Integer(ENV.fetch("DB_REAPING_FREQUENCY", 10)) %>

data/templates/slining_gitignore

@@ -3,7 +3,7 @@
 *.swo
 *.swp
 /.bundle
-/.env
+/.env.local
 /coverage/*
 /db/*.sqlite3
 /log/*

data/templates/slining_layout.html.erb.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="<%= I18n.locale %>">
 <head>
   <meta charset="utf-8" />
   <meta name="ROBOTS" content="NOODP" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slining
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - vaporware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,30 +28,30 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -122,12 +122,12 @@ files:
 - templates/bundler_audit.rake
 - templates/capybara_webkit.rb
 - templates/circle.yml.erb
-- templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
 - templates/dev.rake
 - templates/disable_xml_params.rb
 - templates/dotfiles/.ctags
+- templates/dotfiles/.env
 - templates/errors.rb
 - templates/factories.rb
 - templates/factory_girl_rspec.rb
@@ -139,7 +139,6 @@ files:
 - templates/postgresql_database.yml.erb
 - templates/puma.rb
 - templates/rails_helper.rb
-- templates/sample.env
 - templates/secrets.yml
 - templates/shoulda_matchers_config_rspec.rb
 - templates/slining_gitignore
@@ -160,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,8 +167,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using vaporware's best practices.
-test_files: []
+test_files:
+- spec/adapters/heroku_spec.rb
+- spec/fakes/bin/heroku
+- spec/fakes/bin/hub
+- spec/features/github_spec.rb
+- spec/features/heroku_spec.rb
+- spec/features/new_project_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_github.rb
+- spec/support/fake_heroku.rb
+- spec/support/slining.rb

data/templates/config_i18n_tasks.yml

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