mac_setup 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e02f938dc3d53ca755bec0e704949c02a323c35
-  data.tar.gz: 4bae47b60e7b7db68dcbd86059cabaabc62544b9
+  metadata.gz: 9223c0313ddec740c3975abd57e09bb52b3e3bab
+  data.tar.gz: 7b257be1fee8d0c7e72da35ce49102462a6e7881
 SHA512:
-  metadata.gz: fcc1a968fc82a85030cbece957b7400562a61021832c6e195b418c2e9677e61d07b869970eca7a4e0b93eceba34597384f50ccad1620eb621fb53f556a5fe419
-  data.tar.gz: 1e6692f062ecf9b7b271de9cd326374c5147f4caddfaffffe01d449c6d15335d7eee8ee0b735b4eafe52e79b35ebccc35e68b6f99c7ee6a902114ccc770a6599
+  metadata.gz: 611da27eed94132d5e9a1af2e7dd62e9c9039656a2203a57345d7fd9bfa80222c7766e7d8d0ba0243e5cf74591469c0993c83ad4e72a37d8b57cbc372fe65cb0
+  data.tar.gz: 09f30dc8cae280977c6b0e3ddf09d352d534bfcbf98b56a91903c420ea38fc15dda67581f30e53b0b4a8331ecf9b58dbd1994c21a531b0d5ca1fbf021d1ef391

data/lib/mac_setup/configuration.rb

@@ -93,7 +93,11 @@ module MacSetup
 
     def add_brews(item, existing_brews = brews)
       existing_brews.merge!(brew_value(item)) do |key, oldval, newval|
-        raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
+        if oldval == newval
+          oldval
+        else
+          raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
+        end
       end
     end
 

data/lib/mac_setup/defaults_installer.rb

@@ -0,0 +1,89 @@
+module MacSetup
+  class DefaultsInstaller
+    def self.run(config, status)
+      defaults_file = File.join(MacSetup.dotfiles_path, "mac_setup/defaults.yml")
+
+      if File.exist?(defaults_file)
+        MacSetup.log "Setting defaults..."
+        new(defaults_file, config, status).run
+      else
+        MacSetup.log "No config file at #{MacSetup.shorten_path(defaults_file)}. Skipping..."
+      end
+    end
+
+    def initialize(defaults_file, config, status)
+      @defaults = YAML.load_file(defaults_file)
+      @config = config
+      @status = status
+    end
+
+    def run
+      @defaults.each do |domain, values|
+        MacSetup.log "Setting defaults for domain #{domain}..."
+        set_defaults(domain, values)
+      end
+    end
+
+    private
+
+    def set_defaults(domain, values)
+      values.each do |key, value|
+        existing_value = @status.defaults_value(domain, key)
+
+        if values_equal?(existing_value, value)
+          MacSetup.log "Value for #{domain} #{key} is already set. Skipping..."
+        else
+          MacSetup.log "Changing #{existing_value} to #{value}"
+          set_value(domain, key, value)
+        end
+      end
+    end
+
+    def values_equal?(existing, desired)
+      return if existing.nil?
+
+      case desired
+      when Integer
+        existing.to_i == desired
+      when Float
+        existing.to_f == desired
+      when Array
+        extract_array_values(existing) == desired
+      when TrueClass
+        existing == "1"
+      when FalseClass
+        existing == "0"
+      when String
+        existing == desired
+      end
+    end
+
+    def set_value(domain, key, value)
+      MacSetup.log "Setting #{domain} #{key} to #{value}"
+      qualified_value = qualify_value(value)
+
+      sudo = "sudo " if domain.start_with?("/")
+      Shell.run(%(#{sudo}defaults write #{domain} "#{key}" #{qualified_value}))
+    end
+
+    def extract_array_values(string)
+      string.split("\n")[1..-2].map { |line| line.lstrip.gsub(/(^")|(",?$)/, "") }
+    end
+
+    def qualify_value(value)
+      case value
+      when Integer
+        "-int #{value}"
+      when Float
+        "-float #{value}"
+      when TrueClass, FalseClass
+        "-bool #{value}"
+      when Array
+        values = value.map { |val| "'#{val}'" }.join(" ")
+        "-array #{values}"
+      when String
+        "-string '#{value}'"
+      end
+    end
+  end
+end

data/lib/mac_setup/git_repo_installer.rb

@@ -10,8 +10,7 @@ module MacSetup
 
       MacSetup.log "Installing Git Repos..."
 
-      repos.each do |repo_and_path|
-        repo, install_path = repo_and_path.to_a.flatten
+      repos.each do |repo, install_path|
         new(repo, File.expand_path(install_path)).install_or_update
       end
     end
@@ -46,7 +45,7 @@ module MacSetup
       in_install_path do
         unless can_update?
           MacSetup.log "Can't update. Unstaged changes in #{install_path}"
-          MacSetup.log Shell.run("git status --porcelain")
+          MacSetup.log Shell.result("git status --porcelain")
           return
         end
 
@@ -61,21 +60,21 @@ module MacSetup
     end
 
     def can_update?
-      Shell.run("git status --porcelain").empty?
+      Shell.result("git status --porcelain").empty?
     end
 
     def track_install
       return unless tracking_key
 
       in_install_path do
-        status.git_changes(tracking_key, Shell.run("git ls-files").split("\n"))
+        status.git_changes(tracking_key, Shell.result("git ls-files").split("\n"))
       end
     end
 
     def track_update
       return unless tracking_key
 
-      status.git_changes(tracking_key, Shell.run("git diff --name-only origin").split("\n"))
+      status.git_changes(tracking_key, Shell.result("git diff --name-only origin").split("\n"))
     end
 
     def in_install_path

data/lib/mac_setup/plugins/asdf.rb

@@ -0,0 +1,41 @@
+module MacSetup
+  module Plugins
+    class Asdf < MacSetup::Plugin
+      TOOL_VERSIONS_FILE = Pathname.new("~/.tool-versions").expand_path
+
+      class << self
+        def add_requirements(config)
+          config.require_value(:asdf)
+          config.add(:brews, :asdf)
+        end
+
+        def run(config, _status)
+          install_missing_plugins(config)
+          install_missing_versions
+        end
+
+        private
+
+        def install_missing_plugins(config)
+          (config.asdf - installed_plugins).each do |plugin|
+            Shell.run("asdf", "plugin-add", plugin)
+          end
+        end
+
+        def install_missing_versions
+          tool_versions = TOOL_VERSIONS_FILE.read.split("\n")
+
+          tool_versions.each do |line|
+            plugin, version = line.split(" ")
+
+            Shell.run("asdf", "install", plugin, version)
+          end
+        end
+
+        def installed_plugins
+          @installed_plugins ||= Shell.result("asdf", "plugin-list").split("\n")
+        end
+      end
+    end
+  end
+end

data/lib/mac_setup/result.rb

@@ -0,0 +1,17 @@
+module MacSetup
+  class Result
+    def initialize(stdout, stderr, status)
+      @stdout = stdout
+      @stderr = stderr
+      @status = status
+    end
+
+    def success?
+      @status.success?
+    end
+
+    def output
+      [@stderr, @stdout].join("\n").strip
+    end
+  end
+end

data/lib/mac_setup/script_installer.rb

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

data/lib/mac_setup/shell.rb

@@ -1,11 +1,16 @@
 require "shellwords"
 require "io/console"
+require "open3"
 
 module MacSetup
   class Shell
     class << self
-      def run(command)
-        `#{sanitize_command(command)}`
+      def result(*command)
+        run(*command).output
+      end
+
+      def run(*command)
+        Result.new(*Open3.capture3(*command))
       end
 
       def raw(command)
@@ -23,7 +28,7 @@ module MacSetup
       end
 
       def success?(command)
-        system(sanitize_command(command))
+        run(command).success?
       end
 
       def command_present?(command)

data/lib/mac_setup/system_status.rb

@@ -4,6 +4,7 @@ module MacSetup
   class SystemStatus
     def initialize
       @git_changes = Hash.new { |hash, key| hash[key] = [] }
+      @defaults = Hash.new { |hash, key| hash[key] = {} }
     end
 
     def installed_taps
@@ -22,14 +23,24 @@ module MacSetup
       end
     end
 
+    def defaults_value(domain, key)
+      @defaults[domain][key] ||= read_defaults_value(domain, key)
+    end
+
     private
 
     def get_taps
-      Shell.run("brew tap").split("\n")
+      Shell.result("brew tap").split("\n")
     end
 
     def get_formulas
-      Shell.run("brew list -1").split("\n")
+      Shell.result("brew list -1").split("\n")
+    end
+
+    def read_defaults_value(domain, key)
+      result = Shell.run("defaults read #{domain} '#{key}'")
+
+      result.output if result.success?
     end
   end
 end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/mac_setup.rb

@@ -3,6 +3,7 @@ require "pathname"
 require "mac_setup/version"
 require "mac_setup/configuration"
 require "mac_setup/system_status"
+require "mac_setup/result"
 require "mac_setup/shell"
 require "mac_setup/homebrew_runner"
 require "mac_setup/secrets"
@@ -10,10 +11,13 @@ require "mac_setup/homebrew_installer"
 require "mac_setup/git_repo_installer"
 require "mac_setup/symlink_path_builder"
 require "mac_setup/symlink_installer"
+require "mac_setup/script_installer"
+require "mac_setup/defaults_installer"
 require "mac_setup/plugin"
 require "mac_setup/plugins/keybase"
 require "mac_setup/plugins/mac_app_store"
 require "mac_setup/plugins/dotfiles"
+require "mac_setup/plugins/asdf"
 
 module MacSetup
   DEFAULT_DOTFILES_PATH = File.expand_path("~/.dotfiles")
@@ -22,13 +26,16 @@ module MacSetup
   INSTALLERS = [
     GitRepoInstaller,
     SymlinkInstaller,
-    HomebrewRunner
+    HomebrewRunner,
+    ScriptInstaller,
+    DefaultsInstaller
   ]
 
   DEFAULT_PLUGINS = [
     Plugins::MacAppStore,
     Plugins::Keybase,
-    Plugins::Dotfiles
+    Plugins::Dotfiles,
+    Plugins::Asdf
   ]
 
   class << self
@@ -46,12 +53,15 @@ module MacSetup
 
       GitRepoInstaller.install_repo(config.dotfiles_repo, dotfiles_path)
 
+      Shell.raw("brew update")
+
       config = Configuration.new(DEFAULT_CONFIG_PATH)
       plugins(config).each { |plugin| plugin.add_requirements(config) }
       config.validate!
       status = SystemStatus.new
 
       INSTALLERS.each { |installer| installer.run(config, status) }
+      plugins(config).each { |plugin| plugin.run(config, status) }
     end
 
     def encrypt

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,13 +106,16 @@ files:
 - lib/mac_setup/brewfile_installer.rb
 - lib/mac_setup/command_line_tools_installer.rb
 - lib/mac_setup/configuration.rb
+- lib/mac_setup/defaults_installer.rb
 - lib/mac_setup/git_repo_installer.rb
 - lib/mac_setup/homebrew_installer.rb
 - lib/mac_setup/homebrew_runner.rb
 - lib/mac_setup/plugin.rb
+- lib/mac_setup/plugins/asdf.rb
 - lib/mac_setup/plugins/dotfiles.rb
 - lib/mac_setup/plugins/keybase.rb
 - lib/mac_setup/plugins/mac_app_store.rb
+- lib/mac_setup/result.rb
 - lib/mac_setup/script_installer.rb
 - lib/mac_setup/secrets.rb
 - lib/mac_setup/secrets_installer.rb