mac_setup 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d138f54b0282d08ae090d9d610449a01ca085ca8
-  data.tar.gz: e6c8f046d259c1716ddb3c2fa0b93b8ebdccf6aa
+  metadata.gz: 32bfd8387f06a6e39a2fe649c573ada644381af0
+  data.tar.gz: d81c0672a8f3f4ce45b63c3b031e089d5a8ad38c
 SHA512:
-  metadata.gz: aa607f339bdb85eeebebd20ae6e80d4d75dace9979b040d2226ead3947fbc91449785132b304e8caf5c2b768f9aee26bba1b6bdacd80c4fb760d8aedcb8d6783
-  data.tar.gz: 7652ec93fbfb92e1614ab32b7f5919bbb82b1c56296297b0de8244c7d3a7db19aff3432dc236b6078a9c8612baefd338840f42476046d90a7e8956d7dbc7f5b2
+  metadata.gz: c48aca54cefb1d8c2284ecf2e39ae38d30a58784756bed95405077dc38aecd4e6eaf49b514f6e717a50c179cf2919fa620110926d1c83d173fa8fddfaf1e765f
+  data.tar.gz: 8c40807b907e4c2d240edc298bae37187b3e6f9e64724cba6afdf8d2b831309a5fd7acc4022542c0fcf970d59ab7b0d82fcdd92cd450d0d67421c840de9e2049

data/exe/mac_setup

@@ -2,7 +2,7 @@
 
 require "mac_setup"
 
-DEFAULT_CONFIG_PATH = "~/.mac_setup/config.yml"
+DEFAULT_CONFIG_PATH = "~/.dotfiles/mac_setup/config.yml"
 
 command = ARGV.shift
 options = ARGV.select { |arg| arg.start_with?("--") }

data/lib/mac_setup/brewfile_installer.rb

@@ -1,3 +1,4 @@
+require "pathname"
 require_relative "shell"
 
 module MacSetup
@@ -19,7 +20,6 @@ module MacSetup
       tap_bundle
       set_up_mas
       install_brewfile
-      install_openssl
     end
 
     private
@@ -39,13 +39,22 @@ module MacSetup
     end
 
     def install_mas
-      Shell.run("brew install mas") unless mas_installed?
+      if mas_installed?
+        MacSetup.log "mas already installed. Skipping."
+      else
+        MacSetup.log "Installing mas" do
+          Shell.run("brew install mas")
+        end
+      end
     end
 
     def sign_in_to_mas
-      return if mas_signed_in?
-      apple_id = Shell.ask("What is your Apple ID?")
-      Shell.run("mas signin --dialog #{apple_id}")
+      if mas_signed_in?
+        MacSetup.log "Already signed into Mac App Store. Skipping."
+      else
+        apple_id = Shell.ask("What is your Apple ID?")
+        Shell.run("mas signin --dialog #{apple_id}")
+      end
     end
 
     def mas_signed_in?
@@ -53,18 +62,15 @@ module MacSetup
     end
 
     def install_brewfile
-      Shell.run("brew bundle --global")
+      MacSetup.log "Installing Brewfile" do
+        Shell.run("brew bundle --global")
+      end
     end
 
     def mas_installed?
       Shell.success?("which mas")
     end
 
-    def install_openssl
-      # Needed for encrypted files
-      Shell.run("brew install openssl")
-    end
-
     def bundle_already_tapped?
       status.installed_taps.include?(BUNDLE_TAP)
     end

data/lib/mac_setup/command_line_tools_installer.rb

@@ -1,30 +1,15 @@
-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
+        Shell.run("xcode-select --install")
       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/configuration.rb

@@ -5,7 +5,16 @@ module MacSetup
     attr_reader :config
 
     def initialize(config_path)
-      @config = YAML.load_file(config_path)
+      @config_path = config_path
+      load_config
+    end
+
+    def reload!
+      load_config
+    end
+
+    def dotfiles_repo
+      @config.fetch("repo")
     end
 
     def services
@@ -13,11 +22,17 @@ module MacSetup
     end
 
     def git_repos
-      ((@config["git_repos"] || []) + [@config["repo"]]).uniq
+      (@config["git_repos"] || []).uniq
     end
 
     def symlinks
       (@config["symlinks"] || []).uniq
     end
+
+    private
+
+    def load_config
+      @config = YAML.load_file(@config_path)
+    end
   end
 end

data/lib/mac_setup/git_repo_installer.rb

@@ -6,7 +6,7 @@ module MacSetup
       repos = config.git_repos
       return if repos.none?
 
-      puts "Installing Git Repos..."
+      MacSetup.log "Installing Git Repos..."
 
       repos.each do |repo_and_path|
         repo, install_path = repo_and_path.to_a.flatten
@@ -16,13 +16,14 @@ module MacSetup
 
     def self.install_repo(repo, install_path)
       if Dir.exist?(install_path)
-        print "#{repo} Already Installed. Updating..."
-        update_repo(install_path)
+        MacSetup.log "#{repo} Already Installed. Updating" do
+          update_repo(install_path)
+        end
       else
-        print "Installing #{repo}..."
-        url = expand_url(repo)
-        Shell.run(%(git clone --recursive #{url} "#{install_path}"))
-        puts "Ok"
+        MacSetup.log "Installing #{repo}" do
+          url = expand_url(repo)
+          Shell.run(%(git clone --recursive #{url} "#{install_path}"))
+        end
       end
     end
 
@@ -30,9 +31,9 @@ module MacSetup
       Dir.chdir(install_path) do
         if can_update?
           Shell.run("git pull && git submodule update --init --recursive")
-          puts "Ok"
         else
           puts "\nCan't update. Unstaged changes in #{install_path}"
+          exit 1
         end
       end
     end

data/lib/mac_setup/homebrew_installer.rb

@@ -6,12 +6,13 @@ module MacSetup
 
     def self.run
       if homebrew_missing?
-        puts "Installing Homebrew..."
-        Shell.run(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
+        MacSetup.log "Installing Homebrew" do
+          Shell.run(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
+        end
       else
-        puts "Homebrew already installed. Updating..."
-
-        Shell.run("brew update")
+        MacSetup.log "Homebrew already installed. Updating" do
+          Shell.run("brew update")
+        end
       end
     end
 

data/lib/mac_setup/script_installer.rb

@@ -6,6 +6,7 @@ module MacSetup
 
     def self.run(_config, _status)
       Pathname.new(File.join(DOTFILES_PATH, SCRIPTS_PATH)).each_child do |script|
+        MacSetup.log "Running script #{script}..."
         Shell.run(script.to_s)
       end
     end

data/lib/mac_setup/secrets.rb

@@ -21,7 +21,7 @@ module MacSetup
     def self.strip_extension(file)
       return file unless file.to_s.end_with?(PLAINTEXT_EXT)
 
-      file.sub(/#{PLAINTEXT_EXT}$/, "")
+      file.sub(/\.#{PLAINTEXT_EXT}$/, "")
     end
 
     def initialize(dir)

data/lib/mac_setup/secrets_installer.rb

@@ -0,0 +1,21 @@
+module MacSetup
+  class SecretsInstaller
+    def self.run(_config, status)
+      new(status).run
+    end
+
+    def initialize(status)
+      @status = status
+    end
+
+    def run
+      install_openssl
+      Secrets.decrypt(DOTFILES_PATH)
+    end
+
+    def install_openssl
+      # Needed for encrypted files
+      Shell.run("brew install openssl") unless @status.installed_formulas.include?("openssl")
+    end
+  end
+end

data/lib/mac_setup/services_installer.rb

@@ -22,7 +22,7 @@ module MacSetup
     def run
       return if services.none?
 
-      puts "Installing services..."
+      MacSetup.log "Installing services..."
 
       FileUtils.mkdir_p(LAUNCH_AGENTS_PATH)
       tap_services
@@ -44,11 +44,11 @@ module MacSetup
 
     def install_service(service)
       if running_services.include?(service)
-        puts "Restarting #{service} service..."
+        MacSetup.log "Restarting #{service} service..."
 
         Shell.run("brew services restart #{service}")
       else
-        puts "Installing #{service} service..."
+        MacSetup.log "Installing #{service} service..."
 
         Shell.run("brew services start #{service}")
       end

data/lib/mac_setup/symlink_installer.rb

@@ -11,7 +11,7 @@ module MacSetup
 
       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}..."
+      MacSetup.log "Linking #{short_sorce_path} to #{short_target_path}..."
 
       return unless source_exists
 
@@ -24,7 +24,7 @@ module MacSetup
       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..."
+          MacSetup.log "WARNING: Source doesn’t exist at #{short_sorce_path}. Skipping."
         end
       end
     end
@@ -51,12 +51,12 @@ module MacSetup
       elsif File.directory?(source_path)
         link_children
       else
-        puts "WARNING: File already exists at #{MacSetup.shorten_path(target_path)}. Skipping..."
+        MacSetup.log "WARNING: File already exists at #{MacSetup.shorten_path(target_path)}. Skipping."
       end
     end
 
     def link_children
-      puts "Linking children..."
+      MacSetup.log "Linking children..."
 
       children.each do |child|
         child_source = Symlink.new(
@@ -72,7 +72,7 @@ module MacSetup
       existing_link = File.readlink(target_path)
 
       if existing_link == source_path
-        puts "Already linked. Skipping..."
+        MacSetup.log "Already linked. Skipping."
       else
         print "Replacing existing symlink at #{MacSetup.shorten_path(target_path)}. "
         puts "Originally linked to #{MacSetup.shorten_path(existing_link)}..."
@@ -91,7 +91,6 @@ module MacSetup
 
   class SymlinkInstaller
     def self.run(config, _status)
-      Secrets.decrypt(DOTFILES_PATH)
       install_dotfiles
       install_symlinks(config)
     end

data/lib/mac_setup/system_status.rb

@@ -6,10 +6,18 @@ module MacSetup
       @installed_taps ||= get_taps
     end
 
+    def installed_formulas
+      @installed_formulas ||= get_formulas
+    end
+
     private
 
     def get_taps
       Shell.run("brew tap").split("\n")
     end
+
+    def get_formulas
+      Shell.run("brew list -1").split("\n")
+    end
   end
 end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/mac_setup.rb

@@ -9,15 +9,17 @@ require "mac_setup/script_installer"
 require "mac_setup/symlink_installer"
 require "mac_setup/brewfile_installer"
 require "mac_setup/services_installer"
+require "mac_setup/secrets_installer"
 
 module MacSetup
   DOTFILES_PATH = File.expand_path("~/.dotfiles")
 
   INSTALLERS = [
     GitRepoInstaller,
+    SecretsInstaller,
+    SymlinkInstaller,
     BrewfileInstaller,
     ServicesInstaller,
-    SymlinkInstaller,
     ScriptInstaller
   ]
 
@@ -25,6 +27,8 @@ module MacSetup
     config = Configuration.new(File.expand_path(config_path))
     status = SystemStatus.new
 
+    GitRepoInstaller.install_repo(config.dotfiles_repo, DOTFILES_PATH)
+    config.reload!
     INSTALLERS.each { |installer| installer.run(config, status) }
   end
 
@@ -41,4 +45,14 @@ module MacSetup
   def self.shorten_path(path)
     path.sub(/#{ENV['HOME']}/, "~")
   end
+
+  def self.log(message)
+    if block_given?
+      print "#{message}..."
+      yield
+      puts "Ok."
+    else
+      puts message
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,6 +110,7 @@ files:
 - lib/mac_setup/homebrew_installer.rb
 - lib/mac_setup/script_installer.rb
 - lib/mac_setup/secrets.rb
+- lib/mac_setup/secrets_installer.rb
 - lib/mac_setup/services_installer.rb
 - lib/mac_setup/shell.rb
 - lib/mac_setup/symlink_installer.rb