prefnerd 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5baf52cda97e805d1cc2bfc2f8b0497c1dcaa1b6
-  data.tar.gz: baff97eac5fbf0740b3ab2bf3df665ae8bccd042
+  metadata.gz: ecd39d3f68a1baa503eba80c41c8ccd5fcd1fdc0
+  data.tar.gz: 7ddd0d8d0bd0eb277db33de325beb93fe2c044d7
 SHA512:
-  metadata.gz: ec978cd2344641e8b5844662691a7768afeb5b958fcf64b0169ad1c92051722f5a0bbfd566503cc66f5cd66cb8155371cf3a4bdb3d66f86be317eb535059287a
-  data.tar.gz: 020ab4bb1272f8f4ad6b1b7b5f863a389cb040a14285387a47dea0fe2067a0673b7ec57d1d7c4581e4dfab31baec25aacd1b23828b183f0dbab6dac42c02ebb4
+  metadata.gz: 41f92bdc0ace02ebe0bfe5638fff75e25a751826cf3eee80120cd048e3dc7aa6cabac3c545d4b779596c18b8910cca895a2cb648cf1e94efc42de7f58ad98269
+  data.tar.gz: b946d8bb0e446d33963f7cf917acc919198d8ea1fa5f3851d9fc477e235876456926d6f72508345d9330f5130d54d9fc2918b82f0008f9fea47efc249a343667

data/bin/pn

@@ -6,26 +6,69 @@ require 'tempfile'
 PREFERENCES = File.join(ENV['HOME'], 'Library', 'Preferences')
 PLISTS = File.join(PREFERENCES, '**', '*.plist')
 
-%w[defaults diff fswatch].each do |dependency|
+DOMAINS = Hash.new do |_, key|
+  key == '.GlobalPreferences' ? 'NSGlobalDomain' : key
+end
+
+%w[defaults diff fswatch system_profiler].each do |dependency|
   if `which #{dependency}`.length.zero?
     puts "Missing dependency: #{dependency}"
     exit 1
   end
 end
 
+# Try to get current host UUID.
+match = File.
+  popen(%w[system_profiler SPHardwareDataType]).
+  read.
+  match(/^\s*Hardware UUID:\s*(.+)$/)
+CURRENT_HOST_SUFFIX = '.' + (match && match[1]).to_s + '.plist'
+CURRENT_HOST_PREFIX = '-currentHost '
+
 def read(plist)
   # Swallow stderr; it's usually harmless.
-  stdout, stderr, status = Open3.capture3('defaults', 'read', plist)
+  if plist.start_with?(CURRENT_HOST_PREFIX)
+    stdout, stderr, status = Open3.capture3(
+      'defaults', '-currentHost', 'read', plist[CURRENT_HOST_PREFIX.length..-1]
+    )
+  else
+    stdout, stderr, status = Open3.capture3('defaults', 'read', plist)
+  end
   stdout
 end
 
+def debug(string)
+  if ENV['DEBUG']
+    puts "DEBUG: #{string}"
+  end
+end
+
+def normalize(plist)
+  plist = plist.chomp
+  if plist !~ /\.plist\z/
+    nil
+  elsif plist == File.join(PREFERENCES, File.basename(plist))
+    # File is an immediate child of ~/Library/Preferences; return it sans the
+    # ".plist" extension.
+    DOMAINS[File.basename(plist, '.plist')]
+  elsif plist == File.join(PREFERENCES, 'ByHost', File.basename(plist)) &&
+    plist.end_with?(CURRENT_HOST_SUFFIX)
+    # File is in ~/Library/Preferences/ByHost and matches the UUID of the
+    # current host.
+    CURRENT_HOST_PREFIX + DOMAINS[File.basename(plist).chomp(CURRENT_HOST_SUFFIX)]
+  else
+    plist
+  end
+end
+
 begin
   # Build up map of known defaults
   print 'Reading defaults: '
   DEFAULTS = {}
   Dir.glob(PLISTS, File::FNM_DOTMATCH).each do |plist|
+    plist = normalize(plist)
     print '.'
-    DEFAULTS[plist] = read(plist)
+    DEFAULTS[plist] = read(plist) if plist
   end
   puts
 
@@ -36,11 +79,13 @@ begin
     '-m',
     'fsevents_monitor',
     '-r',
-    ENV['HOME'] + '/Library/Preferences',
+    PREFERENCES,
   ])
   while line = lines.readline
-    plist = line.chomp
-    if plist =~ /\.plist\z/
+    debug("fswatch -> #{line.inspect}")
+    plist = normalize(line)
+    debug("normalized -> #{plist.inspect}")
+    if plist
       new_contents = read(plist)
       new_file = Tempfile.new('pn')
       new_file.write(new_contents)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefnerd
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Greg Hurrell