thredded_create_app 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0232d103e459c18069f055aba4bb87d2d776148151a2519ceeae3450c0ddfd5
-  data.tar.gz: 970727679e31aad434d3e5dbe0e0aa1e4b75c668649bd7a60af63d71f3a8af68
+  metadata.gz: ec9303aa617905a4fd69c91b11bc536eb21cc15fcc3fd33352042f5c9cfba2b5
+  data.tar.gz: fdbc72c7b2f699ab230cbe8c948c49e35a40a2fc90d7a1ad2edac258831fcf11
 SHA512:
-  metadata.gz: 334b7ec1e5e6edf199f5dc1bb92f7162d7cdce08adf74d390ecf50d4230a4497351e52581fb31ef373be286aaf8c837beff60803ebd21474d7ea65d796535596
-  data.tar.gz: 83547babdc8755375d7f5ad6e6e86b29249301f83c745125feb71a6ce692b77bf271a8901d08b7c21c7d3dae4f2487f6d68737f4ee766ce57dc8125f48f797dc
+  metadata.gz: b8d789c432d1d1be4b7e6bd9d4504ae86a18b240f3c1db60c10f8b548c8a1097c752554f59a1570fd036fd8a09fac24cf69fb0e95b6703f494742c1672b33296
+  data.tar.gz: b55ef560baa372181b06ac28016edf68b8666579ec6d1215d5cd815f5a7880c4c6587a7770bd7efda4b95c45fbc2f0a592d912a3e5370ee803e4ff08bcd4926a

data/lib/thredded_create_app/cli.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-require 'thredded_create_app/command_error'
-require 'thredded_create_app/generator'
-require 'thredded_create_app/logging'
-require 'thredded_create_app/version'
-
 require 'highline'
+require_relative './command_error'
+require_relative './generator'
+require_relative './logging'
+require_relative './run_command'
+require_relative './version'
+
 module ThreddedCreateApp
   class CLI # rubocop:disable Metrics/ClassLength
     include ThreddedCreateApp::Logging
+    include ThreddedCreateApp::RunCommand
 
     DEFAULTS = {
       auto_confirm: false,
@@ -31,7 +33,7 @@ module ThreddedCreateApp
 
     def start
       auto_output_coloring do
-        run
+        run_cli
       rescue OptionParser::ParseError, ArgvError => e
         error e.message, 64
       rescue ThreddedCreateApp::CommandError => e
@@ -49,7 +51,7 @@ module ThreddedCreateApp
 
     private
 
-    def run # rubocop:disable Metrics/AbcSize
+    def run_cli # rubocop:disable Metrics/AbcSize
       options = optparse
       generator = ThreddedCreateApp::Generator.new(options)
       log_info 'Will do the following:'
@@ -65,14 +67,9 @@ module ThreddedCreateApp
 
     def start_app_server!(app_path)
       log_info 'Changing directory and starting the app server'
-      command = "cd #{Shellwords.escape(app_path)} && " \
-        'bundle exec rails s'
-      log_command command
-      if defined?(Bundler)
-        Bundler.with_clean_env { exec command }
-      else
-        exec command
-      end
+      ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+      run "cd #{Shellwords.escape(app_path)} && bundle exec rails s",
+          run_method: :exec
     end
 
     # rubocop:disable Metrics/AbcSize,Metrics/BlockLength,Metrics/MethodLength

data/lib/thredded_create_app/generator.rb

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'fileutils'
 require 'shellwords'
-require 'thredded_create_app/tasks/base'
-require 'thredded_create_app/tasks/create_rails_app'
-require 'thredded_create_app/tasks/add_rails_config'
-require 'thredded_create_app/tasks/add_simple_form'
-require 'thredded_create_app/tasks/add_devise'
-require 'thredded_create_app/tasks/add_roadie'
-require 'thredded_create_app/tasks/add_rails_email_preview'
-require 'thredded_create_app/tasks/add_thredded'
-require 'thredded_create_app/tasks/add_display_name_to_users'
-require 'thredded_create_app/tasks/add_invisible_captcha'
-require 'thredded_create_app/tasks/setup_database'
-require 'thredded_create_app/tasks/setup_app_skeleton'
-require 'thredded_create_app/tasks/production_configs'
-require 'thredded_create_app/tasks/add_memcached_support'
-require 'thredded_create_app/tasks/docker'
+require_relative './tasks/base'
+require_relative './tasks/create_rails_app'
+require_relative './tasks/add_rails_config'
+require_relative './tasks/add_simple_form'
+require_relative './tasks/add_devise'
+require_relative './tasks/add_roadie'
+require_relative './tasks/add_rails_email_preview'
+require_relative './tasks/add_thredded'
+require_relative './tasks/add_display_name_to_users'
+require_relative './tasks/add_invisible_captcha'
+require_relative './tasks/setup_database'
+require_relative './tasks/setup_app_skeleton'
+require_relative './tasks/production_configs'
+require_relative './tasks/add_memcached_support'
+require_relative './tasks/docker'
+
 module ThreddedCreateApp
   class Generator < Tasks::Base
     def initialize(**options)
@@ -49,17 +51,15 @@ module ThreddedCreateApp
     private
 
     def in_app_env
-      if defined?(Bundler)
-        Bundler.with_clean_env do
-          Dir.chdir app_path do
-            yield
-          end
-        end
-      else
-        Dir.chdir app_path do
+      bundle_gemfile_was = ENV['BUNDLE_GEMFILE']
+      Dir.chdir app_path do
+        Bundler.with_original_env do
+          ENV['BUNDLE_GEMFILE'] = 'Gemfile'
           yield
         end
       end
+    ensure
+      ENV['BUNDLE_GEMFILE'] = bundle_gemfile_was
     end
 
     def tasks

data/lib/thredded_create_app/run_command.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module ThreddedCreateApp
+  module RunCommand
+    def run(*args, log: true, run_method: :system)
+      if log
+        log_command args.length == 1 ? args[0] : Shellwords.shelljoin(args)
+      end
+      exit 1 unless send(run_method, *args)
+    end
+  end
+end

data/lib/thredded_create_app/tasks/base.rb

@@ -3,13 +3,16 @@
 require 'shellwords'
 require 'fileutils'
 require 'erb'
-require 'thredded_create_app/logging'
-require 'thredded_create_app/command_error'
+require_relative '../logging'
+require_relative '../command_error'
+require_relative '../run_command'
+
 module ThreddedCreateApp
   module Tasks
     # @abstract
-    class Base # rubocop:disable Metrics/ClassLength
+    class Base
       include ThreddedCreateApp::Logging
+      include ThreddedCreateApp::RunCommand
 
       attr_reader :app_name, :app_hostname, :app_path, :gems
 
@@ -149,19 +152,6 @@ module ThreddedCreateApp
         run "bundle exec rails g #{generate_args}#{' --quiet' unless verbose?}"
       end
 
-      def run(*args, log: true)
-        if log
-          log_command args.length == 1 ? args[0] : Shellwords.shelljoin(args)
-        end
-        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?
         @verbose
       end

data/lib/thredded_create_app/tasks/create_rails_app.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'yaml'
-require 'thredded_create_app/tasks/base'
+require_relative './base'
 
 module ThreddedCreateApp
   module Tasks
@@ -26,12 +27,15 @@ module ThreddedCreateApp
           install_gem 'bundler'
           install_gem 'rails', version: @rails_version
         end
-        @rails_version ||= latest_installed_rails_version
+        @rails_version ||=
+          Bundler.with_original_env { latest_installed_rails_version }
 
         run "rails _#{@rails_version}_ new . --skip-bundle" \
-           " --database=#{rails_database} " \
-           " --skip-test#{verbose? ? ' --verbose' : ' --quiet'}" \
-           "#{' --skip-javascript' unless webpack_js?}"
+           " --database=#{rails_database}" \
+           ' --skip-webpack-install' \
+           "#{' --skip-javascript' unless webpack_js?}" \
+           ' --skip-test' \
+           "#{verbose? ? ' --verbose' : ' --quiet'}"
         run 'rm', 'Gemfile.lock' if File.exist?('Gemfile.lock')
         replace 'Gemfile', /gem 'sass-rails'.*$/, "gem 'sassc-rails'"
         add_gem 'rspec-rails', version: '>= 4.0.0.beta3', groups: %i[test]
@@ -42,10 +46,17 @@ module ThreddedCreateApp
       def after_bundle
         run_generator 'rspec:install'
         git_commit 'rails g rspec:install'
+
+        webpacker_install if webpack_js?
       end
 
       private
 
+      def webpacker_install
+        run 'bundle exec rails webpacker:install'
+        git_commit 'bundle exec rails webpacker:install'
+      end
+
       def install_gem(gem_name, version: nil)
         run ["gem install #{gem_name} --no-document",
              ('--user' if @user_install),

data/lib/thredded_create_app/tasks/setup_app_skeleton/_header.html.erb

@@ -20,7 +20,7 @@
           <% else -%>
             <button type="button">
               <span class="app-nav-text"><%= theme_name %></span>
-              <span class="app-nav-icon"><%= inline_svg 'brightness.svg' %></span>
+              <span class="app-nav-icon"><%= inline_svg_tag 'brightness.svg' %></span>
             </button>
           <% end -%>
         <% end -%>

data/lib/thredded_create_app/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thredded_create_app
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gleb Mazovetskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -116,6 +116,7 @@ files:
 - lib/thredded_create_app/command_error.rb
 - lib/thredded_create_app/generator.rb
 - lib/thredded_create_app/logging.rb
+- lib/thredded_create_app/run_command.rb
 - lib/thredded_create_app/tasks/add_devise.rb
 - lib/thredded_create_app/tasks/add_devise/registrations_controller.rb
 - lib/thredded_create_app/tasks/add_devise/sessions_controller.rb
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails app generator for Thredded.