blueberry_rails 0.4.1 → 1.0.0

data/lib/blueberry_rails/generators/app_generator.rb

@@ -25,18 +25,12 @@ module BlueberryRails
     class_option :skip_turbolinks, type: :boolean, default: true,
       desc: 'Skip turbolinks gem'
 
-    class_option :skip_bundle, type: :boolean, aliases: '-B', default: true,
+    class_option :skip_bundle, type: :boolean, aliases: '-B', default: false,
       desc: 'Don\'t run bundle install'
 
-    class_option :gulp, type: :boolean, aliases: '-g', default: false,
-      desc: 'Include Gulp asset pipeline'
-
     class_option :administration, type: :boolean, aliases: '-a', default: false,
       desc: 'Include Admin part of application'
 
-    class_option :fontcustom, type: :boolean, aliases: '-fc', default: false,
-      desc: 'Include Fontcustom'
-
     class_option :translation_engine, type: :boolean, aliases: '-te', default: false,
       desc: 'Include Tranlsation Engine'
 
@@ -46,6 +40,9 @@ module BlueberryRails
     class_option :heroku, type: :boolean, aliases: '-he', default: true,
       desc: 'Heroku reviews app config'
 
+    class_option :webpack, type: :string, aliases: '-w', default: 'stimulus',
+      desc: 'Preconfigure for app-like JavaScript with Webpack (options: react/vue/angular/elm/stimulus)'
+
     def finish_template
       if options[:administration] && (!options[:devise] || !options[:bootstrap])
         raise 'Administration depends on bootstrap and devise!'
@@ -60,20 +57,20 @@ module BlueberryRails
       invoke :setup_development_environment
       invoke :setup_test_environment
       invoke :setup_staging_environment
+      invoke :setup_integration_environment
       invoke :create_views
       invoke :create_assets
       invoke :configure_app
       invoke :remove_routes_comment_lines
       invoke :setup_gems
       invoke :setup_git
-      invoke :setup_gulp
       invoke :setup_admin
       invoke :rake_tasks
       invoke :setup_custom_errors
       invoke :setup_initializers
-      invoke :setup_fontcustom
       invoke :setup_heroku
       invoke :setup_cache_and_compress
+      invoke :setup_linters
     end
 
     def customize_gemfile
@@ -112,7 +109,11 @@ module BlueberryRails
     def setup_staging_environment
       say 'Setting up the staging environment'
       build :setup_staging_environment
-      build :setup_secret_token
+    end
+
+    def setup_integration_environment
+      say 'Setting up the integration environment'
+      build :setup_integration_environment
     end
 
     def setup_initializers
@@ -120,13 +121,6 @@ module BlueberryRails
       build :copy_initializers
     end
 
-    def setup_fontcustom
-      if options[:fontcustom]
-        say 'Setting up fontcustom'
-        build :copy_fontcustom_config
-      end
-    end
-
     def setup_admin
       if options[:administration]
         build :setup_admin
@@ -156,7 +150,6 @@ module BlueberryRails
       build :create_procfile
       build :create_puma_config
       build :add_ruby_version_file
-      build :hound_config
       build :configure_i18n
       build :configure_bin_setup
     end
@@ -189,13 +182,6 @@ module BlueberryRails
       build :init_git
     end
 
-    def setup_gulp
-      if options[:gulp]
-        say 'Adding Gulp asset pipeline'
-        build :gulp_files
-      end
-    end
-
     def setup_heroku
       if options[:heroku]
         say 'Add heroku reviews apps config'
@@ -203,6 +189,16 @@ module BlueberryRails
       end
     end
 
+    def setup_linters
+      say 'Setting up linters'
+      build :hound_config
+    end
+
+    def setup_cocoon
+      say 'Setting up Cocoon'
+      build :cocoon_config
+    end
+
     def rake_tasks
       build :copy_rake_tasks
     end

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.4.1'.freeze
+  VERSION = '1.0.0'.freeze
 
-  RUBY_VERSION = '2.4.0'.freeze
+  RUBY_VERSION = '2.5.1'.freeze
 
-  RAILS_VERSION = '5.1.1'.freeze
+  RAILS_VERSION = '5.2.1.1'.freeze
 end

data/spec/blueberry_rails_spec.rb

@@ -21,9 +21,12 @@ class BlueberryRailsTest < Minitest::Test
     assert_exist_file 'config/initializers/plurals.rb'
     assert_exist_file '.hound.yml'
     assert_exist_file '.rubocop.yml'
-    assert_exist_file 'circle.yml'
+    assert_exist_file '.eslintrc'
+    assert_exist_file '.circleci/config.yml'
     assert_exist_file '.rspec'
     assert_exist_file 'app.json'
+    assert_exist_file 'spec/support/drivers.rb'
+    assert_file_have_content '.ruby-version', BlueberryRails::RUBY_VERSION
     assert_file_have_content 'README.md', 'Test Project'
     assert_file_have_content 'bin/setup', 'bundle install --deployment'
     assert_file_have_content 'Procfile', 'bundle exec puma'
@@ -31,8 +34,10 @@ class BlueberryRailsTest < Minitest::Test
     assert_file_have_content 'config/environments/production.rb', 'Cache-Control'
     assert_file_have_content 'config/environments/production.rb', 'Rack::Deflater'
     assert_file_have_content 'Guardfile', 'factories'
-    assert_file_have_content 'config/secrets.yml', 'staging'
     assert_file_have_content 'config/initializers/airbrake.rb', 'config.blacklist_keys'
+    assert_file_have_content 'package.json', 'eslint'
+    assert_file_have_content 'package.json', 'cocoon'
+    assert_file_have_content 'app/javascript/packs/application.js', 'cocoon'
 
     assert run_rake
   end
@@ -82,27 +87,6 @@ class BlueberryRailsTest < Minitest::Test
     assert run_rake
   end
 
-  def test_rake_runs_with_fontcustom_option
-    create_project '--fontcustom'
-
-    assert_exist_file 'lib/tasks/icons.rake'
-    assert_exist_file 'fontcustom.yml'
-    assert_exist_file "app/assets/icons/_font_icons.scss"
-
-    assert run_rake
-  end
-
-  def test_rake_runs_with_gulp_option
-    create_project '--gulp'
-
-    assert_file_have_content 'config/environments/development.rb',
-                             'config.assets.digest = false'
-    assert_exist_file 'gulp/tasks/default.coffee'
-    assert_exist_file 'gulpfile.js'
-    assert_exist_file 'package.json'
-    assert run_rake
-  end
-
   def test_rake_runs_with_heroku_option
     create_project '--heroku'
 

data/templates/Gemfile_custom.erb

@@ -1,78 +1,63 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '<%= BlueberryRails::RUBY_VERSION %>'
 
 gem 'airbrake'
-<% if !options[:gulp] -%>
-gem 'autoprefixer-rails'
-<% end -%>
-<% if options[:administration] -%>
-gem 'blueberry_admin'
-<% end -%>
-gem 'coffee-rails', '~> 4.2'
+gem 'bootsnap', require: false
+gem 'cocoon', '~> 1.2'
 <% if options[:devise] -%>
-gem 'devise'
+gem 'devise', '~> 4.5'
 <% end -%>
-gem 'dotenv-rails'
+gem 'dotenv-rails', '~> 2.5'
+gem 'draper', '~> 3.0'
 gem 'flutie'
-gem 'jquery-rails'
+gem 'inky-rb', require: 'inky'
 gem 'metamagic'
-gem 'pg'
-gem 'puma', '~> 3.0'
+gem 'pg', '>= 0.18', '< 2.0'
+gem 'premailer-rails', '~> 1.10', '>= 1.10.2'
+gem 'puma', '~> 3.11'
 gem 'rails', '~> <%= BlueberryRails::RAILS_VERSION %>'
-gem 'sassc-rails'
-gem 'simple_form'
-gem 'slim-rails'
+gem 'sassc-rails', '~> 2.0'
+gem 'simple_form', '~> 4.1'
+gem 'slim-rails', '~> 3.2'
 <% if options[:translation_engine] -%>
 gem 'translation_engine', github: 'blueberryapps/translation-engine'
 <% end -%>
-gem 'uglifier', '>= 1.3.0'
-
-source 'https://rails-assets.org' do
-<% if options[:bootstrap] -%>
-  gem 'rails-assets-bootstrap-sass'
+<% unless options[:skip_turbolinks] -%>
+gem 'turbolinks', '~> 5'
 <% end -%>
-  gem 'rails-assets-jquery-ujs'
-end
+gem 'uglifier', '>= 1.3.0'
+gem 'webpacker', '~> 3.3'
 
 group :development do
   gem 'awesome_print'
-  gem 'better_errors'
-  gem 'binding_of_caller'
-<% if options[:fontcustom] -%>
-  gem 'fontcustom'
-<% end -%>
   gem 'guard-rspec'
-  gem 'i18n_yaml_sorter'
   gem 'image_optimizer', '~> 1.3.0'
   gem 'listen', '~> 3.0.5'
-  gem 'mailcatcher'
   gem 'pry-rails'
   gem 'rails-i18n-debug', github: 'XeeD/rails-i18n-debug'
   gem 'rubocop', require: false
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-<% if options[:fontcustom] -%>
-  gem 'svg_optimizer'
-<% end -%>
+  gem 'web-console', '>= 3.3.0'
 end
 
 group :development, :test do
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails', '~> 4.11'
   gem 'pry-byebug'
   gem 'pry-doc'
-  gem 'rspec-rails', '>= 3.1'
-end
-
-group :staging, :production do
-  gem 'newrelic_rpm', '>= 3.9.6'
+  gem 'rspec-rails', '>= 3.8'
 end
 
 group :test do
   gem 'capybara-screenshot'
+  gem 'capybara-selenium'
   gem 'database_cleaner'
   gem 'launchy'
-  gem 'poltergeist', '>= 1.5.0'
+  gem 'rails-controller-testing'
+  gem 'rspec_junit_formatter'
+  gem 'shoulda-matchers'
   gem 'simplecov', require: false
   gem 'webmock'
 end

data/templates/Procfile

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

data/templates/app.json.erb

@@ -25,10 +25,10 @@
   ],
   "buildpacks": [
     {
-      "url": "urn:buildpack:heroku/ruby"
+      "url": "https://github.com/heroku/heroku-buildpack-activestorage-preview"
     },
     {
-      "url": "https://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks"
+      "url": "urn:buildpack:heroku/ruby"
     }
   ]
 }

data/templates/circle.yml.erb

@@ -1,13 +1,71 @@
-machine:
-  services:
-    - postgresql
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:<%= BlueberryRails::RUBY_VERSION %>-node-browsers
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          BUNDLE_PATH: vendor/bundle
+          RAILS_ENV: test
+          DATABASE_URL: "postgres://<%= app_name.gsub('_', '-') %>@localhost:5432/<%= app_name.gsub('_', '-') %>-test"
+      - image: circleci/postgres:9.5-alpine
+        environment:
+          POSTGRES_USER: <%= app_name.gsub('_', '-') %>
+          POSTGRES_DB: <%= app_name.gsub('_', '-') %>-test
+          POSTGRES_PASSWORD: ""
 
-  # Version of ruby to use
-  ruby:
-    version:
-      <%= BlueberryRails::RUBY_VERSION %>
+    working_directory: ~/repo
 
+    steps:
+      - checkout
 
-  # Add some environment variables
-  environment:
-    CIRCLE_ENV: test
+      - run:
+          name: Update bundler
+          command: sudo gem update bundler
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "Gemfile.lock" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      - run:
+          name: Install yarn dependencies
+          command: yarn install
+
+      # Database setup
+      - run: bundle exec rails db:create
+      - run: bundle exec rails db:schema:load
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"
+
+            bundle exec rspec --format progress \
+                            --format RspecJunitFormatter \
+                            --out /tmp/test-results/rspec.xml \
+                            --format progress \
+                            $TEST_FILES
+
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/templates/config/initializers/translation_engine.rb

@@ -1,4 +1,4 @@
-if %w(production staging).include? Rails.env
+if %w(production integration staging).include? Rails.env
   TranslationEngine.config do |config|
     # key for user
     config.api_key  = 'API_KEY'

data/templates/gitignore_custom.erb

@@ -6,16 +6,18 @@
 .env
 .pry_history
 .sass-cache/
-coverage/*
+.yarn-integrity
 config/database.yml
+config/master.key
 db/*.sqlite3
 log/*.log
+node_modules
+public/packs
+public/packs-test
 public/system
 rerun.txt
+storage/*
 tags
 tmp/*
 tmp/**/*
-<% if options[:gulp] -%>
-node_modules
-/public/assets/*
-<% end -%>
+yarn-debug.log*

data/templates/puma.rb

@@ -4,9 +4,8 @@ threads Integer(threads_count / 2), threads_count
 
 preload_app!
 
-rackup      DefaultRackup
-port        ENV['PORT']     || 3000
-environment ENV['RACK_ENV'] || 'development'
+port        ENV.fetch('PORT') { 3000 }
+environment ENV.fetch('RACK_ENV') { 'development' }
 
 on_worker_boot do
   # Worker specific setup for Rails 4.1+

data/templates/spec/controllers/root_controller_spec.rb

@@ -1,12 +1,10 @@
-require 'spec_helper'
-
-describe RootController, type: :controller do
+require 'rails_helper'
 
+RSpec.describe RootController, type: :controller do
   describe 'GET index' do
     it 'returns http success' do
       get :index
       expect(response).to be_success
     end
   end
-
 end

data/templates/spec/drivers.rb

@@ -0,0 +1,16 @@
+require 'selenium/webdriver'
+
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
+Capybara.register_driver :headless_chrome do |app|
+  Capybara::Selenium::Driver.new app,
+    browser:              :chrome,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.chrome(
+      chromeOptions: { args: %w(headless disable-gpu window-size=1366,768) }
+    )
+end
+
+Capybara.javascript_driver = :headless_chrome
+# Capybara.javascript_driver = :chrome