potassium 6.1.0 → 6.5.0

data/spec/features/mailer_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe "Mailer" do
   let(:gemfile) { IO.read("#{project_path}/Gemfile") }
   let(:mailer_config) { IO.read("#{project_path}/config/mailer.rb") }
   let(:dev_config) { IO.read("#{project_path}/config/environments/development.rb") }
+  let(:sidekiq_config) { IO.read("#{project_path}/config/sidekiq.yml") }
 
   before(:all) { drop_dummy_database }
 
@@ -26,6 +27,8 @@ RSpec.describe "Mailer" do
       expect(dev_config).to include("sendgrid_dev_settings = {")
       expect(dev_config).to include("api_key: ENV['SENDGRID_API_KEY']")
     end
+
+    it { expect(sidekiq_config).to include("- mailers") }
   end
 
   context "when selecting aws_ses as mailer" do
@@ -38,5 +41,18 @@ RSpec.describe "Mailer" do
     it { expect(gemfile).to include("letter_opener") }
     it { expect(mailer_config).to include("delivery_method = :aws_sdk") }
     it { expect(dev_config).to include("delivery_method = :letter_opener") }
+    it { expect(sidekiq_config).to include("- mailers") }
+  end
+
+  context "when selecting a mailer and sidekiq" do
+    before :all do
+      drop_dummy_database
+      remove_project_directory
+      create_dummy_project(
+        "background_processor" => true, "email_service" => 'sendgrid'
+      )
+    end
+
+    it { expect(sidekiq_config).to include("- mailers") }
   end
 end

data/spec/features/node_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe "Node" do
-  let(:version) { "12" }
+  let(:version) { "14" }
 
   before(:all) do
     drop_dummy_database

data/spec/features/pundit_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper"
+
+RSpec.describe "Pundit" do
+  before :all do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project("pundit" => true, "devise" => true, "admin" => true)
+  end
+
+  it "adds the Pundit gem to Gemfile" do
+    content = IO.read("#{project_path}/Gemfile")
+
+    expect(content).to include("gem 'pundit'")
+  end
+
+  it "setup active admin" do
+    content = IO.read("#{project_path}/config/initializers/active_admin.rb")
+
+    expect(content).to include("config.authorization_adapter = ActiveAdmin::PunditAdapter")
+    expect(content).to include("config.pundit_default_policy = 'BackOffice::DefaultPolicy'")
+    expect(content).to include("config.pundit_policy_namespace = :back_office")
+  end
+
+  it "creates default policy" do
+    content = IO.read("#{project_path}/app/policies/back_office/default_policy.rb")
+
+    expect(content).to include("class BackOffice::DefaultPolicy")
+  end
+
+  it "modifies the README file" do
+    readme = IO.read("#{project_path}/README.md")
+    expect(readme).to include("from `BackOffice::DefaultPolicy`")
+  end
+end

data/spec/features/schedule_spec.rb

@@ -1,10 +1,14 @@
 require "spec_helper"
 
 RSpec.describe "schedule" do
+  let(:sidekiq_config) { IO.read("#{project_path}/config/sidekiq.yml") }
+
   before :all do
     drop_dummy_database
     remove_project_directory
-    create_dummy_project("schedule" => true)
+    create_dummy_project(
+      "schedule" => true, "background_processor" => true, "email_service" => "sendgrid"
+    )
   end
 
   it "adds the sidekiq-scheduler gem to Gemfile" do
@@ -12,9 +16,12 @@ RSpec.describe "schedule" do
     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:")
+  it "adds schedule section to sidekiq config" do
+    expect(sidekiq_config).to include(":schedule:")
+  end
+
+  it "doesn't remove mailers queue" do
+    expect(sidekiq_config).to include("- mailers")
   end
 
   it "adds scheduler ui to the sidekiq initializer" do

data/spec/features/testing_spec.rb

@@ -0,0 +1,56 @@
+require "spec_helper"
+
+RSpec.describe "Testing" do
+  let(:gemfile_content) { IO.read("#{project_path}/Gemfile") }
+  let(:rails_helper_content) { IO.read("#{project_path}/spec/rails_helper.rb") }
+  let(:rspec_content) { IO.read("#{project_path}/.rspec") }
+
+  let(:support_directories) do
+    %w{
+      custom_matchers
+      shared_examples
+      configurations
+      helpers
+    }
+  end
+
+  let(:conf_files) do
+    %w{
+      factory_bot_config.rb
+      power_types_config.rb
+      shoulda_matchers_config.rb
+      devise_config.rb
+      system_tests_config.rb
+      faker_config.rb
+    }
+  end
+
+  before(:all) do
+    drop_dummy_database
+    remove_project_directory
+    create_dummy_project(devise: true)
+  end
+
+  it { expect(gemfile_content).to include("gem 'rspec-rails'") }
+  it { expect(gemfile_content).to include('rspec-rails') }
+  it { expect(gemfile_content).to include('factory_bot_rails') }
+  it { expect(gemfile_content).to include('faker') }
+  it { expect(gemfile_content).to include('guard-rspec') }
+  it { expect(gemfile_content).to include('rspec-nc') }
+  it { expect(gemfile_content).to include('shoulda-matchers') }
+  it { expect(gemfile_content).to include('capybara') }
+  it { expect(gemfile_content).to include('webdrivers') }
+
+  it { expect(rails_helper_content).to include("require 'spec_helper'") }
+  it { expect(rails_helper_content).to include("config.filter_run_when_matching :focus") }
+
+  it { expect(rspec_content).to include("--require rails_helper") }
+  it { expect(Dir.entries("#{project_path}/spec/support")).to include(*support_directories) }
+  it { expect(Dir.entries("#{project_path}/spec/support/configurations")).to include(*conf_files) }
+
+  it { expect(IO.read("#{project_path}/bin/rspec")).to include('path("rspec-core", "rspec")') }
+  it { expect(IO.read("#{project_path}/Guardfile")).to include(':rspec, cmd: "bin/rspec"') }
+  it { expect(IO.read("#{project_path}/bin/guard")).to include('path("guard", "guard")') }
+
+  it { expect(IO.read("#{project_path}/README.md")).to include("To run unit test") }
+end

data/spec/support/potassium_test_helpers.rb

@@ -17,12 +17,11 @@ module PotassiumTestHelpers
 
   def create_dummy_project(arguments = {})
     Dir.chdir(tmp_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         add_fakes_to_path
         add_project_bin_to_path
         full_arguments = hash_to_arguments(create_arguments(true).merge(arguments))
         run_command("#{potassium_bin} create #{APP_NAME} #{full_arguments}")
-        on_project { run_command("hound rules update ruby --local") }
       end
     end
   end
@@ -47,7 +46,7 @@ module PotassiumTestHelpers
 
   def on_project(&block)
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         block.call
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.5.0
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,16 +86,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: gems
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.1.4.4
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -216,10 +244,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".circleci/setup-rubygems.sh"
 - ".editorconfig"
 - ".gitignore"
 - ".node-version"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -241,17 +271,17 @@ files:
 - lib/potassium/assets/.pryrc
 - lib/potassium/assets/.rubocop.yml
 - lib/potassium/assets/.stylelintrc.json
-- lib/potassium/assets/Dockerfile.ci
 - lib/potassium/assets/Makefile.erb
 - lib/potassium/assets/Procfile
 - lib/potassium/assets/README.md.erb
 - lib/potassium/assets/README.yml
 - lib/potassium/assets/active_admin/admin-component.vue
 - lib/potassium/assets/active_admin/admin_application.js
-- lib/potassium/assets/active_admin/admin_user_policy.rb
-- lib/potassium/assets/active_admin/comment_policy.rb
 - lib/potassium/assets/active_admin/init_activeadmin_vue.rb
-- lib/potassium/assets/active_admin/pundit_page_policy.rb
+- lib/potassium/assets/active_admin/policies/admin_user_policy.rb
+- lib/potassium/assets/active_admin/policies/comment_policy.rb
+- lib/potassium/assets/active_admin/policies/default_policy.rb
+- lib/potassium/assets/active_admin/policies/page_policy.rb
 - lib/potassium/assets/app/graphql/graphql_controller.rb
 - lib/potassium/assets/app/graphql/mutations/login_mutation.rb
 - lib/potassium/assets/app/graphql/queries/base_query.rb
@@ -269,7 +299,8 @@ files:
 - lib/potassium/assets/app/mailers/application_mailer.rb
 - lib/potassium/assets/app/uploaders/base_uploader.rb
 - lib/potassium/assets/app/uploaders/image_uploader.rb
-- lib/potassium/assets/bin/cibuild.erb
+- lib/potassium/assets/app/views/shared/_gtm_body.html.erb
+- lib/potassium/assets/app/views/shared/_gtm_head.html.erb
 - lib/potassium/assets/bin/release
 - lib/potassium/assets/bin/setup.erb
 - lib/potassium/assets/bin/setup_heroku.erb
@@ -283,7 +314,6 @@ files:
 - lib/potassium/assets/config/sentry.rb.erb
 - lib/potassium/assets/config/shrine.rb
 - lib/potassium/assets/config/storage.yml
-- lib/potassium/assets/docker-compose.ci.yml
 - lib/potassium/assets/docker-compose.yml
 - lib/potassium/assets/es-CL.yml
 - lib/potassium/assets/lib/tasks/auto_annotate_models.rake
@@ -295,10 +325,16 @@ files:
 - lib/potassium/assets/seeds/seeds.rb
 - lib/potassium/assets/sidekiq.rb.erb
 - lib/potassium/assets/sidekiq.yml
-- lib/potassium/assets/sidekiq_scheduler.yml
 - lib/potassium/assets/testing/.rspec
+- lib/potassium/assets/testing/devise_config.rb
+- lib/potassium/assets/testing/factory_bot_config.rb
+- lib/potassium/assets/testing/faker_config.rb
 - lib/potassium/assets/testing/platanus.png
+- lib/potassium/assets/testing/power_types_config.rb
 - lib/potassium/assets/testing/rails_helper.rb
+- lib/potassium/assets/testing/shoulda_matchers_config.rb
+- lib/potassium/assets/testing/simplecov_config.rb
+- lib/potassium/assets/testing/system_tests_config.rb
 - lib/potassium/cli.rb
 - lib/potassium/cli/commands/create.rb
 - lib/potassium/cli/commands/install.rb
@@ -326,6 +362,7 @@ files:
 - lib/potassium/recipes/better_errors.rb
 - lib/potassium/recipes/ci.rb
 - lib/potassium/recipes/cleanup.rb
+- lib/potassium/recipes/coverage.rb
 - lib/potassium/recipes/data_migrate.rb
 - lib/potassium/recipes/database.rb
 - lib/potassium/recipes/database_container.rb
@@ -337,10 +374,12 @@ files:
 - lib/potassium/recipes/file_storage.rb
 - lib/potassium/recipes/front_end.rb
 - lib/potassium/recipes/github.rb
+- lib/potassium/recipes/google_tag_manager.rb
 - lib/potassium/recipes/heroku.rb
 - lib/potassium/recipes/i18n.rb
 - lib/potassium/recipes/listen.rb
 - lib/potassium/recipes/mailer.rb
+- lib/potassium/recipes/monitoring.rb
 - lib/potassium/recipes/node.rb
 - lib/potassium/recipes/power_types.rb
 - lib/potassium/recipes/pry.rb
@@ -354,6 +393,7 @@ files:
 - lib/potassium/recipes/script.rb
 - lib/potassium/recipes/secrets.rb
 - lib/potassium/recipes/seeds.rb
+- lib/potassium/recipes/spring.rb
 - lib/potassium/recipes/style.rb
 - lib/potassium/recipes/testing.rb
 - lib/potassium/recipes/tzinfo.rb
@@ -371,6 +411,7 @@ files:
 - spec/features/api_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/coverage_spec.rb
 - spec/features/data_migrate_spec.rb
 - spec/features/database_container_spec.rb
 - spec/features/database_spec.rb
@@ -379,6 +420,7 @@ files:
 - spec/features/file_storage_spec.rb
 - spec/features/front_end_spec.rb
 - spec/features/github_spec.rb
+- spec/features/google_tag_manager_spec.rb
 - spec/features/graphql_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
@@ -386,13 +428,16 @@ files:
 - spec/features/new_project_spec.rb
 - spec/features/node_spec.rb
 - spec/features/power_types_spec.rb
+- spec/features/pundit_spec.rb
 - spec/features/schedule_spec.rb
+- spec/features/testing_spec.rb
 - spec/features/vue_admin_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_github.rb
 - spec/support/fake_heroku.rb
 - spec/support/fake_octokit.rb
 - spec/support/potassium_test_helpers.rb
+- tmp/.keep
 homepage: https://github.com/platanus/potassium
 licenses:
 - MIT
@@ -412,7 +457,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
@@ -422,6 +467,7 @@ test_files:
 - spec/features/api_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/coverage_spec.rb
 - spec/features/data_migrate_spec.rb
 - spec/features/database_container_spec.rb
 - spec/features/database_spec.rb
@@ -430,6 +476,7 @@ test_files:
 - spec/features/file_storage_spec.rb
 - spec/features/front_end_spec.rb
 - spec/features/github_spec.rb
+- spec/features/google_tag_manager_spec.rb
 - spec/features/graphql_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
@@ -437,7 +484,9 @@ test_files:
 - spec/features/new_project_spec.rb
 - spec/features/node_spec.rb
 - spec/features/power_types_spec.rb
+- spec/features/pundit_spec.rb
 - spec/features/schedule_spec.rb
+- spec/features/testing_spec.rb
 - spec/features/vue_admin_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_github.rb

data/lib/potassium/assets/Dockerfile.ci

@@ -1,6 +0,0 @@
-FROM platanus/ruby:2.7
-
-RUN mkdir /app
-WORKDIR /app
-
-ADD . /app

data/lib/potassium/assets/active_admin/admin_user_policy.rb

@@ -1,2 +0,0 @@
-class AdminUserPolicy < ApplicationPolicy
-end

data/lib/potassium/assets/active_admin/comment_policy.rb

@@ -1,2 +0,0 @@
-class ActiveAdmin::CommentPolicy < ApplicationPolicy
-end

data/lib/potassium/assets/active_admin/pundit_page_policy.rb

@@ -1,5 +0,0 @@
-class ActiveAdmin::PagePolicy < ApplicationPolicy
-  def show?
-    true
-  end
-end

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

@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-trap "exit" SIGINT SIGTERM
-
-command -v docker >/dev/null 2>&1 && docker info >/dev/null || {
-  printf >&2 "\e[31mI require docker but it's not installed. Aborting.\e[0m\n"; exit 1;
-}
-
-DOCKER_COMPOSE_ARGS="-f docker-compose.ci.yml"
-
-# Build Image
-build(){
-  docker-compose $DOCKER_COMPOSE_ARGS build test
-}
-
-# Wait services to be ready
-wait_services(){
-  function test_service {
-    docker-compose $DOCKER_COMPOSE_ARGS run --rm test sh -c "nc -z $1 $2"
-  }
-
-  count=0
-  # Chain tests together by using &&
-  until (
-  <% if(selected?(:database, :mysql) || selected?(:database, :postgresql))-%>
-  test_service '$DB_HOST' '$DB_PORT' && \
-  <% end-%>
-  echo "Services ready"
-  )
-  do
-    ((count++))
-    if [ $count -gt 50 ]
-    then
-      echo "Services didn't become ready in time"
-      exit 1
-    else
-      echo "Waiting for services to become ready..."
-    fi
-    sleep 0.5
-  done
-}
-
-# Prepare dependencies
-dependencies(){
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle install
-}
-
-<% if selected?(:front_end, :vue) %>
-yarn_dependencies(){
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test yarn install
-}
-<% end %>
-
-assets() {
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test /bin/bash -c "bin/setup && bundle exec rake assets:precompile"
-}
-
-# Prepare database
-database(){
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle exec rake db:create db:schema:load
-}
-
-# Run the specs
-tests(){
-  [ -n "$CI" ] && {
-    RSPEC_JUNIT_ARGS="-r rspec_junit_formatter --format RspecJunitFormatter -o $HOME/.rspec_reports/junit.xml"
-    RSPEC_FORMAT_ARGS="--format progress --no-color"
-  }
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle exec rspec spec $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
-}
-
-<% if selected?(:front_end, :vue) %>
-js_tests(){
-  docker-compose $DOCKER_COMPOSE_ARGS run --rm test yarn run test
-}
-<% end %>
-
-# Run the complete ci build
-no_ci(){
-  build
-  wait_services
-  dependencies
-  assets
-  database
-  tests
-}
-
-case "$1" in
-  "")
-    no_ci
-    ;;
-  "services")
-    wait_services
-    ;;
-  "deps"|"dependencies")
-    dependencies <% if selected?(:front_end, :vue) %>&& yarn_dependencies<% end %>
-    ;;
-  "assets")
-    assets
-    ;;
-  "db"|"database")
-    database
-    ;;
-<% if selected?(:front_end, :vue) %>
-  "js_tests")
-    js_tests
-    ;;
-<% end %>
-  "specs"|"tests")
-    tests
-    ;;
-  "build")
-    build
-    ;;
-  *)
-    echo "Usage: cibuild [services|deps|assets|db|specs|build]"
-    ;;
-esac

data/lib/potassium/assets/docker-compose.ci.yml

@@ -1,12 +0,0 @@
-version: '3.4'
-
-services:
-  test:
-    build:
-      context: "."
-      dockerfile: Dockerfile.ci
-    volumes:
-    - "test_data:/usr/local/bundle"
-    - "./node_modules:/app/node_modules"
-    environment:
-      RACK_ENV: test

data/lib/potassium/assets/sidekiq_scheduler.yml

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