lib/bin_install/ruby/rbenv.rb in bin_install-0.0.23 vs lib/bin_install/ruby/rbenv.rb in bin_install-0.0.24

@@ -2,36 +2,44 @@
   module Ruby
     module Rbenv
       DOCTOR = 'curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor | bash'.freeze
 
       def self.install
-        puts 'Installing rbenv...'.white
-        Brew::Package.install('rbenv')
-        Brew::Package.install_or_upgrade('ruby-build')
-        Shell.append_to_profiles(%{eval "$(rbenv init -)"\n})
-        require_shims!
-        install_ruby
-        doctor
+        if Ruby::Rvm.installed?
+          puts 'RVM is already installed. Skipping rbenv install.'.yellow
+        else
+          puts 'Installing rbenv...'.white
+          Brew::Package.install('rbenv')
+          Brew::Package.install_or_upgrade('ruby-build')
+          Shell.append_to_profiles(%{eval "$(rbenv init -)"\n})
+          require_shims!
+          install_ruby
+          doctor
+        end
       end
 
       def self.install!
-        puts 'Installing rbenv...'.white
-        Brew::Package.install!('rbenv')
-        Brew::Package.install_or_upgrade!('ruby-build')
-        Shell.append_to_profiles!(%{eval "$(rbenv init -)"\n})
-        require_shims!
-        install_ruby!
-        require_shims!
-        doctor!
+        if Ruby::Rvm.installed?
+          abort('RVM is already installed. Aborting rbenv install.'.red)
+        else
+          puts 'Installing rbenv...'.white
+          Brew::Package.install!('rbenv')
+          Brew::Package.install_or_upgrade!('ruby-build')
+          Shell.append_to_profiles!(%{eval "$(rbenv init -)"\n})
+          require_shims!
+          install_ruby!
+          require_shims!
+          doctor!
+        end
       end
 
       def self.install_ruby(version = Ruby.required_ruby_version)
         puts "Installing Ruby #{version}...".white
 
         if version
           if Ruby.ruby_version_installed?(version)
-            puts "Ruby #{version} is already installed. Skipping.".blue
+            puts "Ruby #{version} is already installed. Skipping Ruby #{version} install.".blue
           else
             system("rbenv install #{version}")
           end
         else
           puts 'Unknown Ruby version. Create .ruby-version file.'
@@ -41,10 +49,10 @@
       def self.install_ruby!(version = Ruby.required_ruby_version)
         puts "Installing Ruby #{version}...".white
 
         if version
           if Ruby.ruby_version_installed?(version)
-            puts "Ruby #{version} is already installed. Skipping.".blue
+            puts "Ruby #{version} is already installed. Skipping Ruby #{version} install.".blue
           else
             BinInstall.system!("rbenv install #{version}")
           end
         else
           abort('Unknown Ruby version. Create .ruby-version file.'.red)