mac_setup 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958d74da43b6b9b23c98203dfce55023ae821ead
-  data.tar.gz: f593796bcc578be1cc5db12693e9e0a9ef3f9955
+  metadata.gz: 85c82751d2edcd5b3f2c05031c7471d47950e176
+  data.tar.gz: 913750c0d4590db473ee9e37992e57f1ee1b5766
 SHA512:
-  metadata.gz: adf67dfc0fab520beeec3e627f922f4e8b356fd137847e69d2152bcab9de337fece85057ab21e3b7e3b6248de4228c85d4081465c2cff696aa01c227f44bba52
-  data.tar.gz: 03b4895bfe6074bf8aa1ca9cfa3d239e53419e26be06c90fcb22a975a9d2e12ba3e611af5dd16d09e4870c10f273e10f2d5bcb445d199cc83913e6b058d8725b
+  metadata.gz: 0bcb6cfa1933a948ba1e764ff6d50e3e45ec93d5ad12a84142725c3aa45b56497b35712c82aa08f22fa3202fc104b8ed9755c54eb24589acd29418f5e8b624dd
+  data.tar.gz: d871cb41042b844deccc7508c2e8d4d2b9db19bac52ecfc420c43f045850d3b43bb4adc2a9ca9d6f7899e98ce678703e98860d59c45945070c09f896b95f2702

data/lib/mac_setup/configuration.rb

@@ -4,7 +4,7 @@ require "set"
 module MacSetup
   class Configuration
     InvalidConfigError = Class.new(StandardError)
-    DEFAULT_KEYS = [:repo, :plugins, :git_repos, :symlinks, :brews, :fonts, :casks, :quicklook, :mas]
+    DEFAULT_KEYS = [:repo, :plugins, :git_repos, :symlinks, :taps, :brews, :fonts, :casks, :quicklook, :mas]
 
     def initialize(config_path)
       @config_path = config_path
@@ -63,6 +63,10 @@ module MacSetup
       @symlinks ||= @config["symlinks"] || {}
     end
 
+    def taps
+      @taps ||= (@config["taps"] || []).map { |item| item.split(/\s+/) }.to_set
+    end
+
     def brews
       @brews ||= (@config["brews"] || []).each_with_object({}) do |item, merged|
         add_brews(item, merged)

data/lib/mac_setup/git_repo_installer.rb

@@ -38,17 +38,20 @@ module MacSetup
     private
 
     def install
-      clone_repo
-      track_install
+      in_install_path do
+        clone_repo
+        track_install
+      end
     end
 
     def update
-      unless can_update?
-        MacSetup.log "Can't update. Unstaged changes in #{install_path}"
-        return
-      end
-
       in_install_path do
+        unless can_update?
+          MacSetup.log "Can't update. Unstaged changes in #{install_path}"
+          MacSetup.log Shell.run("git status --porcelain")
+          return
+        end
+
         Shell.run("git fetch")
         track_update
         Shell.run("git merge origin && git submodule update --init --recursive")
@@ -66,9 +69,7 @@ module MacSetup
     def track_install
       return unless tracking_key
 
-      in_install_path do
-        status.git_changes(tracking_key, Shell.run("git ls-files").split("\n"))
-      end
+      status.git_changes(tracking_key, Shell.run("git ls-files").split("\n"))
     end
 
     def track_update

data/lib/mac_setup/homebrew_installer.rb

@@ -9,7 +9,7 @@ module MacSetup
         MacSetup.log "Homebrew already installed. Skipping..."
       else
         MacSetup.log "Installing Homebrew" do
-          Shell.run(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
+          Shell.raw(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
         end
       end
     end

data/lib/mac_setup/homebrew_runner.rb

@@ -1,15 +1,17 @@
+require "tempfile"
+
 module MacSetup
   class HomebrewRunner
     def self.run(config, _status)
-      brewfile = build_brewfile(config)
-
-      cmd = [
-        "echo << EOF | brew bundle install --file=-",
-        brewfile,
-        "EOF"
-      ]
-
-      Shell.run(cmd.join("\n"))
+      MacSetup.log("Installing Homebrew brews and casks") do
+        Tempfile.create("Brewfile") do |brewfile|
+          write_brewfile(config, brewfile)
+          File.chmod(0644, brewfile)
+          brewfile.rewind
+
+          Shell.raw("brew bundle install --file=#{brewfile.path}")
+        end
+      end
     end
 
     def self.install_brew(formula)
@@ -20,16 +22,18 @@ module MacSetup
       Shell.run("brew cask install #{cask}")
     end
 
-    def self.build_brewfile(config)
+    def self.write_brewfile(config, brewfile)
+      taps = config.taps.map { |parts| %(tap #{quote_args(parts)}) }
+
       brews = config.brews.map do |name, opts|
         [%(brew "#{name}"), print_args(opts)].compact.join(", ")
       end
 
       casks = (config.fonts + config.casks + config.quicklook).map do |name|
-        "cask #{name}"
+        %(cask "#{name}")
       end
 
-      (brews + casks).join("\n")
+      brewfile.write((taps + brews + casks).join("\n"))
     end
 
     def self.print_args(opts)
@@ -37,8 +41,11 @@ module MacSetup
 
       return unless args
 
-      args_str = args.sort.map { |arg| %("#{arg}") }.join(", ")
-      "args: [#{args_str}]"
+      "args: [#{quote_args(args.sort)}]"
+    end
+
+    def self.quote_args(args)
+      args.map { |arg| %("#{arg}") }.join(", ")
     end
   end
 end

data/lib/mac_setup/plugins/keybase.rb

@@ -29,14 +29,15 @@ module MacSetup
         # TODO: Investigate making this work with kext permissions
         def install_volume
           Shell.run("keybase install --components=fuse")
-          Shell.ask("Allow the extension in system preferences")
+          Shell.ask("Allow the extension in system preferences and then hit Return")
           Shell.run("keybase install --components=helper,fuse,mountdir,kbfs")
         end
 
         def add_private_dotfiles(config)
-          dotfiles_dir = Pathname.new("/keybase/private/#{config.keybase}/dotfiles")
+          keybase_dir = Dir.entries("/Volumes").find { |dir| dir.start_with?("Keybase") }
+          dotfiles_dir = "/Volumes/#{keybase_dir}/private/#{config.keybase}/dotfiles"
 
-          return unless dotfiles_dir.exist?
+          return unless Dir.exist?(dotfiles_dir)
 
           SymlinkPathBuilder.paths_for(dotfiles_dir) do |source, target|
             config.add(:symlinks, source => target)

data/lib/mac_setup/symlink_installer.rb

@@ -11,9 +11,9 @@ module MacSetup
     def link
       return if Secrets.encrypted?(source_path)
 
-      short_sorce_path = MacSetup.shorten_path(source_path)
+      short_source_path = MacSetup.shorten_path(source_path)
       short_target_path = MacSetup.shorten_path(target_path)
-      MacSetup.log "Linking #{short_sorce_path} to #{short_target_path}..."
+      MacSetup.log "Linking #{short_source_path} to #{short_target_path}..."
 
       return unless source_exists
 
@@ -25,8 +25,8 @@ module MacSetup
     def source_exists
       File.exist?(source_path).tap do |exists|
         unless exists
-          short_sorce_path = MacSetup.shorten_path(source_path)
-          MacSetup.log "WARNING: Source doesn’t exist at #{short_sorce_path}. Skipping."
+          short_source_path = MacSetup.shorten_path(source_path)
+          MacSetup.log "WARNING: Source doesn’t exist at #{short_source_path}. Skipping."
         end
       end
     end
@@ -100,38 +100,54 @@ module MacSetup
       config.symlinks.each do |source_path, target_path|
         # source = Symlink.new(source_path: File.expand_path(source_path))
         # source.link
-        source = Pathname.new(source_path)
-        short_source_path = source.to_s
-        # MacSetup.shorten_path(source_path)
+        source = Pathname.new(source_path).expand_path
+        short_source_path = MacSetup.shorten_path(source.to_s)
 
         unless source.exist?
           MacSetup.log "#{short_source_path} doesn't exist. Skipping."
           next
         end
 
-        target = Pathname.new(target_path)
-        short_target_path = target.to_s
-        source = source.expand_path
-        target = target.expand_path
-        # MacSetup.shorten_path(target_path)
+        target = Pathname.new(target_path).expand_path
+        short_target_path = MacSetup.shorten_path(target.to_s)
 
-        MacSetup.log "Linking #{short_sorce_path} to #{short_target_path}..."
+        MacSetup.log "Linking #{short_source_path} to #{short_target_path}..."
 
         home = Pathname.new(ENV.fetch("HOME"))
 
         if target.directory?
           filename = target == home ? ".#{source.basename}" : source.basename
           full_target = target.join(filename)
-          File.symlink(source, full_target)
+          link(source, full_target)
         elsif target.to_s.end_with?("/")
           target.mkpath
           full_target = target.join(source.basename)
-          File.symlink(source, full_target)
+          link(source, full_target)
         else
           target.dirname.mkpath
-          File.symlink(source, target)
+          link(source, target)
         end
       end
     end
+
+    def self.link(source, target)
+      if File.exist?(target)
+        if File.symlink?(target)
+          existing_link = File.readlink(target)
+
+          if existing_link == source.to_s
+            MacSetup.log "Already linked. Skipping."
+          else
+            print "Replacing existing symlink at #{MacSetup.shorten_path(target)}. "
+            puts "Originally linked to #{MacSetup.shorten_path(existing_link)}..."
+            FileUtils.ln_sf(source, target)
+          end
+        else
+          MacSetup.log "WARNING: File already exists at #{MacSetup.shorten_path(target)}. Skipping."
+        end
+      else
+        FileUtils.ln_s(source, target)
+      end
+    end
   end
 end

data/lib/mac_setup/symlink_path_builder.rb

@@ -26,7 +26,7 @@ module MacSetup
       end
 
       def relative_path(path, base, replacement = "~/")
-        path.to_s.sub(%r{^#{base}\/}, replacement)
+        path.to_s.sub(%r{^#{Regexp.escape(base.to_s)}\/}, replacement)
       end
     end
   end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler