mac_setup 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e838d025ff3bddf2160c37b063735b85094e7ff5
-  data.tar.gz: 6c7d1722bbc01b83955fd73dd040e2b292460b1d
+  metadata.gz: d138f54b0282d08ae090d9d610449a01ca085ca8
+  data.tar.gz: e6c8f046d259c1716ddb3c2fa0b93b8ebdccf6aa
 SHA512:
-  metadata.gz: 4792d51c9b5840513664182570c7de79c667641afba9aa0ac389db988a183705d129146f589214049c2d61a813a666ce5c2abe6322346011b7c51c526ff3f495
-  data.tar.gz: 8708caa2c2c09d0fa8d3be474d9083a616174e93b404d5622418fe7e83b34704a0e79935d928528fec639d9d21fd2d388d67d8c6505d4eadc2da4d51f6caaa20
+  metadata.gz: aa607f339bdb85eeebebd20ae6e80d4d75dace9979b040d2226ead3947fbc91449785132b304e8caf5c2b768f9aee26bba1b6bdacd80c4fb760d8aedcb8d6783
+  data.tar.gz: 7652ec93fbfb92e1614ab32b7f5919bbb82b1c56296297b0de8244c7d3a7db19aff3432dc236b6078a9c8612baefd338840f42476046d90a7e8956d7dbc7f5b2

data/lib/mac_setup/brewfile_installer.rb

@@ -17,7 +17,7 @@ module MacSetup
 
     def run
       tap_bundle
-      sign_in_to_mas
+      set_up_mas
       install_brewfile
       install_openssl
     end
@@ -30,16 +30,36 @@ module MacSetup
       Shell.run("brew tap #{BUNDLE_TAP}")
     end
 
-    def sign_in_to_mas
+    def set_up_mas
+      brewfile = Pathname.new("~/.Brewfile").expand_path
       return unless brewfile.read =~ /^mas /
+
+      install_mas
+      sign_in_to_mas
+    end
+
+    def install_mas
+      Shell.run("brew install mas") unless mas_installed?
+    end
+
+    def sign_in_to_mas
+      return if mas_signed_in?
       apple_id = Shell.ask("What is your Apple ID?")
       Shell.run("mas signin --dialog #{apple_id}")
     end
 
+    def mas_signed_in?
+      Shell.success?("mas account")
+    end
+
     def install_brewfile
       Shell.run("brew bundle --global")
     end
 
+    def mas_installed?
+      Shell.success?("which mas")
+    end
+
     def install_openssl
       # Needed for encrypted files
       Shell.run("brew install openssl")

data/lib/mac_setup/configuration.rb

@@ -13,7 +13,7 @@ module MacSetup
     end
 
     def git_repos
-      (@config["git_repos"] || []).uniq
+      ((@config["git_repos"] || []) + [@config["repo"]]).uniq
     end
 
     def symlinks

data/lib/mac_setup/symlink_installer.rb

@@ -91,6 +91,7 @@ module MacSetup
 
   class SymlinkInstaller
     def self.run(config, _status)
+      Secrets.decrypt(DOTFILES_PATH)
       install_dotfiles
       install_symlinks(config)
     end

data/lib/mac_setup/version.rb

@@ -1,3 +1,3 @@
 module MacSetup
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/mac_setup.rb

@@ -24,7 +24,6 @@ module MacSetup
   def self.install(config_path, _options)
     config = Configuration.new(File.expand_path(config_path))
     status = SystemStatus.new
-    Secrets.decrypt(DOTFILES_PATH)
 
     INSTALLERS.each { |installer| installer.run(config, status) }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mac_setup
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Wean