et_full_system 8.1.0.pre.rc1 → 8.1.0.pre.rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/et_full_system/cli/local.rb +12 -7
- data/lib/et_full_system/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fa2a567c7fdaac726c60d3d4fbab9ce83068d73f4be685ff4b0d58f017653118
|
|
4
|
+
data.tar.gz: 20c116d6789fa576534588dc4c51a10c8ca17dd7594cf07ce43bd63a1735c2b9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 371b17c780a8dd4da1a717f70d36fdf3b5ed78f6b0c460074652ae99f5412c81c15ea4bd2c6f1727249425687b80003b73d175bbeb98488c7c445b1da375c2e1
|
|
7
|
+
data.tar.gz: c124a3e02fbb78f8421004371ca128e28e571ae6d60392b7993c41c2fc74ffc6141f969c661860b76483de767e06a7f5d6b769a839c977cf3aac30432604506b
|
data/Gemfile.lock
CHANGED
|
@@ -143,6 +143,7 @@ module EtFullSystem
|
|
|
143
143
|
def setup
|
|
144
144
|
setup_depencencies
|
|
145
145
|
install_bundler if rvm_installed?
|
|
146
|
+
install_rvm if options.in_docker_compose? && rvm_required?
|
|
146
147
|
setup_ruby_versions
|
|
147
148
|
setup_services
|
|
148
149
|
end
|
|
@@ -168,12 +169,8 @@ module EtFullSystem
|
|
|
168
169
|
|
|
169
170
|
desc "setup_ruby_versions", "Install all ruby versions required"
|
|
170
171
|
def setup_ruby_versions
|
|
171
|
-
versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
|
|
172
|
-
File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
|
|
173
|
-
end.uniq - [RUBY_VERSION]
|
|
174
172
|
|
|
175
|
-
|
|
176
|
-
versions.each do |version|
|
|
173
|
+
additional_ruby_versions.each do |version|
|
|
177
174
|
puts "------------------------------------------------ SETTING UP ruby #{version} ---------------------------------------------------"
|
|
178
175
|
cmd = "bash --login -c \"rvm install #{version}\""
|
|
179
176
|
puts cmd
|
|
@@ -511,8 +508,6 @@ module EtFullSystem
|
|
|
511
508
|
def install_rvm
|
|
512
509
|
return if rvm_installed?
|
|
513
510
|
|
|
514
|
-
raise "Refusing to install rvm locally - please install yourself" if !in_docker_compose?
|
|
515
|
-
|
|
516
511
|
puts "------------------------------------------------ Installing rvm ---------------------------------------------------"
|
|
517
512
|
cmds = ["gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"]
|
|
518
513
|
cmds << "bash --login -c \"cd #{PROJECT_PATH} && curl -sSL https://get.rvm.io | bash -s stable\""
|
|
@@ -523,6 +518,16 @@ module EtFullSystem
|
|
|
523
518
|
end
|
|
524
519
|
end
|
|
525
520
|
|
|
521
|
+
def additional_ruby_versions
|
|
522
|
+
@additional_ruby_versions = Dir.glob(File.join(PROJECT_PATH, 'systems', '*', '.ruby-version')).map do |version_file|
|
|
523
|
+
File.read(version_file).split("\n").first.gsub(/\Aruby-/, '')
|
|
524
|
+
end.uniq - [RUBY_VERSION]
|
|
525
|
+
end
|
|
526
|
+
|
|
527
|
+
def rvm_required?
|
|
528
|
+
additional_ruby_versions.any?
|
|
529
|
+
end
|
|
530
|
+
|
|
526
531
|
def install_bundler
|
|
527
532
|
puts "------------------------------------------------ Installing bundler ---------------------------------------------------"
|
|
528
533
|
cmd ="bash --login -c \"cd #{PROJECT_PATH} && gem install bundler:1.17.3\""
|