potassium 3.0.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4a19d0503fea30781bf341b2b73f8356e9ad07
-  data.tar.gz: 9de9d7b253c62e7d3c5486204c7a408f4375bc5f
+  metadata.gz: 479102f8435587025fd50c9c83bdc108773ceb61
+  data.tar.gz: 9e5e03778e9218dd0fe9efa1ea1dc4899e7aad96
 SHA512:
-  metadata.gz: d09d2f6e7342f589e44d54981dd093cd89a3998ef39007e326be9653509fe637cce0e255ffeffea5b6229a7b7416e948b52de17d6888d96125ef507c22a4ba19
-  data.tar.gz: db39d009346a0d435f9d6f316205ef9d5e0670637188a92695e2dc33bc0c78ce232236e8e24fa50f9ed52d854e9dc2af32db0b8c45b9cb287dda85d3f1a642fd
+  metadata.gz: cc9c99c8da67c66bb18bb8f6ae214093e36eb42524349578403cfcccaa783642cc65a73e6f9257e899b7cf23f6124150544ab6eb3886a8979eec911df1e8f939
+  data.tar.gz: 1dfb6a5abbf465972f2ea326c2faa718e9117107efadb065c512cebb54ee5dfde3727e3c532ddd79763b0360ff8a316690ae18b5e6ad9f7bc37a3f29f4aaea78

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 5.1.1
+
+Features:
+  - Rails 5.1.1 (`potassium` version will follow `Rails` version from now on) #136
+  - Adds front_end option to include Vue.js and Angular 2 (using `webpacker`)
+  - Replaces `bower` by `yarn`
+  - Add sidekiq as background processor alternative
+
+Bugfixes:
+  - Force `DelayedJobs` migration to use 4.2 `ActiveRecord` class
+  - Fix custom `ActiveAdmin` footer
+  - Remove heroku dependency from mailer recipe, #124
+  - Sentry environment was not being overriden, #123
+  - Support for Draper gem
+
 ## 3.0.0
 
 Features:

data/README.md

@@ -38,7 +38,7 @@ Potassium Rails apps includes the following gems and technologies:
 
 - [Ruby](https://www.ruby-lang.org) Set the project ruby version based on http://ruby.platan.us/latest
 - [dotenv](https://github.com/bkeepers/dotenv) load environmental variables in development
-- [Bower](http://bower.io) for frontend assets packages.
+- [Yarn](https://yarnpkg.com) for frontend assets packages.
 - [EditorConfig](http://editorconfig.org) for keeping all our editor configurations the same.
 - [pry](http://pryrepl.org) and [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) for a less painful debugging experience.
 - [RSpec](http://rspec.info) for unit and integration testing.
@@ -59,10 +59,12 @@ The following optional integrations are added too:
 - [ActiveAdminAddons](https://github.com/platanus/activeadmin_addons) for some help with ActiveAdmin.
 - [Pundit](https://github.com/elabs/pundit) for role-based authorization.
 - [DelayedJob](https://github.com/collectiveidea/delayed_job) to execute longer tasks in the background.]
+- [Sidekiq](https://github.com/mperham/sidekiq) a simple, efficient background processing for Ruby.
+- [Sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) to run scheduled processes
 - Mailing configuration for [AWS SES](https://github.com/aws/aws-sdk-rails)
   and [Sendgrid](https://github.com/platanus/send_grid_mailer) with recipient interceptor support
-- [Clockwork](https://github.com/Rykian/clockwork) to run scheduled processes
 - [Sentry](https://sentry.io) to monitor exceptions and errors
+- [Vue.js](https://vuejs.org) or [Angular 2](https://angular.io/) for frontend development
 
 A few more things are added to the project:
 
@@ -99,7 +101,7 @@ When you choose to deploy to heroku a few extra things are added for the project
 
 | index | buildpack | description |
 |-------|-----------|-------------|
-| 1.    | [bower][heroku-buildpack-bower] | to make sure `bower install` run before the assets precompilation task |
+| 1.    | [nodejs][heroku-buildpack-nodejs] | to support javascript package management with `yarn` and `webpack` based asset compiling |
 | 2.    | [ruby-version][heroku-buildpack-ruby-version] | to support the use of `.ruby-version` file to instruct heroku which ruby version to use |
 | 3.    | [ruby][heroku-buildpack-ruby] | the base buildpack to run ruby applications |
 | 4.    | [ruby-deploy-tasks][buildpack-deploy-tasks] | to run rake task after the deployment is complete, for example `db:migrate` |
@@ -135,7 +137,7 @@ Go to https://monkeyci.platan.us, choose the repository from the list and hit
 [heroku-logging]: https://devcenter.heroku.com/articles/logging#writing-to-your-log
 [procfile]: https://devcenter.heroku.com/articles/procfile
 [heroku-buildpack-ruby-version]: http://github.com/platanus/heroku-buildpack-ruby-version
-[heroku-buildpack-bower]: http://github.com/platanus/heroku-buildpack-bower
+[heroku-buildpack-nodejs]: https://github.com/heroku/heroku-buildpack-nodejs
 [heroku-buildpack-ruby]: http://github.com/heroku/heroku-buildpack-ruby
 [heroku-buildpack-multi]: http://github.com/heroku/heroku-buildpack-multi
 [buildpack-deploy-tasks]: http://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks

data/lib/potassium/assets/README.yml

@@ -72,7 +72,7 @@ readme:
         The emails can be send through the gem `<%= get(:mailer_gem_name) %>` using the `<%= get(:mailer_delivery_method) %>` delivery method.
         All the `action_mailer` configuration can be found at `config/mailer.rb`, which is loaded only on production environments.
 
-        All emails should be sent using background jobs, by default we install `delayed_job` for that purpuse.
+        All emails should be sent using background jobs, by default we install `sidekiq` for that purpuse.
 
         #### Testing in staging
 
@@ -92,15 +92,21 @@ readme:
         delayed_job:
           title: "Queue System"
           body: "For managing tasks in the background, this project uses [DelayedJob](https://github.com/collectiveidea/delayed_job)"
-        clockwork:
+        sidekiq:
+          title: "Queue System"
+          body: "For managing tasks in the background, this project uses [Sidekiq](https://github.com/mperham/sidekiq)"
+        sidekiq_scheduler:
           title: "Scheduled Tasks"
-          body: "To schedule recurring work at particular times or dates, this project uses [Clockwork](https://github.com/Rykian/clockwork)"
+          body: "To schedule recurring work at particular times or dates, this project uses [Sidekiq Scheduler](https://github.com/moove-it/sidekiq-scheduler)"
         sentry:
           title: "Error Reporting"
           body: "To report our errors we use [Sentry](https://github.com/getsentry/raven-ruby)"
         draper:
           title: "Presentation Layer"
           body: "This project uses [Draper](https://github.com/drapergem/draper) to add an object-oriented layer of presentation logic"
+        power_types:
+          title: "Rails pattern enforcing types"
+          body: "This projects uses [Power-Types](https://github.com/platanus/power-types) to generate Services, Commands, Utils and Values."
     seeds:
       title: "Seeds"
       body: |

data/lib/potassium/assets/bin/cibuild.erb

@@ -44,6 +44,10 @@ dependencies(){
   docker-compose $DOCKER_COMPOSE_ARGS run test bundle install
 }
 
+assets() {
+  docker-compose $DOCKER_COMPOSE_ARGS run test /bin/bash -c "bin/setup && bundle exec rake assets:precompile"
+}
+
 # Prepare database
 database(){
   docker-compose $DOCKER_COMPOSE_ARGS run test bundle exec rake db:create db:schema:load
@@ -63,6 +67,7 @@ no_ci(){
   build
   wait_services
   dependencies
+  assets
   database
   tests
 }
@@ -77,6 +82,9 @@ case "$1" in
   "deps"|"dependencies")
     dependencies
     ;;
+  "assets")
+    assets
+    ;;
   "db"|"database")
     database
     ;;
@@ -87,6 +95,6 @@ case "$1" in
     build
     ;;
   *)
-    echo "Usage: cibuild [services|deps|db|specs|build]"
+    echo "Usage: cibuild [services|deps|assets|db|specs|build]"
     ;;
 esac

data/lib/potassium/assets/bin/setup.erb

@@ -10,8 +10,8 @@ set -e
 gem install bundler --conservative
 bundle check || bundle install
 
-# Install bower dependencies
-bower install
+# Install javascript dependencies
+bin/yarn install
 
 # Set up database
 bin/rails db:setup

data/lib/potassium/assets/bin/update.erb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+
+  puts '== Installing YARN stuff =='
+  system! 'bin/yarn install'
+
+  system('bundle check') || system!('bundle install')
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/lib/potassium/assets/circle.yml

@@ -8,6 +8,7 @@ dependencies:
     - docker-compose -f docker-compose.ci.yml build test
     - bin/cibuild services
     - bin/cibuild deps
+    - bin/cibuild assets
 
 database:
   override:

data/lib/potassium/assets/config/{mailer.rb → mailer.rb.erb}

@@ -13,6 +13,6 @@ Rails.application.config.action_mailer.asset_host = ASSET_HOST
 if ENV["EMAIL_RECIPIENTS"].present?
   Mail.register_interceptor RecipientInterceptor.new(
     ENV["EMAIL_RECIPIENTS"],
-    subject_prefix: "[#{Heroku.stage.upcase}]"
+    subject_prefix: "[<%= get(:heroku) ? '#{Heroku.stage.upcase}' : '#{Rails.env}' %>]"
   )
 end

data/lib/potassium/assets/config/sentry.rb.erb

@@ -1,7 +1,9 @@
 if Rails.env.production?
   Raven.configure do |config|
     config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
-    config.tags = { environment: <%= get(:heroku) ? "Heroku.stage" : "Rails.env" %> }
+    <% if get(:heroku) %>
+    config.current_environment = Heroku.stage
+    <% end %>
   end
 
   # In case you want to group the events with different ids in the

data/lib/potassium/assets/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "<%= @app_name.camelcase %>"
+}

data/lib/potassium/assets/redis.yml

@@ -0,0 +1,9 @@
+development: &default
+  host: <%= ENV["BOXEN_REDIS_HOST"] || ENV["REDIS_HOST"] || "127.0.0.1" %>
+  port: <%= ENV["BOXEN_REDIS_PORT"] || ENV["REDIS_PORT"] || 6379 %>
+
+test:
+  <<: *default
+
+production: &deploy
+  url: <%= ENV.fetch("REDIS_URL", "") %>

data/lib/potassium/assets/sidekiq.rb

@@ -0,0 +1,17 @@
+require 'sidekiq'
+require 'sidekiq/web'
+
+redis_config = Rails.application.config_for(:redis)
+
+Sidekiq.configure_client do |config|
+  config.redis = redis_config
+end
+Sidekiq.configure_server do |config|
+  config.redis = redis_config
+end
+
+if !Rails.env.development?
+  Sidekiq::Web.use Rack::Auth::Basic do |username, password|
+    username == 'admin' && password == ENV["SIDEKIQ_ADMIN_PASSWORD"]
+  end
+end

data/lib/potassium/assets/sidekiq.yml

@@ -0,0 +1,4 @@
+production:
+  :concurrency: 5
+:queues:
+  - default

data/lib/potassium/assets/sidekiq_scheduler.yml

@@ -0,0 +1,9 @@
+production:
+  :concurrency: 5
+:queues:
+  - default
+:schedule:
+  #  an_scheduled_task:
+  #    cron: '0 * * * * *'  # Runs once per minute
+  #    class: ExampleJob
+  #    args: ['a', 'b']

data/lib/potassium/cli_options.rb

@@ -83,12 +83,10 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       default_test_value: false
     },
     {
-      type: :switch,
-      name: "delayed-job",
-      desc: "Whether to use DelayedJob or not",
-      negatable: true,
-      default_value: "none",
-      default_test_value: false
+      type: :flag,
+      name: "background_processor",
+      desc: "Decides which background processor to use. Available: sidekiq, delayed_job, none",
+      default_test_value: "sidekiq"
     },
     {
       type: :switch,
@@ -116,8 +114,8 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
     },
     {
       type: :switch,
-      name: "clockwork",
-      desc: "Whether to use clockwork as job scheduler",
+      name: "schedule",
+      desc: "Whether to use sidekiq-scheduler as job scheduler",
       negatable: true,
       default_value: "none",
       default_test_value: false
@@ -129,6 +127,12 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       negatable: true,
       default_value: "none",
       default_test_value: false
+    },
+    {
+      type: :flag,
+      name: :front_end,
+      desc: "Decides which front-end framework to use. Available: Vue, Angular 2, None",
+      default_test_value: "None"
     }
   ]
 

data/lib/potassium/generators/application.rb

@@ -15,6 +15,12 @@ module Potassium
       template_location = File.expand_path('../templates/application.rb', File.dirname(__FILE__))
       instance_eval File.read(template_location), template_location
       super
+
+      after_bundle do
+        git :init
+        git add: "."
+        git commit: %{ -m 'Initial commit' -q }
+      end
     end
   end
 end

data/lib/potassium/recipes/admin.rb

@@ -43,7 +43,7 @@ class Recipes::Admin < Rails::AppBuilder
       gsub_file initializer, /(#{Regexp.escape(line)})/mi do |_match|
         <<-HERE.gsub(/^ {11}/, '')
            class CustomFooter < ActiveAdmin::Component
-             def build
+             def build _arg
                super(id: "footer")
                para "Powered by Platanus"
              end

data/lib/potassium/recipes/angular_admin.rb

@@ -50,7 +50,7 @@ class Recipes::AngularAdmin < Rails::AppBuilder
     create_file 'app/assets/javascripts/admin/directives/.keep'
 
     inside('.') do
-      run('bower install angular --save')
+      run('bin/yarn add angular --save')
     end
   end
 end

data/lib/potassium/recipes/api.rb

@@ -29,7 +29,7 @@ class Recipes::Api < Rails::AppBuilder
       insert_into_file "config/routes.rb", after: line do
         <<-HERE.gsub(/^ {8}/, '')
           scope path: '/api' do
-            api_version(module: "Api::V1", path: { value: "v1" }) do
+            api_version(module: "Api::V1", path: { value: "v1" }, defaults: { format: 'json' }) do
             end
           end
         HERE

data/lib/potassium/recipes/background_processor.rb

@@ -0,0 +1,55 @@
+class Recipes::BackgroundProcessor < Rails::AppBuilder
+  def ask
+    response = if selected?(:email_service, :none)
+                 answer(:background_processor) do
+                   Ask.confirm("Do you want to use Sidekiq for background job processing?")
+                 end
+               else
+                 info "Note: Emails should be sent on background jobs. We'll install sidekiq"
+                 true
+               end
+    set(:background_processor, response)
+  end
+
+  def create
+    add_sidekiq if get(:background_processor)
+  end
+
+  def install
+    ask
+    heroku = load_recipe(:heroku)
+    set(:heroku, heroku.installed?)
+    create
+  end
+
+  def installed?
+    gem_exists?(/sidekiq/)
+  end
+
+  def add_sidekiq
+    gather_gem("sidekiq")
+    add_adapters("sidekiq")
+    add_readme_section :internal_dependencies, :sidekiq
+    edit_procfile("bundle exec sidekiq")
+    append_to_file(".env.development", "DB_POOL=25\n")
+    copy_file("../assets/sidekiq.rb", "config/initializers/sidekiq.rb", force: true)
+    copy_file("../assets/sidekiq.yml", "config/sidekiq.yml", force: true)
+    copy_file("../assets/redis.yml", "config/redis.yml", force: true)
+
+    insert_into_file "config/routes.rb", after: "Rails.application.routes.draw do\n" do
+      <<-HERE.gsub(/^ {6}/, '')
+        mount Sidekiq::Web => '/queue'
+      HERE
+    end
+  end
+
+  def edit_procfile(cmd)
+    gsub_file("Procfile", /^.*$/m) { |match| "#{match}worker: #{cmd}" } if selected?(:heroku)
+  end
+
+  def add_adapters(name)
+    application("config.active_job.queue_adapter = :#{name}")
+    application "config.active_job.queue_adapter = :inline", env: "development"
+    application "config.active_job.queue_adapter = :test", env: "test"
+  end
+end

data/lib/potassium/recipes/ci.rb

@@ -42,5 +42,8 @@ class Recipes::Ci < Rails::AppBuilder
 
       add_readme_header :ci
     end
+
+    uglifier = "  config.assets.js_compressor = :uglifier\n"
+    insert_into_file 'config/environments/test.rb', uglifier, after: "configure do\n"
   end
 end

data/lib/potassium/recipes/draper.rb

@@ -21,8 +21,7 @@ class Recipes::Draper < Rails::AppBuilder
   end
 
   def add_draper
-    gather_gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
-    gather_gem 'draper'
+    gather_gem 'draper', '3.0.0.pre1'
     add_readme_section :internal_dependencies, :draper
     create_file 'app/decorators/.keep'
   end

data/lib/potassium/recipes/front_end.rb

@@ -0,0 +1,61 @@
+class Recipes::FrontEnd < Rails::AppBuilder
+  def ask
+    frameworks = {
+      vue: "Vue",
+      angular: "Angular 2",
+      none: "None"
+    }
+
+    framework = answer(:front_end) do
+      frameworks.keys[
+        Ask.list("Which front-end framework are you going to use?", frameworks.values)
+      ]
+    end
+    set :front_end, framework.to_sym
+  end
+
+  def create
+    return if [:none, :None].include? get(:front_end).to_sym
+
+    gather_gem 'webpacker', github: 'rails/webpacker'
+
+    after(:gem_install) do
+      value = get(:front_end)
+      run "rails webpacker:install"
+      run "rails webpacker:install:#{value}" if value
+
+      if value == :vue
+        application_js_file = "app/javascript/packs/application.js"
+        FileUtils.move "app/javascript/packs/hello_vue.js", application_js_file
+        gsub_file application_js_file, %r{\/\/.*\n}, ""
+
+        js_pack_tag = "\n    <%= javascript_pack_tag 'application' %>\n"
+        layout_file = "app/views/layouts/application.html.erb"
+        insert_into_file layout_file, js_pack_tag, after: "<%= csrf_meta_tags %>"
+      end
+    end
+  end
+
+  def install
+    ask
+    create
+  end
+
+  def installed?
+    package_file = 'package.json'
+    return false unless file_exist?(package_file)
+    package_content = read_file(package_file)
+    package_content.include?("\"@angular/core\"") || package_content.include?("\"vue\"")
+  end
+
+  private
+
+  def frameworks(framework)
+    frameworks = {
+      vue: "vue",
+      angular: "angular",
+      none: nil
+    }
+    frameworks[framework]
+  end
+end

data/lib/potassium/recipes/heroku.rb

@@ -36,10 +36,9 @@ class Recipes::Heroku < Rails::AppBuilder
   def add_heroku
     gather_gems(:production) do
       gather_gem('rails_stdout_logging')
+      gather_gem('heroku-stage')
     end
 
-    gather_gem 'heroku-stage'
-
     copy_file '../assets/Procfile', 'Procfile'
     copy_file '../assets/.buildpacks', '.buildpacks'
 

data/lib/potassium/recipes/mailer.rb

@@ -1,6 +1,5 @@
 class Recipes::Mailer < Rails::AppBuilder
   def ask
-    info "Note: Emails should be sent on background jobs. We'll install delayed_jobs recipe"
     email_services = {
       aws_ses: "Amazon SES",
       sendgrid: "Sendgrid (beta)",
@@ -25,8 +24,8 @@ class Recipes::Mailer < Rails::AppBuilder
     dependencies(email_service)
     config(email_service)
 
-    delayed_job = load_recipe(:delayed_job)
-    delayed_job.add_delayed_job unless delayed_job.installed?
+    background_processor = load_recipe(:background_processor)
+    background_processor.add_sidekiq unless background_processor.installed?
   end
 
   def install
@@ -58,12 +57,11 @@ class Recipes::Mailer < Rails::AppBuilder
     else
       gather_gem service[:gem_name]
     end
-    gather_gem 'heroku-stage'
     gather_gem 'recipient_interceptor'
   end
 
   def config(service)
-    template "../assets/config/mailer.rb", 'config/mailer.rb'
+    template "../assets/config/mailer.rb.erb", 'config/mailer.rb'
     gsub_file 'config/environments/production.rb', /$\s*config.action_mailer.*/, ''
     append_to_file '.env.development', "APPLICATION_HOST=localhost:3000\n"
     append_to_file '.env.development', "EMAIL_RECIPIENTS=\n"

data/lib/potassium/recipes/power_types.rb

@@ -0,0 +1,28 @@
+class Recipes::PowerTypes < Rails::AppBuilder
+  def create
+    add_power_types
+    generate_folders
+  end
+
+  def install
+    add_power_types
+    generate_folders
+  end
+
+  def installed?
+    gem_exists?(/power-types/)
+  end
+
+  private
+
+  def add_power_types
+    gather_gem 'power-types'
+    add_readme_section :internal_dependencies, :power_types
+  end
+
+  def generate_folders
+    after(:gem_install) do
+      generate "power_types:init"
+    end
+  end
+end

data/lib/potassium/recipes/schedule.rb

@@ -1,33 +1,25 @@
 class Recipes::Schedule < Rails::AppBuilder
   def ask
-    use_schedule = answer(:clockwork) { Ask.confirm("Do you need to schedule processes or tasks?") }
-    set(:scheduled, use_schedule)
+    if selected?(:background_processor)
+      response = answer(:schedule) { Ask.confirm("Do you need to schedule jobs?") }
+    end
+    set(:schedule, response)
   end
 
   def create
-    if selected?(:scheduled)
-      gather_gem 'clockwork'
-      template '../assets/config/clock.rb.erb', 'config/clock.rb'
-      add_readme_section :internal_dependencies, :clockwork
-
-      if selected?(:heroku)
-        procfile('scheduler', 'bundle exec clockwork config/clock.rb')
-      end
+    if selected?(:schedule)
+      gather_gem 'sidekiq-scheduler'
+      add_readme_section :internal_dependencies, :sidekiq_scheduler
     end
+    template '../assets/sidekiq_scheduler.yml', 'config/sidekiq.yml', force: true
   end
 
   def install
-    heroku = load_recipe(:heroku)
-    set(:heroku, heroku.installed?)
-
-    error_reporting = load_recipe(:error_reporting)
-    set(:report_error, error_reporting.installed?)
-
-    set(:scheduled, true)
+    set(:schedule, true)
     create
   end
 
   def installed?
-    gem_exists?(/clock/) && file_exist?('config/clock.rb')
+    gem_exists?("sidekiq-scheduler") && file_exist?('config/sidekiq.yml')
   end
 end

data/lib/potassium/recipes/yarn.rb

@@ -0,0 +1,14 @@
+class Recipes::Yarn < Rails::AppBuilder
+  def create
+    template '../assets/package.json', 'package.json' unless get(:front_end)
+    template '../assets/bin/update.erb', 'bin/update', force: true
+    application "config.assets.paths << Rails.root.join('node_modules')"
+    append_to_file ".gitignore", "node_modules/\n"
+
+    if get(:heroku)
+      node_buildpack_url = 'https://github.com/heroku/heroku-buildpack-nodejs'
+      insert_point = 'https://github.com/platanus/heroku-buildpack-ruby-version.git'
+      inject_into_file '.buildpacks', "#{node_buildpack_url}\n", before: insert_point
+    end
+  end
+end

data/lib/potassium/templates/application.rb

@@ -12,12 +12,18 @@ run_action(:cleaning) do
   gather_gem("spring")
 end
 
+run_action(:add_utils) do
+  gather_gem("enumerize")
+end
+
 run_action(:asking) do
   ask :database
   ask :devise
   ask :admin
+  ask :front_end
   ask :angular_admin
-  ask :delayed_job
+  ask :mailer
+  ask :background_processor
   ask :schedule
   ask :error_reporting
   ask :pundit
@@ -25,7 +31,6 @@ run_action(:asking) do
   ask :api
   ask :draper
   ask :paperclip
-  ask :mailer
   ask :heroku
   ask :github
 end
@@ -40,11 +45,12 @@ run_action(:recipe_loading) do
   create :annotate
   create :ruby
   create :env
-  create :bower
+  create :yarn
   create :editorconfig
   create :aws_sdk
-  create :schedule
   create :mailer
+  create :background_processor
+  create :schedule
   create :i18n
   create :pry
   create :better_errors
@@ -53,19 +59,19 @@ run_action(:recipe_loading) do
   create :angular_admin
   create :seeds
   create :error_reporting
-  create :delayed_job
   create :pundit
   create :testing
   create :secrets
-  create :git
   create :api
   create :draper
+  create :power_types
   create :rack_cors
   create :paperclip
   create :tzinfo
   create :script
   create :github
   create :cleanup
+  create :front_end
 end
 
 info "Gathered enough information. Applying the template. Wait a minute."

data/lib/potassium/version.rb

@@ -1,6 +1,6 @@
 module Potassium
-  VERSION = "3.0.0"
+  VERSION = "5.1.1"
   RUBY_VERSION = "2.3.1"
-  RAILS_VERSION = "~> 5.0.2"
-  RUBOCOP_VERSION = "~> 0.46.0"
+  RAILS_VERSION = "~> 5.1.1"
+  RUBOCOP_VERSION = "~> 0.49.1"
 end

data/spec/features/background_processor_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+
+RSpec.describe "BackgroundProcessor" do
+  context "working with sidekiq" do
+    before :all do
+      drop_dummy_database
+      remove_project_directory
+      create_dummy_project("background_processor" => "sidekiq", "heroku" => true)
+    end
+
+    it "adds sidekiq gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'sidekiq'")
+    end
+
+    it "adds queue_adapter to application.rb" do
+      content = IO.read("#{project_path}/config/application.rb")
+      expect(content).to include("config.active_job.queue_adapter = :sidekiq")
+    end
+
+    it "adds inline queue_adapter to development.rb" do
+      content = IO.read("#{project_path}/config/environments/development.rb")
+      expect(content).to include("config.active_job.queue_adapter = :inline")
+    end
+
+    it "adds test queue_adapter to test.rb" do
+      content = IO.read("#{project_path}/config/environments/test.rb")
+      expect(content).to include("config.active_job.queue_adapter = :test")
+    end
+
+    it "modifies Procfile" do
+      content = IO.read("#{project_path}/Procfile")
+      expect(content).to include("worker: bundle exec sidekiq")
+    end
+
+    it "modifies README" do
+      content = IO.read("#{project_path}/README.md")
+      expect(content).to include("this project uses [Sidekiq]")
+    end
+
+    it "adds ENV vars" do
+      content = IO.read("#{project_path}/.env.development")
+      expect(content).to include("DB_POOL=25")
+    end
+
+    it "adds sidekiq.rb file" do
+      content = IO.read("#{project_path}/config/initializers/sidekiq.rb")
+      expect(content).to include("require 'sidekiq'")
+    end
+
+    it "adds sidekiq.yml file" do
+      content = IO.read("#{project_path}/config/sidekiq.yml")
+      expect(content).to include("concurrency: 5")
+    end
+
+    it "adds redis.yml file" do
+      content = IO.read("#{project_path}/config/redis.yml")
+      expect(content).to include("REDIS_HOST")
+    end
+
+    it "mounts sidekiq app" do
+      content = IO.read("#{project_path}/config/routes.rb")
+      expect(content).to include("mount Sidekiq::Web => '/queue'")
+    end
+  end
+end

data/spec/features/front_end.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+RSpec.describe "Front end" do
+  before(:all) { drop_dummy_database }
+  before(:each) { remove_project_directory }
+
+  it "creates a project wihtout a front end framework" do
+    create_dummy_project("front_end" => "None")
+    gemfile = IO.read("#{project_path}/Gemfile")
+    expect(gemfile).not_to include('webpacker')
+  end
+
+  it "creates a project wihtout vue as front end framework" do
+    create_dummy_project("front_end" => "angular")
+    gemfile = IO.read("#{project_path}/Gemfile")
+    node_modules_file = IO.read("#{project_path}/package.json")
+
+    expect(gemfile).to include('webpacker')
+    expect(node_modules_file).to include("\"@angular/core\"")
+  end
+
+  it "creates a project wihtout vue as front end framework" do
+    create_dummy_project("front_end" => "vue")
+    gemfile = IO.read("#{project_path}/Gemfile")
+    node_modules_file = IO.read("#{project_path}/package.json")
+
+    expect(gemfile).to include('webpacker')
+    expect(node_modules_file).to include("\"vue\"")
+  end
+end

data/spec/features/heroku_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "Heroku" do
     remove_project_directory
   end
 
-  fit "creates a project for Heroku" do
+  it "creates a project for Heroku" do
     create_dummy_project("heroku" => true)
     app_name = PotassiumTestHelpers::APP_NAME.dasherize
 
@@ -22,7 +22,7 @@ RSpec.describe "Heroku" do
     buildpacks_path = "#{project_path}/.buildpacks"
     buildpacks = IO.read(buildpacks_path)
 
-    expect(buildpacks).to include("https://github.com/platanus/heroku-buildpack-bower.git")
+    expect(buildpacks).to include("https://github.com/heroku/heroku-buildpack-nodejs")
     expect(buildpacks).to include("https://github.com/platanus/heroku-buildpack-ruby-version.git")
     expect(buildpacks).to include("https://github.com/heroku/heroku-buildpack-ruby.git")
     expect(buildpacks).to(

data/spec/features/power_types_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+RSpec.describe "PowerTypes" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project
+  end
+
+  it "adds the PowerTypes gem to Gemfile" do
+    gemfile_content = IO.read("#{project_path}/Gemfile")
+    expect(gemfile_content).to include("gem 'power-types'")
+  end
+
+  it "adds the PowerTypes brief to README file" do
+    readme = IO.read("#{project_path}/README.md")
+    expect(readme).to include("Power-Types")
+  end
+
+  it "adds commands directory" do
+    commands_directory = "#{project_path}/app/commands"
+    expect(File.directory?(commands_directory)).to eq(true)
+  end
+
+  it "adds services directory" do
+    services_directory = "#{project_path}/app/services"
+    expect(File.directory?(services_directory)).to eq(true)
+  end
+  it "adds utils directory" do
+    utils_directory = "#{project_path}/app/utils"
+    expect(File.directory?(utils_directory)).to eq(true)
+  end
+  it "adds values directory" do
+    values_directory = "#{project_path}/app/values"
+    expect(File.directory?(values_directory)).to eq(true)
+  end
+end

data/spec/features/schedule_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+RSpec.describe "schedule" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project("schedule" => true)
+  end
+
+  it "adds the sidekiq-scheduler gem to Gemfile" do
+    gemfile_content = IO.read("#{project_path}/Gemfile")
+    expect(gemfile_content).to include("gem 'sidekiq-scheduler'")
+  end
+
+  it "creates the config with schedule" do
+    initializer_content = IO.read("#{project_path}/config/sidekiq.yml")
+    expect(initializer_content).to include(":schedule:")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 5.1.1
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,6 @@ files:
 - docs/CONTRIBUTING.md
 - docs/DSL.md
 - lib/potassium.rb
-- lib/potassium/assets/.bowerrc
 - lib/potassium/assets/.buildpacks
 - lib/potassium/assets/.dockerignore
 - lib/potassium/assets/.editorconfig
@@ -211,22 +210,26 @@ files:
 - lib/potassium/assets/bin/cibuild.erb
 - lib/potassium/assets/bin/setup.erb
 - lib/potassium/assets/bin/setup_heroku.erb
-- lib/potassium/assets/bower.json
+- lib/potassium/assets/bin/update.erb
 - lib/potassium/assets/circle.yml
-- lib/potassium/assets/config/clock.rb.erb
 - lib/potassium/assets/config/database_mysql.yml.erb
 - lib/potassium/assets/config/database_postgresql.yml.erb
-- lib/potassium/assets/config/mailer.rb
+- lib/potassium/assets/config/mailer.rb.erb
 - lib/potassium/assets/config/puma.rb
 - lib/potassium/assets/config/secrets.yml.erb
 - lib/potassium/assets/config/sentry.rb.erb
 - lib/potassium/assets/docker-compose.ci.yml
 - lib/potassium/assets/es-CL.yml
 - lib/potassium/assets/lib/tasks/auto_annotate_models.rake
+- lib/potassium/assets/package.json
+- lib/potassium/assets/redis.yml
 - lib/potassium/assets/seeds/admin_data_loader.rb
 - lib/potassium/assets/seeds/fake_data_loader.rake
 - lib/potassium/assets/seeds/fake_data_loader.rb
 - lib/potassium/assets/seeds/seeds.rb
+- lib/potassium/assets/sidekiq.rb
+- lib/potassium/assets/sidekiq.yml
+- lib/potassium/assets/sidekiq_scheduler.yml
 - lib/potassium/assets/testing/.rspec
 - lib/potassium/assets/testing/paperclip.rb
 - lib/potassium/assets/testing/platanus.png
@@ -255,23 +258,23 @@ files:
 - lib/potassium/recipes/annotate.rb
 - lib/potassium/recipes/api.rb
 - lib/potassium/recipes/aws_sdk.rb
+- lib/potassium/recipes/background_processor.rb
 - lib/potassium/recipes/better_errors.rb
-- lib/potassium/recipes/bower.rb
 - lib/potassium/recipes/ci.rb
 - lib/potassium/recipes/cleanup.rb
 - lib/potassium/recipes/database.rb
-- lib/potassium/recipes/delayed_job.rb
 - lib/potassium/recipes/devise.rb
 - lib/potassium/recipes/draper.rb
 - lib/potassium/recipes/editorconfig.rb
 - lib/potassium/recipes/env.rb
 - lib/potassium/recipes/error_reporting.rb
-- lib/potassium/recipes/git.rb
+- lib/potassium/recipes/front_end.rb
 - lib/potassium/recipes/github.rb
 - lib/potassium/recipes/heroku.rb
 - lib/potassium/recipes/i18n.rb
 - lib/potassium/recipes/mailer.rb
 - lib/potassium/recipes/paperclip.rb
+- lib/potassium/recipes/power_types.rb
 - lib/potassium/recipes/pry.rb
 - lib/potassium/recipes/puma.rb
 - lib/potassium/recipes/pundit.rb
@@ -285,6 +288,7 @@ files:
 - lib/potassium/recipes/style.rb
 - lib/potassium/recipes/testing.rb
 - lib/potassium/recipes/tzinfo.rb
+- lib/potassium/recipes/yarn.rb
 - lib/potassium/template_finder.rb
 - lib/potassium/templates/application.rb
 - lib/potassium/templates/recipe.rb
@@ -294,14 +298,17 @@ files:
 - potassium.gemspec
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
-- spec/features/clockwork_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
+- spec/features/front_end.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
 - spec/features/new_project_spec.rb
+- spec/features/power_types_spec.rb
+- spec/features/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
@@ -326,21 +333,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
 test_files:
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
+- spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
-- spec/features/clockwork_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
+- spec/features/front_end.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
 - spec/features/new_project_spec.rb
+- spec/features/power_types_spec.rb
+- spec/features/schedule_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb

data/lib/potassium/assets/.bowerrc

@@ -1,3 +0,0 @@
-{
-  "directory": "vendor/assets/bower_components"
-}

data/lib/potassium/assets/bower.json

@@ -1,4 +0,0 @@
-{
-  "name": "<%= @app_name.camelcase %>",
-  "version": "1.0.0"
-}

data/lib/potassium/assets/config/clock.rb.erb

@@ -1,16 +0,0 @@
-require 'clockwork'
-require_relative './boot'
-require_relative './environment'
-
-module Clockwork
-  <% if selected?(:report_error) -%>
-error_handler do |error|
-    Raven.capture_exception(error)
-  end
-  <% end -%>
-# Example
-  #
-  # every(5.minutes, 'ScheduledJob') do
-  #   ScheduledJob.perform_later
-  # end
-end

data/lib/potassium/recipes/bower.rb

@@ -1,13 +0,0 @@
-class Recipes::Bower < Rails::AppBuilder
-  def create
-    copy_file '../assets/.bowerrc', '.bowerrc'
-    template '../assets/bower.json', 'bower.json'
-    application "config.assets.paths << Rails.root.join('vendor', 'assets', 'bower_components')"
-
-    if get(:heroku)
-      bower_buildpack_url = 'https://github.com/platanus/heroku-buildpack-bower.git'
-      insert_point = 'https://github.com/platanus/heroku-buildpack-ruby-version.git'
-      inject_into_file '.buildpacks', "#{bower_buildpack_url}\n", before: insert_point
-    end
-  end
-end

data/lib/potassium/recipes/delayed_job.rb

@@ -1,38 +0,0 @@
-class Recipes::DelayedJob < Rails::AppBuilder
-  def ask
-    use_delayed_job = answer(:"delayed-job") { Ask.confirm("Do you want to use delayed jobs?") }
-    set(:delayed_job, use_delayed_job)
-  end
-
-  def create
-    add_delayed_job if selected?(:delayed_job)
-  end
-
-  def install
-    heroku = load_recipe(:heroku)
-    set(:heroku, heroku.installed?)
-    add_delayed_job
-  end
-
-  def installed?
-    gem_exists?(/delayed_job_active_record/)
-  end
-
-  def add_delayed_job
-    gather_gem "delayed_job_active_record"
-
-    general_config = "config.active_job.queue_adapter = :delayed_job"
-    application(general_config)
-    dev_config = "config.active_job.queue_adapter = :inline"
-    application dev_config, env: "development"
-
-    after(:gem_install) do
-      generate "delayed_job:active_record"
-      add_readme_section :internal_dependencies, :delayed_job
-
-      if selected?(:heroku)
-        gsub_file("Procfile", /^.*$/m) { |match| "#{match}worker: bundle exec rails jobs:work" }
-      end
-    end
-  end
-end

data/lib/potassium/recipes/git.rb

@@ -1,9 +0,0 @@
-class Recipes::Git < Rails::AppBuilder
-  def create
-    git :init
-    after(:database_creation) do
-      git add: "."
-      git commit: %{ -m 'Initial commit' }
-    end
-  end
-end

data/spec/features/clockwork_spec.rb

@@ -1,21 +0,0 @@
-require "spec_helper"
-
-RSpec.describe "Clockwork" do
-  before :all do
-    drop_dummy_database
-    remove_project_directory
-    create_dummy_project("clockwork" => true)
-  end
-
-  it "adds the Clockwork gem to Gemfile" do
-    gemfile_content = IO.read("#{project_path}/Gemfile")
-
-    expect(gemfile_content).to include("gem 'clockwork'")
-  end
-
-  it "creates the config for clockwork scheduler" do
-    initializer_content = IO.read("#{project_path}/config/clock.rb")
-
-    expect(initializer_content).to include("module Clockwork")
-  end
-end