underlay 1.52.1 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dde78cb7d8ba8f2c8c7f93250425fb19b24ebb44907faacf37453e5d293a109
-  data.tar.gz: 1a5a24be479c3750e32430ffa8e08fe2eb595e7a4c6657d06cd9661c76dfa247
+  metadata.gz: 2f96efbeb8d838ada0d330aed5225e7ef1a6ea054b8a429c0628e405e4e1a189
+  data.tar.gz: 03d684f4ebb12de9aaea53800d1eeee3ffa6e268617c516a984f86dd730ee4b7
 SHA512:
-  metadata.gz: fbd4a1c9931e083852d4d11af6b644a735ee9ea4f83b5ec956d38de51e2360f7e1bcd1799b58e6bf15c0740c78246797b31d21b25375d5c042a16b0819f20608
-  data.tar.gz: cba387c279816491b9ea3fac214480750b48391842baf47d26e8bc2bd34cfde93700f50dc5278d6400d74d229cee1c6c997137ddb81439b8abb48ec2798b6c81
+  metadata.gz: f5781b045cff4ee4988d5e17087b1adadbee4a6ae307fecf4dbe427aaa4be8020951c8a4fa7e99bcb515d64daa8bbf01c6c2d2968315b8473e377a048ebb6639
+  data.tar.gz: 7cbe4d65d07e1f2ce078cc08fb2902717e0a2267fd6ab159976a415dea6a4ce139f78476a7a5fb8d85d20b9101fc4ac38e86b7ebb1c29133e225be3af4fea4b1

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.1

data/README.md

@@ -171,6 +171,7 @@ PostgreSQL needs to be installed and running for the `db:create` rake task.
 
 ## TODO
 
+- [] Set `config.cache_classes` to false for test environment, Otherwise it doesn't allow us to stub classes properly
 - [X] Install TwilioBase gem (if the option is set)
 - [x] Remove duplicate application.html.erb layout
 - [X] Fix issue with flashes.scss partial not being added to assets
@@ -179,7 +180,7 @@ PostgreSQL needs to be installed and running for the `db:create` rake task.
 - [X] Configure Redis on heroku (with config vars + initializer)
 - [X] Update rake (in generated project) to run lints
 - [X] Prevent views and static sites from generating in API mode
-- [ ] Setup default front-end libraries and depencies
+- [ ] Setup default front-end libraries and dependencies
 - [X] Setup .gitignore
 - [X] Fix lograge Installation
 - [X] Setup circle ci
@@ -187,7 +188,7 @@ PostgreSQL needs to be installed and running for the `db:create` rake task.
 - [X] Use factory_bot_rails instead of factory_bot
 - [X] Create github repo
 - [X] Fix rubocop and other linters offenses
-- [ ] Publish gem
+- [X] Publish gem
 
 ## Kudos
 
@@ -203,7 +204,7 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/DVELP/front_man. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/DVELP/underlay. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org/) code of conduct.
 
 
 ## License

data/lib/underlay/app_builder.rb

@@ -446,8 +446,14 @@ module Underlay
       end
     end
 
+    def remove_app_comment_lines
+      files = ['jobs/application_job.rb']
+
+      remove_comment_lines(files: files, path_key: 'app')
+    end
+
     def remove_config_comment_lines
-      config_files = [
+      files = [
         'application.rb',
         'initializers/backtrace_silencers.rb',
         'initializers/wrap_parameters.rb',
@@ -459,8 +465,18 @@ module Underlay
         '../Rakefile'
       ] + mode_dependent_files
 
-      config_files.each do |config_file|
-        path = File.join(destination_root, "config/#{config_file}")
+      remove_comment_lines(files: files, path_key: 'config')
+    end
+
+    def remove_routes_comment_lines
+      replace_in_file 'config/routes.rb',
+        /Rails\.application\.routes\.draw do.*end/m,
+        "Rails.application.routes.draw do\nend"
+    end
+
+    def remove_comment_lines(files:, path_key:)
+      files.each do |config_file|
+        path = File.join(destination_root, "#{path_key}/#{config_file}")
 
         accepted_content = File.readlines(path).reject do |line|
           line =~ /^.*#.*$/ || line =~ /^$\n/
@@ -472,12 +488,6 @@ module Underlay
       end
     end
 
-    def remove_routes_comment_lines
-      replace_in_file 'config/routes.rb',
-        /Rails\.application\.routes\.draw do.*end/m,
-        "Rails.application.routes.draw do\nend"
-    end
-
     def setup_default_rake_task
       append_file 'Rakefile' do
         <<~HERE
@@ -499,12 +509,6 @@ module Underlay
     end
 
     def manual_code_correct
-      replace_in_file(
-        'config/environments/development.rb',
-        "if Rails.root.join('tmp/caching-dev.txt').exist?",
-        "if Rails.root.join('tmp', 'caching-dev.txt').exist?"
-      )
-
       simple_form_corrections unless api_mode?
     end
 

data/lib/underlay/generators/app_generator.rb

@@ -78,6 +78,7 @@ module Underlay
       invoke :configure_app
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
+      invoke :remove_app_comment_lines
       invoke :remove_config_comment_lines
       invoke :remove_routes_comment_lines
       invoke :setup_figaro
@@ -245,6 +246,10 @@ module Underlay
       build_for_non_api :customize_error_pages
     end
 
+    def remove_app_comment_lines
+      build :remove_app_comment_lines
+    end
+
     def remove_config_comment_lines
       build :remove_config_comment_lines
     end

data/lib/underlay/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module Underlay
-  RAILS_VERSION = '~> 5.1.3'
+  RAILS_VERSION = '~> 6.0.3'
   RUBY_VERSION = IO
     .read("#{File.dirname(__FILE__)}/../../.ruby-version")
     .strip
     .freeze
-  VERSION = '1.52.1'
+  VERSION = '2.0'
 end

data/templates/Gemfile.erb

@@ -19,6 +19,7 @@ ruby '<%= Underlay::RUBY_VERSION %>'
   gem 'sprockets', '>= 3.0.0'
   gem 'uglifier'
 <% end -%>
+gem 'bootsnap', require: false
 gem 'figaro'
 gem 'lograge'
 gem 'pg'

data/templates/bin_setup

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
-include FileUtils
 
 require 'pathname'
 require 'fileutils'
 
+include FileUtils
+
 APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 def system!(*args)

data/templates/rubocop.yml.erb

@@ -9,11 +9,8 @@ Metrics/LineLength:
 
 Metrics/MethodLength:
   Enabled: false
-
-Rails:
-  Enabled: true
-
-Style/AlignParameters:
+  
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Style/BlockComments:
@@ -57,7 +54,7 @@ Style/HashSyntax:
 Style/IfUnlessModifier:
   Enabled: false
 
-Style/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 Style/MultilineMethodCallIndentation:

data/underlay.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Underlay::VERSION
 
-  s.add_dependency 'bundler', '~> 1.3'
+  s.add_dependency 'bundler', '~> 2.1'
   s.add_dependency 'rails', Underlay::RAILS_VERSION
 
   s.add_development_dependency 'rspec', '~> 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: underlay
 version: !ruby/object:Gem::Version
-  version: 1.52.1
+  version: '2.0'
 platform: ruby
 authors:
 - dvelp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
 description: 'Underlay removes the monotony of your setup, so you can spend your time
   focusing above the value line.
 
-'
+  '
 email: engage@dvelp.co.uk
 executables:
 - underlay
@@ -162,15 +162,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.1
+      version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using DVELP's best practices.