voyage 1.44.0.13 → 1.44.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6876472a49199f6053d4d52c6af7ec762773974b
-  data.tar.gz: 9a022fe59e41a4236ee7d6d51a10a3b1a163f8e3
+  metadata.gz: 898b6240efc3c604ed7eea9ea2ec695db6c91768
+  data.tar.gz: 616e9ba3fa97d099de9cc6b8a1d74b23cfd855fa
 SHA512:
-  metadata.gz: 6d95cdf569d0528dec2300101ed96321e440b21cba85a1d7cf7782310eb844403f295958a07cdca74df680a7483b5f6f1557bff96fe35f8bd7f783b740ce0c79
-  data.tar.gz: de16df8aae0896fbc8179251ef812de9da291be9ced917cb5685a8efc9798ac7938a963c8ba97eb211ef825f619d2545809e8b1415ebbacce7f64462db280704
+  metadata.gz: 5e40bcb36dff0d357c56bf5d330d75133fd3348356edce7364ee7c193826d5c9d488d5272573bd674714eefbe908a2c709ed43abbdda4dbc093a026594915eab
+  data.tar.gz: 4f59db9fa7a67ceec794cf0981f56b8345c74774da5fc994a312a03576138681ade9d47283b50a3acf7bec3fddd29b16acb171f1a32614b06e06b6052372b98d

data/lib/voyage/app_builder.rb

@@ -22,6 +22,10 @@ module Suspenders
       gsub_file('Gemfile', /^\s{2}\n/, '')
     end
 
+    def bundle_without_production
+      template '../templates/bundle_config', '.bundle/config'
+    end
+
     def use_slim
       if @@accept_defaults || agree?('Would you like to use slim? (Y/n)')
         @@use_slim = true
@@ -766,11 +770,6 @@ module Suspenders
       template '../templates/auto_annotate_models.rake', 'lib/tasks/auto_annotate_models.rake', force: true
     end
 
-    def update_delayed_job_migration_rails_5_1_specify_4_2
-      file = Dir['db/migrate/*_create_delayed_jobs.rb'].first
-      replace_in_file file, 'class CreateDelayedJobs < ActiveRecord::Migration', "class CreateDelayedJobs < ActiveRecord::Migration[4.2]"
-    end
-
     def add_favicon
       template '../templates/favicon.ico', 'app/assets/images/favicon.ico', force: true
     end
@@ -887,9 +886,11 @@ module Suspenders
     end
 
     def configure_background_jobs_for_rspec
-      # template '../templates/config_dj_rails5_patches.rb', 'config/dj_rails5_patches.rb', force: true
+      # NOTE: (2017-05-31) jon => don't want this
+    end
 
-      run 'rails g delayed_job:active_record'
+    def configure_active_job
+      # NOTE: (2017-06-02) jon => don't want this
     end
 
     def configure_capybara_webkit

data/lib/voyage/generators/app_generator.rb

@@ -24,6 +24,7 @@ module Suspenders
     def finish_template
       invoke :suspenders_customization
       invoke :update_gemset_in_gemfile
+      invoke :bundle_without_production
       invoke :use_slim
       invoke :install_devise
       invoke :customize_application_js
@@ -41,7 +42,6 @@ module Suspenders
       invoke :update_test_environment
       invoke :add_rubocop_config
       invoke :add_auto_annotate_models_rake_task
-      invoke :update_delayed_job_migration_rails_5_1_specify_4_2
       invoke :add_favicon
       invoke :customize_application_mailer
       invoke :add_specs
@@ -64,6 +64,10 @@ module Suspenders
       build :update_gemset_in_gemfile
     end
 
+    def bundle_without_production
+      build :bundle_without_production
+    end
+
     def use_slim
       build :use_slim
     end
@@ -132,10 +136,6 @@ module Suspenders
       build :add_auto_annotate_models_rake_task
     end
 
-    def update_delayed_job_migration_rails_5_1_specify_4_2
-      build :update_delayed_job_migration_rails_5_1_specify_4_2
-    end
-
     def add_favicon
       build :add_favicon
     end

data/lib/voyage/templates/Gemfile.erb

@@ -5,15 +5,13 @@ ruby "<%= Voyage::RUBY_VERSION %>"
 #ruby-gemset
 
 gem "autoprefixer-rails"
-gem "delayed_job_active_record", github: 'collectiveidea/delayed_job_active_record', branch: 'gogovan-rails-5-1'
-<%# TODO: (2017-05-17) jon => remove this fork's version of delayed_job when DJ proper is released both ^ and v %>
-gem 'delayed_job', github: 'dsander/delayed_job', branch: 'rails51'
+<%# gem "delayed_job_active_record" %>
 gem "flutie"
 gem "honeybadger"
 gem "jquery-rails"
 gem "normalize-rails", "~> 3.0.0"
 gem "pg"
-gem "puma"
+<%# gem "puma" %>
 gem "rack-canonical-host"
 gem "rails", "<%= Voyage::RAILS_VERSION %>"
 gem "recipient_interceptor"
@@ -61,8 +59,8 @@ gem 'fog'
 gem 'mini_magick'
 
 # Cron Jobs
-gem 'whenever', require: false # provides a clear syntax for writing and deploying cron jobs
-gem 'whenever-web'
+# gem 'whenever', require: false # provides a clear syntax for writing and deploying cron jobs
+# gem 'whenever-web'
 
 # Debugging (need at top level if we want pry-remote to work on a deployed prod server)
 gem 'pry-awesome_print' # make pry output legible
@@ -78,9 +76,6 @@ group :development do
 
   # Customizations
   gem 'annotate' # annotate models automatically when rake db:migrate is called
-  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 'bitters', '~> 1.3'
   gem 'fix-db-schema-conflicts' # when working with multiple developers schema order of columns is standardized.
   gem 'meta_request' # for chrome rails console plugin found here: https://chrome.google.com/webstore/detail/railspanel/gjpfobpafnhjhbajcjgccbbdofdckggg?hl=en-US
   gem 'rails-erd' # auto gen ERD Diagram of models in the app on rake db:migrate
@@ -138,4 +133,5 @@ end
 
 group :production do
   gem 'analytics-ruby', '~> 2.2.2', require: 'segment/analytics'
+  gem 'puma'
 end

data/lib/voyage/templates/bundle_config

@@ -0,0 +1,2 @@
+---
+BUNDLE_WITHOUT: "production"

data/lib/voyage/templates/rubocop.yml

@@ -82,3 +82,9 @@ Metrics/MethodLength:
 
 Metrics/AbcSize:
   Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/AndOr:
+  Enabled: false

data/lib/voyage/version.rb

@@ -5,5 +5,5 @@ module Voyage
       .read("#{File.dirname(__FILE__)}/../../.ruby-version")
       .strip
       .freeze
-  VERSION = '1.44.0.13'.freeze
+  VERSION = '1.44.0.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: 1.44.0.13
+  version: 1.44.0.14
 platform: ruby
 authors:
 - thoughtbot, headway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -119,8 +119,8 @@ files:
 - lib/voyage/templates/application.js
 - lib/voyage/templates/application_mailer.rb.erb
 - lib/voyage/templates/auto_annotate_models.rake
+- lib/voyage/templates/bundle_config
 - lib/voyage/templates/circle.yml.erb
-- lib/voyage/templates/config_dj_rails5_patches.rb
 - lib/voyage/templates/config_initializers_ams.rb
 - lib/voyage/templates/config_locales_en.yml.erb
 - lib/voyage/templates/controller_helpers.rb

data/lib/voyage/templates/config_dj_rails5_patches.rb

@@ -1,20 +0,0 @@
-# RAILS 5 patches for delayed_job
-# TODO: REMOVE WHEN upstream is updated
-
-module DelayedWorkerPatches
-  def reload!
-    return unless self.class.reload_app?
-    if defined?(ActiveSupport::Reloader)
-      Rails.application.reloader.reload!
-    else
-      ActionDispatch::Reloader.cleanup!
-      ActionDispatch::Reloader.prepare!
-    end
-  end
-end
-
-module Delayed
-  class Worker
-    prepend DelayedWorkerPatches
-  end
-end