bin_install 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b5b12097e512e94272a9191f9777496a5c682c830f4c48969f85a62e55f956
-  data.tar.gz: fc77d48cdd3c7bba9ec20a641a15d49508b7515e0e9d29cf466920fb505b59c9
+  metadata.gz: 3b928fdb5ebfc541304bba6a6717a179342364cb419888372fdfd612c298510e
+  data.tar.gz: 9e4681b16858d25a1c29f9470f6aee7d8762056f530892ec1a12c2a3ce96e57a
 SHA512:
-  metadata.gz: 74aae9c86430f81e531488f1cf44b821f810075c5ae11e8974ad70fc3f51e9b6a70ec8ab8d436654dbe315b742ea635b43c36959f438fdbe965dcc5a8ad1d232
-  data.tar.gz: 351838344076ec66f02172d6872680046f64612a85018b538696835c6965dfb198ba459a93577fa43cec8586821e686f0f48d14f694f9497489e8b0ad4edc02c
+  metadata.gz: a0e45d363f289c641f15b7a405ae8be21dd03f4dec54b96e4f4259b8233dece771a2d51383c5c954e9138ae536932efddc0d65f62f8ffb16c1a768d0dc6b694f
+  data.tar.gz: '089a636e7a793327e23b60eb06516a2b94b5ed004f8624eeddd86112d8896176543a824761c0d91d508ff93695145afcc440d742a665f37bc3baca24cf123d7b'

data/lib/bin_install/ruby/rbenv.rb

@@ -27,7 +27,6 @@ module BinInstall
           Shell.append_to_profiles!(%{eval "$(rbenv init -)"\n})
           require_shims!
           install_ruby!
-          require_shims!
           doctor!
         end
       end

data/lib/bin_install/ruby/rvm.rb

@@ -6,7 +6,7 @@ module BinInstall
       def self.install
         puts 'Installing RVM...'.white
         system(INSTALL)
-        system('source ~/.rvm/scripts/rvm')
+        require_loaded!
         install_ruby
       end
 
@@ -14,6 +14,7 @@ module BinInstall
         puts 'Installing RVM...'.white
         BinInstall.system!(INSTALL)
         BinInstall.system!('source ~/.rvm/scripts/rvm')
+        require_loaded!
         install_ruby!
       end
 
@@ -24,9 +25,7 @@ module BinInstall
           if Ruby.ruby_version_installed?(version)
             puts "Ruby #{version} is already installed. Skipping Ruby #{version} install.".blue
           else
-            result = system("rvm install #{version}")
-            ap 'result 1'
-            ap result
+            system("rvm install #{version}")
             system("rvm use #{version}")
           end
         else
@@ -49,6 +48,20 @@ module BinInstall
         end
       end
 
+      def self.require_loaded!
+        abort_install! unless installed?
+      end
+
+      def self.abort_install!
+        puts 'Warning RVM is not loaded.'.yellow
+        puts 'Try closing this window and restarting your shell session.'.yellow
+        puts "\n"
+        puts 'Rerun the installer with:'
+        puts '$ bin/install'.cyan
+        puts "\n"
+        abort('Aborting install.'.red)
+      end
+
       def self.installed?
         Shell.executable_exists?('rvm')
       end

data/lib/bin_install/version.rb

@@ -1,3 +1,3 @@
 module BinInstall
-  VERSION = '0.0.27'.freeze
+  VERSION = '0.0.28'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bin_install
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - David Singer