voyage 1.0 → 1.44.0.1

data/lib/suspenders/generators/stylesheet_base_generator.rb

@@ -0,0 +1,37 @@
+require "rails/generators"
+
+module Suspenders
+  class StylesheetBaseGenerator < Rails::Generators::Base
+    source_root File.expand_path(
+      File.join("..", "..", "..", "templates"),
+      File.dirname(__FILE__))
+
+    def add_stylesheet_gems
+      gem "bourbon", "~> 5.0.0.beta.7"
+      gem "neat", "~> 2.0.0.beta.1"
+      gem "refills", group: [:development, :test]
+      Bundler.with_clean_env { run "bundle install" }
+    end
+
+    def add_css_config
+      copy_file(
+        "application.scss",
+        "app/assets/stylesheets/application.scss",
+        force: true,
+      )
+    end
+
+    def remove_prior_config
+      remove_file "app/assets/stylesheets/application.css"
+    end
+
+    def install_refills
+      generate "refills:import", "flashes"
+      remove_dir "app/views/refills"
+    end
+
+    def install_bitters
+      run "bitters install --path app/assets/stylesheets"
+    end
+  end
+end

data/lib/suspenders/version.rb

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

data/lib/voyage.rb

@@ -1,6 +1,8 @@
 require 'voyage/version'
 
 require 'suspenders/generators/app_generator'
+require 'suspenders/generators/static_generator'
+require 'suspenders/generators/stylesheet_base_generator'
 require 'suspenders/actions'
 require "suspenders/adapters/heroku"
 require 'suspenders/app_builder'

data/lib/voyage/README.md

@@ -0,0 +1,22 @@
+## Updating to new Thoughtbot releases
+
+### Files that we change in the mainline of the repo:
+
+  * bin/voyage
+  * suspenders.gemspec
+
+Everything else is scoped to lib/voyage, so all of those changes will always apply cleanly after rebasing to upstream/master. Then just go back through each set of commits and make sure our overrides don't need some updating.
+
+### Here are files we're currently overriding:
+
+  * lib/suspenders/app_generator.rb => lib/voyage/app_generator.rb
+  * templates/config_locales_en.yml.erb => lib/voyage/templates/config_locales_en.yml.erb
+  * templates/Gemfile.erb               => lib/voyage/templates/Gemfile.erb
+  * templates/rails_helper.rb.erb       => lib/voyage/templates/rails_helper.rb.erb
+  * templates/README.md.erb             => lib/voyage/templates/README.md.erb
+
+Everything else is a new file we want to add.
+
+## Testing
+
+Test that the new generator works, manually for now. It'd be awesome to get some [aruba](https://github.com/cucumber/aruba) tests going to test the various command line options / generated app permutations that are possible. For example, with and without devise, which templating language we should use, etc.

data/lib/voyage/app_builder.rb

@@ -15,38 +15,43 @@ module Suspenders
       end
     end
 
+    def update_gemset_in_gemfile
+      replace_in_file 'Gemfile', '#ruby-gemset', "#ruby-gemset=#{app_name}"
+    end
+
     def use_slim
       if @@accept_defaults || agree?('Would you like to use slim? (Y/n)')
         @@use_slim = true
         run 'gem install html2slim'
+        update_application_layout_for_slim
+      else
+        @@use_slim = false
+      end
+    end
 
-        find = <<-RUBY.gsub(/^ {8}/, '')
-          <%#
-            Configure default and controller-, and view-specific titles in
-            config/locales/en.yml. For more see:
-            https://github.com/calebthompson/title#usage
-          %>
-        RUBY
+    def update_application_layout_for_slim
+      find = <<-RUBY.gsub(/^ {8}/, '')
+        <%#
+          Configure default and controller-, and view-specific titles in
+          config/locales/en.yml. For more see:
+          https://github.com/calebthompson/title#usage
+        %>
+      RUBY
 
-        replace = <<-RUBY.gsub(/^ {8}/, '')
-          <% # Configure default and controller-, and view-specific titles in
-        # config/locales/en.yml. For more see:
-        # https://github.com/calebthompson/title#usage %>
-        RUBY
+      replace = <<-RUBY.gsub(/^ {8}/, '')
+        <% # Configure default and controller-, and view-specific titles in
+      # config/locales/en.yml. For more see:
+      # https://github.com/calebthompson/title#usage %>
+      RUBY
 
-        replace_in_file 'app/views/layouts/application.html.erb', find, replace
+      replace_in_file 'app/views/layouts/application.html.erb', find, replace
 
-        if @@use_slim
-          inside('lib') do # arbitrary, run in context of newly generated app
-            run "erb2slim '../app/views/layouts' '../app/views/layouts'"
-            run "erb2slim -d '../app/views/layouts'"
+      inside('lib') do # arbitrary, run in context of newly generated app
+        run "erb2slim '../app/views/layouts' '../app/views/layouts'"
+        run "erb2slim -d '../app/views/layouts'"
 
-            run "erb2slim '../app/views/application' '../app/views/application'"
-            run "erb2slim -d '../app/views/application'"
-          end
-        end
-      else
-        @@use_slim = false
+        run "erb2slim '../app/views/application' '../app/views/application'"
+        run "erb2slim -d '../app/views/application'"
       end
     end
 
@@ -121,31 +126,36 @@ module Suspenders
         protected
 
         def configure_permitted_parameters
-          devise_parameter_sanitizer.for(:sign_up) do |u|
-            u.permit(
+          devise_parameter_sanitizer.permit(
+            :sign_up,
+            keys: [
               #{':first_name,' if adding_first_and_last_name}
               #{':last_name,' if adding_first_and_last_name}
               :email,
               :password,
               :password_confirmation,
               :remember_me,
-            )
-          end
-
-          devise_parameter_sanitizer.for(:sign_in) do |u|
-            u.permit(:login, :email, :password, :remember_me)
-          end
-
-          devise_parameter_sanitizer.for(:account_update) do |u|
-            u.permit(
+            ]
+          )
+
+          devise_parameter_sanitizer.permit(
+            :sign_in,
+            keys: [
+              :login, :email, :password, :remember_me
+            ]
+          )
+
+          devise_parameter_sanitizer.permit(
+            :account_update,
+            keys: [
               #{':first_name,' if adding_first_and_last_name}
               #{':last_name,' if adding_first_and_last_name}
               :email,
               :password,
               :password_confirmation,
               :current_password,
-            )
-          end
+            ]
+          )
         end
         RUBY
       end
@@ -237,7 +247,7 @@ module Suspenders
 
         trait :admin do
           roles [:admin]
-          sequence(:email) { |n| "admin_#{n}@example.com" }
+          email 'admin@example.com'
         end
         RUBY
       end
@@ -255,7 +265,7 @@ module Suspenders
     # ----------------
 
     def generate_seeder_templates(using_devise:)
-      config = { force: true, using_devise: true }
+      config = { force: true, using_devise: using_devise }
       template '../templates/seeder.rb.erb', 'lib/seeder.rb', config
       template '../templates/seeds.rb.erb', 'db/seeds.rb', config
     end
@@ -296,6 +306,18 @@ module Suspenders
       end
     end
 
+    # --------
+    # TEMP FIX
+    #   https://github.com/thoughtbot/bourbon/issues/993
+    #   https://github.com/thoughtbot/refills/issues/400
+    # --------
+    def downgrade_neat_1_8_so_refills_media_mixin_works
+      replace_in_file 'Gemfile', "gem 'neat', '~> 2.0.0.beta.1'", "gem 'neat', '~> 1.8.0'"
+    end
+    # ------------
+    # END TEMP FIX
+    # ------------
+
 
     # -------------------------
     # ADDING REFILLS COMPONENTS
@@ -421,7 +443,7 @@ module Suspenders
     # setup_test_environment overrides
     # --------------------------------
     def generate_factories_file
-      # NOTE: (2016-02-03) jonk => don't want this
+      # NOTE: (2016-02-03) jonk => don't want this, we use individual factories
     end
 
     def configure_ci
@@ -439,29 +461,6 @@ module Suspenders
     # End setup_test_environment overrides
     # ------------------------------------
 
-
-    # -------------
-    # Configure App
-    # -------------
-    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 configure_puma
-      # NOTE: (2016-02-03) jonk => don't want this
-    end
-
-    def set_up_forego
-      # NOTE: (2016-02-03) jonk => don't want this
-    end
-    # -----------------
-    # End Configure App
-    # -----------------
-
-
     def remove_config_comment_lines
       # NOTE: (2016-02-09) jonk => don't want this
     end

data/lib/voyage/generators/app_generator.rb

@@ -1,11 +1,5 @@
 module Suspenders
   class AppGenerator < Rails::Generators::AppGenerator
-    class_option :skip_turbolinks, type: :boolean, default: false,
-      desc: "Skip turbolinks gem"
-
-    class_option :skip_bundle, type: :boolean, aliases: "-B", default: true,
-      desc: "Don't run bundle install"
-
     def self.start
       preflight_check
       accept_defaults
@@ -29,6 +23,7 @@ module Suspenders
 
     def finish_template
       invoke :suspenders_customization
+      invoke :update_gemset_in_gemfile
       invoke :use_slim
       invoke :install_devise
       invoke :customize_application_js
@@ -36,6 +31,7 @@ module Suspenders
       invoke :generate_ruby_version_and_gemset
       invoke :generate_data_migrations
       invoke :add_high_voltage_static_pages
+      invoke :downgrade_neat_1_8_so_refills_media_mixin_works # this should be temporary until they get refills re-written to take advantage of Neat 2.0
       invoke :generate_refills
       invoke :generate_test_environment
       invoke :update_test_environment
@@ -49,6 +45,10 @@ module Suspenders
       super
     end
 
+    def update_gemset_in_gemfile
+      build :update_gemset_in_gemfile
+    end
+
     def use_slim
       build :use_slim
     end
@@ -77,6 +77,10 @@ module Suspenders
       build :add_high_voltage_static_pages
     end
 
+    def downgrade_neat_1_8_so_refills_media_mixin_works
+      build :downgrade_neat_1_8_so_refills_media_mixin_works
+    end
+
     def generate_refills
       build :generate_refills
     end
@@ -113,6 +117,7 @@ module Suspenders
 
     def bon_voyage
       say 'Congratulations! You just pulled our suspenders, Headway style!'
+      say honeybadger_outro
     end
   end
 end

data/lib/voyage/templates/Gemfile.erb

@@ -2,23 +2,24 @@
 source "https://rubygems.org"
 
 ruby "<%= Voyage::RUBY_VERSION %>"
-#ruby-gemset=<%= @app_name %>
+#ruby-gemset
 
 gem "autoprefixer-rails"
-gem "bourbon", "~> 4.2.0"
-gem "coffee-rails", "~> 4.1.0"
 gem "delayed_job_active_record"
 gem "flutie"
-gem "high_voltage"
+gem "honeybadger"
 gem "jquery-rails"
-gem "neat", "~> 1.7.0"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
+gem "puma"
 gem "rack-canonical-host"
 gem "rails", "<%= Voyage::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sass-rails", "~> 5.0"
 gem "simple_form"
+gem "skylight"
+gem "sprockets", ">= 3.0.0"
+gem 'suspenders'
 gem "title"
 gem "uglifier"
 
@@ -44,12 +45,11 @@ gem 'paper_trail'
 gem 'settingslogic' # yaml settings (project wide, non-editable), this is implemented with the model Settings.rb
 
 # Want these here for debugging on production
+gem 'pry-byebug' # stepwise debugging inside pry
 gem 'pry-rails' # better REPL than irb
-gem 'pry-awesome_print'
-gem 'pry-byebug'
+gem 'pry-awesome_print' # make pry output legible
 gem 'pry-remote'
 
-gem 'librato-rails' # general monitoring of things
 gem 'nondestructive_migrations'
 gem 'carrierwave'
 gem 'mini_magick'
@@ -58,8 +58,7 @@ gem 'whenever', require: false # provides a clear syntax for writing and deployi
 gem 'whenever-web'
 
 group :development do
-  gem "quiet_assets"
-  gem "refills"
+  gem "listen"
   gem "spring"
   gem "spring-commands-rspec"
   gem "web-console"
@@ -67,26 +66,28 @@ group :development do
   # Customizations
   gem 'annotate' # annotate models automatically when rake db:migrate is called
   gem 'rails-erd' # auto gen ERD Diagram of models in the app on rake db:migrate
-  gem 'zenflow', github: 'zencoder/zenflow'
+  gem 'zenflow', git: 'https://github.com/zencoder/zenflow.git'
   gem 'better_errors' # A better error page for rails when a local 500 (or similar) is thrown
   gem 'binding_of_caller' # REPL in better_errors to debug in the browser at the point at which it failed
   gem 'meta_request' # for chrome rails console plugin found here: https://chrome.google.com/webstore/detail/railspanel/gjpfobpafnhjhbajcjgccbbdofdckggg?hl=en-US
-  gem 'bitters', '~> 1.2'
+  gem 'bitters', '~> 1.3'
   gem 'redcarpet' # used to render the readme inside a static welcome page from the high_voltage gem
 end
 
 group :development, :test do
   gem "awesome_print"
   gem "bullet"
-  gem "bundler-audit", require: false
+  gem "bundler-audit", ">= 0.5.0", require: false
   gem "dotenv-rails"
   gem "factory_girl_rails"
-  gem "rspec-rails", "~> 3.4.0"
+  <%# gem "pry-byebug" %>
+  <%# gem "pry-rails" %>
+  gem "rspec-rails", "~> 3.5"
 
   # Customizations
   gem 'faker' # provides auto generated names for factories, can be customized
 
-  gem 'rubocop', '0.36.0', require: false # lock to keep in sync with Hound
+  gem 'rubocop'
   gem 'rubocop-rspec', require: false
 
   gem 'letter_opener' # auto-open emails when they're sent
@@ -97,6 +98,7 @@ group :development, :staging do
 end
 
 group :test do
+  <%# gem "capybara-webkit" # We don't want this. %>
   gem "database_cleaner"
   gem "formulaic"
   gem "launchy"

data/lib/voyage/templates/rails_helper.rb.erb

@@ -1,7 +1,7 @@
 require 'simplecov'
 SimpleCov.command_name 'Rspec'
 
-ENV["RAILS_ENV"] = "test"
+ENV["RACK_ENV"] = "test"
 
 require File.expand_path("../../config/environment", __FILE__)
 abort("DATABASE_URL environment variable is set") if ENV["DATABASE_URL"]

data/lib/voyage/version.rb

@@ -1,8 +1,9 @@
 module Voyage
-  RAILS_VERSION = "~> 4.2".freeze
-  RUBY_VERSION = IO.
-    read("#{File.dirname(__FILE__)}/../../.ruby-version").
-    strip.
-    freeze
-  VERSION = '1.0'.freeze
+  RAILS_VERSION = '~> 5.0.1'.freeze
+  RUBY_VERSION =
+    IO
+      .read("#{File.dirname(__FILE__)}/../../.ruby-version")
+      .strip
+      .freeze
+  VERSION = '1.44.0.1'.freeze
 end