support npm + pre

Author: eGust

.travis.yml

@@ -5,19 +5,24 @@ cache:
   bundler: true
   yarn: true
 
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-
-env:
-  - RAILS_VERSION=4.2
-  - RAILS_VERSION=5.2
-
 matrix:
-  exclude:
+  allow_failures:
+  - env: RAILS_VERSION=pre
+  include:
+    - rvm: 2.3
+      env: RAILS_VERSION=4.2 PACKAGE_MANAGER=npm
+    - rvm: 2.3
+      env: RAILS_VERSION=5.2 PACKAGE_MANAGER=yarn
+    - rvm: 2.4
+      env: RAILS_VERSION=5.2 PACKAGE_MANAGER=npm
+    - rvm: 2.5
+      env: RAILS_VERSION=5.2 PACKAGE_MANAGER=yarn
+    - rvm: 2.6
+      env: RAILS_VERSION=5.2 PACKAGE_MANAGER=npm
     - rvm: 2.5
-      env: RAILS_VERSION=4.2
+      env: RAILS_VERSION=pre PACKAGE_MANAGER=npm
+    - rvm: 2.6
+      env: RAILS_VERSION=pre PACKAGE_MANAGER=yarn
 
 gemfile:
   - test/Gemfile-rails.$RAILS_VERSION
@@ -28,19 +33,18 @@ before_install:
 install:
   - nvm install --lts
   - node -v
-  - yarn global add @vue/cli
+  - sh -c 'if test "$PACKAGE_MANAGER" = "npm"; then npm i -g @vue/cli; else yarn global add @vue/cli fi'
   - gem install rspec
 
-before_script:
-  - sh -c 'cd test && ./install.rb'
-
 script:
-  - sh -c 'cd test && rspec ./vcr_spec.rb'
+  - sh -c 'cd test && ./install.rb'
+  - sh -c 'cd test && rspec ./vcr_specs.rb'
 
 jobs:
   include:
     - stage: gem release
       rvm: 2.3
+      env: RAILS_VERSION=4.2 PACKAGE_MANAGER=yarn
       script: echo "Deploying to rubygems.org ..."
       deploy:
         provider: rubygems

lib/helpers/lib/common.rb

@@ -3,5 +3,13 @@ class Object
     def blank?
       respond_to?(:empty?) ? !!empty? : !self
     end
+
+    def presence
+      blank? ? nil : self
+    end
+
+    def present?
+      !blank?
+    end
   end
 end

lib/helpers/scripts/vue_create.rb

@@ -74,7 +74,7 @@ def run_vue_create?
     if @pack.exist?
       puts 'Detected `package.json`!'
       pack_input = @input.gets(
-        '  Do you want `vue create?` to overwrite your package.json',
+        '  Do you want vue-cli to overwrite your package.json',
         'yAks',
         a: 'Auto', k: 'Keep', s: 'Skip vue create',
       )
@@ -86,7 +86,7 @@ def run_vue_create?
     if gi.exist?
       puts 'Detected `.gitignore`!'
       gi_input = @input.gets(
-        '  Do you want `vue create?` to overwrite your .gitignore',
+        '  Do you want vue-cli to overwrite your .gitignore',
         'yMk',
         m: 'Merge', k: 'Keep',
       )

lib/source/vue.rails.js

@@ -57,6 +57,7 @@ module.exports = (() => {
     const root = resolve(__dirname);
     const pop = (config.public_output_path || 'vue_assets').replace(/(^\/+|\/+$)/g, '');
     const {
+      package_manager: packageManager,
       manifest_output: manifestOutput,
       js_output: output,
       alias = {},
@@ -100,6 +101,7 @@ module.exports = (() => {
     settings = {
       env: mode,
       root,
+      packageManager,
       manifestOutput: manifestOutput && resolve(root, manifestOutput),
 
       outputDir: resolve(root, 'public', pop),

lib/vue_cli/rails/configuration.rb

@@ -37,6 +37,7 @@ def load_config(config)
           },
         }
         @package_manager = config['package_manager']
+        c['packageManger'] = @package_manager
         cw = c['configureWebpack']
 
         c['env'] = ::Rails.env

test/Gemfile-rails.5.2

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.2.2', '>= 5.2.2.1'
+gem 'rails', '~> 5.2.0'
 gem 'puma', '~> 3.11'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'

test/Gemfile-rails.pre

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'puma', '~> 3.11'
+gem 'sass-rails', '~> 5.0'
+
+gem 'bootsnap', '>= 1.4.1', require: false
+
+group :development do
+  gem 'spring'
+end
+
+gem 'vue_cli-rails', path: '../../'
+gem 'sqlite3', '~> 1.3.0'

test/install.rb

@@ -147,6 +147,28 @@ def yield_args_by_rails(ver)
       spring
       spring-watcher-listen
     ]
+  elsif ver.start_with?('6')
+    args = %w[
+      --database=sqlite3
+      --skip-git
+      --skip-keeps
+      --skip-bundle
+      --skip-yarn
+      --skip-turbolinks
+      --skip-listen
+      --skip-coffee
+      --skip-test
+    ]
+    white_list = %w[
+      rails
+      puma
+      sass-rails
+      uglifier
+      bootsnap
+      jquery-rails
+      spring
+      spring-watcher-listen
+    ]
   else
     abort("Unsupported Rails version: #{ver}!\n#{USAGE}")
   end
@@ -173,20 +195,25 @@ def rails_ver
   ver = ENV['RAILS_VERSION']
   abort("RAILS_VERSION not found!\n#{USAGE}") if ver.blank?
 
-  versions = %x`gem list -r -a -e rails`.scan(/\b((\d+\.)+\d+)\b/).map { |m| m[0] }
-  ver = ver.upcase == 'LATEST' ? versions.first : versions.find { |v| v.start_with?(ver) }
+  if ver.upcase == 'PRE'
+    ver = %x`gem list -r -e --pre rails`.scan(/\b((\d+\.)+\w+)\b/).map { |m| m[0] }.first
+  else
+    versions = %x`gem list -r -e -a rails`.scan(/\b((\d+\.)+\d+)\b/).map { |m| m[0] }
+    ver = ver.upcase == 'LATEST' ? versions.first : versions.find { |v| v.start_with?(ver) }
+  end
   abort("Can not find matched Rails version!\n#{USAGE}") if ver.blank?
   ver
 end
 
-def auto_install(pm = 'yarn')
+def auto_install(pm = nil)
   PTY.spawn('bundle exec rake vue:create 2>&1') do |r, w, _pid|
     STDERR.puts '--'
     STDERR.puts 'bundle exec rake vue:create'
     STDERR.puts 'AUTO FILL-UP'
     STDERR.puts ''
 
-    simple_answer(r, w, 'Which package manager', pm == 'yarn' ? 'y' : 'n')
+    simple_answer(r, w, 'Which package manager', pm == 'npm' ? 'n' : 'y')
+    simple_answer(r, w, 'Do you want vue-cli to overwrite your package.json')
     wait_answer(r, w, 'Generate project in current directory')
 
     ln = select_single(r, w, 'Please pick a preset', 'Manually select features')
@@ -222,7 +249,7 @@ def main
 
   update_gemfile(dest_dir, white_list, append_lines)
   Cmd.run('bundle install')
-  auto_install
+  auto_install(ENV['PACKAGE_MANAGER'])
 end
 
 main

test/uninstall_rails.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/helpers/lib/common'
+
+def get_rails_version
+  ver = ARGV[0].presence || ENV['RAILS_VERSION']
+  versions = %x`gem list -e activesupport`.scan(/\b((\d+\.)+\w+)\b/).map { |m| m[0] }
+  if ver.blank?
+    abort <<~TEXT
+      Must specify a Rails version!
+        Installed versions: #{versions.join(' ')}
+    TEXT
+  end
+
+  unless versions.include?(ver)
+    abort <<~TEXT
+      Version (#{ver}) does not exist in the system
+        available versions: #{versions.join(' ')}
+    TEXT
+  end
+  ver
+end
+
+KNOWN_GEMS = %w[
+  rails
+  railties
+
+  actioncable
+  actionmailbox
+  actionmailer
+  actiontext
+  activejob
+
+  activestorage
+  activerecord
+  activemodel
+  actionpack
+  actionview
+  activesupport
+]
+
+def main
+  ver = get_rails_version
+  re = %r{\b#{ver.tr('.', '\.')}\b}
+  KNOWN_GEMS.each do |gem|
+    next unless %x[gem list -e #{gem}] =~ re
+    puts %x[gem uninstall #{gem} -v #{ver}]
+  end
+  puts "Done! - Rails #{ver} should be uninstalled"
+end
+
+main

test/vcr_spec.rb renamed to test/vcr_specs.rb

@@ -3,6 +3,7 @@
 require 'rspec'
 require 'fileutils'
 require 'pathname'
+require 'json'
 
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
@@ -21,6 +22,7 @@
     @cwd = Pathname.new(__dir__).join('vcdr')
     Dir.chdir(@cwd)
     @env = %x`which env`.chomp
+    @pm = JSON.parse(%x`bundle exec rake vue:json_config`)['packageManger']
   end
 
   it 'can invoke vue:lint' do
@@ -44,24 +46,24 @@
     }.not_to raise_error
   end
 
-  it 'can run yarn lint' do
+  it 'can run npm run / yarn lint' do
     expect {
-      %x(#{@env} RAILS_ENV=test yarn lint)
+      %x(#{@env} RAILS_ENV=test #{@pm} lint)
     }.not_to raise_error
   end
 
-  it 'can run yarn test:unit' do
+  it 'can run npm run / yarn test:unit' do
     expect {
-      %x(#{@env} RAILS_ENV=test yarn test:unit)
+      %x(#{@env} RAILS_ENV=test #{@pm} test:unit)
     }.not_to raise_error
   end
 
-  it 'can add vue:node_dev and run yarn prod' do
+  it 'can add vue:node_dev and run npm run / yarn prod' do
     expect {
       %x(#{@env} bundle exec rake vue:node_dev)
     }.not_to raise_error
     expect {
-      %x(#{@env} yarn prod)
+      %x(#{@env} #{@pm} prod)
     }.not_to raise_error
   end
 end