welaika-suspenders 2.29.0 → 2.30.0

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'bundler/setup'
+require 'pry-byebug'
+require 'awesome_print'
 
 Bundler.require(:default, :test)
 
@@ -8,6 +10,7 @@ Dir['./spec/support/**/*.rb'].each { |file| require file }
 
 RSpec.configure do |config|
   config.include SuspendersTestHelpers
+  config.include ProjectFiles
 
   config.example_status_persistence_file_path = 'tmp/rspec_examples.txt'
 

data/spec/support/be_executable_matcher.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :be_executable do
+  match do |filename|
+    File.stat(File.join(project_path, filename)).executable?
+  end
+end

data/spec/support/generators.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.before(:each, type: :generator) do
+    remove_project_directory
+  end
+end

data/spec/support/project_files.rb

@@ -0,0 +1,13 @@
+module ProjectFiles
+  def touch(filename)
+    path = File.join(project_path, filename)
+    dirname = File.dirname(path)
+    FileUtils.mkdir_p(dirname)
+    FileUtils.touch(path)
+  end
+
+  def rm(filename)
+    path = File.join(project_path, filename)
+    FileUtils.rm_rf(path)
+  end
+end

data/suspenders.gemspec

@@ -29,4 +29,6 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.8'
+  s.add_development_dependency 'pry-byebug', '~> 3.6'
+  s.add_development_dependency 'awesome_print', '~> 1.8'
 end

data/templates/Gemfile.erb

@@ -10,20 +10,18 @@ end
 ruby '<%= Suspenders::RUBY_VERSION %>'
 
 gem 'active_interaction', '~> 3.6'
-gem 'autoprefixer-rails'
+gem 'bootsnap', '>= 1.1.0', require: false
 gem 'coffee-rails', '~> 4.2'
 gem 'email_validator'
-gem 'flutie'
 gem 'pg', '>= 0.18', '< 2.0'
 gem 'puma', '~> 3.11'
 gem 'rack-canonical-host'
 gem 'rails', '<%= Suspenders::RAILS_VERSION %>'
 gem 'rails-i18n'
 gem 'recipient_interceptor'
-gem 'sass-rails', '~> 5.0'
+gem 'sassc-rails'
 gem 'title'
 gem 'uglifier', '>= 1.3.0'
-gem 'bootsnap', '>= 1.1.0', require: false
 <% if options[:webpack] %>
 gem 'webpacker'
 <% end %>
@@ -49,4 +47,4 @@ group :test do
   gem 'webmock'
 end
 
-gem 'welaika-suspenders', '~> <%= Suspenders::VERSION %>', group: %i[development test]
+gem 'welaika-suspenders', group: %i[development test]

data/templates/_flashes.html.slim

@@ -1,4 +1,4 @@
 - if flash.any?
   .flashes
     - user_facing_flashes.each do |key, value|
-      div(class="flash-#{key}")= value
+      div(class="flash-#{key}") = value

data/templates/factory_bot_rspec.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+#
+FactoryBot.use_parent_strategy = true
 
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods

data/templates/gitlab-ci.yml.erb

@@ -13,8 +13,10 @@ variables:
   - postgres:<%= Suspenders::POSTGRES_VERSION %>
   - selenium/standalone-chrome:latest
 
-.cache: &gems-cache-settings
-  key: "gems-$CI_COMMIT_REF_SLUG"
+.cache: &cache-settings
+  key: "$CI_COMMIT_REF_SLUG"
+  untracked: true
+  policy: pull
   paths:
     - vendor/bundle
 
@@ -26,15 +28,15 @@ stages:
 prepare:
   stage: setup
   cache:
-    <<: *gems-cache-settings
+    <<: *cache-settings
+    policy: pull-push
   script:
     - bundle install --retry 3 --deployment --jobs $(nproc)
 
 quality:rubocop:
   stage: quality
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     - bundle check --path vendor/bundle
     - bundle exec rubocop
@@ -42,8 +44,7 @@ quality:rubocop:
 quality:slim_lint:
   stage: quality
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     - bundle check --path vendor/bundle
     - bundle exec slim-lint app/views/
@@ -51,8 +52,7 @@ quality:slim_lint:
 quality:bundler-audit:
   stage: quality
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     - bundle check --path vendor/bundle
     - bundle exec bundle-audit check --update
@@ -60,8 +60,7 @@ quality:bundler-audit:
 quality:brakeman:
   stage: quality
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     - bundle check --path vendor/bundle
     - bundle exec brakeman -z --skip-files vendor/bundle
@@ -69,8 +68,7 @@ quality:brakeman:
 quality:rubycritic:
   stage: quality
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     - bundle check --path vendor/bundle
     - bundle exec rubycritic app/ config/ lib/ --no-browser --minimum-score 94 --format console
@@ -79,12 +77,11 @@ test:rspec:
   stage: test
   services: *rails-services
   cache:
-    <<: *gems-cache-settings
-    policy: pull
+    <<: *cache-settings
   script:
     # Install node
     - curl -sL https://deb.nodesource.com/setup_10.x | bash -
-    - apt-get update -qq && apt-get install -qq nodejs
+    - apt-get install -qq nodejs
 
     # Install yarn
     - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -

data/templates/overcommit.yml

@@ -11,4 +11,4 @@ PreCommit:
   SlimLint:
     enabled: true
     on_warn: fail # Treat all warnings as failures
-    command: ['bundle', 'exec', 'slim-lint', 'app/views/'] # Invoke within Bundler context
+    command: ['bundle', 'exec', 'slim-lint'] # Invoke within Bundler context

data/templates/suspenders_gitignore

@@ -5,6 +5,9 @@
 .byebug_history
 /.bundle
 /.env.local
+/.env.development.local
+/.env.test.local
+/.env.production.local
 /coverage/*
 /db/*.sqlite3
 /db/*.sqlite3-journal

data/templates/suspenders_layout.html.slim

@@ -2,18 +2,17 @@ doctype html
 html lang=I18n.locale
   head
     meta charset="utf-8"
-    meta name="ROBOTS" content="NOODP"
     meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"
 
     / Configure default and controller-, and view-specific titles in
       config/locales/en.yml. For more see:
       https://github.com/calebthompson/title#usage
 
-    title= title
+    title = title
     = stylesheet_link_tag :application, media: 'all'
     = csrf_meta_tags
     = csp_meta_tag
-  body class=body_class
+  body
     = render 'flashes'
     = yield
     = render 'javascript'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.30.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: 'weLaika''s fork of the famous thoughbot suspenders gem.
 
 '
@@ -72,18 +100,23 @@ files:
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/generators/base.rb
 - lib/suspenders/generators/ci_generator.rb
 - lib/suspenders/generators/db_optimizations_generator.rb
 - lib/suspenders/generators/decorator_generator.rb
 - lib/suspenders/generators/factories_generator.rb
 - lib/suspenders/generators/faker_generator.rb
 - lib/suspenders/generators/js_driver_generator.rb
+- lib/suspenders/generators/json_generator.rb
 - lib/suspenders/generators/lint_generator.rb
+- lib/suspenders/generators/production/deployment_generator.rb
 - lib/suspenders/generators/production/email_generator.rb
 - lib/suspenders/generators/production/error_reporting_generator.rb
 - lib/suspenders/generators/production/force_tls_generator.rb
+- lib/suspenders/generators/production/manifest_generator.rb
 - lib/suspenders/generators/production/timeout_generator.rb
 - lib/suspenders/generators/security_generator.rb
+- lib/suspenders/generators/staging/pull_requests_generator.rb
 - lib/suspenders/generators/static_generator.rb
 - lib/suspenders/generators/stylesheet_base_generator.rb
 - lib/suspenders/generators/testing_generator.rb
@@ -95,13 +128,20 @@ files:
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
+- spec/features/production/deployment_spec.rb
 - spec/features/production/email_spec.rb
+- spec/features/production/manifest_spec.rb
+- spec/features/staging/pull_requests_spec.rb
 - spec/spec_helper.rb
+- spec/support/be_executable_matcher.rb
 - spec/support/contain_json_matcher.rb
 - spec/support/exist_as_a_file_matcher.rb
 - spec/support/fake_heroku.rb
+- spec/support/generators.rb
 - spec/support/match_contents_matcher.rb
+- spec/support/project_files.rb
 - spec/support/suspenders.rb
 - suspenders.gemspec
 - templates/Gemfile.erb
@@ -111,12 +151,10 @@ files:
 - templates/_flashes.html.slim
 - templates/_javascript.html.slim
 - templates/action_mailer.rb
-- templates/app.json.erb
 - templates/application.sass
 - templates/bin_deploy
 - templates/bin_setup
 - templates/bin_setup_review_app.erb
-- templates/browserslist
 - templates/chromedriver.rb
 - templates/config_locales_it.yml.erb
 - templates/database.gitlab.yml
@@ -166,15 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: 2.6.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.7.4
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.
@@ -184,11 +221,18 @@ test_files:
 - spec/features/api_spec.rb
 - spec/features/cli_help_spec.rb
 - spec/features/heroku_spec.rb
+- spec/features/json_spec.rb
 - spec/features/new_project_spec.rb
+- spec/features/production/deployment_spec.rb
 - spec/features/production/email_spec.rb
+- spec/features/production/manifest_spec.rb
+- spec/features/staging/pull_requests_spec.rb
 - spec/spec_helper.rb
+- spec/support/be_executable_matcher.rb
 - spec/support/contain_json_matcher.rb
 - spec/support/exist_as_a_file_matcher.rb
 - spec/support/fake_heroku.rb
+- spec/support/generators.rb
 - spec/support/match_contents_matcher.rb
+- spec/support/project_files.rb
 - spec/support/suspenders.rb

data/templates/app.json.erb

@@ -1,27 +0,0 @@
-{
-  "name":"<%= app_name.dasherize %>",
-  "scripts":{},
-  "env":{
-    "APPLICATION_HOST":{
-      "required":true
-    },
-    "EMAIL_RECIPIENTS":{
-      "required":true
-    },
-    "HEROKU_APP_NAME": {
-      "required":true
-    },
-    "HEROKU_PARENT_APP_NAME": {
-      "required":true
-    },
-    "RACK_ENV":{
-      "required":true
-    },
-    "SECRET_KEY_BASE":{
-      "generator":"secret"
-    }
-  },
-  "addons":[
-    "heroku-postgresql"
-  ]
-}

data/templates/browserslist

@@ -1,3 +0,0 @@
-Last 2 versions
-Explorer >= 11
-Android >= 4.4