mac_setup 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57f9af7d99a2694983bf5d0b09a700eae37b249
-  data.tar.gz: 06f8d752ef6a7103c1b829d98a5d0e140dd44739
+  metadata.gz: 05b25fd9b18c84ceab8c35345f58607111782d0c
+  data.tar.gz: 3683dd0949e472f501f9624145ed97f695450f9b
 SHA512:
-  metadata.gz: d5ecd9dd676671ea407cd222aca03577a1fa11c670a62edd600619c77dd171020531d3632b4d1a4465ad6f989a53fc0ab9c67b66e3b50435cee9ed986813a204
-  data.tar.gz: 4110cb066e342f2b4f048b8d6609143cec308eb59789bc04231dc1602cc55a0466540280f87ae315f5d869b0d49652a3bb49ae8c6b3773fda9ad09d8562d14f5
+  metadata.gz: 81bd2abe212ca77282c59023e5d1505f6e803715da8791ee94caa9f1046690b7469d152c0a96ef4f2111d177f01cbd5044cd0b712e2f7f5f684a54cb772a48ba
+  data.tar.gz: a61fad4936463e8d1e737feb2069f11209733847af307e638e80c9f85169f9376b9d65a9aa3ada6503baa0e5e2a528e143840f80e6787692b0b69d47520dbcfc

data/exe/mac_setup

@@ -2,22 +2,21 @@
 
 require "mac_setup"
 
-DEFAULT_CONFIG_PATH = "~/.dotfiles/mac_setup/config.yml"
-
 command = ARGV.shift
 options = ARGV.select { |arg| arg.start_with?("--") }
+config_path = (ARGV - options).first || File.expand_path(DEFAULT_CONFIG_PATH)
 
 case command
 when "bootstrap"
-  MacSetup.bootstrap(ARGV[0])
+  MacSetup.bootstrap(ARGV.take(2))
 when "install"
-  config_path = (ARGV - options)[0] || File.expand_path(DEFAULT_CONFIG_PATH)
+  # config_path = (ARGV - options)[0] || File.expand_path(DEFAULT_CONFIG_PATH)
 
-  if File.exist?(config_path)
-    MacSetup.install(config_path, options)
-  else
-    puts "You must specify a path to config file or create one at #{DEFAULT_CONFIG_PATH}"
-  end
+  # if File.exist?(config_path)
+    MacSetup.install # (config_path, options)
+  # else
+  #   puts "You must specify a path to config file or create one at #{DEFAULT_CONFIG_PATH}"
+  # end
 when "encrypt"
   MacSetup.encrypt
 else

data/lib/mac_setup/configuration.rb

@@ -1,36 +1,106 @@
 require "yaml"
+require "set"
 
 module MacSetup
   class Configuration
-    attr_reader :config
+    InvalidConfigError = Class.new(StandardError)
+    DEFAULT_KEYS = [:plugins, :git_repos, :symlinks, :brews, :fonts, :casks, :quicklook, :mas]
 
     def initialize(config_path)
       @config_path = config_path
       load_config
     end
 
-    def reload!
-      load_config
+    def require_value(key)
+      value = @config.fetch(key.to_s) do
+        raise InvalidConfigError, "Missing config value for #{key}!"
+      end
+
+      define_singleton_method(key) { value }
+      allowed_keys << key.to_sym
     end
 
-    def dotfiles_repo
-      @config.fetch("repo")
+    def add(type, value)
+      add_method = "add_#{type}"
+
+      if respond_to?(add_method, include_private: true)
+        send(add_method, value)
+      else
+        collection = public_send(type)
+
+        case collection
+        when Set
+          collection << value.to_s
+        when Hash
+          collection.merge(value) do |key, oldval, newval|
+            raise InvalidConfigError, "#{key} is defined twice!: #{oldval}, #{newval}"
+          end
+        end
+      end
     end
 
-    def services
-      (@config["services"] || []).uniq
+    def plugins
+      @plugins ||= Set.new(@config["plugins"])
+    end
+
+    def validate!
+      extra_keys = @config.keys.map(&:to_i) - allowed_keys
+
+      return if extra_keys.none?
+
+      raise InvalidConfigError, "Extra keys in config: #{extra_keys.join(", ")}"
+    end
+
+    def dotfiles_repo
+      @config.fetch("repo")
     end
 
     def git_repos
-      (@config["git_repos"] || []).uniq
+      @git_repos ||= @config["git_repos"] || {}
     end
 
     def symlinks
-      (@config["symlinks"] || []).uniq
+      @symlinks ||= @config["symlinks"] || {}
+    end
+
+    def brews
+      @brews ||= (@config["brews"] || []).reduce({}) do |merged, item|
+        add_brews(item, merged)
+      end
+    end
+
+    def fonts
+      @fonts ||= Set.new(@config["fonts"])
+    end
+
+    def casks
+      @casks ||= Set.new(@config["casks"])
+    end
+
+    def quicklook
+      @quicklook ||= Set.new(@config["quicklook"])
+    end
+
+    def mas
+      @mas ||= @config["mas"] || {}
     end
 
     private
 
+    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}"
+      end
+    end
+
+    def brew_value(item)
+      item.is_a?(Hash) ? item : { item.to_s => {} }
+    end
+
+    def allowed_keys
+      @allowed_keys ||= Set.new(DEFAULT_KEYS)
+    end
+
     def load_config
       @config = YAML.load_file(@config_path)
     end

data/lib/mac_setup/git_repo_installer.rb

@@ -16,8 +16,8 @@ module MacSetup
       end
     end
 
-    def self.install_repo(repo, install_path, tracking_key: nil, status: nil)
-      new(repo, install_path, tracking_key: tracking_key, status: status).install_or_update
+    def self.install_repo(repo, install_path, track: nil, status: nil)
+      new(repo, install_path, tracking_key: track, status: status).install_or_update
     end
 
     def initialize(repo, install_path, tracking_key: nil, status: nil)
@@ -44,7 +44,7 @@ module MacSetup
 
     def update
       unless can_update?
-        puts "\nCan't update. Unstaged changes in #{install_path}"
+        MacSetup.log "Can't update. Unstaged changes in #{install_path}"
         return
       end
 

data/lib/mac_setup/homebrew_installer.rb

@@ -5,19 +5,13 @@ module MacSetup
     BREW_INSTALL_URL = "https://raw.githubusercontent.com/Homebrew/install/master/install"
 
     def self.run
-      if homebrew_missing?
+      if Shell.command_present?("brew")
+        MacSetup.log "Homebrew already installed. Skipping..."
+      else
         MacSetup.log "Installing Homebrew" do
           Shell.run(%{/usr/bin/ruby -e "$(curl -fsSL #{BREW_INSTALL_URL})"})
         end
-      else
-        MacSetup.log "Homebrew already installed. Updating" do
-          Shell.run("brew update")
-        end
       end
     end
-
-    def self.homebrew_missing?
-      Shell.run("which brew").empty?
-    end
   end
 end

data/lib/mac_setup/homebrew_runner.rb

@@ -0,0 +1,40 @@
+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"))
+    end
+
+    def self.install_cask(cask)
+      Shell.run("brew cask install #{cask}")
+    end
+
+    def self.build_brewfile(config)
+      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}"
+      end
+
+      (brews + casks).join("\n")
+    end
+
+    def self.print_args(opts)
+      args = opts["args"]
+
+      return unless args
+
+      args_str = args.sort.map { |arg| %("#{arg}") }.join(", ")
+      "args: [#{args_str}]"
+    end
+  end
+end

data/lib/mac_setup/plugin.rb

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

data/lib/mac_setup/plugins/keybase.rb

@@ -0,0 +1,32 @@
+module MacSetup
+  module Plugins
+    class Keybase < MacSetup::Plugin
+      def self.bootstrap(config)
+        add_requirements(config)
+        install
+        login(config.keybase)
+        install_volume
+      end
+
+      def self.add_requirements(config)
+        config.require_value(:keybase)
+        config.add(:casks, :keybase)
+      end
+
+      private
+
+      def self.install
+        HomebrewRunner.install_cask(:keybase)
+      end
+
+      def self.login(username)
+        Shell.run("keybase login #{username}")
+      end
+
+      # TODO: Investigate making this work with kext permissions
+      def self.install_volume
+        Shell.run("keybase install --components=helper,fuse,mountdir,kbfs")
+      end
+    end
+  end
+end

data/lib/mac_setup/plugins/mac_app_store.rb

@@ -0,0 +1,75 @@
+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
+
+      def run
+        set_up_mas
+        install_brewfile
+      end
+
+      private
+
+      def set_up_mas
+        return unless brewfile.read =~ /^mas /
+
+        install_mas
+        sign_in_to_mas
+      end
+
+      def install_mas
+        MacSetup.log "Installing mas" do
+          Shell.run("brew install mas")
+        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}")
+        end
+      end
+
+      def mas_signed_in?
+        Shell.success?("mas account")
+      end
+
+      def install_brewfile
+        MacSetup.log "Installing Brewfile" do
+          Shell.run("brew bundle --global")
+        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/shell.rb

@@ -3,29 +3,35 @@ require "io/console"
 
 module MacSetup
   class Shell
-    def self.run(command)
-      `#{sanitize_command(command)}`
-    end
+    class << self
+      def run(command)
+        `#{sanitize_command(command)}`
+      end
 
-    def self.ask(question)
-      puts question
-      gets.strip
-    end
+      def ask(question)
+        puts question
+        gets.strip
+      end
 
-    def self.password
-      puts "Enter Password"
-      STDIN.noecho(&:gets).strip
-    end
+      def password
+        puts "Enter Password"
+        STDIN.noecho(&:gets).strip
+      end
 
-    def self.success?(command)
-      system(sanitize_command(command))
-    end
+      def success?(command)
+        system(sanitize_command(command))
+      end
+
+      def command_present?(command)
+        success?("command -v #{command} >/dev/null 2>&1")
+      end
 
-    def self.sanitize_command(command)
-      if command.respond_to?(:each)
-        Shellwords.join(command)
-      else
-        command
+      def sanitize_command(command)
+        if command.respond_to?(:each)
+          Shellwords.join(command)
+        else
+          command
+        end
       end
     end
   end

data/lib/mac_setup/version.rb

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

data/lib/mac_setup.rb

@@ -1,58 +1,82 @@
+require "pathname"
+
 require "mac_setup/version"
 require "mac_setup/configuration"
 require "mac_setup/system_status"
+require "mac_setup/shell"
+require "mac_setup/homebrew_runner"
 require "mac_setup/secrets"
-require "mac_setup/command_line_tools_installer"
 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"
-require "mac_setup/secrets_installer"
+require "mac_setup/plugin"
+require "mac_setup/plugins/keybase"
+require "mac_setup/plugins/mac_app_store"
 
 module MacSetup
-  DOTFILES_PATH = File.expand_path("~/.dotfiles")
+  DEFAULT_DOTFILES_PATH = File.expand_path("~/.dotfiles")
+  DEFAULT_CONFIG_PATH = File.join(DEFAULT_DOTFILES_PATH, "mac_setup/config.yml")
 
   INSTALLERS = [
     GitRepoInstaller,
-    SecretsInstaller,
     SymlinkInstaller,
-    BrewfileInstaller,
-    ServicesInstaller,
-    ScriptInstaller
+    HomebrewRunner
   ]
 
-  def self.install(config_path, _options)
-    config = Configuration.new(File.expand_path(config_path))
-    status = SystemStatus.new
+  DEFAULT_PLUGINS = [
+    Plugins::MacAppStore,
+    Plugins::Keybase
+  ]
 
-    GitRepoInstaller.install_repo(config.dotfiles_repo, DOTFILES_PATH, status: status, track: :dotfiles)
-    config.reload!
-    INSTALLERS.each { |installer| installer.run(config, status) }
-  end
+  class << self
+    def bootstrap(dotfiles_repo)
+      GitRepoInstaller.install_repo(dotfiles_repo, dotfiles_path)
+      HomebrewInstaller.run
 
-  def self.bootstrap(dotfiles_repo)
-    CommandLineToolsInstaller.run
-    GitRepoInstaller.install_repo(dotfiles_repo, DOTFILES_PATH)
-    HomebrewInstaller.run
-  end
+      config = Configuration.new(DEFAULT_CONFIG_PATH)
 
-  def self.encrypt
-    Secrets.encrypt(DOTFILES_PATH)
-  end
+      plugins(config).each { |plugin| plugin.bootstrap(config) }
+    end
 
-  def self.shorten_path(path)
-    path.sub(/#{ENV['HOME']}/, "~")
-  end
+    def install # (config_path, _options)
+      config = Configuration.new(DEFAULT_CONFIG_PATH)
+
+      GitRepoInstaller.install_repo(config.dotfiles_repo, dotfiles_path)
+
+      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) }
+    end
+
+    def encrypt
+      Secrets.encrypt(dotfiles_path)
+    end
+
+    def shorten_path(path)
+      path.sub(/#{ENV['HOME']}/, "~")
+    end
+
+    def log(message)
+      if block_given?
+        print "#{message}..."
+        yield
+        puts "Ok."
+      else
+        puts message
+      end
+    end
+
+    def dotfiles_path
+      DEFAULT_DOTFILES_PATH
+    end
+
+    # private
 
-  def self.log(message)
-    if block_given?
-      print "#{message}..."
-      yield
-      puts "Ok."
-    else
-      puts message
+    def plugins(config)
+      DEFAULT_PLUGINS + config.plugins.map { |plugin_name| Plugin.load(plugin_name) }
+      # @plugins ||= (DEFAULT_PLUGINS + config.plugins).map { |plugin_name| Plugin.load(plugin) }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2018-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,10 @@ files:
 - lib/mac_setup/configuration.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/keybase.rb
+- lib/mac_setup/plugins/mac_app_store.rb
 - lib/mac_setup/script_installer.rb
 - lib/mac_setup/secrets.rb
 - lib/mac_setup/secrets_installer.rb