bug fixes, some enhancement, jest support

Author: eGust

.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 *.gem
+.rubocop-http*

.rubocop.yml

@@ -1,20 +1,8 @@
+inherit_from:
+  - http://shopify.github.io/ruby-style-guide/rubocop.yml
+
 AllCops:
   TargetRubyVersion: 2.3
 
-Metrics/LineLength:
-  Max: 99
-
 Style/FrozenStringLiteralComment:
   Enabled: false
-
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/Documentation:
-  Enabled: false

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vue_cli-rails (0.1.0)
+    vue_cli-rails (0.2.0)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6)
       railties (>= 4.2)
@@ -34,7 +34,7 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     erubi (1.8.0)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
@@ -96,4 +96,4 @@ DEPENDENCIES
   vue_cli-rails!
 
 BUNDLED WITH
-   1.17.3
+   1.17.2

Rakefile

@@ -3,4 +3,4 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task(default: :spec)

bin/console

@@ -5,7 +5,7 @@ def gets(message, list = 'Yn', **hint)
     default, list = build_list(list)
     keys_hint, hint = build_hint(list, hint)
 
-    print "#{message} (#{hint}) #{keys_hint}"
+    print("#{message} (#{hint}) #{keys_hint}")
     wait_valid_input(keys_hint, Set.new(list.map(&:downcase)), default)
   end
 

bin/setup

@@ -4,8 +4,8 @@
 ver = ENV['RAILS_VERSION']
 abort('RAILS_VERSION not found!') if ver.blank?
 
-versions = `gem list -r -a -e rails`.scan(/\b((\d+\.)+\d+)\b/).map { |m| m[0] }
-ver = versions.find { |v| v.start_with? ver }
+versions = %x`gem list -r -a -e rails`.scan(/\b((\d+\.)+\d+)\b/).map { |m| m[0] }
+ver = versions.find { |v| v.start_with?(ver) }
 abort("Version #{ver} not found!") if ver.blank?
 
 run("gem install rails -v #{ver}")
@@ -26,23 +26,20 @@
       skip-bundle
     ],
     keep_gems: /^\s*gem\s+['"](rails|puma|bootsnap)/,
-    append: <<~RUBY
-      gem 'sqlite3', '~> 1.3.10'
-    RUBY
+    append: "gem 'sqlite3', '~> 1.3.10'",
   },
 }
 
 require 'pathname'
 require 'fileutils'
 
 scirpt = RAILS_NEW_SCRIPT[ver[0]]
-run "rails new test_vcr #{scirpt[:args].map { |a| "--#{a}" }.join(' ')}"
-FileUtils.chdir 'test_vcr'
+run("rails new test_vcr #{scirpt[:args].map { |a| "--#{a}" }.join(' ')}")
+FileUtils.chdir('test_vcr')
 
 root = Pathname.new(FileUtils.pwd)
 gemfile = root.join('Gemfile').read.split("\n")
-              .reject(&:empty?).reject { |s| s =~ /^\s*#/ }
-              .reject { |s| s =~ /^\s*gem/ && s !~ scirpt[:keep_gems] }
+  .reject(&:empty?).reject { |s| s =~ /^\s*#/ }
+  .reject { |s| s =~ /^\s*gem/ && s !~ scirpt[:keep_gems] }
 root.join('Gemfile').write("#{(gemfile + [scirpt[:append]]).join("\n")}\n")
-run 'bundle install'
-# rails new test_vcr --database=sqlite3 --skip-yarn --skip-git --skip-sprockets --skip-spring --skip-listen --skip-turbolinks --skip-javascript --skip-test --skip-bundle
+run('bundle install')

lib/helpers/lib/input_loop.rb

@@ -23,7 +23,7 @@ def install_format_support(formats)
     end
 
     STDERR.puts "Unsupported formats #{unknown}" if unknown.any?
-    @pm.add "-D #{pkgs.join(' ')}"
+    @pm.add("-D #{pkgs.join(' ')}")
   end
 
   def install_node_dev
@@ -32,10 +32,10 @@ def install_node_dev
 
     add_deps(pack_json, %w[cross-env npm-run-all])
     add_scripts(pack_json,
-                dev: 'run-p rails-s serve',
-                prod: 'cross-env RAILS_ENV=production vue-cli-service build',
-                serve: 'vue-cli-service serve',
-                'rails-s' => 'cross-env NO_WEBPACK_DEV_SERVER=1 rails s')
+      dev: 'run-p rails-s serve',
+      prod: 'cross-env RAILS_ENV=production vue-cli-service build',
+      serve: 'vue-cli-service serve',
+      'rails-s' => 'cross-env NO_WEBPACK_DEV_SERVER=1 rails s')
     puts 'Dependencies and scripts have been installed successfully'
     cmd = @pm.package_manager == :npm ? 'npm run' : 'yarn'
     puts "  Please use `#{cmd} dev` to start dev server"
@@ -49,14 +49,14 @@ def add_deps(package_json, *packages, dev: true)
     pkgs = [packages].flatten.find_all do |dep|
       !(dep.blank? || deps.key?(dep))
     end
-    @pm.add "#{dev ? '-D ' : ''}#{pkgs.join(' ')}" if pkgs.any?
+    @pm.add("#{dev ? '-D ' : ''}#{pkgs.join(' ')}") if pkgs.any?
   end
 
   def add_scripts(package_json, commands = {})
     json = JSON.parse(package_json.read)
     scripts = json['scripts']
     commands.stringify_keys.each do |key, cmd|
-      scripts[key] = cmd unless scripts.key? key
+      scripts[key] = cmd unless scripts.key?(key)
     end
     package_json.write(JSON.pretty_generate(json))
   end

lib/helpers/scripts/install_rails.rb

@@ -15,19 +15,22 @@ def self.run!
 
   def start
     check_node!
-    FileUtils.chdir @root
+    FileUtils.chdir(@root)
+    @pending_install = false
     begin
       package_manager?
       install_vue_cli
       run_vue_create?
       install_dev_deps
-      delete_vue_src?
+      @pm.install if @pending_install
+      delete_vue_sample?
       copy_demo?
       copy_config
       generate_vue_yml
+      fix_jest_config!
       puts 'vue:create finished!'
     ensure
-      FileUtils.chdir @pwd
+      FileUtils.chdir(@pwd)
     end
   end
 
@@ -43,14 +46,14 @@ def package_manager?
     npm = @pm.npm_version
     abort('Cannot find npm or yarn') unless yarn || npm
 
-    if yarn && npm
-      input = @input.gets(
+    input = if yarn && npm
+      @input.gets(
         'Which package manager to use?',
         @root.join('package-lock.json').exist? ? 'yN' : 'Yn',
         y: 'yarn', n: 'npm',
       )
     else
-      input = npm ? 'n' : 'y'
+      npm ? 'n' : 'y'
     end
     @pm.use!(input == 'n' ? :npm : :yarn)
     puts "Using package manager: #{@pm.package_manager}"
@@ -64,27 +67,73 @@ def install_vue_cli
   end
 
   def run_vue_create?
-    input = 'y'
+    pack_input = 'y'
     if @pack.exist?
       puts 'Detected `package.json`!'
-      input = @input.gets(
+      pack_input = @input.gets(
         '  Do you want `vue create?` to overwrite your package.json',
-        'ynAk',
-        a: 'Auto', k: 'Keep',
+        'yAks',
+        a: 'Auto', k: 'Keep', s: 'Skip vue create',
+      )
+    end
+    return if pack_input == 's'
+
+    gi_input = 'y'
+    gi = @root.join('.gitignore')
+    if gi.exist?
+      puts 'Detected `.gitignore`!'
+      gi_input = @input.gets(
+        '  Do you want `vue create?` to overwrite your .gitignore',
+        'yMk',
+        m: 'Merge', k: 'Keep',
       )
     end
-    return if input == 'n'
 
-    src_json = JSON.parse(@pack.read) unless input == 'y'
-    @pm.exec('vue create', '', "-n -m #{@pm.package_manager} .")
+    # backups
+    vue_config = @root.join('vue.config.js')
+    backup_vue_config = vue_config.exist?
+    src_json = JSON.parse(@pack.read) if pack_input != 'y'
+    gi_lines = gi.read.split("\n") if gi_input != 'y'
+    if backup_vue_config
+      FileUtils.mv(vue_config, "#{vue_config}.backup")
+      # will be recreated
+      FileUtils.rm_f(@root.join('vue.rails.js'))
+    end
+    pub_dir = @root.join('public')
+    FileUtils.mv(pub_dir, "#{pub_dir}.backup")
 
-    dst_json = JSON.parse(@pack.read) unless input == 'y'
-    return if input == 'y' || dst_json == src_json
+    begin
+      @pm.exec('vue create', '', "-n -m #{@pm.package_manager} .")
+    ensure
+      # restore backups
+      FileUtils.rm_rf(pub_dir) if pub_dir.exist?
+      FileUtils.mv("#{pub_dir}.backup", pub_dir)
+      FileUtils.mv("#{vue_config}.backup", vue_config) if backup_vue_config
+    end
 
-    src_json, dst_json = [dst_json, src_json] if input == 'a'
+    # merge gitignore
+    if gi_input == 'm'
+      old_gi_line_count = gi_lines.size
+      old_gi = Set.new(gi_lines.map(&:strip))
+
+      gi.read.split("\n").map(&:strip).find_all(&:present?).each do |ln|
+        gi_lines << ln unless old_gi.include?(ln)
+      end
+      gi.write(gi_lines.map { |ln| "#{ln}\n" }.join('')) if gi_lines.size > old_gi_line_count
+    elsif gi_input == 'k'
+      gi.write(gi_lines.join(''))
+    end
+
+    # check packages.json
+    return if pack_input == 'y'
+    dst_json = JSON.parse(@pack.read)
+    return if dst_json == src_json
+
+    # merge packages.json
+    src_json, dst_json = [dst_json, src_json] if pack_input == 'a'
     dst_json.deep_merge!(src_json)
     @pack.write(JSON.pretty_generate(dst_json))
-    @pm.install
+    @pending_install = true
   end
 
   def install_dev_deps
@@ -93,15 +142,20 @@ def install_dev_deps
     dd = %w[webpack-assets-manifest js-yaml].find_all do |dep|
       !dev_deps.key?(dep)
     end
-    @pm.add "-D #{dd.join(' ')}" if dd.any?
+    if dd.any?
+      @pm.add("-D #{dd.join(' ')}")
+      @pending_install = false
+    end
   end
 
-  def delete_vue_src?
-    src = @root.join('src')
-    return unless src.exist? && src.directory?
+  def delete_vue_sample?
+    %w[src dist].each do |fn|
+      file = @root.join(fn)
+      next unless file.exist?
 
-    puts 'Detected `src` folder (should be generated by vue-cli)'
-    FileUtils.rm_rf(src.to_s) if @input.gets('  Do you want to delete src folder?') == 'y'
+      puts "Detected `#{fn}` (should be generated by vue-cli)"
+      FileUtils.rm_rf(file.to_s) if @input.gets("  Do you want to delete #{file}?") == 'y'
+    end
   end
 
   def copy_demo?
@@ -115,8 +169,8 @@ def copy_demo?
     foo = false
     bar = false
     route_lines.each do |line|
-      foo ||= line.include? 'vue#foo'
-      bar ||= line.include? 'vue#bar'
+      foo ||= line.include?('vue#foo')
+      bar ||= line.include?('vue#bar')
     end
     return if foo && bar
 
@@ -147,7 +201,28 @@ def generate_vue_yml
     end
 
     yml = @src_dir.join('vue.yml').read
-    yml = yml.sub('${PACKAGE_MANAGER}', pm.package_manager.to_s)
+    yml = yml.sub('${PACKAGE_MANAGER}', @pm.package_manager.to_s)
     yml_dest.write(yml)
   end
+
+  def fix_jest_config!
+    jest_file = @root.join('jest.config.js')
+    return unless jest_file.exist?
+
+    jest_config = %x`node -e "console.log(JSON.stringify(require('./jest.config.js')))"`
+    jest_config = JSON.parse(jest_config)
+    jest_config.delete('moduleNameMapper')
+    jest = <<~JS
+      const { jestModuleNameMapper: moduleNameMapper } = require('./vue.rails');
+
+      module.exports = #{JSON.pretty_generate(jest_config)}_MODULE_NAME_MAPPER_;
+    JS
+    jest_file.write(jest.sub(/\n?}_MODULE_NAME_MAPPER_/, ",\n  moduleNameMapper\n}"))
+
+    dev_deps = JSON.parse(@pack.read)['devDependencies']
+    return unless dev_deps['eslint'].present?
+    @pm.exec('eslint', jest_file.to_s, '--fix')
+  rescue => e
+    STDERR.puts e.message
+  end
 end