potassium 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88890214b6b2c25983461ebce4351f5d988d02af8616c5b5a5dc9ff6628a9a80
-  data.tar.gz: 2bd3d019f36148439c4b271cba2a3db65d3c1d9720eab2cf0509202c2c4553c3
+  metadata.gz: 28763549d04fed43f8cbe7206b9ca47dc79b1d631b1fd338a638ca59e18ec70c
+  data.tar.gz: f70e44992829f10fa2e5dff986fc6e56d293ab13b5210575b4da8be95784174b
 SHA512:
-  metadata.gz: 8982526dca4d0faf9a5ab380c1105c59dc7dfbb71d1c8bb63118367ea172924c4fb2d3468226d2392fb414b426c1bcc458c6b90caf12145b8997d6b6bd8ee11e
-  data.tar.gz: 9279a00b0ede0b3a1ca12e206229ff872475196cacc74231130fc1da4380357d00df8594b1c5036d8f0b59acce08483a69ffdccd28423f8a388013d71a3d511e
+  metadata.gz: 2714545c45a60fc3981ecb0237f5bbe3ac00f0da0c4384ff8a8f2ee01b37d449008804a196d08b1642c4f931c85f12b8e0b92476cf8bb269fa89c39b18c521ae
+  data.tar.gz: c113ea96c6e0be9a328d92f55a52f90e65d0ced49a621211e5f055a015804a972d8163d713d2c451e42be15ef86626951e300de6e4c3fa9c1fd3d4d10e4ff31b

data/.circleci/config.yml

@@ -0,0 +1,32 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/app
+    parallelism: 4
+    shell: /bin/bash --login
+
+    docker:
+    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
+      command: /sbin/init
+
+    steps:
+    - checkout
+    - run: rm -f app/.rvmrc; echo 2.5.1 > app/.ruby-version; rvm use 2.5.1 --default
+    - run: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
+    - run: echo 'export rvm_install_on_use_flag=0' >> /home/ubuntu/.rvmrc
+
+    - restore_cache:
+        keys:
+        - v1-dep-{{ .Branch }}-
+        - v1-dep-master-
+    - run: bundle install
+    - run: gem install hound-cli
+    - save_cache:
+        key: v1-dep-{{ .Branch }}-{{ epoch }}
+        paths:
+        - vendor/bundle
+    - run:
+        command: bundle exec rspec --color --require spec_helper --format=doc --format progress $(circleci tests glob spec/**/*_spec.rb | circleci tests split)
+        environment:
+          RAILS_ENV: test
+          RACK_ENV: test

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased
+
+## 5.2.2
+
+Features:
+  - Implement release phase on heroku
+  - Add sendgrid_dev support
+  -
+Fix:
+  - Fix Circle CI
+  - Fix services containers env variables
+
 ## 5.2.1
 
 Features:

data/README.md

@@ -98,13 +98,13 @@ When you choose to deploy to heroku a few extra things are added for the project
     parity between testing and production environments
   - Adds a `.buildpacks` file with the default buildpacks to use. It use the
     following buildpacks:
+  - Adds a `bin/release` file with the release phase script to run specific tasks before the app is deployed completely, for example `rails db:migrate`.
 
 | index | buildpack | description |
 |-------|-----------|-------------|
 | 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` |
 
 Also the heroku applications are created
 
@@ -113,7 +113,6 @@ Also the heroku applications are created
     and `production` stages.
   - Setup initial configuration variables
   - Set the application buildpack to the [multi-buildpack][heroku-buildpack-multi]
-  - Set **deploy-tasks** buildpack is setup to run `rake db:migrate` after each deploy
 
 You'll need to manually
 
@@ -140,7 +139,6 @@ Go to https://monkeyci.platan.us, choose the repository from the list and hit
 [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
 [circle-ci]: https://circleci.com
 
 ## Development Tools

data/lib/potassium/assets/.buildpacks

@@ -1,3 +1,2 @@
 https://github.com/platanus/heroku-buildpack-ruby-version.git
 https://github.com/heroku/heroku-buildpack-ruby.git
-https://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks.git

data/lib/potassium/assets/.pryrc

@@ -8,5 +8,5 @@ end
 if defined?(Rails)
   require 'rails/console/app'
   require 'rails/console/helpers'
-  include Rails::ConsoleMethods
+  include Rails::ConsoleMethods # rubocop:disable Style/MixinUsage
 end

data/lib/potassium/assets/Procfile

@@ -1 +1,2 @@
 web: bundle exec puma -C ./config/puma.rb
+release: bin/release

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

@@ -22,7 +22,7 @@ wait_services(){
   # Chain tests together by using &&
   until (
   <% if(selected?(:database, :mysql) || selected?(:database, :postgresql))-%>
-  test_service '$<%=get(:database).to_s.upcase%>_HOST' '$<%=get(:database).to_s.upcase%>_PORT' && \
+  test_service '$DB_HOST' '$DB_PORT' && \
   <% end-%>
   echo "Services ready"
   )

data/lib/potassium/assets/bin/release

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+echo 'Release Phase...'
+
+bundle exec rails db:migrate
+
+echo 'Release Phase: OK'

data/lib/potassium/assets/lib/tasks/auto_annotate_models.rake

@@ -3,40 +3,40 @@ if Rails.env.development?
     # You can override any of these by setting an environment variable of the
     # same name.
     Annotate.set_defaults(
-      'routes'                  => 'false',
-      'position_in_routes'      => 'after',
-      'position_in_class'       => 'after',
-      'position_in_test'        => 'after',
-      'position_in_fixture'     => 'after',
-      'position_in_factory'     => 'after',
-      'position_in_serializer'  => 'after',
-      'show_foreign_keys'       => 'true',
-      'show_indexes'            => 'true',
-      'simple_indexes'          => 'false',
-      'model_dir'               => 'app/models',
-      'root_dir'                => '',
-      'include_version'         => 'false',
-      'require'                 => '',
-      'exclude_tests'           => 'true',
-      'exclude_fixtures'        => 'true',
-      'exclude_factories'       => 'true',
-      'exclude_serializers'     => 'true',
-      'exclude_scaffolds'       => 'true',
-      'exclude_controllers'     => 'true',
-      'exclude_helpers'         => 'false',
-      'ignore_model_sub_dir'    => 'false',
-      'ignore_columns'          => nil,
-      'ignore_unknown_models'   => 'false',
+      'routes' => 'false',
+      'position_in_routes' => 'after',
+      'position_in_class' => 'after',
+      'position_in_test' => 'after',
+      'position_in_fixture' => 'after',
+      'position_in_factory' => 'after',
+      'position_in_serializer' => 'after',
+      'show_foreign_keys' => 'true',
+      'show_indexes' => 'true',
+      'simple_indexes' => 'false',
+      'model_dir' => 'app/models',
+      'root_dir' => '',
+      'include_version' => 'false',
+      'require' => '',
+      'exclude_tests' => 'true',
+      'exclude_fixtures' => 'true',
+      'exclude_factories' => 'true',
+      'exclude_serializers' => 'true',
+      'exclude_scaffolds' => 'true',
+      'exclude_controllers' => 'true',
+      'exclude_helpers' => 'false',
+      'ignore_model_sub_dir' => 'false',
+      'ignore_columns' => nil,
+      'ignore_unknown_models' => 'false',
       'hide_limit_column_types' => 'integer,boolean',
-      'skip_on_db_migrate'      => 'false',
-      'format_bare'             => 'true',
-      'format_rdoc'             => 'false',
-      'format_markdown'         => 'false',
-      'sort'                    => 'false',
-      'force'                   => 'false',
-      'trace'                   => 'false',
-      'wrapper_open'            => nil,
-      'wrapper_close'           => nil
+      'skip_on_db_migrate' => 'false',
+      'format_bare' => 'true',
+      'format_rdoc' => 'false',
+      'format_markdown' => 'false',
+      'sort' => 'false',
+      'force' => 'false',
+      'trace' => 'false',
+      'wrapper_open' => nil,
+      'wrapper_close' => nil
     )
   end
 

data/lib/potassium/assets/testing/rails_helper.rb

@@ -1,6 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RACK_ENV'] ||= 'test'
-require File.expand_path('../../config/environment', __FILE__)
+require File.expand_path('../config/environment', __dir__)
 require 'rspec/rails'
 require 'spec_helper'
 require 'shoulda/matchers'
@@ -20,7 +20,7 @@ require 'faker'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.

data/lib/potassium/recipes/ci.rb

@@ -36,9 +36,9 @@ class Recipes::Ci < Rails::AppBuilder
         YAML
       compose.add_service("postgresql", srv)
       compose.add_link('test', 'postgresql')
-      compose.add_env('test', 'POSTGRESQL_USER', 'postgres')
-      compose.add_env('test', 'POSTGRESQL_HOST', 'postgresql')
-      compose.add_env('test', 'POSTGRESQL_PORT', '5432')
+      compose.add_env('test', 'DB_USER', 'postgres')
+      compose.add_env('test', 'DB_HOST', 'postgresql')
+      compose.add_env('test', 'DB_PORT', '5432')
     end
 
     add_readme_header :ci

data/lib/potassium/recipes/heroku.rb

@@ -41,6 +41,8 @@ class Recipes::Heroku < Rails::AppBuilder
 
     copy_file '../assets/Procfile', 'Procfile'
     copy_file '../assets/.buildpacks', '.buildpacks'
+    copy_file '../assets/bin/release', 'bin/release'
+    run 'chmod a+x bin/release'
 
     template "../assets/bin/setup_heroku.erb", "bin/setup_heroku", force: true
     run "chmod a+x bin/setup_heroku"
@@ -88,7 +90,6 @@ class Recipes::Heroku < Rails::AppBuilder
     run_toolbelt_command "labs:enable runtime-dyno-metadata", staged_app_name
     run_toolbelt_command "config:add HEROKU_APP_NAME=#{staged_app_name}", staged_app_name
     run_toolbelt_command "config:add #{rack_env}", staged_app_name
-    run_toolbelt_command "config:add DEPLOY_TASKS=db:migrate", staged_app_name
 
     set_rails_secrets(environment)
     set_app_multi_buildpack(environment)

data/lib/potassium/recipes/mailer.rb

@@ -68,7 +68,7 @@ class Recipes::Mailer < Rails::AppBuilder
 
     mailer_config =
       <<~RUBY
-        require Rails.root.join("config/mailer")
+        require Rails.root.join("config", "mailer")
       RUBY
 
     prepend_file "config/environments/production.rb", mailer_config
@@ -81,11 +81,18 @@ class Recipes::Mailer < Rails::AppBuilder
     append_to_file '.env.development', "SENDGRID_API_KEY=\n"
     sendgrid_settings = <<~RUBY
       Rails.application.config.action_mailer.sendgrid_settings = {
-        api_key: ENV['SENDGRID_API']
+        api_key: ENV['SENDGRID_API_KEY']
       }
     RUBY
     inject_into_file 'config/mailer.rb', sendgrid_settings,
       after: "Rails.application.config.action_mailer.delivery_method = :sendgrid\n"
+    sendgrid_dev_settings = <<~RUBY
+      Rails.application.config.action_mailer.sendgrid_dev_settings = {
+        api_key: ENV['SENDGRID_API_KEY']
+      }
+    RUBY
+    application sendgrid_dev_settings, env: "development"
+    application "config.action_mailer.delivery_method = :sendgrid_dev", env: "development"
   end
 
   def aws_ses

data/lib/potassium/version.rb

@@ -1,5 +1,5 @@
 module Potassium
-  VERSION = "5.2.1"
+  VERSION = "5.2.2"
   RUBY_VERSION = "2.5.5"
   RAILS_VERSION = "~> 5.2.1"
   RUBOCOP_VERSION = "~> 0.65.0"

data/spec/features/database_container_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "yaml"
 
 RSpec.describe "DatabaseContainer" do
   before(:all) do

data/spec/features/heroku_spec.rb

@@ -18,6 +18,7 @@ RSpec.describe "Heroku" do
     procfile = IO.read(procfile_path)
 
     expect(procfile).to include("web: bundle exec puma -C ./config/puma.rb")
+    expect(procfile).to include("release: bin/release")
 
     buildpacks_path = "#{project_path}/.buildpacks"
     buildpacks = IO.read(buildpacks_path)
@@ -25,20 +26,15 @@ RSpec.describe "Heroku" do
     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(
-      include("https://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks.git")
-    )
 
     expect(FakeHeroku).to have_created_app_for("staging")
     expect(FakeHeroku).to have_created_app_for("production")
 
     expect(FakeHeroku).to have_configured_vars("staging", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("staging", "RACK_ENV")
-    expect(FakeHeroku).to have_configured_vars("staging", "DEPLOY_TASKS")
 
     expect(FakeHeroku).to have_configured_vars("production", "SECRET_KEY_BASE")
     expect(FakeHeroku).to have_configured_vars("production", "RACK_ENV")
-    expect(FakeHeroku).to have_configured_vars("production", "DEPLOY_TASKS")
 
     expect(FakeHeroku).to have_created_pipeline_for("staging")
     expect(FakeHeroku).to have_add_pipeline_for("production")
@@ -55,5 +51,12 @@ RSpec.describe "Heroku" do
     expect(bin_setup_heroku).to include("heroku apps:info --app pl-#{app_name}-production")
     expect(bin_setup_heroku).to include("git config heroku.remote staging")
     expect(File.stat(bin_setup_path)).to be_executable
+
+    bin_release_path = "#{project_path}/bin/release"
+    bin_release = IO.read(bin_release_path)
+
+    expect(bin_release).to include('set -e')
+    expect(bin_release).to include('bundle exec rails db:migrate')
+    expect(File.stat(bin_release_path)).to be_executable
   end
 end

data/spec/features/mailer_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+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") }
+
+  before(:all) { drop_dummy_database }
+
+  context "when selecting sendgrid as mailer" do
+    before(:all) do
+      remove_project_directory
+      create_dummy_project("email_service" => "sendgrid")
+    end
+
+    it { expect(gemfile).to include("send_grid_mailer") }
+
+    it "adds configuration to mailer.rb" do
+      expect(mailer_config).to include("delivery_method = :sendgrid")
+      expect(mailer_config).to include("sendgrid_settings = {")
+      expect(mailer_config).to include("api_key: ENV['SENDGRID_API_KEY']")
+    end
+
+    it "adds configuration to development.rb" do
+      expect(dev_config).to include("delivery_method = :sendgrid_dev")
+      expect(dev_config).to include("sendgrid_dev_settings = {")
+      expect(dev_config).to include("api_key: ENV['SENDGRID_API_KEY']")
+    end
+  end
+
+  context "when selecting aws_ses as mailer" do
+    before(:all) do
+      remove_project_directory
+      create_dummy_project("email_service" => "aws_ses")
+    end
+
+    it { expect(gemfile).to include("aws-sdk-rails") }
+    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") }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,6 +173,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".editorconfig"
 - ".gitignore"
 - ".rspec"
@@ -184,7 +185,6 @@ files:
 - Rakefile
 - bin/potassium
 - bin/potassium_test
-- circle.yml
 - docs/CONTRIBUTING.md
 - docs/DSL.md
 - lib/potassium.rb
@@ -211,6 +211,7 @@ files:
 - lib/potassium/assets/app/mailers/application_mailer.rb
 - lib/potassium/assets/aws.rb
 - lib/potassium/assets/bin/cibuild.erb
+- lib/potassium/assets/bin/release
 - lib/potassium/assets/bin/setup.erb
 - lib/potassium/assets/bin/setup_heroku.erb
 - lib/potassium/assets/bin/update.erb
@@ -317,6 +318,7 @@ files:
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
+- spec/features/mailer_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/power_types_spec.rb
 - spec/features/schedule_spec.rb
@@ -343,8 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
@@ -362,6 +363,7 @@ test_files:
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
+- spec/features/mailer_spec.rb
 - spec/features/new_project_spec.rb
 - spec/features/power_types_spec.rb
 - spec/features/schedule_spec.rb

data/circle.yml

@@ -1,12 +0,0 @@
-machine:
-  ruby:
-    version: 2.5.1
-  services:
-    - docker
-  post:
-    - "echo 'export rvm_install_on_use_flag=0' >> /home/ubuntu/.rvmrc"
-
-dependencies:
-  override:
-    - bundle install
-    - gem install hound-cli