mac_setup 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05b25fd9b18c84ceab8c35345f58607111782d0c
-  data.tar.gz: 3683dd0949e472f501f9624145ed97f695450f9b
+  metadata.gz: 9c4e9c261b3d1a91265e2aedd53b1a45d6e91340
+  data.tar.gz: de0dc8873cf819ea49ebfe1573fb53807b7e177c
 SHA512:
-  metadata.gz: 81bd2abe212ca77282c59023e5d1505f6e803715da8791ee94caa9f1046690b7469d152c0a96ef4f2111d177f01cbd5044cd0b712e2f7f5f684a54cb772a48ba
-  data.tar.gz: a61fad4936463e8d1e737feb2069f11209733847af307e638e80c9f85169f9376b9d65a9aa3ada6503baa0e5e2a528e143840f80e6787692b0b69d47520dbcfc
+  metadata.gz: 7392b6f59c7398bd6efabf67cf1c497fd92ce404ccc031e2f98697d61e1dd775313d4e077f8392431557551add773a4704f5ab216bc2c4c2370b06edbea3c3e2
+  data.tar.gz: 10051992c38e779f7924750d6e846a8c5012a27f2c93b6afbcad79432fa2524549837af094b7c583ac0243243e1035d4e883d35d62a65d0226a10ca940bee671

data/exe/mac_setup

@@ -3,8 +3,8 @@
 require "mac_setup"
 
 command = ARGV.shift
-options = ARGV.select { |arg| arg.start_with?("--") }
-config_path = (ARGV - options).first || File.expand_path(DEFAULT_CONFIG_PATH)
+# options = ARGV.select { |arg| arg.start_with?("--") }
+# config_path = (ARGV - options).first || File.expand_path(DEFAULT_CONFIG_PATH)
 
 case command
 when "bootstrap"

data/lib/mac_setup/configuration.rb

@@ -4,7 +4,7 @@ require "set"
 module MacSetup
   class Configuration
     InvalidConfigError = Class.new(StandardError)
-    DEFAULT_KEYS = [:plugins, :git_repos, :symlinks, :brews, :fonts, :casks, :quicklook, :mas]
+    DEFAULT_KEYS = [:repo, :plugins, :git_repos, :symlinks, :brews, :fonts, :casks, :quicklook, :mas]
 
     def initialize(config_path)
       @config_path = config_path
@@ -32,7 +32,7 @@ module MacSetup
         when Set
           collection << value.to_s
         when Hash
-          collection.merge(value) do |key, oldval, newval|
+          collection.merge!(value) do |key, oldval, newval|
             raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
           end
         end
@@ -44,11 +44,11 @@ module MacSetup
     end
 
     def validate!
-      extra_keys = @config.keys.map(&:to_i) - allowed_keys
+      extra_keys = @config.keys.map(&:to_sym) - allowed_keys.to_a
 
       return if extra_keys.none?
 
-      raise InvalidConfigError, "Extra keys in config: #{extra_keys.join(", ")}"
+      raise InvalidConfigError, "Extra keys in config: #{extra_keys.join(', ')}"
     end
 
     def dotfiles_repo
@@ -64,7 +64,7 @@ module MacSetup
     end
 
     def brews
-      @brews ||= (@config["brews"] || []).reduce({}) do |merged, item|
+      @brews ||= (@config["brews"] || []).each_with_object({}) do |item, merged|
         add_brews(item, merged)
       end
     end
@@ -88,7 +88,7 @@ module MacSetup
     private
 
     def add_brews(item, existing_brews = brews)
-      existing_brews.merge(brew_value(item)) do |key, oldval, newval|
+      existing_brews.merge!(brew_value(item)) do |key, oldval, newval|
         raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
       end
     end

data/lib/mac_setup/homebrew_runner.rb

@@ -12,6 +12,10 @@ module MacSetup
       Shell.run(cmd.join("\n"))
     end
 
+    def self.install_brew(formula)
+      Shell.run("brew install #{formula}")
+    end
+
     def self.install_cask(cask)
       Shell.run("brew cask install #{cask}")
     end

data/lib/mac_setup/plugin.rb

@@ -1,17 +1,20 @@
 module MacSetup
   class Plugin
-    def self.add_requirements(_config)
-    end
-
-    def self.run(_config, _status)
-    end
+    class << self
+      def add_requirements(_config)
+      end
 
-    def self.load(plugin_name)
+      def run(_config, _status)
+      end
 
-    end
+      def load(_plugin_name)
+      end
 
-    def self.bootstrap
+      def get_status(_status)
+      end
 
+      def bootstrap
+      end
     end
   end
 end

data/lib/mac_setup/plugins/dotfiles.rb

@@ -0,0 +1,13 @@
+module MacSetup
+  module Plugins
+    class Dotfiles < MacSetup::Plugin
+      class << self
+        def add_requirements(config)
+          SymlinkPathBuilder.paths_for(MacSetup.dotfiles_path) do |source, target|
+            config.add(:symlinks, source => target)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mac_setup/plugins/keybase.rb

@@ -1,31 +1,44 @@
 module MacSetup
   module Plugins
     class Keybase < MacSetup::Plugin
-      def self.bootstrap(config)
-        add_requirements(config)
-        install
-        login(config.keybase)
-        install_volume
-      end
+      class << self
+        def bootstrap(config)
+          add_requirements(config)
+          install
+          log_in(config.keybase)
+          install_volume
+        end
 
-      def self.add_requirements(config)
-        config.require_value(:keybase)
-        config.add(:casks, :keybase)
-      end
+        def add_requirements(config)
+          config.require_value(:keybase)
+          config.add(:casks, :keybase)
+          add_private_dotfiles(config)
+        end
 
-      private
+        private
 
-      def self.install
-        HomebrewRunner.install_cask(:keybase)
-      end
+        def install
+          HomebrewRunner.install_cask(:keybase)
+        end
 
-      def self.login(username)
-        Shell.run("keybase login #{username}")
-      end
+        def log_in(username)
+          Shell.run("keybase login #{username}")
+        end
+
+        # TODO: Investigate making this work with kext permissions
+        def install_volume
+          Shell.run("keybase install --components=helper,fuse,mountdir,kbfs")
+        end
+
+        def add_private_dotfiles(config)
+          dotfiles_dir = Pathname.new("/keybase/private/#{config.keybase}/dotfiles")
+
+          return unless dotfiles_dir.exist?
 
-      # TODO: Investigate making this work with kext permissions
-      def self.install_volume
-        Shell.run("keybase install --components=helper,fuse,mountdir,kbfs")
+          SymlinkPathBuilder.paths_for(dotfiles_dir) do |source, target|
+            config.add(:symlinks, source => target)
+          end
+        end
       end
     end
   end

data/lib/mac_setup/plugins/mac_app_store.rb

@@ -1,75 +1,46 @@
 module MacSetup
   module Plugins
     class MacAppStore < MacSetup::Plugin
-      attr_reader :config, :status
-
-      def self.add_requirements(config)
-        config.add(:brews, :mas)
-      end
-
-      def self.get_status(status)
-
-      end
-
-      def self.run(config, status)
-        new(config, status).run
-      end
-
-      def initialize(config, status)
-        @config = config
-        @status = status
-      end
+      class << self
+        def bootstrap(config)
+          add_requirements(config)
+          install
+          log_in
+        end
 
-      def run
-        set_up_mas
-        install_brewfile
-      end
+        def add_requirements(config)
+          config.add(:brews, :mas)
+        end
 
-      private
+        def run(config, _status)
+          log_in
 
-      def set_up_mas
-        return unless brewfile.read =~ /^mas /
+          config.mas.each do |_name, id|
+            Shell.run("mas install #{id}")
+          end
+        end
 
-        install_mas
-        sign_in_to_mas
-      end
+        private
 
-      def install_mas
-        MacSetup.log "Installing mas" do
-          Shell.run("brew install mas")
+        def install
+          MacSetup.log "Installing mas" do
+            HomebrewRunner.install_brew(:mas)
+          end
         end
-      end
 
-      def sign_in_to_mas
-        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}")
+        def log_in
+          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 #{apple_id}")
+          end
         end
-      end
-
-      def mas_signed_in?
-        Shell.success?("mas account")
-      end
 
-      def install_brewfile
-        MacSetup.log "Installing Brewfile" do
-          Shell.run("brew bundle --global")
+        def mas_signed_in?
+          Shell.success?("mas account")
         end
       end
-
-      def mas_installed?
-        Shell.command_present?("mas")
-      end
-
-      def bundle_already_tapped?
-        status.installed_taps.include?(BUNDLE_TAP)
-      end
-
-      def brewfile
-        @brewfile ||= Pathname.new("~/.Brewfile").expand_path
-      end
     end
   end
 end

data/lib/mac_setup/symlink_installer.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module MacSetup
   class Symlink
     def initialize(options)
@@ -91,33 +93,45 @@ module MacSetup
 
   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
+      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)
+
+        unless source.exist?
+          MacSetup.log "#{short_source_path} doesn't exist. Skipping."
+          next
+        end
 
-    def self.dotfiles
-      Dir.entries(DOTFILES_PATH).reject { |entry| entry.start_with?(".") }
+        target = Pathname.new(target_path)
+        short_target_path = target.to_s
+        source = source.expand_path
+        target = target.expand_path
+        # MacSetup.shorten_path(target_path)
+
+        MacSetup.log "Linking #{short_sorce_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)
+        elsif target.to_s.end_with?("/")
+          target.mkpath
+          full_target = target.join(source.basename)
+          File.symlink(source, full_target)
+        else
+          target.dirname.mkpath
+          File.symlink(source, target)
+        end
+      end
     end
   end
 end

data/lib/mac_setup/symlink_path_builder.rb

@@ -0,0 +1,33 @@
+module MacSetup
+  class SymlinkPathBuilder
+    HOME = ENV.fetch("HOME").freeze
+
+    class << self
+      def paths_for(root_dir)
+        root = Pathname.new(root_dir)
+
+        each_child(root) do |child|
+          yield [relative_path(child, HOME), relative_path(child, root, "~/.")]
+        end
+      end
+
+      private
+
+      def each_child(dir, &block)
+        dir.children.each do |child|
+          next if child.basename.to_s.start_with?(".")
+
+          if child.directory?
+            each_child(child, &block)
+          else
+            block.call(child)
+          end
+        end
+      end
+
+      def relative_path(path, base, replacement = "~/")
+        path.to_s.sub(%r{^#{base}\/}, replacement)
+      end
+    end
+  end
+end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/mac_setup.rb

@@ -8,9 +8,11 @@ require "mac_setup/homebrew_runner"
 require "mac_setup/secrets"
 require "mac_setup/homebrew_installer"
 require "mac_setup/git_repo_installer"
+require "mac_setup/symlink_installer"
 require "mac_setup/plugin"
 require "mac_setup/plugins/keybase"
 require "mac_setup/plugins/mac_app_store"
+require "mac_setup/plugins/dotfiles"
 
 module MacSetup
   DEFAULT_DOTFILES_PATH = File.expand_path("~/.dotfiles")
@@ -24,7 +26,8 @@ module MacSetup
 
   DEFAULT_PLUGINS = [
     Plugins::MacAppStore,
-    Plugins::Keybase
+    Plugins::Keybase,
+    Plugins::Dotfiles
   ]
 
   class << self
@@ -55,7 +58,7 @@ module MacSetup
     end
 
     def shorten_path(path)
-      path.sub(/#{ENV['HOME']}/, "~")
+      path.to_s.sub(/#{ENV['HOME']}/, "~")
     end
 
     def log(message)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-07 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/homebrew_runner.rb
 - lib/mac_setup/plugin.rb
+- lib/mac_setup/plugins/dotfiles.rb
 - lib/mac_setup/plugins/keybase.rb
 - lib/mac_setup/plugins/mac_app_store.rb
 - lib/mac_setup/script_installer.rb
@@ -118,6 +119,7 @@ files:
 - lib/mac_setup/services_installer.rb
 - lib/mac_setup/shell.rb
 - lib/mac_setup/symlink_installer.rb
+- lib/mac_setup/symlink_path_builder.rb
 - lib/mac_setup/system_status.rb
 - lib/mac_setup/version.rb
 - mac_setup.gemspec