jetfuel 1.19.7 → 1.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1cb7c092fe5077070a6a33af5db17748361352f
-  data.tar.gz: cc7f24e7852085ba183a1351a7100e4ae3f2023f
+  metadata.gz: 38da21f546405a1487999fc73fb207b78ef3b5ee
+  data.tar.gz: c188755a2d169b98abaaacb0026b3c41964e8e8b
 SHA512:
-  metadata.gz: f56b9ef7fac2f869e4a9c6f05d367e94e2845b8a51b6cb0646e73aec0ff9045811e725d14694178bbcdd1012384b288bef3b1b42ffcbccae5d609f1ff15a5efd
-  data.tar.gz: 43b9f53ff27d7130521a981f9cceb4564aacec5e904bdc9a990524abf951c27ecc8f6f4c24d488868957d8a2e10ec24ec02862f36fddf241ea9f45a66ebab8c1
+  metadata.gz: 16bebaac7ae113be86657ff3952ec76f506915595567856292d77e2fda53831df677236503473498a86d93566b140fb3bb7e7f336c7428f44467932658b90ab9
+  data.tar.gz: 43f9e7266f703b1ff11fe02d91c3dfedcb17eb7f447dad57fa7612faeaaf459a455998ecd0fdf77fb8553a1712a8a507a11df45bce591bdb782f761fbbaf2344

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jetfuel (1.19.7)
+    jetfuel (1.19.8)
       bundler (~> 1.3)
       rails (= 4.1.1)
 

data/README.md

@@ -58,8 +58,7 @@ It includes application gems like:
 * [Bourbon](https://github.com/thoughtbot/bourbon) for Sass mixins
 * [Twitter Bootstrap](https://getbootstrap.com) for scaffold application styles
 * [Leather](https://github.com/dvanderbeek/leather) for Devise with styled views, a bootstrap UI Kit page, and some useful bootstrap component helpers
-* [Delayed Job](https://github.com/collectiveidea/delayed_job) for background
-  processing
+* [Sidekiq](https://github.com/mperham/sidekiq) for background job processing
 * [Email Validator](https://github.com/balexand/email_validator) for email
   validation
 * [Flutie](https://github.com/thoughtbot/flutie) for and `body_class` view
@@ -196,11 +195,6 @@ Snow Leopard (OS X 10.6).
 Use [Command Line Tools for XCode](https://developer.apple.com/downloads/index.action)
 for Lion (OS X 10.7) or Mountain Lion (OS X 10.8).
 
-We use [Capybara Webkit](https://github.com/thoughtbot/capybara-webkit) for
-full-stack JavaScript integration testing. It requires QT. Instructions for
-installing QT are
-[here](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
-
 PostgreSQL needs to be installed and running for the `db:create` rake task.
 
 Issues

data/lib/jetfuel/app_builder.rb

@@ -91,13 +91,13 @@ module Jetfuel
     end
 
     def setup_asset_host
-      replace_in_file 'config/environments/production.rb',
-        '# config.action_controller.asset_host = "http://assets.example.com"',
-        "config.action_controller.asset_host = ENV.fetch('ASSET_HOST')"
+      # replace_in_file 'config/environments/production.rb',
+      #   '# config.action_controller.asset_host = "http://assets.example.com"',
+      #   "config.action_controller.asset_host = ENV.fetch('ASSET_HOST')"
 
-      replace_in_file 'config/environments/production.rb',
-        "config.assets.version = '1.0'",
-        "config.assets.version = ENV.fetch('ASSETS_VERSION')"
+      # replace_in_file 'config/environments/production.rb',
+      #   "config.assets.version = '1.0'",
+      #   "config.assets.version = ENV.fetch('ASSETS_VERSION')"
 
       replace_in_file 'config/environments/production.rb',
         'config.serve_static_assets = false',
@@ -175,7 +175,7 @@ end
     end
 
     def setup_capistrano_specific_gems
-      inject_into_file 'Gemfile', "\n\s\sgem 'capistrano',  '~> 3.2'\n\s\sgem 'capistrano-rails', '~> 1.1'",
+      inject_into_file 'Gemfile', "\n\s\sgem 'capistrano',  '~> 3.2'\n\s\sgem 'capistrano-rails', '~> 1.1'\n\s\sgem 'capistrano-sidekiq'",
         after: /gem 'spring-commands-rspec'/
     end
 
@@ -203,9 +203,10 @@ end
       copy_file 'i18n.rb', 'spec/support/i18n.rb'
     end
 
-    def configure_background_jobs_for_rspec
+    def configure_background_jobs
+      run 'mkdir app/workers'
       copy_file 'background_jobs_rspec.rb', 'spec/support/background_jobs.rb'
-      run 'bundle exec rails g delayed_job:active_record'
+      # run 'bundle exec rails g delayed_job:active_record'
     end
 
     def configure_action_mailer_in_specs
@@ -394,6 +395,16 @@ fi
         "Rails.application.routes.draw do\nend"
     end
 
+    def add_sidekiq_web_routes
+      replace_in_file 'config/routes.rb',
+        /Rails\.application\.routes\.draw/,
+        "require 'sidekiq/web'\n\nRails.application.routes.draw"
+
+      replace_in_file 'config/routes.rb',
+      /\nend/,
+      "\n\s\smount Sidekiq::Web, at: '/sidekiq'\nend"
+    end
+
     def disable_xml_params
       copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
     end

data/lib/jetfuel/generators/app_generator.rb

@@ -38,6 +38,7 @@ module Jetfuel
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
+      invoke :add_sidekiq_web_routes
       invoke :setup_git
       invoke :setup_database
       invoke :create_heroku_apps
@@ -93,7 +94,7 @@ module Jetfuel
       build :set_up_factory_girl_for_rspec
       build :generate_rspec
       build :configure_rspec
-      build :configure_background_jobs_for_rspec
+      build :configure_background_jobs
       build :enable_database_cleaner
       build :configure_spec_support_features
       build :configure_travis
@@ -221,6 +222,10 @@ module Jetfuel
       build :remove_routes_comment_lines
     end
 
+    def add_sidekiq_web_routes
+      build :add_sidekiq_web_routes
+    end
+
     def outro
       say 'Congratulations! You are all fueled up.'
       say "Remember to run 'rails generate airbrake' with your API key."

data/lib/jetfuel/version.rb

@@ -1,5 +1,5 @@
 module Jetfuel
   RAILS_VERSION = '4.1.1'
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = '1.19.7'
+  VERSION = '1.19.8'
 end

data/templates/Capfile

@@ -20,6 +20,8 @@ require 'capistrano/deploy'
 require 'capistrano/bundler'
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
+require 'capistrano/sidekiq'
+require 'capistrano/sidekiq/monit'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

data/templates/Gemfile.erb

@@ -5,7 +5,9 @@ ruby '<%= Jetfuel::RUBY_VERSION %>'
 gem 'airbrake'
 gem 'bourbon', '~> 3.2.1'
 gem 'coffee-rails'
-gem 'delayed_job_active_record'
+gem 'sidekiq'
+gem 'sinatra', require: false
+gem 'slim'
 gem 'email_validator'
 gem 'flutie'
 gem 'jquery-rails'

data/templates/background_jobs_rspec.rb

@@ -1,19 +1,17 @@
-module BackgroundJobs
-  def run_background_jobs_immediately
-    delay_jobs = Delayed::Worker.delay_jobs
-    Delayed::Worker.delay_jobs = false
-    yield
-  ensure
-    Delayed::Worker.delay_jobs = delay_jobs
-  end
-end
-
+require 'sidekiq/testing'
 RSpec.configure do |config|
-  config.around(:each, type: :feature) do |example|
-    run_background_jobs_immediately do
-      example.run
+  config.before(:each) do | example |
+    # Clears out the jobs for tests using the fake testing
+    Sidekiq::Worker.clear_all
+
+    if example.metadata[:sidekiq] == :fake
+      Sidekiq::Testing.fake!
+    elsif example.metadata[:sidekiq] == :inline
+      Sidekiq::Testing.inline!
+    elsif example.metadata[:type] == :acceptance
+      Sidekiq::Testing.inline!
+    else
+      Sidekiq::Testing.fake!
     end
   end
-
-  config.include BackgroundJobs
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jetfuel
 version: !ruby/object:Gem::Version
-  version: 1.19.7
+  version: 1.19.8
 platform: ruby
 authors:
 - FlyoverWorks