suspenders 1.45.0 → 1.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 253fc6f3c173bce9e7858831161cf75924094222
-  data.tar.gz: 947de81dd1fc955c04f13ea1260e4391b505b0f2
+SHA256:
+  metadata.gz: 5e456d8de3863b0f24364c29696229e699488cbe187aca31ee6abde4ed512e5a
+  data.tar.gz: d06e8ae58fff1ab88ec50db76194af8da542ff9485eb73af0014f1e7bf87efc1
 SHA512:
-  metadata.gz: 003c8627d76eaad3f8a51f404608dc1cd66ee35dbaba8b45cf6f5ef0e9a06fc4fe7f826f9f387a51118d2670df7499a46b83a7441541e21f5a0b691a08a0e063
-  data.tar.gz: 3a08ab29152033941e6a1b2baba20743d2992ab9872e590e7815007cadcbba37514700cc6f9deaed72f02408458a21d1ed020f15c1e060e16250bd7da01a5553
+  metadata.gz: b4a3ab9fdf134a6d2504c2c9110471df7252c545da046897c91504333f4c0dff88b486bda56f554d6cd8cec66ab2fdca732434afe51dc1952c211bc9b564db57
+  data.tar.gz: 46cdb956f84eb6fed1fcbd9e095974d4ffac51a65093debe0a73d80bee19e7d441bc7cd815a75c942d325c7c06d9c975b4efc0dbf7e03ab29ac64c012dc4e03a

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.0

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
-rvm: 2.4.1
+rvm: 2.5.0
 cache: bundler
 sudo: false
 before_install:
   - "echo '--colour' > ~/.rspec"
   - git config --global user.name 'Travis CI'
   - git config --global user.email 'travis-ci@example.com'
+  - gem update --system
 install: bundle install
 notifications:
   email: false

data/CONTRIBUTING.md

@@ -52,3 +52,11 @@ We may suggest changes.
 
 To update the Ruby version,
 change `.ruby-version` and `.travis.yml`.
+
+If you see this error while running tests:
+
+```
+Your Ruby version is XXX, but your Gemfile specified YYY (Bundler::RubyVersionMismatch)
+```
+
+Try removing the `tmp/` directory and re-running the tests.

data/NEWS.md

@@ -1,3 +1,23 @@
+1.46.0 (January 26, 2018)
+
+* Bug fix: Fix for action mailer asset_host
+* Bug fix: Lock pg to ~> 0.18
+* Breaking: Remove Database Cleaner
+* Upgrade: Update to Rails 5.1.4
+* Upgrade: Update to Ruby 2.5.0
+* Upgrade: Update bourbon from 5.0.0.beta.8 to 5.0.0
+* Upgrade: Update FactoryGirl to FactoryBot
+* Generators: Analytics generator
+* Generators: CI generator
+* Generators: DB optimization generator
+* Generators: Factories generator
+* Generators: Forms generator
+* Generators: Javascript driver generator
+* Generators: Jobs generator
+* Generators: Lint generator
+* Generators: Testing driver generator
+* Generators: Views generator
+
 1.45.0 (September 8, 2017)
 
 * Bump Rails to 5.1.3 (#857)

data/README.md

@@ -80,7 +80,7 @@ And testing gems like:
 * [Capybara](https://github.com/jnicklas/capybara) and
   [Capybara WebKit](https://github.com/thoughtbot/capybara-webkit) for
   integration testing
-* [Factory Girl](https://github.com/thoughtbot/factory_girl) for test data
+* [Factory Bot](https://github.com/thoughtbot/factory_bot) for test data
 * [Formulaic](https://github.com/thoughtbot/formulaic) for integration testing
   HTML forms
 * [RSpec](https://github.com/rspec/rspec) for unit testing

data/lib/suspenders.rb

@@ -1,9 +1,18 @@
-require 'suspenders/version'
-require 'suspenders/generators/app_generator'
+require "suspenders/version"
+require "suspenders/generators/app_generator"
 require "suspenders/generators/enforce_ssl_generator"
-require "suspenders/generators/initialize_active_job_generator"
-require 'suspenders/generators/static_generator'
-require 'suspenders/generators/stylesheet_base_generator'
-require 'suspenders/actions'
+require "suspenders/generators/static_generator"
+require "suspenders/generators/stylesheet_base_generator"
+require "suspenders/generators/forms_generator"
+require "suspenders/generators/ci_generator"
+require "suspenders/generators/db_optimizations_generator"
+require "suspenders/generators/factories_generator"
+require "suspenders/generators/lint_generator"
+require "suspenders/generators/jobs_generator"
+require "suspenders/generators/analytics_generator"
+require "suspenders/generators/views_generator"
+require "suspenders/generators/js_driver_generator"
+require "suspenders/generators/testing_generator"
+require "suspenders/actions"
 require "suspenders/adapters/heroku"
-require 'suspenders/app_builder'
+require "suspenders/app_builder"

data/lib/suspenders/actions.rb

@@ -15,18 +15,10 @@ module Suspenders
     end
 
     def action_mailer_asset_host(rails_env, host)
-      config = "config.action_mailer.asset_host = { host: #{host} }"
+      config = "config.action_mailer.asset_host = #{host}"
       configure_environment(rails_env, config)
     end
 
-    def configure_application_file(config)
-      inject_into_file(
-        "config/application.rb",
-        "\n\n    #{config}",
-        before: "\n  end"
-      )
-    end
-
     def configure_environment(rails_env, config)
       inject_into_file(
         "config/environments/#{rails_env}.rb",

data/lib/suspenders/app_builder.rb

@@ -55,23 +55,6 @@ module Suspenders
       )
     end
 
-    def add_bullet_gem_configuration
-      config = <<-RUBY
-  config.after_initialize do
-    Bullet.enable = true
-    Bullet.bullet_logger = true
-    Bullet.rails_logger = true
-  end
-
-      RUBY
-
-      inject_into_file(
-        "config/environments/development.rb",
-        config,
-        after: "config.action_mailer.raise_delivery_errors = true\n",
-      )
-    end
-
     def raise_on_unpermitted_parameters
       config = <<-RUBY
     config.action_controller.action_on_unpermitted_parameters = :raise
@@ -93,10 +76,6 @@ module Suspenders
       run "chmod a+x bin/setup"
     end
 
-    def provide_dev_prime_task
-      copy_file 'dev.rake', 'lib/tasks/dev.rake'
-    end
-
     def configure_generators
       config = <<-RUBY
 
@@ -115,18 +94,6 @@ module Suspenders
       inject_into_class 'config/application.rb', 'Application', config
     end
 
-    def set_up_factory_girl_for_rspec
-      copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
-    end
-
-    def generate_factories_file
-      copy_file "factories.rb", "spec/factories.rb"
-    end
-
-    def set_up_hound
-      copy_file "hound.yml", ".hound.yml"
-    end
-
     def configure_smtp
       copy_file 'smtp.rb', 'config/smtp.rb'
 
@@ -186,32 +153,6 @@ config.public_file_server.headers = {
       remove_file "config/initializers/wrap_parameters.rb"
     end
 
-    def create_partials_directory
-      empty_directory 'app/views/application'
-    end
-
-    def create_shared_flashes
-      copy_file "_flashes.html.erb", "app/views/application/_flashes.html.erb"
-      copy_file "flashes_helper.rb", "app/helpers/flashes_helper.rb"
-    end
-
-    def create_shared_javascripts
-      copy_file '_javascript.html.erb', 'app/views/application/_javascript.html.erb'
-    end
-
-    def create_shared_css_overrides
-      copy_file(
-        "_css_overrides.html.erb",
-        "app/views/application/_css_overrides.html.erb",
-      )
-    end
-
-    def create_application_layout
-      template 'suspenders_layout.html.erb.erb',
-        'app/views/layouts/application.html.erb',
-        force: true
-    end
-
     def use_postgres_config_template
       template 'postgresql_database.yml.erb', 'config/database.yml',
         force: true
@@ -235,54 +176,15 @@ config.public_file_server.headers = {
       create_file '.ruby-version', "#{Suspenders::RUBY_VERSION}\n"
     end
 
-    def enable_database_cleaner
-      copy_file 'database_cleaner_rspec.rb', 'spec/support/database_cleaner.rb'
-    end
-
-    def provide_shoulda_matchers_config
-      copy_file(
-        "shoulda_matchers_config_rspec.rb",
-        "spec/support/shoulda_matchers.rb"
-      )
-    end
-
-    def configure_spec_support_features
-      empty_directory_with_keep_file 'spec/features'
-      empty_directory_with_keep_file 'spec/support/features'
-    end
-
-    def configure_rspec
-      remove_file "spec/rails_helper.rb"
-      remove_file "spec/spec_helper.rb"
-      copy_file "rails_helper.rb", "spec/rails_helper.rb"
-      copy_file "spec_helper.rb", "spec/spec_helper.rb"
-    end
-
-    def configure_ci
-      template "circle.yml.erb", "circle.yml"
-    end
-
-    def configure_i18n_for_test_environment
-      copy_file "i18n.rb", "spec/support/i18n.rb"
-    end
-
     def configure_i18n_for_missing_translations
       raise_on_missing_translations_in("development")
       raise_on_missing_translations_in("test")
     end
 
-    def configure_background_jobs_for_rspec
-      run 'rails g delayed_job:active_record'
-    end
-
     def configure_action_mailer_in_specs
       copy_file 'action_mailer.rb', 'spec/support/action_mailer.rb'
     end
 
-    def configure_capybara_webkit
-      copy_file "capybara_webkit.rb", "spec/support/capybara_webkit.rb"
-    end
-
     def configure_time_formats
       remove_file "config/locales/en.yml"
       template "config_locales_en.yml.erb", "config/locales/en.yml"
@@ -296,15 +198,11 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       append_file "config/environments/production.rb", rack_timeout_config
     end
 
-    def configure_simple_form
-      bundle_command "exec rails generate simple_form:install"
-    end
-
     def configure_action_mailer
       action_mailer_host "development", %{"localhost:3000"}
-      action_mailer_asset_host "development", %{"localhost:3000"}
+      action_mailer_asset_host "development", %{"http://localhost:3000"}
       action_mailer_host "test", %{"www.example.com"}
-      action_mailer_asset_host "test", %{"www.example.com"}
+      action_mailer_asset_host "test", %{"http://www.example.com"}
       action_mailer_host "production", %{ENV.fetch("APPLICATION_HOST")}
       action_mailer_asset_host(
         "production",
@@ -312,17 +210,6 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
       )
     end
 
-    def configure_active_job
-      configure_application_file(
-        "config.active_job.queue_adapter = :delayed_job"
-      )
-      configure_environment "test", "config.active_job.queue_adapter = :inline"
-    end
-
-    def generate_rspec
-      generate 'rspec:install'
-    end
-
     def replace_default_puma_configuration
       copy_file "puma.rb", "config/puma.rb", force: true
     end
@@ -388,11 +275,6 @@ you can deploy to staging and production with:
       run "hub create #{repo_name}"
     end
 
-    def setup_segment
-      copy_file '_analytics.html.erb',
-        'app/views/application/_analytics.html.erb'
-    end
-
     def setup_bundler_audit
       copy_file "bundler_audit.rake", "lib/tasks/bundler_audit.rake"
       append_file "Rakefile", %{\ntask default: "bundle:audit"\n}

data/lib/suspenders/generators/analytics_generator.rb

@@ -0,0 +1,29 @@
+require "rails/generators"
+
+module Suspenders
+  class AnalyticsGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def install_partial
+      copy_file "_analytics.html.erb",
+        "app/views/application/_analytics.html.erb"
+    end
+
+    def render_partial
+      if File.exist?(js_partial)
+        inject_into_file js_partial,
+          %{\n\n<%= render "analytics" %>},
+          after: "<%= yield :javascript %>"
+      end
+    end
+
+    private
+
+    def js_partial
+      "app/views/application/_javascript.html.erb"
+    end
+  end
+end

data/lib/suspenders/generators/app_generator.rb

@@ -43,10 +43,8 @@ module Suspenders
     def suspenders_customization
       invoke :customize_gemfile
       invoke :setup_development_environment
-      invoke :setup_test_environment
       invoke :setup_production_environment
       invoke :setup_secret_token
-      invoke :create_suspenders_views
       invoke :configure_app
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
@@ -54,14 +52,13 @@ module Suspenders
       invoke :remove_routes_comment_lines
       invoke :setup_dotfiles
       invoke :setup_database
-      invoke :create_local_heroku_setup
-      invoke :create_heroku_apps
       invoke :create_github_repo
-      invoke :setup_segment
       invoke :setup_bundler_audit
       invoke :setup_spring
       invoke :generate_default
       invoke :setup_default_directories
+      invoke :create_local_heroku_setup
+      invoke :create_heroku_apps
       invoke :outro
     end
 
@@ -69,7 +66,6 @@ module Suspenders
       build :replace_gemfile, options[:path]
       build :set_ruby_to_version_being_used
       bundle_command 'install'
-      build :configure_simple_form
     end
 
     def setup_database
@@ -87,32 +83,13 @@ module Suspenders
       build :raise_on_missing_assets_in_test
       build :raise_on_delivery_errors
       build :set_test_delivery_method
-      build :add_bullet_gem_configuration
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
-      build :provide_dev_prime_task
       build :configure_generators
       build :configure_i18n_for_missing_translations
       build :configure_quiet_assets
     end
 
-    def setup_test_environment
-      say 'Setting up the test environment'
-      build :set_up_factory_girl_for_rspec
-      build :generate_factories_file
-      build :set_up_hound
-      build :generate_rspec
-      build :configure_rspec
-      build :configure_background_jobs_for_rspec
-      build :enable_database_cleaner
-      build :provide_shoulda_matchers_config
-      build :configure_spec_support_features
-      build :configure_ci
-      build :configure_i18n_for_test_environment
-      build :configure_action_mailer_in_specs
-      build :configure_capybara_webkit
-    end
-
     def setup_production_environment
       say 'Setting up the production environment'
       build :configure_smtp
@@ -127,19 +104,9 @@ module Suspenders
       build :setup_secret_token
     end
 
-    def create_suspenders_views
-      say 'Creating suspenders views'
-      build :create_partials_directory
-      build :create_shared_flashes
-      build :create_shared_javascripts
-      build :create_shared_css_overrides
-      build :create_application_layout
-    end
-
     def configure_app
       say 'Configuring app'
       build :configure_action_mailer
-      build :configure_active_job
       build :configure_time_formats
       build :setup_default_rake_task
       build :replace_default_puma_configuration
@@ -175,11 +142,6 @@ module Suspenders
       end
     end
 
-    def setup_segment
-      say 'Setting up Segment'
-      build :setup_segment
-    end
-
     def setup_dotfiles
       build :copy_dotfiles
     end
@@ -218,10 +180,19 @@ module Suspenders
 
     def generate_default
       run("spring stop")
-      generate("suspenders:initialize_active_job")
       generate("suspenders:enforce_ssl")
       generate("suspenders:static")
       generate("suspenders:stylesheet_base")
+      generate("suspenders:testing")
+      generate("suspenders:ci")
+      generate("suspenders:js_driver")
+      generate("suspenders:forms")
+      generate("suspenders:db_optimizations")
+      generate("suspenders:factories")
+      generate("suspenders:lint")
+      generate("suspenders:jobs")
+      generate("suspenders:analytics")
+      generate("suspenders:views")
     end
 
     def outro

data/lib/suspenders/generators/ci_generator.rb

@@ -0,0 +1,26 @@
+require "rails/generators"
+
+module Suspenders
+  class CiGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__))
+
+    def simplecov_test_integration
+      inject_into_file "spec/spec_helper.rb", before: 'SimpleCov.start "rails"' do
+        <<-RUBY
+
+  if ENV["CIRCLE_ARTIFACTS"]
+    dir = File.join(ENV["CIRCLE_ARTIFACTS"], "coverage")
+    SimpleCov.coverage_dir(dir)
+  end
+
+        RUBY
+      end
+    end
+
+    def configure_ci
+      template "circle.yml.erb", "circle.yml"
+    end
+  end
+end

data/lib/suspenders/generators/db_optimizations_generator.rb

@@ -0,0 +1,29 @@
+require "rails/generators"
+
+module Suspenders
+  class DbOptimizationsGenerator < Rails::Generators::Base
+    def add_bullet
+      gem "bullet", group: %i(development test)
+    end
+
+    def configure_bullet
+      inject_into_file(
+        "config/environments/development.rb",
+        configuration,
+        after: "config.action_mailer.raise_delivery_errors = true\n",
+      )
+    end
+
+    private
+
+    def configuration
+      <<-RUBY
+  config.after_initialize do
+    Bullet.enable = true
+    Bullet.bullet_logger = true
+    Bullet.rails_logger = true
+  end
+      RUBY
+    end
+  end
+end

data/lib/suspenders/generators/factories_generator.rb

@@ -0,0 +1,26 @@
+require "rails/generators"
+
+module Suspenders
+  class FactoriesGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def add_factory_bot
+      gem "factory_bot_rails", group: %i(development test)
+    end
+
+    def set_up_factory_bot_for_rspec
+      copy_file "factory_bot_rspec.rb", "spec/support/factory_bot.rb"
+    end
+
+    def generate_empty_factories_file
+      copy_file "factories.rb", "spec/factories.rb"
+    end
+
+    def provide_dev_prime_task
+      copy_file "dev.rake", "lib/tasks/dev.rake"
+    end
+  end
+end

data/lib/suspenders/generators/forms_generator.rb

@@ -0,0 +1,18 @@
+require "rails/generators"
+
+module Suspenders
+  class FormsGenerator < Rails::Generators::Base
+    def add_simple_form
+      gem "simple_form"
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def configure_simple_form
+      create_file "config/initializers/simple_form.rb" do
+        "SimpleForm.setup {|config|}"
+      end
+
+      generate "simple_form:install", "--force"
+    end
+  end
+end

data/lib/suspenders/generators/jobs_generator.rb

@@ -0,0 +1,47 @@
+require "rails/generators"
+
+module Suspenders
+  class JobsGenerator < Rails::Generators::Base
+    include Suspenders::Actions
+
+    source_root(
+      File.expand_path(
+        File.join("..", "..", "..", "templates"),
+        File.dirname(__FILE__),
+      ),
+    )
+
+    def add_jobs_gem
+      gem "delayed_job_active_record"
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def configure_background_jobs_for_rspec
+      generate "delayed_job:active_record"
+    end
+
+    def initialize_active_job
+      copy_file(
+        "active_job.rb",
+        "config/initializers/active_job.rb",
+      )
+    end
+
+    def configure_active_job
+      configure_application_file(
+        "config.active_job.queue_adapter = :delayed_job",
+      )
+      configure_environment "test", "config.active_job.queue_adapter = :inline"
+    end
+
+    private
+
+    def configure_application_file(config)
+      inject_into_file(
+        "config/application.rb",
+        "\n    #{config}",
+        before: "\n  end",
+      )
+    end
+  end
+end

data/lib/suspenders/generators/js_driver_generator.rb

@@ -0,0 +1,18 @@
+require "rails/generators"
+
+module Suspenders
+  class JsDriverGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def add_gems
+      gem "capybara-webkit", group: :test
+    end
+
+    def configure_capybara_webkit
+      copy_file "capybara_webkit.rb", "spec/support/capybara_webkit.rb"
+    end
+  end
+end

data/lib/suspenders/generators/lint_generator.rb

@@ -0,0 +1,14 @@
+require "rails/generators"
+
+module Suspenders
+  class LintGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def set_up_hound
+      copy_file "hound.yml", ".hound.yml"
+    end
+  end
+end

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -7,7 +7,7 @@ module Suspenders
       File.dirname(__FILE__))
 
     def add_stylesheet_gems
-      gem "bourbon", "~> 5.0.0.beta.8"
+      gem "bourbon", "~> 5.0"
       gem "neat", "~> 2.1"
       gem "refills", group: [:development, :test]
       Bundler.with_clean_env { run "bundle install" }

data/lib/suspenders/generators/testing_generator.rb

@@ -0,0 +1,60 @@
+require "rails/generators"
+
+module Suspenders
+  class TestingGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def add_testing_gems
+      gem "spring-commands-rspec", group: :development
+      gem "rspec-rails", "~> 3.6", group: %i(development test)
+      gem "shoulda-matchers", group: :test
+
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def generate_rspec
+      generate "rspec:install"
+    end
+
+    def configure_rspec
+      remove_file "spec/rails_helper.rb"
+      remove_file "spec/spec_helper.rb"
+      copy_file "rails_helper.rb", "spec/rails_helper.rb"
+      copy_file "spec_helper.rb", "spec/spec_helper.rb"
+    end
+
+    def provide_shoulda_matchers_config
+      copy_file(
+        "shoulda_matchers_config_rspec.rb",
+        "spec/support/shoulda_matchers.rb",
+      )
+    end
+
+    def configure_spec_support_features
+      empty_directory_with_keep_file "spec/features"
+      empty_directory_with_keep_file "spec/support/features"
+    end
+
+    def configure_i18n_for_test_environment
+      copy_file "i18n.rb", "spec/support/i18n.rb"
+    end
+
+    def configure_action_mailer_in_specs
+      copy_file "action_mailer.rb", "spec/support/action_mailer.rb"
+    end
+
+    private
+
+    def empty_directory_with_keep_file(destination)
+      empty_directory(destination, {})
+      keep_file(destination)
+    end
+
+    def keep_file(destination)
+      create_file(File.join(destination, ".keep"))
+    end
+  end
+end

data/lib/suspenders/generators/views_generator.rb

@@ -0,0 +1,35 @@
+require "rails/generators"
+
+module Suspenders
+  class ViewsGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__),
+    )
+
+    def create_partials_directory
+      empty_directory "app/views/application"
+    end
+
+    def create_shared_flashes
+      copy_file "_flashes.html.erb", "app/views/application/_flashes.html.erb"
+      copy_file "flashes_helper.rb", "app/helpers/flashes_helper.rb"
+    end
+
+    def create_shared_javascripts
+      copy_file "_javascript.html.erb",
+        "app/views/application/_javascript.html.erb"
+    end
+
+    def create_shared_css_overrides
+      copy_file "_css_overrides.html.erb",
+        "app/views/application/_css_overrides.html.erb"
+    end
+
+    def create_application_layout
+      template "suspenders_layout.html.erb.erb",
+        "app/views/layouts/application.html.erb",
+        force: true
+    end
+  end
+end

data/lib/suspenders/version.rb

@@ -1,8 +1,8 @@
 module Suspenders
-  RAILS_VERSION = "~> 5.1.3".freeze
+  RAILS_VERSION = "~> 5.1.4".freeze
   RUBY_VERSION = IO.
     read("#{File.dirname(__FILE__)}/../../.ruby-version").
     strip.
     freeze
-  VERSION = "1.45.0".freeze
+  VERSION = "1.46.0".freeze
 end

data/spec/features/new_project_spec.rb

@@ -169,7 +169,7 @@ RSpec.describe "Suspend a new project with default configuration" do
   it "sets action mailer default host and asset host" do
     config_key = 'config\.action_mailer\.asset_host'
     config_value =
-      '{ host: ENV\.fetch\("ASSET_HOST", ENV\.fetch\("APPLICATION_HOST"\)\) }'
+      %q{ENV\.fetch\("ASSET_HOST", ENV\.fetch\("APPLICATION_HOST"\)\)}
     expect(production_config).to match(/#{config_key} = #{config_value}/)
   end
 
@@ -201,6 +201,14 @@ RSpec.describe "Suspend a new project with default configuration" do
     )
   end
 
+  it "configs background jobs for rspec" do
+    delayed_job = IO.read("#{project_path}/bin/delayed_job")
+
+    expect(delayed_job).to match(
+      /^require 'delayed\/command'$/,
+    )
+  end
+
   it "configs bullet gem in development" do
     expect(development_config).to match /^ +Bullet.enable = true$/
     expect(development_config).to match /^ +Bullet.bullet_logger = true$/

data/spec/support/suspenders.rb

@@ -14,9 +14,11 @@ module SuspendersTestHelpers
     Dir.chdir(tmp_path) do
       Bundler.with_clean_env do
         add_fakes_to_path
-        `
-          #{suspenders_bin} #{APP_NAME} #{arguments}
-        `
+        with_revision_for_honeybadger do
+          `
+            #{suspenders_bin} #{APP_NAME} #{arguments}
+          `
+        end
         Dir.chdir(APP_NAME) do
           with_env("HOME", tmp_path) do
             `git add .`
@@ -88,12 +90,23 @@ module SuspendersTestHelpers
   end
 
   def with_env(name, new_value)
+    had_key = ENV.has_key?(name)
     prior = ENV[name]
     ENV[name] = new_value.to_s
 
     yield
 
   ensure
-    ENV[name] = prior
+    ENV.delete(name)
+
+    if had_key
+      ENV[name] = prior
+    end
+  end
+
+  def with_revision_for_honeybadger
+    with_env("HEROKU_SLUG_COMMIT", 1) do
+      yield
+    end
   end
 end

data/suspenders.gemspec

@@ -5,6 +5,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{Suspenders::RUBY_VERSION}"
+  s.required_rubygems_version = ">= 2.7.4"
   s.authors = ['thoughtbot']
   s.date = Date.today.strftime('%Y-%m-%d')
 
@@ -28,7 +29,6 @@ rush to build something amazing; don't use it if you like missing deadlines.
   s.version = Suspenders::VERSION
 
   s.add_dependency 'bitters', '~> 1.7'
-  s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'

data/templates/Gemfile.erb

@@ -8,17 +8,15 @@ end
 ruby "<%= Suspenders::RUBY_VERSION %>"
 
 gem "autoprefixer-rails"
-gem "delayed_job_active_record"
 gem "flutie"
 gem "honeybadger"
 gem "jquery-rails"
-gem "pg"
+gem "pg", "~> 0.18"
 gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
-gem "simple_form"
 gem "skylight"
 gem "sprockets", ">= 3.0.0"
 gem "suspenders"
@@ -32,27 +30,20 @@ group :development do
   gem "listen"
   gem "rack-mini-profiler", require: false
   gem "spring"
-  gem "spring-commands-rspec"
   gem "web-console"
 end
 
 group :development, :test do
   gem "awesome_print"
-  gem "bullet"
   gem "bundler-audit", ">= 0.5.0", require: false
   gem "dotenv-rails"
-  gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.6"
 end
 
 group :test do
-  gem "capybara-webkit"
-  gem "database_cleaner"
   gem "formulaic"
   gem "launchy"
-  gem "shoulda-matchers"
   gem "simplecov", require: false
   gem "timecop"
   gem "webmock"

data/templates/_javascript.html.erb

@@ -2,8 +2,6 @@
 
 <%= yield :javascript %>
 
-<%= render "analytics" %>
-
 <% if Rails.env.test? %>
   <%= javascript_tag do %>
     $.fx.off = true;

data/templates/circle.yml.erb

@@ -1,6 +1,6 @@
 database:
   override:
-    - bin/setup
+    - RAILS_ENV=development bin/setup
 test:
   override:
     - COVERAGE=true bin/rake

data/templates/dev.rake

@@ -1,10 +1,10 @@
 if Rails.env.development? || Rails.env.test?
-  require "factory_girl"
+  require "factory_bot"
 
   namespace :dev do
     desc "Sample data for local development environment"
     task prime: "db:setup" do
-      include FactoryGirl::Syntax::Methods
+      include FactoryBot::Syntax::Methods
 
       # create(:user, email: "user@example.com", password: "password")
     end

data/templates/factories.rb

@@ -1,2 +1,2 @@
-FactoryGirl.define do
+FactoryBot.define do
 end

data/templates/factory_bot_rspec.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
+end

data/templates/rails_helper.rb

@@ -16,7 +16,7 @@ RSpec.configure do |config|
   config.include Features, type: :feature
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!
-  config.use_transactional_fixtures = false
+  config.use_transactional_fixtures = true
 end
 
 ActiveRecord::Migration.maintain_test_schema!

data/templates/spec_helper.rb

@@ -1,11 +1,6 @@
 if ENV.fetch("COVERAGE", false)
   require "simplecov"
 
-  if ENV["CIRCLE_ARTIFACTS"]
-    dir = File.join(ENV["CIRCLE_ARTIFACTS"], "coverage")
-    SimpleCov.coverage_dir(dir)
-  end
-
   SimpleCov.start "rails"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: suspenders
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 1.46.0
 platform: ruby
 authors:
 - thoughtbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,11 +83,20 @@ files:
 - lib/suspenders/actions.rb
 - lib/suspenders/adapters/heroku.rb
 - lib/suspenders/app_builder.rb
+- lib/suspenders/generators/analytics_generator.rb
 - lib/suspenders/generators/app_generator.rb
+- lib/suspenders/generators/ci_generator.rb
+- lib/suspenders/generators/db_optimizations_generator.rb
 - lib/suspenders/generators/enforce_ssl_generator.rb
-- lib/suspenders/generators/initialize_active_job_generator.rb
+- lib/suspenders/generators/factories_generator.rb
+- lib/suspenders/generators/forms_generator.rb
+- lib/suspenders/generators/jobs_generator.rb
+- lib/suspenders/generators/js_driver_generator.rb
+- lib/suspenders/generators/lint_generator.rb
 - lib/suspenders/generators/static_generator.rb
 - lib/suspenders/generators/stylesheet_base_generator.rb
+- lib/suspenders/generators/testing_generator.rb
+- lib/suspenders/generators/views_generator.rb
 - lib/suspenders/version.rb
 - spec/adapters/heroku_spec.rb
 - spec/fakes/bin/heroku
@@ -134,13 +129,12 @@ files:
 - templates/capybara_webkit.rb
 - templates/circle.yml.erb
 - templates/config_locales_en.yml.erb
-- templates/database_cleaner_rspec.rb
 - templates/dev.rake
 - templates/dotfiles/.ctags
 - templates/dotfiles/.env
 - templates/errors.rb
 - templates/factories.rb
-- templates/factory_girl_rspec.rb
+- templates/factory_bot_rspec.rb
 - templates/flashes_helper.rb
 - templates/hound.yml
 - templates/i18n.rb
@@ -168,15 +162,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.1
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.4
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.

data/lib/suspenders/generators/initialize_active_job_generator.rb

@@ -1,19 +0,0 @@
-require "rails/generators"
-
-module Suspenders
-  class InitializeActiveJobGenerator < Rails::Generators::Base
-    source_root(
-      File.expand_path(
-        File.join("..", "..", "..", "templates"),
-        File.dirname(__FILE__),
-      ),
-    )
-
-    def initialize_active_job
-      copy_file(
-        "active_job.rb",
-        "config/initializers/active_job.rb",
-      )
-    end
-  end
-end

data/templates/database_cleaner_rspec.rb

@@ -1,21 +0,0 @@
-RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner.clean_with(:deletion)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :deletion
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
-end

data/templates/factory_girl_rspec.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
-end