blueberry_rails 0.4.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c406dea7cfbeac218cb081773eeffd0a27c31f95
-  data.tar.gz: 371ddadce54b93bc4881e398a2529261cb004cdb
+SHA256:
+  metadata.gz: 4fbb8c6e103d826c985348415655e945ea6e12ca3462a7c420baa131a0a36e0a
+  data.tar.gz: 0e39bce765bc81dcdd4c0f6e6fd31501c396d779f52ef2de6a85768db7c33ac2
 SHA512:
-  metadata.gz: 9c0d5bb28b507c0591e3734d02da80c9527297e3431389021d969dfe67026c41be298ed049a0bf6957d562b13fc0fe3873c233eca809859e54d2a380a7f71348
-  data.tar.gz: 1e209b2600673e51bea02fa11f1681470e787c1ddedf016aa0e58cd36fd660013f3fd477807e937a3b77bc628faaccabca6b5c8233c60dcc71d0e761fb6bd24a
+  metadata.gz: 89275f78f96f19de1e8b7b448088410be260e3c96a9e0cc1e8f647d9d5f410421e441f0b1629b3d6fdc81be793f67410de2ea59e2c5abd7ce4e740d2ec87e6b2
+  data.tar.gz: d137d50afce3b360f996083bbb1cd8dcb0423c7b6ff384f71cb722d6988a890795f317f2fb16ec5577968d003fffddaaadd6ef4a071c1c57000b9b86a9f570de

data/.circleci/config.yml

@@ -0,0 +1,47 @@
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.5.1-node-browsers
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          RAILS_ENV: test
+          DATABASE_URL: "postgres://bb@localhost:5432/test_project_test"
+      - image: circleci/postgres:9.5-alpine
+        environment:
+          POSTGRES_USER: bb
+          POSTGRES_DB: test_project_test
+          POSTGRES_PASSWORD: ""
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: Update bundler
+          command: sudo gem update bundler
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "lib/blueberry_rails/version.rb" }}
+          # 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
+
+      - save_cache:
+          paths:
+            - ./
+          key: v1-dependencies-{{ checksum "lib/blueberry_rails/version.rb" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: bundle exec rake

data/.eslintrc

@@ -0,0 +1,21 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true,
+    "node": true
+  },
+  "extends": ["airbnb-base"],
+  "rules": {
+    "import/no-extraneous-dependencies": [
+      "error",
+    ],
+    "object-property-newline": [
+      "error",
+      { "allowAllPropertiesOnSameLine": false }
+    ]
+  },
+  "globals": {
+    "expect": true
+  }
+}

data/.hound.yml

@@ -1,6 +1,3 @@
-coffee_script:
-  enabled: true
-
 ruby:
   enabled: true
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - db/schema.rb
     - bin/*
-
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: true
 
@@ -10,7 +10,7 @@ AbcSize:
   Enabled: false
 
 AccessorMethodName:
-  Enabled: true
+  Enabled: false
 
 ActionFilter:
   Enabled: true
@@ -72,14 +72,14 @@ CyclomaticComplexity:
 Delegate:
   Enabled: false
 
-DeprecatedHashMethods:
+PreferedHashMethods:
   Enabled: true
 
 Documentation:
   Enabled: false
 
 DotPosition:
-  EnforcedStyle: trailing
+  EnforcedStyle: leading
 
 DoubleNegation:
   Enabled: false
@@ -114,9 +114,6 @@ FormatString:
   Enabled: true
   EnforcedStyle: percent
 
-FrozenStringLiteralComment:
-  Enabled: false
-
 GlobalVars:
   Enabled: true
 
@@ -133,10 +130,10 @@ InlineComment:
   Enabled: false
 
 Lambda:
-  Enabled: true
+  Enabled: false
 
 LambdaCall:
-  Enabled: true
+  Enabled: false
 
 LineEndConcatenation:
   Enabled: true
@@ -174,7 +171,7 @@ NumericLiterals:
 OneLineConditional:
   Enabled: true
 
-OpMethod:
+BinaryOperatorParameter:
   Enabled: true
 
 ParameterLists:
@@ -214,13 +211,22 @@ SignalException:
 SpecialGlobalVars:
   Enabled: true
 
+SpaceInLambdaLiteral:
+  Enabled: false
+
 StringLiterals:
   EnforcedStyle: single_quotes
 
+Style/MutableConstant:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 VariableInterpolation:
   Enabled: false
 
-TrailingCommaInLiteral:
+TrailingCommaInArrayLiteral:
   Enabled: true
 
 TrivialAccessors:
@@ -233,7 +239,7 @@ WhileUntilModifier:
   Enabled: false
 
 WordArray:
-  Enabled: true
+  Enabled: false
 
 # Lint
 
@@ -258,7 +264,7 @@ ElseLayout:
 HandleExceptions:
   Enabled: false
 
-InvalidCharacterLiteral:
+MultilineMethodCallIndentation:
   Enabled: false
 
 LiteralInCondition:
@@ -281,3 +287,6 @@ UnderscorePrefixedVariableName:
 
 Void:
   Enabled: false
+
+SymbolArray:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.5.1

data/README.md

@@ -28,10 +28,6 @@ Custom Erros
 
     --custom-errors
 
-Fontcustom
-
-    --fontncustom
-
 Twitter bootstrap
 
     --bootstrap
@@ -44,10 +40,6 @@ Devise model
 
     --devise_model User
 
-Use Gulp instead of Asset Pipeline
-
-    --gulp
-
 ## Gems
 
 Blueberry Rails template contains following gems by default:
@@ -65,53 +57,9 @@ Testing related:
 
 * [Capybara](https://github.com/jnicklas/capybara) for acceptance testing
 * [Guard](https://github.com/ranmocy/guard-rails) for automatically running specs
-* [Factory Girl](https://github.com/rspec/rspec-rails) as a fixtures replacement
+* [factory_bot](https://github.com/thoughtbot/factory_bot) as a fixtures replacement
 * [Rspec](https://github.com/rspec/rspec-rails)
 
-## Gulp
-
-Based on [Gulp on Rails: Replacing the Asset Pipeline](http://viget.com/extend/gulp-rails-asset-pipeline) and [corresponding  GitHub repository](https://github.com/vigetlabs/gulp-rails-pipeline).
-
-Additional articles
-* [Gulp - a modern approach to asset pipeline for Rails developers](http://blog.arkency.com/2015/03/gulp-modern-approach-to-asset-pipeline-for-rails-developers/)
-
-### Usage
-
-    $ blueberry_rails newproject --gulp
-    $ npm install
-
-Default Gulp task, compiles stylesheets/javascripts and starts BrowserSync (for frontend dev)
-
-    $ gulp
-
-Compile all assets w/o BrowserSync (for backend dev)
-
-    $ gulp development
-
-Generate production ready assets (including fingerprinting)
-
-    $ gulp build
-
-Start BrowserSync
-
-    $ gulp watch
-
-Optimize image size
-
-    $ gulp images
-
-Generate font icons from SVGs
-
-    $ gulp fontIcons
-
-Add fingerprints to assets
-
-    $ gulp rev
-
-Remove all assets
-
-    $ gulp clean
-
 ## Other great stuff
 
 * Do not secret token in the repo - load it via ENV variable

data/blueberry_rails.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'bundler', '~> 1.3'
+  gem.add_dependency 'bundler', '~> 1.17'
   gem.add_dependency 'rails', BlueberryRails::RAILS_VERSION
 
   gem.add_development_dependency 'rake'
 
-  gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 2.5.1'
 
 end

data/lib/blueberry_rails/app_builder.rb

@@ -14,26 +14,26 @@ module BlueberryRails
       template 'Gemfile_custom.erb', 'Gemfile'
     end
 
-    def secret_token
-      template 'secret_token.rb.erb', 'config/initializers/secret_token.rb'
-    end
-
-    def setup_secret_token
-      inject_into_file 'config/secrets.yml',
-                       "\nstaging:\n" \
-                       "  secret_key_base: <%= ENV[\"SECRET_KEY_BASE\"] %>\n",
-                       after: "  secret_key_base: <%= ENV[\"SECRET_KEY_BASE\"] %>\n"
-    end
-
     def hound_config
       copy_file '../.hound.yml', '.hound.yml'
+      copy_file '../.eslintrc', '.eslintrc'
       copy_file '../.rubocop.yml', '.rubocop.yml'
+
+      run 'yarn add -D eslint eslint-config-airbnb-base eslint-config-import'
+    end
+
+    def cocoon_config
+      run 'yarn add https://github.com/1776/cocoon'
+      inject_into_file 'app/javascript/packs/application.js',
+                       "import 'cocoon';\n",
+                       before: 'import { Application } from "stimulus"'
     end
 
     def setup_mailer_hosts
       action_mailer_host 'development', "development.#{app_name}.com"
       action_mailer_host 'test', "test.#{app_name}.com"
       action_mailer_host 'staging', "staging.#{app_name}.com"
+      action_mailer_host 'integration', "integration.#{app_name}.com"
       action_mailer_host 'production', "#{app_name}.com"
     end
 
@@ -50,6 +50,11 @@ module BlueberryRails
                       'config.consider_all_requests_local       = true'
     end
 
+    def setup_integration_environment
+      copy_file 'config/environments/production.rb',
+                'config/environments/integration.rb'
+    end
+
     def setup_admin
       directory 'admin_controllers', 'app/controllers/admin'
       directory 'admin_views', 'app/views/admin'
@@ -65,14 +70,19 @@ module BlueberryRails
     end
 
     def create_partials_directory
-      directory 'views/application', 'app/views/application'
+      directory 'views/application', 'app/views/application', force: true
     end
 
     def create_application_layout
       remove_file 'app/views/layouts/application.html.erb'
+      remove_file 'app/views/layouts/mailer.html.erb'
+      remove_file 'app/views/layouts/mailer.text.erb'
 
       template 'views/layouts/application.html.slim.erb',
-               'app/views/layouts/application.html.slim'
+               'app/views/layouts/application.html.slim', force: true
+
+      template 'views/layouts/mailer.html.slim.erb',
+               'app/views/layouts/mailer.html.slim', force: true
 
       directory 'helpers', 'app/helpers', force: true
 
@@ -81,19 +91,15 @@ module BlueberryRails
     end
 
     def copy_assets_directory
-      remove_file 'app/assets/stylesheets/application.css'
-      remove_file 'app/assets/javascripts/application.js'
+      remove_file 'app/assets/stylesheets', force: true
+      remove_file 'app/assets/javascripts', force: true
 
-      directory 'assets', 'app/assets'
-
-      remove_file 'app/assets/icons'
+      run 'mkdir app/javascript/stylesheets', force: true
+      run 'touch app/javascript/packs/application.sass', force: true
 
       if options[:administration]
-        directory 'admin_assets', 'app/assets'
-
-        replace_in_file 'config/initializers/assets.rb',
-                        '.precompile += %w( ',
-                        '.precompile += %w( admin.css admin.js '
+        run 'touch app/javascript/packs/admin.js', force: true
+        run 'touch app/javascript/packs/admin.sass', force: true
       end
     end
 
@@ -127,12 +133,14 @@ module BlueberryRails
     end
 
     def create_database
-      bundle_command 'exec rake db:create'
+      bundle_command 'exec rails db:create'
     end
 
     def generate_rspec
       generate 'rspec:install'
 
+      copy_file 'spec/drivers.rb', 'spec/support/drivers.rb'
+
       inject_into_file 'spec/rails_helper.rb',
                        "\n# Screenshots\n" \
                        "require 'capybara-screenshot/rspec'\n" \
@@ -150,7 +158,7 @@ module BlueberryRails
     end
 
     def setup_rspec_support_files
-      copy_file 'spec/factory_girl_syntax.rb', 'spec/support/factory_girl.rb'
+      copy_file 'spec/factory_bot_syntax.rb', 'spec/support/factory_bot.rb'
       copy_file 'spec/database_cleaner_setup.rb', 'spec/support/database_cleaner.rb'
       copy_file 'spec/mail_body_helpers.rb', 'spec/support/mixins/mail_body_helpers.rb'
     end
@@ -196,11 +204,11 @@ module BlueberryRails
 
     def configure_i18n
       inject_into_file "config/application.rb",
-                       "\n\n    config.i18n.load_path += Dir[Rails.root.join 'config/locales/**/*.{rb,yml}']",
+                       "\n    config.i18n.load_path += Dir[Rails.root.join 'config/locales/**/*.{rb,yml}']",
                        before: "\n    # Settings"
 
       inject_into_file 'config/application.rb',
-                       "\n\n    config.i18n.available_locales = [:cs, :en]\n    config.i18n.default_locale = :cs",
+                       "\n    config.i18n.available_locales = [:cs, :en]\n    config.i18n.default_locale = :cs",
                        before: "\n    # Settings"
 
       remove_file 'config/locales/en.yml'
@@ -214,7 +222,8 @@ module BlueberryRails
     end
 
     def configure_circle
-      template 'circle.yml.erb', 'circle.yml'
+      empty_directory '.circleci'
+      template 'circle.yml.erb', '.circleci/config.yml'
     end
 
     def add_ruby_version_file
@@ -224,7 +233,7 @@ module BlueberryRails
                 else
                   "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
                 end
-      add_file '.ruby-version', "#{version}\n"
+      add_file '.ruby-version', "#{version}\n", force: true
     end
 
     def install_devise
@@ -284,12 +293,14 @@ module BlueberryRails
     end
 
     def setup_gitignore
-      [ 'spec/lib',
+      [
+        'spec/lib',
         'spec/controllers',
         'spec/features',
         'spec/support/matchers',
         'spec/support/mixins',
-        'spec/support/shared_examples' ].each do |dir|
+        'spec/support/shared_examples'
+      ].each do |dir|
         run "mkdir -p #{dir}"
         run "touch #{dir}/.keep"
       end
@@ -301,9 +312,6 @@ module BlueberryRails
 
     def copy_rake_tasks
       copy_file 'tasks/images.rake', 'lib/tasks/images.rake'
-      if options[:fontcustom]
-        copy_file 'tasks/icons.rake', 'lib/tasks/icons.rake'
-      end
     end
 
     def copy_custom_errors
@@ -316,15 +324,9 @@ module BlueberryRails
 
       inject_into_class 'config/application.rb', 'Application', config
 
-      remove_file 'public/404.html'
-      remove_file 'public/422.html'
-      remove_file 'public/500.html'
-    end
-
-    def copy_fontcustom_config
-      copy_file 'fontcustom.yml', 'fontcustom.yml'
-      copy_file 'assets/icons/_font_icons.scss',
-                'app/assets/icons/_font_icons.scss'
+      remove_file 'public/404.html', force: true
+      remove_file 'public/422.html', force: true
+      remove_file 'public/500.html', force: true
     end
 
     def configure_bin_setup
@@ -345,36 +347,5 @@ module BlueberryRails
     def reviews_app
       template 'app.json.erb', 'app.json'
     end
-
-    # Gulp
-    def gulp_files
-      copy_file 'gulp/gulp_helper.rb', 'app/helpers/gulp_helper.rb'
-      remove_file 'app/assets/stylesheets/application.css'
-      copy_file 'gulp/application.sass',
-                'app/assets/stylesheets/application.sass'
-      remove_file 'app/assets/javascripts/application.js'
-      copy_file 'gulp/application.js.coffee',
-                'app/assets/javascripts/application.js.coffee'
-
-      application do
-        "# Make public assets requireable in manifest files\n    "  \
-        "config.assets.paths << Rails.root.join('public', 'assets', 'stylesheets')\n    " \
-        "config.assets.paths << Rails.root.join('public', 'assets', 'javascripts')\n"
-      end
-
-      inject_into_file 'config/environments/development.rb',
-                       "config.assets.digest = false\n",
-                       before: 'config.assets.quiet = true'
-
-      copy_file 'gulp/rev_manifest.rb', 'config/initializers/rev_manifest.rb'
-      copy_file 'gulp/global.coffee',   'gulp/assets/javascripts/global.coffee'
-      copy_file 'gulp/message.coffee',  'gulp/assets/javascripts/message.coffee'
-      copy_file 'gulp/global.sass',     'gulp/assets/stylesheets/global.sass'
-      copy_file 'gulp/config.coffee'
-      directory 'gulp/tasks'
-      directory 'gulp/util'
-      copy_file 'gulp/gulpfile.js',  'gulpfile.js'
-      copy_file 'gulp/package.json', 'package.json', force: true
-    end
   end
 end