thredded_create_app 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f102c2efa1d8aa3c0bb522c850945a2b601d526e4ae2bdd6e4b34660382e3ab5
-  data.tar.gz: fd1c3a2c01fcb7ece4f0ab288a93dde768a7377ac9f43632029af5a94499595d
+  metadata.gz: db282a04338266835a3d22a51412fe231eb8199464d001ba7d1169ce3ef6ee74
+  data.tar.gz: d2a4a3a9d2004b6501ac35db551f77838612b95e090e6acb2e5b334d275f0640
 SHA512:
-  metadata.gz: f0832d96199468229058952ee68bd6dc64432fca78f0309fea6c52a68a1e9ab576153ac011728fdca97c6449fc49348d7e2b93e13ad43e785be6ed65bb60b558
-  data.tar.gz: 1c7558e3c1b4a87efe2891dbc4a415a1c86e59adca2fc589a24152ab3628788ab33e7aaef7559116245dcf7edc4809eee3a52993377e677847c663c1020c6c5c
+  metadata.gz: ed068b67a37c9133825d4f5ad0a7a6828f86cca729180fb6af257997e95b014f99f4b766f0aac7c76b6cb6e23288e045c9de7b334ab10abc05dd9083a23d05c4
+  data.tar.gz: 8cce0de75ec5f90b5d0f8cf0ab129531339c12df819af7d94dd2366c2f302f3520d4a4446dda88674643739bf471ba10fb322642e658c6b78c8b422de7baadf3

data/lib/thredded_create_app/cli.rb

@@ -30,19 +30,17 @@ module ThreddedCreateApp
 
     def start
       auto_output_coloring do
+        run
+      rescue OptionParser::ParseError, ArgvError => e
+        error e.message, 64
+      rescue ThreddedCreateApp::CommandError => e
         begin
-          run
-        rescue OptionParser::ParseError, ArgvError => e
-          error e.message, 64
-        rescue ThreddedCreateApp::CommandError => e
-          begin
-            error e.message, 78
-          ensure
-            log_verbose e.backtrace * "\n"
-          end
-        rescue Errno::EPIPE
-          exit 1
+          error e.message, 78
+        ensure
+          log_verbose e.backtrace * "\n"
         end
+      rescue Errno::EPIPE
+        exit 1
       end
     rescue ExecutionError => e
       exit e.exit_code
@@ -121,7 +119,7 @@ module ThreddedCreateApp
                  For more information, see the readme at:
           #{File.expand_path('../../README.md', File.dirname(__FILE__))}
           https://github.com/thredded/thredded_create_app
-TEXT
+        TEXT
       end.parse!(argv)
       if positional_args.length != 1
         fail ArgvError, 'Expected 1 positional argument, ' \

data/lib/thredded_create_app/generator.rb

@@ -100,10 +100,11 @@ module ThreddedCreateApp
 
     def add_gems_to_gemfile(gems)
       File.open('Gemfile', 'a') do |f|
-        gems.each do |(name, version, groups, path)|
+        gems.each do |(name, version, require, groups, path)|
           f.puts ["gem '#{name}'",
-                  (version if version),
-                  ("groups: %i(#{groups * ' '})" if groups),
+                  ("'#{version}'" if version),
+                  ("require: '#{require}'" if require),
+                  ("groups: %i[#{groups * ' '}]" if groups),
                   ("path: '#{path}'" if path)].compact.join(', ')
         end
       end
@@ -115,7 +116,7 @@ module ThreddedCreateApp
         FileUtils.mkdir_p cache_path
         run 'ln', '-s', cache_path, 'vendor/cache'
       end
-      run 'bundle', 'install',
+      run 'bundle', 'install', '--with=test',
           *('--quiet' unless verbose?),
           *(%w[--path .bundle] unless File.writable?(Gem.dir))
       run 'bundle', 'package', *('--quiet' unless verbose?) if cache_path

data/lib/thredded_create_app/logging.rb

@@ -5,6 +5,7 @@ module ThreddedCreateApp
   module Logging
     def log_verbose(message = nil)
       return unless verbose?
+
       log_stderr Rainbow(message || yield).magenta.bright
     end
 

data/lib/thredded_create_app/tasks/add_devise.rb

@@ -38,7 +38,7 @@ module ThreddedCreateApp
 
       def setup_after_sign_in_behaviour
         inject_into_file 'app/controllers/application_controller.rb',
-                         after:   /::Base\n(  protect_from_forgery.*\n)?/,
+                         after: /::Base\n(  protect_from_forgery.*\n)?/,
                          content: <<-'RUBY'
 
   before_action :store_current_location, unless: :devise_controller?
@@ -57,11 +57,12 @@ module ThreddedCreateApp
   def back_url
     session[:user_return_to] || (respond_to?(:root_path) ? root_path : thredded.root_path)
   end
-        RUBY
+                         RUBY
       end
 
       def fix_migration_indices_limit_on_mysql
         return unless database_adapter_name =~ /mysql|maria/i
+
         migration_file = Dir['db/migrate/*_devise_create_users.rb'][0]
         replace migration_file,
                 /add_index :users, :(?:email|\w+_token), +unique: true/,

data/lib/thredded_create_app/tasks/add_devise/spec/features/devise_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.feature 'Devise', type: :feature do
+RSpec.describe 'Devise', type: :feature do
   it 'sign in path responds with 200' do
     visit new_user_session_path
     expect(page.status_code).to be 200

data/lib/thredded_create_app/tasks/add_display_name_to_users.rb

@@ -27,31 +27,29 @@ module ThreddedCreateApp
                                   'add_display_name_to_users.rb.erb'
         model_path = 'app/models/user.rb'
         inject_into_file model_path,
-                         after:   "ApplicationRecord\n",
+                         after: "ApplicationRecord\n",
                          content: display_name_model_rb
         inject_into_file model_path,
-                         before:  /end\n\z/,
+                         before: /end\n\z/,
                          content: uniq_display_name_method_rb
         git_commit 'Add a unique display_name User attribute'
       end
 
       def configure_devise
         inject_into_file 'app/controllers/application_controller.rb',
-                         after:   /::Base\n(  protect_from_forgery.*\n)?/,
+                         after: /::Base\n(  protect_from_forgery.*\n)?/,
                          content: devise_permitted_params_rb
         %w[app/views/devise/registrations/new.html.erb
            app/views/devise/registrations/edit.html.erb].each do |path|
           autofocus = File.read(path).include?(', autofocus: true')
           replace path, ', autofocus: true', '' if autofocus
-          if @simple_form
-            inject_into_file path,
-                             after:   %(<div class="form-inputs">\n),
-                             content: simple_form_input_html(autofocus)
-          else
-            inject_into_file path,
-                             after:   /error_messages! %>\n\n/,
-                             content: actionview_input_html(autofocus)
-          end
+          inject_into_file path,
+                           after: devise_form_fields_begin_pattern,
+                           content: if @simple_form
+                                      simple_form_input_html(autofocus)
+                                    else
+                                      actionview_input_html(autofocus)
+                                    end
         end
         git_commit 'Configure Devise to support display_name in forms'
       end

data/lib/thredded_create_app/tasks/add_invisible_captcha.rb

@@ -22,19 +22,17 @@ module ThreddedCreateApp
                          after: "::Devise::RegistrationsController\n",
                          content: <<-RUBY
     invisible_captcha only: %i[create], honeypot: :name
-        RUBY
+                         RUBY
 
         form_view_path = 'app/views/devise/registrations/new.html.erb'
         form_view_captcha = '<%= invisible_captcha :name %>'
-        if @simple_form
-          inject_into_file form_view_path,
-                           after: %(<div class="form-inputs">\n),
-                           content: "    #{form_view_captcha}\n"
-        else
-          inject_into_file form_view_path,
-                           after: %(error_messages! %>\n\n),
-                           content: "  #{form_view_captcha}\n\n"
-        end
+        inject_into_file form_view_path,
+                         after: devise_form_fields_begin_pattern,
+                         content: if @simple_form
+                                    "    #{form_view_captcha}\n"
+                                  else
+                                    "  #{form_view_captcha}\n\n"
+                                  end
         inject_into_file form_view_path,
                          before: ') do |f|',
                          content: ", html: {autocomplete: 'off'}"

data/lib/thredded_create_app/tasks/add_memcached_support.rb

@@ -15,7 +15,7 @@ module ThreddedCreateApp
 
       def after_bundle
         inject_into_file 'config/environments/production.rb',
-                         before:  /end\n\z/,
+                         before: /end\n\z/,
                          content: dalli_config
       end
 

data/lib/thredded_create_app/tasks/add_thredded/spec/features/thredded_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.feature 'Thredded', type: :feature do
+RSpec.describe 'Thredded', type: :feature do
   it 'root path responds with 200' do
     visit thredded.root_path
     expect(page.status_code).to be 200

data/lib/thredded_create_app/tasks/base.rb

@@ -13,13 +13,24 @@ module ThreddedCreateApp
 
       attr_reader :app_name, :app_hostname, :app_path, :gems
 
-      def initialize(app_path:, verbose: false, database:, **_args)
+      def initialize(
+        app_path:, verbose: false, database:, simple_form: true, **_args
+      )
         @app_path = app_path
         @app_name = File.basename(File.expand_path(app_path))
         @app_hostname = "#{@app_name.tr(' ', '_').downcase}.com"
         @verbose = verbose
         @database_adapter_name = database.to_s
         @gems = []
+        @simple_form = simple_form
+      end
+
+      def devise_form_fields_begin_pattern
+        if @simple_form
+          %(<div class="form-inputs">\n)
+        else
+          %r{render "devise/shared/error_messages", resource: resource %>\n\n}
+        end
       end
 
       def summary
@@ -34,9 +45,9 @@ module ThreddedCreateApp
 
       attr_reader :database_adapter_name
 
-      def add_gem(gem_name, version: nil, groups: nil, path: nil)
+      def add_gem(gem_name, version: nil, require: nil, groups: nil, path: nil)
         log_verbose "+ gem #{gem_name}"
-        @gems << [gem_name, version, groups, path]
+        @gems << [gem_name, version, require, groups, path]
       end
 
       def git_commit(message)
@@ -59,6 +70,7 @@ module ThreddedCreateApp
         if File.directory?(expanded_src_path)
           fail "Only 'w' mode is supported for directories" if mode != 'w'
           fail 'ERB processing not supported for directories' if process_erb
+
           FileUtils.cp_r expanded_src_path, target_path
           return
         end
@@ -92,17 +104,8 @@ module ThreddedCreateApp
       end
 
       def add_precompile_asset(asset)
-        log_verbose "Add precompile asset: #{asset}"
-        assets_conf = File.read('config/initializers/assets.rb')
-        if assets_conf.include?('# Rails.application.config.assets.precompile')
-          replace 'config/initializers/assets.rb',
-                  /# Rails\.application\.config\.assets\.precompile.*/,
-                  "Rails.application.config.assets.precompile += %w(#{asset})"
-        else
-          replace 'config/initializers/assets.rb',
-                  /config\.assets\.precompile \+= %w\((.*?)\)/,
-                  "config.assets.precompile += %w(\\1 #{asset})"
-        end
+        log_verbose "Add asset to manifest: #{asset}"
+        append_to_file 'app/assets/config/manifest.js', "//= link #{asset}\n"
       end
 
       def add_route(route_str, prepend: false)
@@ -124,6 +127,10 @@ module ThreddedCreateApp
                     eval_template(File.read(expand_src_path(template))))
       end
 
+      def append_to_file(path, content)
+        File.write(path, File.read(path) + content)
+      end
+
       def inject_into_file(path, content:, after: nil, before: nil)
         replace path, (after || before), after ? '\0' + content : content + '\0'
       end
@@ -140,7 +147,13 @@ module ThreddedCreateApp
         if log
           log_command args.length == 1 ? args[0] : Shellwords.shelljoin(args)
         end
-        exit 1 unless system(*args)
+        ok =
+          if Bundler.respond_to?(:with_unbundled_env)
+            Bundler.with_unbundled_env { system(*args) }
+          else
+            Bundler.with_clean_env { system(*args) }
+          end
+        exit 1 unless ok
       end
 
       def verbose?

data/lib/thredded_create_app/tasks/create_rails_app.rb

@@ -28,13 +28,12 @@ module ThreddedCreateApp
         end
         @rails_version ||= latest_installed_rails_version
 
-        # I have no idea why this bundle exec is necessary on Travis.
-        run "#{'bundle exec ' if ENV['TRAVIS']}" \
-           "rails _#{@rails_version}_ new . --skip-bundle" \
+        run "rails _#{@rails_version}_ new . --skip-bundle" \
            " --database=#{rails_database} " \
-           " --skip-test#{verbose? ? ' --verbose' : ' --quiet'}"
+           " --skip-test#{verbose? ? ' --verbose' : ' --quiet'}" \
+           ' --skip-javascript'
         replace 'Gemfile', /gem 'sass-rails'.*$/, "gem 'sassc-rails'"
-        add_gem 'rspec-rails', groups: %i[test]
+        add_gem 'rspec-rails', version: '>= 4.0.0.beta3', groups: %i[test]
         add_gem 'capybara', groups: %i[test]
         git_commit summary
       end

data/lib/thredded_create_app/tasks/setup_app_skeleton.rb

@@ -12,7 +12,7 @@ module ThreddedCreateApp
         '#0288D1', # light blue
         '#0097A7', # cyan
         '#00796B', # teal
-        '#F57C00', # orange
+        '#F57C00' # orange
       ].freeze
 
       def summary
@@ -20,6 +20,9 @@ module ThreddedCreateApp
       end
 
       def before_bundle
+        add_gem 'babel-transpiler'
+        add_gem 'uglifier'
+        add_gem 'turbolinks'
         add_gem 'rails-timeago'
       end
 
@@ -27,6 +30,7 @@ module ThreddedCreateApp
         add_config_vars
         add_i18n
         add_seeds
+        configure_assets
         add_favicon_and_touch_icons
         add_javascripts
         add_styles
@@ -54,14 +58,36 @@ module ThreddedCreateApp
                            <%= favicon_link_tag 'favicon.ico' %>
                            <%= favicon_link_tag 'apple-touch-icon.png',
                                                 rel: 'apple-touch-icon', type: 'image/png' %>
-        ERB
+                         ERB
+      end
+
+      def configure_assets
+        copy 'setup_app_skeleton/manifest.js',
+             'app/assets/config/manifest.js'
+
+        append_to_file 'config/initializers/assets.rb', <<~RUBY
+
+          # Work around https://github.com/rails/sprockets/issues/581
+          Rails.application.config.assets.configure do |env|
+            env.export_concurrent = false
+          end
+        RUBY
       end
 
       def add_javascripts
+        inject_into_file 'config/environments/production.rb',
+                         after: "  # config.assets.css_compressor = :sass\n",
+                         content: <<-RUBY
+  config.assets.js_compressor = Uglifier.new(harmony: true)
+                         RUBY
+
+        copy 'setup_app_skeleton/javascripts/application.js',
+             'app/assets/javascripts/application.js'
         copy 'setup_app_skeleton/javascripts/app.js',
              'app/assets/javascripts/app.js'
         copy 'setup_app_skeleton/javascripts/app/',
              'app/assets/javascripts/app/'
+        add_precompile_asset 'application.js'
         git_commit 'Add app JavaScript'
       end
 
@@ -120,7 +146,7 @@ module ThreddedCreateApp
           expand_src_path('setup_app_skeleton/application_helper_methods.rb')
         )
         inject_into_file 'app/helpers/application_helper.rb',
-                         before:  /end\n\z/,
+                         before: /end\n\z/,
                          content: indent(2, app_helper_src)
         copy 'setup_app_skeleton/themes_helper.rb',
              'app/helpers/themes_helper.rb'
@@ -132,20 +158,20 @@ module ThreddedCreateApp
                 indent(4, <<~ERB)
                   <%= stylesheet_link_tag current_theme, media: 'all', 'data-turbolinks-track': 'reload' %>
                 ERB
-        replace 'app/views/layouts/application.html.erb',
-                /[ ]*<%= javascript_include_tag 'application', .*? %>/,
-                <<-'ERB'
+        inject_into_file 'app/views/layouts/application.html.erb',
+                         before: %r{\s*</head>},
+                         content: <<-'ERB'
     <%= javascript_include_tag 'application',
                                 async: !Rails.application.config.assets.debug,
                                 defer: true,
                                 'data-turbolinks-track': 'reload' %>
-        ERB
+                         ERB
 
         inject_into_file 'app/views/layouts/application.html.erb',
-                         before: '</head>',
+                         before: %r{\s*</head>},
                          content: <<-'ERB'
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-        ERB
+                         ERB
 
         body = File.read(
           expand_src_path('setup_app_skeleton/application.body.html.erb')
@@ -173,7 +199,7 @@ module ThreddedCreateApp
                          before: /^\s*mount Thredded::Engine/,
                          content: indent(2, <<~'RUBY')
                            resources :users, only: [:show]
-        RUBY
+                         RUBY
       end
 
       def add_home_page

data/lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/application.js

@@ -0,0 +1,2 @@
+//= require turbolinks
+//= require_tree .

data/lib/thredded_create_app/tasks/setup_app_skeleton/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

data/lib/thredded_create_app/tasks/setup_app_skeleton/spec/features/homepage_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.feature 'Homepage', type: :feature do
+RSpec.describe 'Homepage', type: :feature do
   it 'responds with 200' do
     visit root_path
     expect(page.status_code).to be 200

data/lib/thredded_create_app/tasks/setup_database.rb

@@ -30,6 +30,7 @@ module ThreddedCreateApp
 
       def create_db_user
         return if @db_adapter == :sqlite3
+
         log_info "Creating #{dev_user} local database user"
         run 'bash',
             File.join(File.dirname(__FILE__), 'setup_database',

data/lib/thredded_create_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThreddedCreateApp
-  VERSION = '0.1.27'
+  VERSION = '0.1.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.53.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +160,8 @@ files:
 - lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app/monkey-patch-turbolinks.js
 - lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app/theme.js
 - lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/app/time_ago.js
+- lib/thredded_create_app/tasks/setup_app_skeleton/javascripts/application.js
+- lib/thredded_create_app/tasks/setup_app_skeleton/manifest.js
 - lib/thredded_create_app/tasks/setup_app_skeleton/seeds.rb.erb
 - lib/thredded_create_app/tasks/setup_app_skeleton/spec/controllers/users_controller_spec.rb
 - lib/thredded_create_app/tasks/setup_app_skeleton/spec/features/homepage_spec.rb
@@ -207,15 +195,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Rails app generator for Thredded.