bin_install 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62b5ae2ce4fecb95185c52b43dea86192700f2dbea10f480471719baf32f235
-  data.tar.gz: 7550e53504e74804f3204905b084ad0994f06457c80989f6a4260f13a6b98b75
+  metadata.gz: 7ecf7891844031416b232094852fd7bd08aa582e81bd80f45792c6afa4f02bda
+  data.tar.gz: 28fc8baf1ddf45a86336aa3fa2fabc6870d0bef6a4c2a93f47b6909e9f4a0a51
 SHA512:
-  metadata.gz: 887c53d589428cf9cee8348212e9404f1ae64933f1a1173d341eb44c8d87afd4f09c623d899859b552f78062c466a229e51a7dd7b07e071454d14d4777406508
-  data.tar.gz: 0de80f18edde2ddba2eb7e3dd5e034a6e55d839bff2ecc2029ba5ac62dcc529dca141d45baccc4eba4ace4d1e65d8fd621e81591812714f2f2773998d4d31448
+  metadata.gz: 1cfddb5fe7b03502a89b4c0075d316846fe4b641d031faf345097b656fbdc7f0a5dc76983eeb7cfc8bf1a83468d37132e7590988def69215e3696fd69930d579
+  data.tar.gz: 16daccfd0e4d7ce5a2e3f5114d8def7c0b0c8f7e60703cd7aded3186978a55f1af5a77f52d6245e6c67cf1221d033895963578291c2f336158d38715ebc746f0

data/lib/bin_install/brew.rb

@@ -4,6 +4,7 @@ require 'bin_install/brew/service'
 
 module BinInstall
   module Brew
+    INSTALL = '/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"'.freeze
     def self.require!
       if installed?
         update!
@@ -17,12 +18,12 @@ module BinInstall
 
     def self.install
       puts 'Installing Homebrew...'.white
-      system('/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"')
+      system(INSTALL)
     end
 
     def self.install!
       puts 'Installing Homebrew...'.white
-      BinInstall.system!('/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"')
+      BinInstall.system!(INSTALL)
     end
 
     def self.ask

data/lib/bin_install/git.rb

@@ -14,6 +14,7 @@ module BinInstall
       if remote?(name)
         puts "Remote #{name} already exists. Skipping.".blue
       else
+        puts "Adding remote #{name} for #{url}...".white
         system("git remote add #{name} #{url}")
       end
     end
@@ -22,6 +23,7 @@ module BinInstall
       if remote?(name)
         puts "Remote #{name} already exists. Skipping.".blue
       else
+        puts "Adding remote #{name} for #{url}...".white
         BinInstall.system!("git remote add #{name} #{url}")
       end
     end

data/lib/bin_install/rails.rb

@@ -1,42 +1,42 @@
 module BinInstall
   module Rails
     def self.db_create(environment = 'development')
-      puts 'Creating database...'.white
+      puts "Creating database for #{environment}...".white
       rails_or_rake("db:create RAILS_ENV=#{environment}")
     end
 
     def self.db_create!(environment = 'development')
-      puts 'Creating database...'.white
+      puts "Creating database for #{environment}...".white
       rails_or_rake!("db:create RAILS_ENV=#{environment}")
     end
 
     def self.db_migrate(environment = 'development')
-      puts 'Migrating database...'.white
+      puts "Migrating database for #{environment}...".white
       rails_or_rake("db:migrate RAILS_ENV=#{environment}")
     end
 
     def self.db_migrate!(environment = 'development')
-      puts 'Migrating database...'.white
+      puts "Migrating database for #{environment}...".white
       rails_or_rake!("db:migrate RAILS_ENV=#{environment}")
     end
 
     def self.db_reset(environment = 'development')
-      puts 'Resetting database...'.white
+      puts "Resetting database for #{environment}...".white
       rails_or_rake("db:reset RAILS_ENV=#{environment}")
     end
 
     def self.db_reset!(environment = 'development')
-      puts 'Resetting database...'.white
+      puts "Resetting database for #{environment}...".white
       rails_or_rake!("db:reset RAILS_ENV=#{environment}")
     end
 
     def self.db_setup(environment = 'development')
-      puts 'Preparing database...'.white
+      puts "Preparing database for #{environment}...".white
       rails_or_rake("db:setup RAILS_ENV=#{environment}")
     end
 
     def self.db_setup!(environment = 'development')
-      puts 'Preparing database...'.white
+      puts "Preparing database for #{environment}...".white
       rails_or_rake!("db:setup RAILS_ENV=#{environment}")
     end
 

data/lib/bin_install/ruby/rbenv.rb

@@ -1,14 +1,16 @@
 module BinInstall
   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_doctor!
+        require_shims!
         install_ruby
-        require_doctor!
+        doctor
       end
 
       def self.install!
@@ -16,9 +18,9 @@ module BinInstall
         Brew::Package.install!('rbenv')
         Brew::Package.install_or_upgrade!('ruby-build')
         Shell.append_to_profiles!(%{eval "$(rbenv init -)"\n})
-        require_doctor!
+        require_shims!
         install_ruby!
-        require_doctor!
+        doctor!
       end
 
       def self.install_ruby(version = Ruby.required_ruby_version)
@@ -50,15 +52,15 @@ module BinInstall
       end
 
       def self.doctor
-        system('curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor | bash')
+        system(DOCTOR)
       end
 
       def self.doctor!
-        BinInstall.system!('curl -fsSL https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-doctor | bash')
+        BinInstall.system!(DOCTOR)
       end
 
-      def self.require_doctor!
-        abort_install! unless doctor
+      def self.require_shims!
+        abort_install! unless `#{DOCTOR}`.include?('Checking for rbenv shims in PATH: OK')
       end
 
       def self.abort_install!

data/lib/bin_install/version.rb

@@ -1,3 +1,3 @@
 module BinInstall
-  VERSION = '0.0.20'.freeze
+  VERSION = '0.0.21'.freeze
 end

data/lib/bin_install/zsh/oh_my_zsh.rb

@@ -1,6 +1,7 @@
 module BinInstall
   module Zsh
     module OhMyZsh
+      INSTALL = %(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)").freeze
       def self.require!
         abort('Oh My Zsh is required. Visit http://ohmyz.sh/ to install.'.red) unless installed?
       end
@@ -9,7 +10,7 @@ module BinInstall
         puts 'Installing Oh My Zsh...'.white
         print_reload_warning
         if continue?
-          system(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+          system(INSTALL)
         else
           abort('Oh My Zsh installation aborted by user.'.red)
         end
@@ -19,7 +20,7 @@ module BinInstall
         puts 'Installing Oh My Zsh...'.white
         print_reload_warning
         if continue?
-          BinInstall.system!(%(sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"))
+          BinInstall.system!(INSTALL)
         else
           abort('Oh My Zsh installation aborted by user.'.red)
         end

data/lib/bin_install/zsh.rb

@@ -9,13 +9,11 @@ module BinInstall
     def self.install
       puts 'Installing Zsh...'.white
       Brew::Package.install_or_upgrade('zsh')
-      Brew::Package.install_or_upgrade('zsh-completions')
     end
 
     def self.install!
       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.20
+  version: 0.0.21
 platform: ruby
 authors:
 - David Singer
@@ -105,6 +105,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- ".zshrc"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt