bin_install 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2690a798f72b41eff1125342940db0b5ed2d43aa337ae040316207545364ad43
-  data.tar.gz: a918abf1a51698d43b2c75d3bbea10be695196d2655228c73814f5f4af8d0e92
+  metadata.gz: d076004ba397a3c7d3ecb86c28ca94776722294a1ba44143963c9fe240bbd703
+  data.tar.gz: e3673ee112018aa4387aca87689899afadfefad6a2a48537b31962f99f5d10a8
 SHA512:
-  metadata.gz: f5bb001b9cbc557ebc80d94dc8912d6e6884dc2021b80c2505772f62b39acb9d3ab446047bcf78f753bc11f29d39143105df8408e85803661b703ae293ea9e01
-  data.tar.gz: 74e177759c3e3a3c3e886bbb82e29791ca479c340c32f494a37ef77fa026f2a3d5a10d3ddb20d6c7a4e6d319628f4afff70dbe727ed92bd5ae013dff20d726f8
+  metadata.gz: ea9f2dbfab3fb6bbb99c31549ffe7e3a1aba3ecc584350d8a19fb58d0222dd9cbac18cf573855bef95a07c9639a62e29804dda2e97bde737c697371cc91b9ad3
+  data.tar.gz: a08e98275c48f2d90c37134afde9d2263086676a433562a9faaab02c7e58507ac5ced7eea69b102de8efa7894f7e5b44d6e27ab4801e8410e7e4341c62df56c0

data/lib/bin_install/atom/package.rb

@@ -1,5 +1,5 @@
 module BinInstall
-  module Brew
+  module Atom
     module Package
       # https://atom.io/packages/list?direction=desc&sort=downloads
       POPULAR_PACKAGES = %w[file-icons minimap atom-beautify linter linter-ui-default pigments git-plus busy-signal linter-eslint react].freeze

data/lib/bin_install/brew/package.rb

@@ -50,11 +50,11 @@ module BinInstall
       end
 
       def self.link(package)
-        system("brew link #{package}")
+        system("brew link #{package} --force")
       end
 
       def self.link!(package)
-        BinInstall.system!("brew link #{package}")
+        BinInstall.system!("brew link #{package} --force")
       end
 
       def self.installed?(package)

data/lib/bin_install/ruby_environment_manager/rbenv.rb

@@ -46,12 +46,11 @@ module BinInstall
       end
 
       def self.reload_shell!
-        puts 'Shell must be reloaded.'.red
-        puts 'Close this shell and open a new one.'
-        puts 'Rerun installer with:'
+        puts 'Warning rbenv requires reloading the shell'.yellow
+        puts 'Close this shell and rerun the installer with:'.red
         puts '$ gem install bin_install'.cyan
         puts '$ bin/install'.cyan
-        abort('Can not continue until shell is reloaded.'.red)
+        abort('Can not continue.'.red)
       end
 
       def self.install_ruby(version = nil)

data/lib/bin_install/version.rb

@@ -1,3 +1,3 @@
 module BinInstall
-  VERSION = '0.0.11'.freeze
+  VERSION = '0.0.12'.freeze
 end

data/lib/bin_install/zsh/oh_my_zsh.rb

@@ -7,12 +7,37 @@ module BinInstall
 
       def self.install
         puts 'Installing Oh My Zsh...'.white
-        system(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+        print_reload_warning
+        if continue?
+          system(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+        else
+          abort('Oh My Zsh installation aborted by user.'.red)
+        end
       end
 
       def self.install!
         puts 'Installing Oh My Zsh...'.white
-        BinInstall.system!(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+        print_reload_warning
+        if continue?
+          BinInstall.system!(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+        else
+          abort('Oh My Zsh installation aborted by user.'.red)
+        end
+      end
+
+      def self.print_reload_warning
+        return if installed?
+        puts 'Warning Oh My Zsh requires reloading the shell.'.yellow
+        puts 'After Oh My Zsh finishes installing you must restart your shell!'.red
+        puts 'Rerun the installer with:'
+        puts '$ gem install bin_install'.cyan
+        puts '$ bin/install'.cyan
+      end
+
+      def self.continue?
+        return true if installed?
+        print 'Would you like to continue? [Y/n]: '
+        Shell.default_yes?(gets.chomp)
       end
 
       def self.installed?

data/lib/bin_install/zsh.rb

@@ -8,36 +8,14 @@ module BinInstall
 
     def self.install
       puts 'Installing Zsh...'.white
-      print_reload_warning
-      if continue?
-        Brew::Package.install_or_upgrade('zsh')
-        Brew::Package.install_or_upgrade('zsh-completions')
-      else
-        abort('Warning Zsh install stopped by user.'.red)
-      end
+      Brew::Package.install_or_upgrade('zsh')
+      Brew::Package.install_or_upgrade('zsh-completions')
     end
 
     def self.install!
-      puts 'Installing Oh My Zsh...'.white
-      print_reload_warning
-      if continue?
-        Brew::Package.install_or_upgrade('zsh')
-        Brew::Package.install_or_upgrade('zsh-completions')
-      else
-        abort('Warning Zsh install stopped by user.'.red)
-      end
-    end
-
-    def self.print_reload_warning
-      puts 'Warning Zsh requires reloading the shell.'.yellow
-      puts 'After Zsh finishes installing you may need to rerun the installer with:'
-      puts '$ gem install bin_install'.cyan
-      puts '$ bin/install'.cyan
-    end
-
-    def self.continue?
-      print 'Would you like to continue? [Y/n]: '
-      Shell.default_yes?(gets.chomp)
+      puts 'Installing Zsh...'.white
+      Brew::Package.install_or_upgrade('zsh')
+      Brew::Package.install_or_upgrade('zsh-completions')
     end
 
     def self.installed?

metadata

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