apple-data 1.0.587 → 1.0.595

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f240e7d367575fe8d99486eb07bca0d43ec2fa8d5cf7545003687d2cedd0c0c4
-  data.tar.gz: a76ebd9e597d58911736579fcc105d9e6e56b27ac7fbf96dc1764eb1ce58e3d7
+  metadata.gz: 22e817464fbce6112bd5dae6cbef2399725364505f7d285145c4da89f20434bd
+  data.tar.gz: 2fb9f60e8402670a5a666fcde3f3074f6a0b95331c5a4a31a621d058510ff914
 SHA512:
-  metadata.gz: 667efca7e6dfc8c5e6e7a38a18f1bfeda459004fdcc433572dfc22f6ca0fbb76b921e033f30a07439e568c00d04748773dd4afe97f28f52eb20fa98f854a42d7
-  data.tar.gz: 63c66b3939a84118fd437eaca612f4fa49b2450de3369106bce31a75c440cffc51483f776a1496aa38a8b097d9245f8ee9d577243d1807c4a358530f25b96eb2
+  metadata.gz: b4d339ff15e7c8903a6e59b68dd2e9ab356fea359a8d63d4eec34e11065b54a4a65fe1e35e9638db3536eb8a6a6e36d3d0208a0274d62dbb569c8cda5657cae6
+  data.tar.gz: 7bfb7bfd28fd4a671180f79efef654355acd58ec499a579ccaefa8fde3d2253ed2a0b5abe3c692e0917208b4f54761c6fa9263e8120cf0bf5bf6baab748113cf

data/lib/apple_data/boot_args.rb

@@ -1,5 +1,5 @@
 # typed: strict
 # frozen_string_literal: true
 
-class BootArgsData < DataFile
+class BootArgsData < AppleData::DataFile
 end

data/lib/apple_data/data_file.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module AppleData
+  # Base class for all data files
+  class DataFile
+    extend T::Sig
+    attr_reader :data
+
+    sig { params(parts: String).void }
+    def initialize(*parts)
+      @parts = parts
+      @collections = {}
+      T.unsafe(self).load_file(*parts)
+      ensure_metadata
+    end
+
+    sig { params(parts: String).returns(T::Hash[T.untyped, T.untyped]) }
+    def load_file(*parts)
+      parts[-1] = "#{parts[-1]}.yaml" unless T.must(parts[-1]).end_with? '.yaml'
+      @filename = File.join(AppleData.data_location, T.unsafe(File).join(*parts))
+      @data = {}
+      @data = YAML.load_file @filename if File.exist? @filename
+      @data
+    end
+
+    def save!
+      save_data data
+    end
+
+    def save
+      save!
+    end
+
+    def collection(name)
+      @collections[name.to_s] ||= DataFileCollection.new(self, name)
+    end
+
+    private
+
+    def save_data(data)
+      File.write(@filename, data.to_yaml)
+    end
+
+    def ensure_metadata
+      @data['metadata'] ||= {}
+      @data['metadata'].reverse_merge!({ 'description' => nil, 'credits' => [] })
+    end
+  end
+end

data/lib/apple_data/fdr.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 # Factory Device Restore
-class FDRData < DataFile
+class FDRData < AppleData::DataFile
   def initialize
     super('fdr.yaml')
 

data/lib/apple_data/ioreg.rb

@@ -1,57 +1,59 @@
 # typed: true
 # frozen_string_literal: true
 
-# Data file for the IOReg data
-class IORegData < DataFile
-  def initialize
-    super('ioreg.yaml')
+module AppleData
+  # Data file for the IOReg data
+  class IORegData < AppleData::DataFile
+    def initialize
+      super('ioreg.yaml')
 
-    @classes = []
+      @classes = []
 
-    @data['classes'].each do |single_class|
-      @classes << IORegClass.load_one(single_class)
+      @data['classes'].each do |single_class|
+        @classes << IORegClass.load_one(single_class)
+      end
     end
-  end
 
-  def data
-    @data = {}
-    @data['classes'] = @classes.map(&:to_h)
+    def data
+      @data = {}
+      @data['classes'] = @classes.map(&:to_h)
+    end
   end
-end
 
-# A single IOKit class
-class IORegClass
-  attr_accessor :description, :name, :parents, :known_names
+  # A single IOKit class
+  class IORegClass
+    attr_accessor :description, :name, :parents, :known_names
 
-  def initialize(klass_name)
-    @name = klass_name
-    @parents = []
-  end
+    def initialize(klass_name)
+      @name = klass_name
+      @parents = []
+    end
 
-  def self.for_name(name)
-    @instances ||= {}
+    def self.for_name(name)
+      @instances ||= {}
 
-    @instances[name] = IORegClass.new name unless @instances.key? name
+      @instances[name] = IORegClass.new name unless @instances.key? name
 
-    @instances[name]
-  end
+      @instances[name]
+    end
 
-  def self.values
-    @instances.values.sort_by(&:name)
-  end
+    def self.values
+      @instances.values.sort_by(&:name)
+    end
 
-  def self.load_one(hash)
-    instance = for_name hash['name']
-    instance.description = hash['description']
-    instance.parents = hash['parents']
-    instance.known_names = (hash['known_names'] || []).sort
-  end
+    def self.load_one(hash)
+      instance = for_name hash['name']
+      instance.description = hash['description']
+      instance.parents = hash['parents']
+      instance.known_names = (hash['known_names'] || []).sort
+    end
 
-  def to_h
-    { 'name' => @name, 'description' => @description, 'parents' => @parents, 'known_names' => @known_names }
-  end
+    def to_h
+      { 'name' => @name, 'description' => @description, 'parents' => @parents, 'known_names' => @known_names }
+    end
 
-  def user_client?
-    @parents.include? 'IOUserClient'
+    def user_client?
+      @parents.include? 'IOUserClient'
+    end
   end
 end

data/lib/apple_data/lockdown.rb

@@ -1,48 +1,50 @@
 # typed: true
 # frozen_string_literal: true
 
-# Schema file for the `lockdownd.yaml` file
-class LockdownData < DataFile
-  def initialize
-    super('lockdownd.yaml')
-    @data ||= {}
-    @data['clients'] ||= []
-    @data['domains'] ||= []
-  end
+module AppleData
+  # Schema file for the `lockdownd.yaml` file
+  class LockdownData < AppleData::DataFile
+    def initialize
+      super('lockdownd.yaml')
+      @data ||= {}
+      @data['clients'] ||= []
+      @data['domains'] ||= []
+    end
 
-  def ensure_client(client)
-    @data['clients'] << client unless @data['clients'].include? client
-  end
+    def ensure_client(client)
+      @data['clients'] << client unless @data['clients'].include? client
+    end
 
-  def ensure_domain_has_property(domain, property, _type = nil)
-    domain_instance = get_domain domain
+    def ensure_domain_has_property(domain, property, _type = nil)
+      domain_instance = get_domain domain
 
-    return unless property
+      return unless property
 
-    domain_instance['properties'] << property unless domain_instance['properties'].include? property
-  end
+      domain_instance['properties'] << property unless domain_instance['properties'].include? property
+    end
 
-  def get_domain(domain)
-    result = @data['domains'].find { |d| d['name'] == domain }
-    unless result
-      result = {}
-      result['name'] = domain
-      @data['domains'] << result
+    def get_domain(domain)
+      result = @data['domains'].find { |d| d['name'] == domain }
+      unless result
+        result = {}
+        result['name'] = domain
+        @data['domains'] << result
+      end
+      result['description'] ||= nil
+      result['properties'] ||= []
+      result
     end
-    result['description'] ||= nil
-    result['properties'] ||= []
-    result
-  end
 
-  def data
-    @data['clients'].sort!
+    def data
+      @data['clients'].sort!
 
-    @data['domains'].each do |domain|
-      domain['properties'].sort!
-    end
+      @data['domains'].each do |domain|
+        domain['properties'].sort!
+      end
 
-    @data['domains'].sort_by! { |d| d['name'] }
+      @data['domains'].sort_by! { |d| d['name'] }
 
-    @data
+      @data
+    end
   end
 end

data/lib/apple_data/macho.rb

@@ -1,5 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
-class MachoData < DataFile
+module AppleData
+  class MachoData < AppleData::DataFile
+  end
 end

data/lib/apple_data/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AppleData
-  VERSION = '1.0.587'
+  VERSION = '1.0.595'
 end

data/lib/apple_data.rb

@@ -1,13 +1,26 @@
 # frozen_string_literal: true
 
+DEFAULT_APPLE_DATA_SHARE = T.let(File.join(File.dirname(__FILE__), '../share/'), String)
+
+# Base Namespace for AppleData gem
+module AppleData
+  def get_data(file)
+    YAML.load_file(File.join(@apple_data, file))
+  end
+
+  def self.data_location=(location)
+    @apple_data = location
+  end
+
+  def self.data_location
+    @apple_data || DEFAULT_APPLE_DATA_SHARE
+  end
+end
+
+require 'apple_data/data_file'
 require 'apple_data/boot_args'
 require 'apple_data/fdr'
 require 'apple_data/ioreg'
 require 'apple_data/macho'
 require 'apple_data/lockdown'
-
-APPLE_DATA_SHARE = T.let(File.join(File.dirname(__FILE__), '../share/'), String)
-
-def get_data(file)
-  YAML.load_file(File.join(APPLE_DATA_SHARE, file))
-end
+require 'apple_data/keybag'

data/share/cores.yaml

@@ -315,7 +315,18 @@ chip_ids:
         board_name: J475dAP
 
 
+  0x6500:
+    name: R1
+    description: Vision Pro R1
+    architecture: arm64
+    type: AVISP
 
+    revisions:
+    boards:
+      0x01:
+        product_name: Apple Vision Pro (R1)
+        product_id:
+        board_name:
 
   0x7000:
     name: t7000
@@ -1594,6 +1605,10 @@ chip_ids:
         product_name: MacBook Air (M2, 2023)
         product_id: Mac14,15
         board_name: J415AP
+      0x42:
+        product_name: Apple Vision Pro
+        product_id: RealityDevice14,1
+        board_name: n301
 
   0x8120:
     name: t8120