mac_setup 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97c8ad74f9d53a077daee438677c55e3f679670
-  data.tar.gz: bce55a00df2b902d8ef0fbac7d0365a06dc2de20
+  metadata.gz: b172f86ac79a714d13f90f469e577965906888b4
+  data.tar.gz: e72880131a84e71201d210310b53cf0086394705
 SHA512:
-  metadata.gz: 27908ef58581729323760b78083afa07290522f09f1cb18cb854a0db379cc15013a12f15b313bcd6beab23c2aeeeb768a5cfc430b7a8deb611fc767ffc9b46e3
-  data.tar.gz: f186c539d81e369e13752a654ce458fbc514097ec5f9010e53f4106b80f560372a8da6d98c6afb0f244134df99271b81e53492906fa6b57c22098dca36d76bd4
+  metadata.gz: 43c95d83b9c2e70f3e00ad528826cc606b3a782565852d8a163f8b0b0cee57f6bbf2156e61b0bfa5f23342217d7a03446e6f68de138d9d95154d8dad082cc514
+  data.tar.gz: f3cc4fffb8d1b2afe98fdc165fd42789d81f1544543c830e749412f28575ce59e57feabfa7d94ca54014aead0ca0a8321c8dc726243606ba81ba1fdb96744f10

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p648
+system

data/lib/mac_setup.rb

@@ -51,8 +51,6 @@ module MacSetup
     def install # (config_path, _options)
       config = Configuration.new(DEFAULT_CONFIG_PATH)
 
-      GitRepoInstaller.install_repo(config.dotfiles_repo, dotfiles_path)
-
       Shell.raw("brew update")
 
       config = Configuration.new(DEFAULT_CONFIG_PATH)

data/lib/mac_setup/configuration.rb

@@ -4,7 +4,9 @@ require "set"
 module MacSetup
   class Configuration
     InvalidConfigError = Class.new(StandardError)
-    DEFAULT_KEYS = [:repo, :plugins, :git_repos, :symlinks, :taps, :brews, :fonts, :casks, :quicklook, :mas]
+    DEFAULT_KEYS = [
+      :repo, :plugins, :git_repos, :symlinks, :taps, :brews, :fonts, :casks, :quicklook, :mas, :extra_dotfiles
+    ]
 
     def initialize(config_path)
       @config_path = config_path
@@ -55,6 +57,10 @@ module MacSetup
       @config.fetch("repo")
     end
 
+    def extra_dotfiles
+      @config.fetch("extra_dotfiles", [])
+    end
+
     def git_repos
       @git_repos ||= @config["git_repos"] || {}
     end

data/lib/mac_setup/plugins/dotfiles.rb

@@ -3,8 +3,19 @@ module MacSetup
     class Dotfiles < MacSetup::Plugin
       class << self
         def add_requirements(config)
-          SymlinkPathBuilder.paths_for(MacSetup.dotfiles_path) do |source, target|
-            config.add(:symlinks, source => target)
+          GitRepoInstaller.install_repo(config.dotfiles_repo, MacSetup.dotfiles_path)
+          paths = [MacSetup.dotfiles_path]
+
+          config.extra_dotfiles.each do |repo|
+            path = File.expand_path("~/.#{repo.split('/').last}")
+            paths << path
+            GitRepoInstaller.install_repo(repo, path)
+          end
+
+          paths.each do |path|
+            SymlinkPathBuilder.paths_for(path) do |source, target|
+              config.add(:symlinks, source => target)
+            end
           end
         end
       end

data/lib/mac_setup/plugins/keybase.rb

@@ -6,13 +6,11 @@ module MacSetup
           add_requirements(config)
           install
           log_in(config.keybase)
-          install_volume
         end
 
         def add_requirements(config)
           config.require_value(:keybase)
           config.add(:casks, :keybase)
-          add_private_dotfiles(config)
         end
 
         private
@@ -25,24 +23,6 @@ module MacSetup
           # Using backticks doesn't work with the keybase login process
           Shell.raw("keybase login #{username}")
         end
-
-        # 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 and then hit Return")
-          Shell.run("keybase install --components=helper,fuse,mountdir,kbfs")
-        end
-
-        def add_private_dotfiles(config)
-          keybase_dir = Dir.entries("/Volumes").find { |dir| dir.start_with?("Keybase") }
-          dotfiles_dir = "/Volumes/#{keybase_dir}/private/#{config.keybase}/dotfiles"
-
-          return unless Dir.exist?(dotfiles_dir)
-
-          SymlinkPathBuilder.paths_for(dotfiles_dir) do |source, target|
-            config.add(:symlinks, source => target)
-          end
-        end
       end
     end
   end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Wean
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -102,12 +102,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -150,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Tool to set up a Mac