potassium 5.2.2 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28763549d04fed43f8cbe7206b9ca47dc79b1d631b1fd338a638ca59e18ec70c
-  data.tar.gz: f70e44992829f10fa2e5dff986fc6e56d293ab13b5210575b4da8be95784174b
+  metadata.gz: b9fb3b1b4a6ac80cce023a76b98629143523145baa3adcdf7a8afa46a56c97a1
+  data.tar.gz: 0e99964ae4b0d55e7d8ba7bd610240e22d40203450cb8651009418970bcf16d3
 SHA512:
-  metadata.gz: 2714545c45a60fc3981ecb0237f5bbe3ac00f0da0c4384ff8a8f2ee01b37d449008804a196d08b1642c4f931c85f12b8e0b92476cf8bb269fa89c39b18c521ae
-  data.tar.gz: c113ea96c6e0be9a328d92f55a52f90e65d0ced49a621211e5f055a015804a972d8163d713d2c451e42be15ef86626951e300de6e4c3fa9c1fd3d4d10e4ff31b
+  metadata.gz: e759b1f5f9b8ff6a6eebcfa1e60366fb7a4cc188fb1561a2367439155014312f5dcfe168c8a8a1a3e1a2c43de2f6e837cea04cb0746b4452aae5090f5635755b
+  data.tar.gz: 7a1ea34a7dde786ab915f79c9b1e59a62bf0f593dd1d331cd0a25284669b66e74d4628b62e4846ce6aeb1bae933ea965ae88fece52b424effad7c82dbeb87ad7

data/.circleci/config.yml

@@ -6,14 +6,11 @@ jobs:
     shell: /bin/bash --login
 
     docker:
-    - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
-      command: /sbin/init
+    - image: circleci/ruby:2.5.5-node
 
     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
+    - setup_remote_docker
 
     - restore_cache:
         keys:

data/CHANGELOG.md

@@ -2,12 +2,34 @@
 
 ## Unreleased
 
+## 5.2.3
+
+Features:
+  - Add restore-from commands for pg_restore in makefile [#237](https://github.com/platanus/potassium/pull/237)
+  - Allow usage of vue components in rails views out of the box [#231](https://github.com/platanus/potassium/pull/231)
+  - Add data migrate [#227](https://github.com/platanus/potassium/pull/227)
+  - Add raven capture in error handler if sentry enabled [#226](https://github.com/platanus/potassium/pull/226)
+  - Remove unnecesary aws-sdk gems in favor of specific ones [#221](https://github.com/platanus/potassium/pull/221)
+  - Unify storage options and deprecate paperclip [#211](https://github.com/platanus/potassium/pull/211)
+
+Fix:
+  - Fix gather_gem issue when multiple versions passed as argument [#242](https://github.com/platanus/potassium/pull/242)
+  - Support "None" passed as CLI flag option in file storage [#240](https://github.com/platanus/potassium/pull/240)
+  - Add sidekiq worker to Procfile if installed after project setup (with heroku) [#234](https://github.com/platanus/potassium/pull/234)
+  - Include test_data volume to CI compose for bundler related data [#229](https://github.com/platanus/potassium/pull/229)
+  - Comment out schedule entry in sidekiq.yml [#225](https://github.com/platanus/potassium/pull/225)
+  - Use ruby image for potassium test build [#224](https://github.com/platanus/potassium/pull/224)
+  - Use webpacker from rubygems instead of repo master [#222](https://github.com/platanus/potassium/pull/222)
+  - Add rubocop-rspec for compatibility with updated linters in spec [#218](https://github.com/platanus/potassium/pull/218)
+  - Remove containers after spec run [#216](https://github.com/platanus/potassium/pull/216)
+  - Fix database container install [#214](https://github.com/platanus/potassium/pull/214)
+
 ## 5.2.2
 
 Features:
   - Implement release phase on heroku
   - Add sendgrid_dev support
-  -
+
 Fix:
   - Fix Circle CI
   - Fix services containers env variables

data/README.md

@@ -98,7 +98,7 @@ 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`.
+  - 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:with_data`.
 
 | index | buildpack | description |
 |-------|-----------|-------------|

data/lib/potassium/assets/Makefile.erb

@@ -44,3 +44,18 @@ services-logs:
 services-port:
 	@set -o pipefail; \
 	docker-compose $(DOCKER_COMPOSE_ARGS) port ${SERVICE} ${PORT} 2> /dev/null | cut -d':' -f2 || echo ${PORT}
+
+backup-staging: ROLE=staging
+backup-production: ROLE=production
+backup-%:
+	@echo Capturing $(ROLE)....
+	@heroku pg:backups:capture --remote $(ROLE)
+
+restore-from-staging: ROLE=staging
+restore-from-production: ROLE=production
+restore-from-%:
+	$(eval TEMP_FILE=$(shell mktemp))
+	@echo Restoring from $(ROLE)....
+	@heroku pg:backups:download --remote $(ROLE) --output $(TEMP_FILE)
+	@pg_restore --verbose --clean --no-acl --no-owner -h localhost \
+		-U postgres -p $(shell make services-port SERVICE=postgresql PORT=5432) -d $(PROJECT)_development $(TEMP_FILE)

data/lib/potassium/assets/README.yml

@@ -85,7 +85,7 @@ readme:
         paperclip:
           title: "Uploads"
           body: "For managing uploads, this project uses [Paperclip](https://github.com/thoughtbot/paperclip), a gem made by the awesome [Thoughbot](https://thoughtbot.com/) team."
-        storage:
+        active_storage:
           title: "Active Storage"
           body: "For managing uploads, this project uses [Active Storage](https://github.com/rails/rails/tree/master/activestorage)."
         pundit:

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

@@ -15,7 +15,7 @@ build(){
 # Wait services to be ready
 wait_services(){
   function test_service {
-    docker-compose $DOCKER_COMPOSE_ARGS run test sh -c "nc -z $1 $2"
+    docker-compose $DOCKER_COMPOSE_ARGS run --rm test sh -c "nc -z $1 $2"
   }
 
   count=0
@@ -41,16 +41,16 @@ wait_services(){
 
 # Prepare dependencies
 dependencies(){
-  docker-compose $DOCKER_COMPOSE_ARGS run test bundle install
+  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle install
 }
 
 assets() {
-  docker-compose $DOCKER_COMPOSE_ARGS run test /bin/bash -c "bin/setup && bundle exec rake assets:precompile"
+  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 test bundle exec rake db:create db:schema:load
+  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle exec rake db:create db:schema:load
 }
 
 # Run the specs
@@ -59,7 +59,7 @@ tests(){
     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 test bundle exec rspec spec $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
+  docker-compose $DOCKER_COMPOSE_ARGS run --rm test bundle exec rspec spec $RSPEC_FORMAT_ARGS $RSPEC_JUNIT_ARGS
 }
 
 # Run the complete ci build

data/lib/potassium/assets/bin/release

@@ -4,6 +4,6 @@ set -e
 
 echo 'Release Phase...'
 
-bundle exec rails db:migrate
+bundle exec rails db:migrate:with_data
 
 echo 'Release Phase: OK'

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

@@ -6,6 +6,6 @@ services:
       context: "."
       dockerfile: Dockerfile.ci
     volumes:
-    - "./vendor/bundle:/usr/local/bundle"
+    - "test_data:/usr/local/bundle"
     environment:
       RACK_ENV: test

data/lib/potassium/assets/sidekiq_scheduler.yml

@@ -2,7 +2,7 @@ production:
   :concurrency: 5
 :queues:
   - default
-:schedule:
+# :schedule:
   #  an_scheduled_task:
   #    cron: '0 * * * * *'  # Runs once per minute
   #    class: ExampleJob

data/lib/potassium/cli_options.rb

@@ -67,20 +67,11 @@ module Potassium::CliOptions # rubocop:disable Metrics/ModuleLength
       default_test_value: false
     },
     {
-      type: :switch,
-      name: "paperclip",
-      desc: "Whether to include Paperclip as dependency",
-      negatable: true,
-      default_value: "none",
-      default_test_value: false
-    },
-    {
-      type: :switch,
-      name: "active_storage",
-      desc: "Whether to include Active Storage as dependency",
-      negatable: true,
+      type: :flag,
+      name: "storage",
+      desc: "Decides which file storage to use. Available: active_storage, paperclip, none",
       default_value: "none",
-      default_test_value: false
+      default_test_value: "active_storage"
     },
     {
       type: :switch,

data/lib/potassium/helpers/gem-helpers.rb

@@ -69,7 +69,7 @@ module GemHelpers
   def add_original_rails_gems
     gemfile_entries.each do |entry|
       unless entry.commented_out
-        gather_gem(entry.name, entry.version)
+        gather_gem(entry.name, version: entry[:version])
       end
     end
   end

data/lib/potassium/recipes/api.rb

@@ -35,9 +35,17 @@ class Recipes::Api < Rails::AppBuilder
         HERE
       end
 
+      api_error_concern_path = 'app/controllers/concerns/api_error_concern.rb'
+
       copy_file '../assets/api/base_controller.rb', 'app/controllers/api/v1/base_controller.rb'
-      copy_file '../assets/api/api_error_concern.rb', 'app/controllers/concerns/api_error_concern.rb'
+      copy_file '../assets/api/api_error_concern.rb', api_error_concern_path
       copy_file '../assets/api/responder.rb', 'app/responders/api_responder.rb'
+
+      if selected?(:report_error)
+        previous_line = 'logger.error exception.backtrace.join("\n")'
+        new_line = "\n      Raven.capture_exception(exception)"
+        insert_into_file api_error_concern_path, new_line, after: previous_line
+      end
     end
   end
 end

data/lib/potassium/recipes/background_processor.rb

@@ -44,7 +44,10 @@ class Recipes::BackgroundProcessor < Rails::AppBuilder
   end
 
   def edit_procfile(cmd)
-    gsub_file("Procfile", /^.*$/m) { |match| "#{match}worker: #{cmd}" } if selected?(:heroku)
+    heroku = load_recipe(:heroku)
+    if selected?(:heroku) || heroku.installed?
+      gsub_file('Procfile', /^.*$/m) { |match| "#{match}worker: #{cmd}" }
+    end
   end
 
   def add_adapters(name)

data/lib/potassium/recipes/ci.rb

@@ -41,6 +41,8 @@ class Recipes::Ci < Rails::AppBuilder
       compose.add_env('test', 'DB_PORT', '5432')
     end
 
+    compose.add_volume('test_data')
+
     add_readme_header :ci
 
     application 'config.assets.js_compressor = :uglifier', env: 'test'

data/lib/potassium/recipes/data_migrate.rb

@@ -0,0 +1,44 @@
+class Recipes::DataMigrate < Rails::AppBuilder
+  def create
+    gather_gem('data_migrate')
+    annotate_task = 'lib/tasks/auto_annotate_models.rake'
+    insert_into_file annotate_task, annotate_config, after: "Annotate.load_tasks\n"
+  end
+
+  def install
+    create
+  end
+
+  def installed?
+    gem_exists?(/data_migrate/)
+  end
+
+  private
+
+  def annotate_config
+    <<-RUBY
+
+  data_migrate_tasks = %w(
+    db:migrate:with_data
+    db:migrate:up:with_data
+    db:migrate:down:with_data
+    db:migrate:redo:with_data
+    db:rollback:with_data
+  )
+
+  data_migrate_tasks.each do |task|
+    Rake::Task[task].enhance do
+      Rake::Task[Rake.application.top_level_tasks.last].enhance do
+        annotation_options_task = if Rake::Task.task_defined?('app:set_annotation_options')
+                                    'app:set_annotation_options'
+                                  else
+                                    'set_annotation_options'
+                                  end
+        Rake::Task[annotation_options_task].invoke
+        Annotate::Migration.update_annotations
+      end
+    end
+  end
+    RUBY
+  end
+end

data/lib/potassium/recipes/database_container.rb

@@ -24,7 +24,7 @@ class Recipes::DatabaseContainer < Rails::AppBuilder
       environment:
         MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
       volumes:
-       - mysql_data:/var/lib/mysql
+        - mysql_data:/var/lib/mysql
     YAML
 
   def create
@@ -58,6 +58,7 @@ class Recipes::DatabaseContainer < Rails::AppBuilder
       TEXT
 
     insert_into_file 'bin/setup', setup_text, before: "# Set up database"
+    create
     run 'bin/setup'
     info "A new container with a #{get(:database)} database has been created."
   end

data/lib/potassium/recipes/file_storage.rb

@@ -0,0 +1,83 @@
+class Recipes::FileStorage < Rails::AppBuilder
+  def ask
+    storages = {
+      active_storage: 'ActiveStorage',
+      paperclip: '[DEPRECATED] Paperclip',
+      none: 'None, thanks'
+    }
+
+    storage = answer(:storage) do
+      storages.keys[Ask.list('Which storage are you going to use?', storages.values)]
+    end
+
+    set(:storage, storage.to_sym)
+  end
+
+  def create
+    add_chosen_storage(check_rspec: false)
+  end
+
+  def install
+    ask
+    add_chosen_storage(check_rspec: true)
+  end
+
+  def installed?
+    gem_exists?(/paperclip/) || file_exist?('config/storage.yml')
+  end
+
+  private
+
+  def paperclip_config
+    @paperclip_config ||=
+      <<~RUBY
+        config.paperclip_defaults = {
+          storage: :s3,
+          s3_protocol: 'https',
+          s3_region: ENV.fetch('AWS_REGION', 'us-east-1'),
+          s3_credentials: {
+            bucket: ENV['S3_BUCKET']
+          }
+        }
+      RUBY
+  end
+
+  def config_rspec_for_paperclip
+    copy_file '../assets/testing/platanus.png', 'spec/assets/platanus.png'
+    copy_file '../assets/testing/paperclip.rb', 'spec/support/paperclip.rb'
+  end
+
+  def add_paperclip
+    gather_gem 'paperclip', '~> 6.0'
+    application paperclip_config, env: 'production'
+    append_to_file '.gitignore', "/public/system/*\n"
+  end
+
+  def add_active_storage
+    after(:gem_install) { run('bundle exec rails active_storage:install') }
+    copy_file('../assets/config/storage.yml', 'config/storage.yml', force: true)
+    active_storage_service_regexp = /config.active_storage.service = :local\n/
+    gsub_file 'config/environments/production.rb', active_storage_service_regexp do
+      'config.active_storage.service = :amazon'
+    end
+  end
+
+  def common_setup
+    gather_gem 'aws-sdk-s3', '~> 1.0'
+    add_readme_section :internal_dependencies, get(:storage)
+    append_to_file '.env.development', "S3_BUCKET=\n"
+  end
+
+  def add_chosen_storage(check_rspec:)
+    return if [:none, :None].include? get(:storage).to_sym
+
+    common_setup
+    case get(:storage)
+    when :paperclip
+      add_paperclip
+      config_rspec_for_paperclip if !check_rspec || gem_exists?(/rspec-rails/)
+    when :active_storage
+      add_active_storage
+    end
+  end
+end

data/lib/potassium/recipes/front_end.rb

@@ -17,22 +17,15 @@ class Recipes::FrontEnd < Rails::AppBuilder
   def create
     return if [:none, :None].include? get(:front_end).to_sym
 
-    gather_gem 'webpacker', github: 'rails/webpacker'
+    gather_gem 'webpacker'
 
+    recipe = self
     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
+      recipe.setup_vue_with_compiler_build if value == :vue
     end
   end
 
@@ -48,6 +41,22 @@ class Recipes::FrontEnd < Rails::AppBuilder
     package_content.include?("\"@angular/core\"") || package_content.include?("\"vue\"")
   end
 
+  def setup_vue_with_compiler_build
+    application_js = 'app/javascript/packs/application.js'
+    remove_file "app/javascript/packs/hello_vue.js"
+    create_file application_js, application_js_content, force: true
+
+    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 %>"
+    insert_into_file(
+      layout_file,
+      "<div id=\"vue-app\">\n      <app></app>\n      ",
+      before: "<%= yield %>"
+    )
+    insert_into_file layout_file, "\n    </div>", after: "<%= yield %>"
+  end
+
   private
 
   def frameworks(framework)
@@ -58,4 +67,20 @@ class Recipes::FrontEnd < Rails::AppBuilder
     }
     frameworks[framework]
   end
+
+  def application_js_content
+    <<~JS
+      import Vue from 'vue/dist/vue.esm';
+      import App from '../app.vue';
+
+      document.addEventListener('DOMContentLoaded', () => {
+        const app = new Vue({
+          el: '#vue-app',
+          components: { App },
+        });
+
+        return app;
+      });
+    JS
+  end
 end

data/lib/potassium/templates/application.rb

@@ -29,8 +29,7 @@ run_action(:asking) do
   ask :i18n
   ask :api
   ask :draper
-  ask :active_storage
-  ask :paperclip
+  ask :file_storage
   ask :heroku
   ask :github
 end
@@ -46,11 +45,11 @@ run_action(:recipe_loading) do
   create :database_container
   create :database
   create :annotate
+  create :data_migrate
   create :listen
   create :ruby
   create :yarn
   create :editorconfig
-  create :aws_sdk
   create :mailer
   create :background_processor
   create :schedule
@@ -69,8 +68,7 @@ run_action(:recipe_loading) do
   create :draper
   create :power_types
   create :rack_cors
-  create :active_storage
-  create :paperclip
+  create :file_storage
   create :tzinfo
   create :script
   create :github

data/lib/potassium/version.rb

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

data/potassium.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "pry", "~> 0.10.3"
   spec.add_development_dependency "rubocop", Potassium::RUBOCOP_VERSION
+  spec.add_development_dependency "rubocop-rspec"
   spec.add_runtime_dependency "rails", Potassium::RAILS_VERSION
   spec.add_runtime_dependency "gli", "~> 2.12.2"
   spec.add_runtime_dependency "inquirer", "~> 0.2"

data/spec/features/data_migrate_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+RSpec.describe 'DataMigrate' do
+  let(:gemfile) { IO.read("#{project_path}/Gemfile") }
+  let(:annotate_task) { IO.read("#{project_path}/lib/tasks/auto_annotate_models.rake") }
+
+  before(:all) do
+    remove_project_directory
+    create_dummy_project
+  end
+
+  it { expect(gemfile).to include("data_migrate") }
+  it { expect(annotate_task).to include("data_migrate_tasks") }
+end

data/spec/features/database_container_spec.rb

@@ -11,10 +11,6 @@ RSpec.describe "DatabaseContainer" do
     create_dummy_project("database" => database)
   end
 
-  after do
-    `docker-compose -f #{project_path}/docker-compose.yml down`
-  end
-
   [:postgresql, :mysql].each do |db_type|
     context "when database is #{db_type}" do
       let!(:database) { db_type }

data/spec/features/file_storage_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+
+RSpec.describe "File Storage" do
+  context "when selecting active_storage" do
+    before :all do
+      drop_dummy_database
+      remove_project_directory
+      create_dummy_project(storage: :active_storage)
+    end
+
+    it "adds the aws-sdk-s3 gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'aws-sdk-s3'")
+    end
+
+    it "customizes config file" do
+      content = IO.read("#{project_path}/config/storage.yml")
+      expect(content).to include("bucket: <%= ENV['S3_BUCKET'] %>")
+    end
+
+    it "adds brief to README file" do
+      content = IO.read("#{project_path}/README.md")
+      expect(content).to include("Active Storage")
+    end
+
+    it "uses amazon on production env" do
+      content = IO.read("#{project_path}/config/environments/production.rb")
+      expect(content).to include("config.active_storage.service = :amazon")
+    end
+
+    it "adds S3 bucket ENV vars" do
+      content = IO.read("#{project_path}/.env.development")
+      expect(content).to include("S3_BUCKET=")
+    end
+  end
+
+  context "when selecting paperclip" do
+    before :all do
+      drop_dummy_database
+      remove_project_directory
+      create_dummy_project(storage: :paperclip)
+    end
+
+    it "adds the Paperclip gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'paperclip'")
+    end
+
+    it "adds the aws-sdk-s3 gem to Gemfile" do
+      gemfile_content = IO.read("#{project_path}/Gemfile")
+      expect(gemfile_content).to include("gem 'aws-sdk-s3'")
+    end
+
+    it "adds brief to README file" do
+      content = IO.read("#{project_path}/README.md")
+      expect(content).to include("Paperclip")
+    end
+
+    it "adds local file storage path to gitignore" do
+      content = IO.read("#{project_path}/.gitignore")
+      expect(content).to include("/public/system/*")
+    end
+
+    it "adds paperclip_defaults config to production" do
+      content = IO.read("#{project_path}/config/environments/production.rb")
+      expect(content).to include("config.paperclip_defaults")
+    end
+
+    it "adds S3 bucket ENV var" do
+      content = IO.read("#{project_path}/.env.development")
+      expect(content).to include("S3_BUCKET=")
+    end
+  end
+end

data/spec/features/front_end.rb

@@ -4,27 +4,30 @@ RSpec.describe "Front end" do
   before(:all) { drop_dummy_database }
   before(:each) { remove_project_directory }
 
+  let(:gemfile) { IO.read("#{project_path}/Gemfile") }
+  let(:node_modules_file) { IO.read("#{project_path}/package.json") }
+  let(:application_js_file) { IO.read("#{project_path}/app/javascript/packs/application.js") }
+  let(:layout_file) { IO.read("#{project_path}/app/views/layouts/application.html.erb") }
+
   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
+  it "creates a project wiht vue in compiler mode as frontend 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\"")
+    expect(application_js_file).to include('vue/dist/vue.esm')
+    expect(application_js_file).to include("el: '#vue-app'")
+    expect(layout_file).to include('id="vue-app"')
   end
 end

data/spec/features/heroku_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe "Heroku" do
     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(bin_release).to include('bundle exec rails db:migrate:with_data')
     expect(File.stat(bin_release_path)).to be_executable
   end
 end

data/spec/features/new_project_spec.rb

@@ -12,11 +12,11 @@ RSpec.describe "A new project" do
     expect { on_project { `bundle exec rails -v` } }.to_not output.to_stderr
   end
 
-  it "is a valid rubocop project" do
-    on_project do
-      expect(run_rubocop).to eq(true)
-    end
-  end
+  # it "is a valid rubocop project" do
+    # on_project do
+    #   expect(run_rubocop).to eq(true)
+    # end
+  # end
 
   it "configures postgresql" do
     database_config_file = IO.read("#{project_path}/config/database.yml")
@@ -26,14 +26,6 @@ RSpec.describe "A new project" do
     expect(gemfile).to include %{gem 'pg'}
   end
 
-  it "configures aws" do
-    gemfile_content = IO.read("#{project_path}/Gemfile")
-    expect(gemfile_content).to include("'aws-sdk', '~> 3'")
-
-    initializer = IO.read("#{project_path}/config/initializers/aws.rb")
-    expect(initializer).to include("Aws::VERSION")
-  end
-
   it "configures the correct ruby version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 

data/spec/spec_helper.rb

@@ -26,6 +26,10 @@ RSpec.configure do |config|
     create_tmp_directory
   end
 
+  config.after(:each) do
+    docker_cleanup
+  end
+
   config.before(:each) do
     FakeGithub.clear!
     FakeHeroku.clear!

data/spec/support/potassium_test_helpers.rb

@@ -47,6 +47,10 @@ module PotassiumTestHelpers
     end
   end
 
+  def docker_cleanup
+    run_command(`docker-compose -f #{project_path}/docker-compose.yml down --volumes`)
+  end
+
   private
 
   def tmp_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.2.3
 platform: ruby
 authors:
 - juliogarciag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.65.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +223,6 @@ files:
 - lib/potassium/assets/api/draper_responder.rb
 - lib/potassium/assets/api/responder.rb
 - 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
@@ -258,16 +271,15 @@ files:
 - lib/potassium/helpers/variable-helpers.rb
 - lib/potassium/newest_version_ensurer.rb
 - lib/potassium/recipe.rb
-- lib/potassium/recipes/active_storage.rb
 - lib/potassium/recipes/admin.rb
 - lib/potassium/recipes/angular_admin.rb
 - 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/ci.rb
 - lib/potassium/recipes/cleanup.rb
+- lib/potassium/recipes/data_migrate.rb
 - lib/potassium/recipes/database.rb
 - lib/potassium/recipes/database_container.rb
 - lib/potassium/recipes/devise.rb
@@ -275,13 +287,13 @@ files:
 - lib/potassium/recipes/editorconfig.rb
 - lib/potassium/recipes/env.rb
 - lib/potassium/recipes/error_reporting.rb
+- lib/potassium/recipes/file_storage.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/listen.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
@@ -307,13 +319,14 @@ files:
 - potassium.gemspec
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
-- spec/features/active_storage_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/data_migrate_spec.rb
 - spec/features/database_container_spec.rb
 - spec/features/database_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
+- spec/features/file_storage_spec.rb
 - spec/features/front_end.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb
@@ -345,20 +358,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An application generator from Platanus
 test_files:
 - spec/fakes/bin/heroku
 - spec/fakes/bin/hub
-- spec/features/active_storage_spec.rb
 - spec/features/background_processor_spec.rb
 - spec/features/ci_spec.rb
+- spec/features/data_migrate_spec.rb
 - spec/features/database_container_spec.rb
 - spec/features/database_spec.rb
 - spec/features/draper_spec.rb
 - spec/features/error_reporting_spec.rb
+- spec/features/file_storage_spec.rb
 - spec/features/front_end.rb
 - spec/features/github_spec.rb
 - spec/features/heroku_spec.rb

data/lib/potassium/assets/aws.rb

@@ -1 +0,0 @@
-Aws::VERSION = Gem.loaded_specs["aws-sdk"].version

data/lib/potassium/recipes/active_storage.rb

@@ -1,40 +0,0 @@
-class Recipes::ActiveStorage < Rails::AppBuilder
-  def ask
-    active_storage = answer(:active_storage) do
-      Ask.confirm("Do you want to use ActiveStorage for uploads?")
-    end
-
-    set(:active_storage, active_storage)
-  end
-
-  def create
-    return unless selected?(:active_storage)
-    add_active_storage
-  end
-
-  def install
-    add_active_storage
-  end
-
-  def installed?
-    file_exist?('config/storage.yml')
-  end
-
-  private
-
-  def add_active_storage
-    after(:gem_install) { run("bundle exec rails active_storage:install") }
-
-    add_readme_section :internal_dependencies, :storage
-
-    copy_file("../assets/config/storage.yml", "config/storage.yml", force: true)
-
-    append_to_file '.env.development', "AWS_REGION=\n"
-    append_to_file '.env.development', "S3_BUCKET=\n"
-
-    raise_delivery_errors_regexp = /config.active_storage.service = :local\n/
-    gsub_file 'config/environments/production.rb', raise_delivery_errors_regexp do
-      "config.active_storage.service = :amazon"
-    end
-  end
-end

data/lib/potassium/recipes/aws_sdk.rb

@@ -1,7 +0,0 @@
-class Recipes::AwsSdk < Rails::AppBuilder
-  def create
-    gather_gem('aws-sdk', '~> 3')
-
-    template("../assets/aws.rb", "config/initializers/aws.rb", force: true)
-  end
-end

data/lib/potassium/recipes/paperclip.rb

@@ -1,47 +0,0 @@
-class Recipes::Paperclip < Rails::AppBuilder
-  def ask
-    paperclip = answer(:paperclip) { Ask.confirm("Do you want to use Paperclip for uploads?") }
-    set(:paperclip, paperclip)
-  end
-
-  def create
-    return unless selected?(:paperclip)
-    add_paperclip
-    config_rspec
-  end
-
-  def install
-    add_paperclip
-    config_rspec if gem_exists?(/rspec-rails/)
-  end
-
-  def installed?
-    gem_exists?(/paperclip/)
-  end
-
-  private
-
-  def add_paperclip
-    gather_gem 'paperclip', '~> 5.0'
-    paperclip_config =
-      <<~RUBY
-        config.paperclip_defaults = {
-          storage: :s3,
-          s3_protocol: 'https',
-          s3_region: ENV.fetch('AWS_REGION', 'us-east-1'),
-          s3_credentials: {
-            bucket: ENV['S3_BUCKET']
-          }
-        }
-      RUBY
-    application paperclip_config, env: 'production'
-    append_to_file '.env.development', "S3_BUCKET=\n"
-    append_to_file '.gitignore', "/public/system/*\n"
-    add_readme_section :internal_dependencies, :paperclip
-  end
-
-  def config_rspec
-    copy_file '../assets/testing/platanus.png', 'spec/assets/platanus.png'
-    copy_file '../assets/testing/paperclip.rb', 'spec/support/paperclip.rb'
-  end
-end

data/spec/features/active_storage_spec.rb

@@ -1,30 +0,0 @@
-require "spec_helper"
-
-RSpec.describe "Active Storage" do
-  before :all do
-    drop_dummy_database
-    remove_project_directory
-    create_dummy_project("active_storage" => true)
-  end
-
-  it "customizes config file" do
-    content = IO.read("#{project_path}/config/storage.yml")
-    expect(content).to include("bucket: <%= ENV['S3_BUCKET'] %>")
-  end
-
-  it "adds brief to README file" do
-    content = IO.read("#{project_path}/README.md")
-    expect(content).to include("Active Storage")
-  end
-
-  it "uses amazon on production env" do
-    content = IO.read("#{project_path}/config/environments/production.rb")
-    expect(content).to include("config.active_storage.service = :amazon")
-  end
-
-  it "adds amazon ENV vars" do
-    content = IO.read("#{project_path}/.env.development")
-    expect(content).to include("AWS_REGION=")
-    expect(content).to include("S3_BUCKET=")
-  end
-end