mac_setup 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61d6b8d5f046d9b1d0bcf705c295a2357578214
-  data.tar.gz: d3ac96244790173f91ddd947ed43c25266f87b89
+  metadata.gz: 7ed05ad2d53e582a5b346bae37ba77ac67d98f95
+  data.tar.gz: e1630c23a4feaa83beb46bb2b170875ed19cd762
 SHA512:
-  metadata.gz: 9358b9466dafbb8c77c16ea89d60ed189042827756e646f4c7d671f981653734cfd28852ecdd1f54eb41fd9c91622e5f6106d8585c05378f83ec97e2b6fb6c51
-  data.tar.gz: ce6b0e39e5ba19d77c78b671757d4cac0bd0ac09b3d5a1cd6ee590021b875c0e8c71427c133bf69aa93b9a5bc8510e9ff470b6b5e4e5f5bd4074acf9b241926d
+  metadata.gz: b0a70cff07477ff478713745316931a355b54f4246a76b675612afc5b592ddfb1e9853db58aa3d512e9a1c1500ebf88c04563983bc13ac1a6481ec042fd98726
+  data.tar.gz: ffc90185c1df4ccedd9dd00056c150f6252eb7366e13a4edc31402db47bcb06e14630bbb1ef4c9d9fe89fad8ce402a4a8ea1bafb2201bb0574e76db09b90b689

data/.rubocop.yml

@@ -1,38 +1,35 @@
 require: rubocop-rspec
 
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 100
-  Exclude:
-    - 'spec/**/*'
+AllCops:
+  DisplayCopNames: true
 
-Metrics/MethodLength:
-  Exclude:
-    - 'spec/**/*'
+## Style
 
+Style/Documentation:
+  Enabled: false
 Style/SingleSpaceBeforeFirstArg:
   Enabled: false
-
 Style/AccessorMethodName:
   Enabled: false
+Style/SymbolArray:
+  Enabled: false
+Style/SignalException:
+  Enabled: false
+Style/NumericLiterals:
+  Enabled: false
+Style/WordArray:
+  Enabled: false
 
 Style/GuardClause:
   Enabled: true
-
 Style/MethodCalledOnDoEndBlock:
   Enabled: true
-
-Style/SymbolArray:
-  Enabled: false
+Style/CollectionMethods:
+  Enabled: true
 
 Style/TrivialAccessors:
   ExactNameMatch: true
 
-Style/CollectionMethods:
-  Enabled: true
-
 Style/PredicateName:
   NamePrefix:
     - is_
@@ -41,16 +38,30 @@ Style/PredicateName:
     - is_
     - have_
 
-Style/SignalException:
-  Enabled: false
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
 
-Style/NumericLiterals:
-  Enabled: false
+## Metrics
+
+Metrics/LineLength:
+  Max: 100
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/MethodLength:
+  Max: 15
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+## RSpec
 
 RSpec/DescribeClass:
   Enabled: false
 RSpec/DescribedClass:
-  Enabled: false
+  Enabled: true
 RSpec/DescribeMethod:
   Enabled: false
 RSpec/FilePath:

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.0.0-p648

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
+  - 2.0.0-p648
 
 before_install:
   - gem update bundler

data/Gemfile

@@ -1,6 +1,4 @@
-source 'https://rubygems.org'
-
-gem 'codeclimate-test-reporter', group: :test, require: nil
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in mac_setup.gemspec
 gemspec

data/Rakefile

@@ -1,12 +1,12 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new(:rubocop) do |task|
-  task.options = ['--display-cop-names', '--display-style-guide']
+  task.options = ["--display-style-guide"]
 end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: 'rubocop'
+task default: "rubocop"
 task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-require 'mac_setup'
+require "bundler/setup"
+require "mac_setup"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require 'mac_setup'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start

data/exe/mac_setup

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 
-require 'mac_setup'
+require "mac_setup"
 
-DEFAULT_CONFIG_PATH = '~/.mac_setup.yml'
+DEFAULT_CONFIG_PATH = "~/.mac_setup/config.yml"
 
 command = ARGV.shift
-options = ARGV.select { |arg| arg.start_with?('--') }
+options = ARGV.select { |arg| arg.start_with?("--") }
 
 case command
-when 'bootstrap'
+when "bootstrap"
   MacSetup.bootstrap(ARGV[0])
-when 'install'
+when "install"
   config_path = (ARGV - options)[0] || File.expand_path(DEFAULT_CONFIG_PATH)
 
   if File.exist?(config_path)

data/lib/mac_setup/brewfile_installer.rb

@@ -0,0 +1,46 @@
+require_relative "shell"
+
+module MacSetup
+  class BrewfileInstaller
+    BUNDLE_TAP = "homebrew/bundle"
+
+    attr_reader :config, :status
+
+    def self.run(config, status)
+      new(config, status).run
+    end
+
+    def initialize(config, status)
+      @config = config
+      @status = status
+    end
+
+    def run
+      tap_bundle
+      sign_in_to_mas
+      install_brewfile
+    end
+
+    private
+
+    def tap_bundle
+      return if bundle_already_tapped?
+
+      Shell.run("brew tap #{BUNDLE_TAP}")
+    end
+
+    def sign_in_to_mas
+      return unless brewfile.read =~ /^mas /
+      apple_id = Shell.ask("What is your Apple ID?")
+      Shell.run("mas signin --dialog #{apple_id}")
+    end
+
+    def install_brewfile
+      Shell.run("brew bundle --global")
+    end
+
+    def bundle_already_tapped?
+      status.installed_taps.include?(BUNDLE_TAP)
+    end
+  end
+end

data/lib/mac_setup/configuration.rb

@@ -1,47 +1,23 @@
-require 'yaml'
+require "yaml"
 
 module MacSetup
   class Configuration
-    CASK_FORMULA = 'caskroom/cask/brew-cask'
-
     attr_reader :config
 
     def initialize(config_path)
       @config = YAML.load_file(config_path)
     end
 
-    def taps
-      (@config['taps'] || []).uniq
-    end
-
-    def formulas
-      add_cask(@config['formulas'] || []).uniq
-    end
-
-    def casks
-      (@config['casks'] || []).uniq
-    end
-
-    def launch_agents
-      (@config['launch_agents'] || []).uniq
+    def services
+      (@config["services"] || []).uniq
     end
 
     def git_repos
-      (@config['git_repos'] || []).uniq
-    end
-
-    def scripts
-      (@config['scripts'] || []).uniq
+      (@config["git_repos"] || []).uniq
     end
 
     def symlinks
-      (@config['symlinks'] || []).uniq
-    end
-
-    private
-
-    def add_cask(specified_formulas)
-      casks.any? ? specified_formulas << CASK_FORMULA : specified_formulas
+      (@config["symlinks"] || []).uniq
     end
   end
 end

data/lib/mac_setup/git_repo_installer.rb

@@ -1,12 +1,12 @@
-require_relative 'shell'
+require_relative "shell"
 
 module MacSetup
   class GitRepoInstaller
-    def self.run(config)
+    def self.run(config, _status)
       repos = config.git_repos
       return if repos.none?
 
-      puts 'Installing Git Repos...'
+      puts "Installing Git Repos..."
 
       repos.each do |repo_and_path|
         repo, install_path = repo_and_path.to_a.flatten
@@ -22,15 +22,15 @@ module MacSetup
         print "Installing #{repo}..."
         url = expand_url(repo)
         Shell.run(%(git clone --recursive #{url} "#{install_path}"))
-        puts 'Ok'
+        puts "Ok"
       end
     end
 
     def self.update_repo(install_path)
       Dir.chdir(install_path) do
         if can_update?
-          Shell.run('git pull && git submodule update --init --recursive')
-          puts 'Ok'
+          Shell.run("git pull && git submodule update --init --recursive")
+          puts "Ok"
         else
           puts "\nCan't update. Unstaged changes in #{install_path}"
         end
@@ -38,7 +38,7 @@ module MacSetup
     end
 
     def self.can_update?
-      Shell.run('git status --porcelain').empty?
+      Shell.run("git status --porcelain").empty?
     end
 
     def self.expand_url(repo)

data/lib/mac_setup/homebrew_installer.rb

@@ -1,31 +1,22 @@
-require_relative 'shell'
+require_relative "shell"
 
 module MacSetup
   class HomebrewInstaller
-    BREW_INSTALL_URL = 'https://raw.githubusercontent.com/Homebrew/install/master/install'
+    BREW_INSTALL_URL = "https://raw.githubusercontent.com/Homebrew/install/master/install"
 
-    def self.run(options = [])
+    def self.run
       if homebrew_missing?
-        puts 'Installing Homebrew...'
-        Shell.run("curl -fsS '#{BREW_INSTALL_URL}' | ruby")
+        puts "Installing Homebrew..."
+        Shell.run(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
       else
-        puts 'Homebrew already installed...'
-      end
+        puts "Homebrew already installed. Updating..."
 
-      update_homebrew(options)
+        Shell.run("brew update")
+      end
     end
 
     def self.homebrew_missing?
-      Shell.run('which brew').empty?
-    end
-
-    def self.update_homebrew(options)
-      if options.include?('--skip-brew-update')
-        puts 'Skipping Homebrew Update...'
-      else
-        puts 'Updating Homebrew...'
-        Shell.run('brew update')
-      end
+      Shell.run("which brew").empty?
     end
   end
 end

data/lib/mac_setup/script_installer.rb

@@ -1,11 +1,12 @@
-require_relative 'shell'
+require_relative "shell"
 
 module MacSetup
   class ScriptInstaller
-    def self.run(config)
-      config.scripts.each do |script|
-        full_path = File.join(DOTFILES_PATH, 'mac_setup/scripts', script)
-        Shell.run(full_path)
+    SCRIPTS_PATH = "mac_setup/scripts"
+
+    def self.run(_config, _status)
+      Pathname.new(File.join(DOTFILES_PATH, SCRIPTS_PATH)).each_child do |script|
+        Shell.run(script.to_s)
       end
     end
   end

data/lib/mac_setup/services_installer.rb

@@ -0,0 +1,67 @@
+require "fileutils"
+
+require_relative "shell"
+
+module MacSetup
+  class ServicesInstaller
+    LAUNCH_AGENTS_PATH = File.expand_path("~/Library/LaunchAgents")
+    SERVICES_TAP = "homebrew/services"
+
+    attr_reader :config, :status, :services, :running_services
+
+    def self.run(config, status)
+      new(config, status).run
+    end
+
+    def initialize(config, status)
+      @config = config
+      @status = status
+      @services = config.services
+    end
+
+    def run
+      return if services.none?
+
+      puts "Installing services..."
+
+      FileUtils.mkdir_p(LAUNCH_AGENTS_PATH)
+      tap_services
+      get_running_services
+
+      services.each { |service| install_service(service) }
+    end
+
+    private
+
+    def get_running_services
+      services_list = Shell.run("brew services list").split("\n").drop(1)
+      services_with_status = services_list.map { |line| line.split(/\s+/, 3).take(2) }
+
+      @running_services = services_with_status.each_with_object([]) do |(service, status), services|
+        services << service if status == "started"
+      end
+    end
+
+    def install_service(service)
+      if running_services.include?(service)
+        puts "Restarting #{service} service..."
+
+        Shell.run("brew services restart #{service}")
+      else
+        puts "Installing #{service} service..."
+
+        Shell.run("brew services start #{service}")
+      end
+    end
+
+    def tap_services
+      return if services_already_tapped?
+
+      Shell.run("brew tap #{SERVICES_TAP}")
+    end
+
+    def services_already_tapped?
+      status.installed_taps.include?(SERVICES_TAP)
+    end
+  end
+end

data/lib/mac_setup/shell.rb

@@ -3,5 +3,10 @@ module MacSetup
     def self.run(command)
       `#{command}`
     end
+
+    def self.ask(question)
+      puts question
+      gets.strip
+    end
   end
 end

data/lib/mac_setup/symlink_installer.rb

@@ -1,61 +1,121 @@
 module MacSetup
-  class SymlinkInstaller
-    def self.run(config)
-      install_dotfiles
-      install_symlinks(config)
+  class Symlink
+    def initialize(options)
+      @source_path = options[:source_path]
+      @file_name = options[:name]
+      @target_path = options[:target_path]
     end
 
-    def self.install_dotfiles
-      dotfiles.each do |file_name|
-        source = File.expand_path(file_name, DOTFILES_PATH)
-        create_link(source, file_name)
-      end
+    def link
+      short_sorce_path = MacSetup.shorten_path(source_path)
+      short_target_path = MacSetup.shorten_path(target_path)
+      puts "Linking #{short_sorce_path} to #{short_target_path}..."
+
+      return unless source_exists
+
+      target_exists? ? replace : FileUtils.ln_s(source_path, target_path)
     end
 
-    def self.install_symlinks(config)
-      config.symlinks.each do |file|
-        file_name = File.basename(file)
-        source = File.expand_path(file)
+    private
 
-        create_link(source, file_name)
+    def source_exists
+      File.exist?(source_path).tap do |exists|
+        unless exists
+          short_sorce_path = MacSetup.shorten_path(source_path)
+          puts "WARNING: Source doesn’t exist at #{short_sorce_path}. Skipping..."
+        end
       end
     end
 
-    def self.install_dotfile(name)
-      dotfile = dotfiles.find { |file| file =~ /#{Regexp.escape(name)}/ }
-      source = File.expand_path(dotfile, DOTFILES_PATH)
+    def target_exists?
+      File.exist?(target_path)
+    end
 
-      create_link(source, dotfile)
+    def target
+      @target ||= SymlinkTarget.new(target_path)
     end
 
-    def self.dotfiles
-      Dir.entries(DOTFILES_PATH).reject { |entry| entry.start_with?('.') }
+    def source_path
+      @source_path ||= File.expand_path(file_name, DOTFILES_PATH)
+    end
+
+    def target_path
+      @target_path ||= File.join(ENV["HOME"], ".#{file_name}")
     end
 
-    def self.create_link(source, file_name)
-      target = File.join(ENV['HOME'], ".#{file_name}")
+    def file_name
+      @file_name ||= File.basename(source_path)
+    end
 
-      if File.exist?(target)
-        replace(source, target, name)
+    def replace
+      if File.symlink?(target_path)
+        replace_symlink
+      elsif File.directory?(source_path)
+        link_children
       else
-        FileUtils.ln_s(source, target)
+        puts "WARNING: File already exists at #{MacSetup.shorten_path(target_path)}. Skipping..."
       end
     end
 
-    def self.replace(source, target, dotfile)
-      if File.symlink?(target)
-        replace_symlink(source, target, dotfile)
-      else
-        puts "File already exists at #{target}. Skipping..."
+    def link_children
+      puts "Linking children..."
+
+      children.each do |child|
+        child_source = Symlink.new(
+          source_path: File.join(source_path, child),
+          target_path: File.join(target_path, child)
+        )
+
+        child_source.link
       end
     end
 
-    def self.replace_symlink(source, target, dotfile)
-      if File.readlink(target) == source
-        puts "#{dotfile} already linked. Skipping..."
+    def replace_symlink
+      existing_link = File.readlink(target_path)
+
+      if existing_link == source_path
+        puts "Already linked. Skipping..."
       else
-        FileUtils.ln_sf(source, target)
+        print "Replacing existing symlink at #{MacSetup.shorten_path(target_path)}. "
+        puts "Originally linked to #{MacSetup.shorten_path(existing_link)}..."
+        FileUtils.ln_sf(source_path, target_path)
       end
     end
+
+    def children
+      Dir.entries(source_path).reject { |entry| entry.start_with?(".") }
+    end
+  end
+
+  class SymlinkInstaller
+    def self.run(config, _status)
+      install_dotfiles
+      install_symlinks(config)
+    end
+
+    def self.install_dotfiles
+      dotfiles.each do |file_name|
+        source = Symlink.new(name: file_name)
+        source.link
+      end
+    end
+
+    def self.install_symlinks(config)
+      config.symlinks.each do |source_path|
+        source = Symlink.new(source_path: File.expand_path(source_path))
+        source.link
+      end
+    end
+
+    def self.install_dotfile(name)
+      dotfile = dotfiles.find { |file| file =~ /#{Regexp.escape(name)}/ }
+      source = Symlink.new(name: dotfile)
+
+      source.link
+    end
+
+    def self.dotfiles
+      Dir.entries(DOTFILES_PATH).reject { |entry| entry.start_with?(".") }
+    end
   end
 end

data/lib/mac_setup/system_status.rb

@@ -1,49 +1,15 @@
-require_relative 'shell'
+require_relative "shell"
 
 module MacSetup
   class SystemStatus
-    def installed_formulas
-      @installed_formulas ||= get_formulas
-    end
-
-    def outdated_formulas
-      @outdated_formulas ||= get_outdated_formulas
-    end
-
     def installed_taps
       @installed_taps ||= get_taps
     end
 
-    def installed_casks
-      @installed_casks ||= get_casks
-    end
-
-    def loaded_agents
-      @loaded_agents ||= get_loaded_agents
-    end
-
     private
 
-    def get_formulas
-      Shell.run('brew list -1').split("\n")
-    end
-
     def get_taps
-      Shell.run('brew tap').split("\n")
-    end
-
-    def get_casks
-      Shell.run('brew cask list -1').split("\n")
-    end
-
-    def get_outdated_formulas
-      Shell.run('brew outdated --quiet').split("\n")
-    end
-
-    def get_loaded_agents
-      Shell.run('launchctl list | grep homebrew').split("\n").map do |line|
-        line.split(/\s/)[-1]
-      end
+      Shell.run("brew tap").split("\n")
     end
   end
 end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = '0.3.0'
+  VERSION = "0.4.0"
 end

data/lib/mac_setup.rb

@@ -1,45 +1,38 @@
-require 'mac_setup/version'
-require 'mac_setup/configuration'
-require 'mac_setup/system_status'
-require 'mac_setup/command_line_tools_installer'
-require 'mac_setup/homebrew_installer'
-require 'mac_setup/tap_installer'
-require 'mac_setup/formula_installer'
-require 'mac_setup/cask_installer'
-require 'mac_setup/launch_agent_installer'
-require 'mac_setup/git_repo_installer'
-require 'mac_setup/script_installer'
-require 'mac_setup/symlink_installer'
+require "mac_setup/version"
+require "mac_setup/configuration"
+require "mac_setup/system_status"
+require "mac_setup/homebrew_installer"
+require "mac_setup/git_repo_installer"
+require "mac_setup/script_installer"
+require "mac_setup/symlink_installer"
+require "mac_setup/brewfile_installer"
+require "mac_setup/services_installer"
 
 module MacSetup
-  DOTFILES_PATH = File.expand_path('~/.dotfiles')
+  DOTFILES_PATH = File.expand_path("~/.dotfiles")
 
-  def self.install(config_path, options)
+  INSTALLERS = [
+    SymlinkInstaller,
+    BrewfileInstaller,
+    ServicesInstaller,
+    GitRepoInstaller,
+    ScriptInstaller
+  ]
+
+  def self.install(config_path, _options)
     config = Configuration.new(File.expand_path(config_path))
     status = SystemStatus.new
 
-    HomebrewInstaller.run(options)
-    TapInstaller.run(config, status)
-    FormulaInstaller.run(config, status)
-    CaskInstaller.run(config, status)
-    LaunchAgentInstaller.run(config, status)
-    GitRepoInstaller.run(config)
-    ScriptInstaller.run(config)
-    SymlinkInstaller.run(config)
+    INSTALLERS.each { |installer| installer.run(config, status) }
   end
 
   def self.bootstrap(dotfiles_repo)
-    check_brew_install_path
-
     GitRepoInstaller.install_repo(dotfiles_repo, DOTFILES_PATH)
-    CommandLineToolsInstaller.run
-    SymlinkInstaller.install_dotfile('mac_setup')
+    SymlinkInstaller.install_dotfile("mac_setup")
+    HomebrewInstaller.run
   end
 
-  def self.check_brew_install_path
-    return if Dir.exist?('/usr/local')
-
-    puts '/usr/local does not exist.'
-    puts 'Read this to fix: https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/El_Capitan_and_Homebrew.md#if-usrlocal-does-not-exist'
+  def self.shorten_path(path)
+    path.sub(/#{ENV['HOME']}/, "~")
   end
 end

data/mac_setup.gemspec

@@ -1,28 +1,28 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mac_setup/version'
+require "mac_setup/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'mac_setup'
+  spec.name          = "mac_setup"
   spec.version       = MacSetup::VERSION
-  spec.authors       = ['Matt Wean']
-  spec.email         = ['matthew.wean@gmail.com']
+  spec.authors       = ["Matt Wean"]
+  spec.email         = ["matthew.wean@gmail.com"]
 
-  spec.summary       = 'Tool to set up a Mac'
-  spec.license       = 'MIT'
+  spec.summary       = "Tool to set up a Mac"
+  spec.license       = "MIT"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '~> 0.34.2'
-  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop", "~> 0.34.2"
+  spec.add_development_dependency "rubocop-rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,18 +103,15 @@ files:
 - bin/setup
 - exe/mac_setup
 - lib/mac_setup.rb
-- lib/mac_setup/cask_installer.rb
-- lib/mac_setup/command_line_tools_installer.rb
+- lib/mac_setup/brewfile_installer.rb
 - lib/mac_setup/configuration.rb
-- lib/mac_setup/formula_installer.rb
 - lib/mac_setup/git_repo_installer.rb
 - lib/mac_setup/homebrew_installer.rb
-- lib/mac_setup/launch_agent_installer.rb
 - lib/mac_setup/script_installer.rb
+- lib/mac_setup/services_installer.rb
 - lib/mac_setup/shell.rb
 - lib/mac_setup/symlink_installer.rb
 - lib/mac_setup/system_status.rb
-- lib/mac_setup/tap_installer.rb
 - lib/mac_setup/version.rb
 - mac_setup.gemspec
 homepage: 
@@ -137,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Tool to set up a Mac

data/lib/mac_setup/cask_installer.rb

@@ -1,20 +0,0 @@
-require_relative 'shell'
-
-module MacSetup
-  class CaskInstaller
-    def self.run(config, status)
-      casks = config.casks
-      return if casks.none?
-
-      puts 'Installing casks...'
-
-      uninstalled_casks = casks - status.installed_casks
-
-      uninstalled_casks.each do |cask|
-        print "Installing #{cask}..."
-        Shell.run("brew cask install #{cask}")
-        puts('Ok')
-      end
-    end
-  end
-end

data/lib/mac_setup/command_line_tools_installer.rb

@@ -1,30 +0,0 @@
-require 'fileutils'
-
-require_relative 'shell'
-
-module MacSetup
-  class CommandLineToolsInstaller
-    BIN_PATH = '/Library/Developer/CommandLineTools/usr/bin/clang'
-    TMP_FILE = '/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress'
-
-    def self.run
-      if File.exist?(BIN_PATH)
-        puts 'Command Line Tools already installed. Skipping...'
-      else
-        install_clts
-      end
-    end
-
-    def self.install_clts
-      puts 'Installing Command Line Tools...'
-      FileUtils.touch(TMP_FILE)
-      Shell.run(%(softwareupdate -i "#{package_name}" -v))
-      FileUtils.rm_f(TMP_FILE)
-    end
-
-    def self.package_name
-      response = Shell.run('softwareupdate -l')
-      response.match(/(Command.*$)/)[1]
-    end
-  end
-end

data/lib/mac_setup/formula_installer.rb

@@ -1,57 +0,0 @@
-require 'English'
-
-require_relative 'shell'
-
-module MacSetup
-  class FormulaInstaller
-    attr_reader :config, :status
-
-    def self.run(config, status)
-      new(config, status).run
-    end
-
-    def initialize(config, status)
-      @config = config
-      @status = status
-    end
-
-    def run
-      formulas = config.formulas
-      return if formulas.none?
-
-      puts 'Installing formulas...'
-
-      formulas.each { |formula| install_formula(formula) }
-    end
-
-    def install_formula(formula)
-      if status.installed_formulas.include?(formula)
-        upgrade_formula(formula)
-      else
-        print "Installing #{formula}..."
-        output = Shell.run("brew install #{formula}")
-
-        $CHILD_STATUS.success? ? puts('Ok') : puts("\n#{output}")
-      end
-    end
-
-    def upgrade_formula(formula)
-      if can_upgrade?(formula)
-        print "Upgrading #{formula}..."
-        output = Shell.run("brew upgrade #{formula}")
-
-        $CHILD_STATUS.success? ? puts('Ok') : puts("\n#{output}")
-      else
-        puts "Already using latest version of #{formula}..."
-      end
-    end
-
-    def can_upgrade?(formula)
-      status.outdated_formulas.include?(full_name(formula))
-    end
-
-    def full_name(formula)
-      Shell.run("brew info #{formula}").split("\n")[0].split(':')[0]
-    end
-  end
-end

data/lib/mac_setup/launch_agent_installer.rb

@@ -1,35 +0,0 @@
-require 'fileutils'
-
-require_relative 'shell'
-
-module MacSetup
-  class LaunchAgentInstaller
-    BREW_OPT_PATH = '/usr/local/opt'
-    LAUNCH_AGENTS_PATH = File.expand_path('~/Library/LaunchAgents')
-
-    def self.run(config, status)
-      launch_agents = config.launch_agents
-      return if launch_agents.none?
-
-      puts 'Installing launch agents...'
-
-      FileUtils.mkdir_p(LAUNCH_AGENTS_PATH)
-
-      launch_agents.each { |agent| install_launch_agent(agent, status) }
-    end
-
-    def self.install_launch_agent(agent, status)
-      puts "Installing launch agent for #{agent}..."
-
-      domain = "homebrew.mxcl.#{agent}"
-      plist = "#{domain}.plist"
-      FileUtils.ln_sf(File.join(BREW_OPT_PATH, agent, plist), LAUNCH_AGENTS_PATH)
-
-      agent_plist_path = File.join(LAUNCH_AGENTS_PATH, plist)
-
-      Shell.run("launchctl unload '#{agent_plist_path}'") if status.loaded_agents.include?(domain)
-
-      Shell.run("launchctl load '#{agent_plist_path}'")
-    end
-  end
-end

data/lib/mac_setup/tap_installer.rb

@@ -1,28 +0,0 @@
-require 'English'
-
-require_relative 'shell'
-
-module MacSetup
-  class TapInstaller
-    def self.run(config, status)
-      return if config.taps.none?
-
-      puts 'Installing taps...'
-
-      uninstalled_taps = config.taps - status.installed_taps
-
-      if uninstalled_taps.none?
-        puts 'No uninstalled taps'
-      else
-        uninstalled_taps.each { |tap| install_tap(tap) }
-      end
-    end
-
-    def self.install_tap(tap)
-      print "Installing #{tap}..."
-      output = Shell.run("brew tap #{tap}")
-
-      $CHILD_STATUS.success? ? puts('Ok') : puts("\n#{output}")
-    end
-  end
-end