revelry_generate 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65fbc30b9789fba87473536017239ffb6d11994c
-  data.tar.gz: 2512dad81fe94db8eaa721903690b4439df24ff3
+  metadata.gz: 10fa01183488f274afc53ee90030af9dacb35d05
+  data.tar.gz: e1bf3d50330a72831c51a606b9a6f7f42af9acdd
 SHA512:
-  metadata.gz: 83043a38b8aa3f0987f516324bf5bed5f03d462773e9eb6061565b668d08e121423fa5b03dea41d824e64670b2554aa98186d49ec8e30baa98467b88bde735b5
-  data.tar.gz: a1e47654b3d8a211385699f0c1777a09da71691983de55460a8c8e1b4296685458136db6721726e49bfe6d747a6262347e17983ba19b183dc0adea98a2213df8
+  metadata.gz: b8bad466f0f5bc8f9dc006d485529f724e44608ecb934c7d775df50c4d87afa987e495bbcc2f53dc21c61c1d9323e31909aea959e2c4ddc0f5607a3bd8124cc1
+  data.tar.gz: 928b70de135ca71a179bf80f3dcc8c910a9d196ed605e8c951ac6e4f69892639388f6a50b8a764e07441b248bb31a5a0828b558c50585c66e184e6d758b9286d

data/lib/rails/generators/revelry_generate/skeleton_generator.rb

@@ -47,6 +47,7 @@ module RevelryGenerate
         hook_path = File.join(gem_root, 'skeletons', ENV['SKELETON'] || 'slush', '__generators__', 'post_skeleton.rb')
 
         return unless File.exist? hook_path
+
         puts "rake rails:template LOCATION=#{hook_path}"
         if Rails::VERSION::MAJOR < 4
           rake("rails:template LOCATION=#{hook_path}")

data/skeletons/slush/__generators__/post_skeleton.rb

@@ -1,10 +1,43 @@
-# Set the latest installed node version in nodenv as the version
-node_version = `nodenv versions`.split.last
+puts ""
+puts "#######################################"
+puts "# Starting post skeleton              #"
+puts "#######################################"
+puts ""
+
+def which(cmd)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each { |ext|
+      exe = File.join(path, "#{cmd}#{ext}")
+      return exe if File.executable?(exe) && !File.directory?(exe)
+    }
+  end
+  return nil
+end
+
+node_version =
+  if which('asdf').present?
+    `asdf list nodejs`.split.last
+  elsif which('nodenv').present?
+    `nodenv versions`.split.last
+  end
+
+if node_version.present?
+  # If we have a working node version manager, try to set the version to the
+  # latest node we have installed
+  node_set_version_command =
+    if which('asdf').present?
+      'asdf local nodejs'
+    elsif which('nodenv').present?
+      'nodenv local'
+    end
+
+  system("#{node_set_version_command} #{node_version}") || fail('Failed to set node version!')
+end
 
 # Bootstrap a render server node app
 x = system(
   <<-SH
-    nodenv local #{node_version} &&
     npm install -g slush revelrylabs/slush-revelry &&
     npm install &&
     slush &&
@@ -159,7 +192,6 @@ inject_into_file 'render-server/package.json', after: '"scripts": {' do
 end
 
 generate 'rspec:install'
-system("SKELETON=#{ENV['SKELETON']||'slush'} rails g revelry_generate:skeleton")
 git :init
 
 if yes? 'Setup github and heroku?'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_generate
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: