udb 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030b2114165b983357479c5b9f5c278ddcb859f6b89a529b2c632eb7227749dc
-  data.tar.gz: e2be4d1bec8e2fc90c32b96f457b8ebb2cef0390d9a0b9f431ed34803d87f55f
+  metadata.gz: d153646bfddc91ed1ea91a1682e7a38185601ecdb3a930d20c997c9609cddcfa
+  data.tar.gz: 557547a04c8a9fba8c9d1af6aee8d2707c5ce4fa899371e171482fb2037cfc51
 SHA512:
-  metadata.gz: cadc118ddaa3396e17d89c5d3b89e754bed287c50285f7b6711ad63f5ecc305e00de02de3e5abf7b58e39b38989f2b24f94c022209c7f2b4185e9599fcde33e9
-  data.tar.gz: b1026028c8bd8a0c51fe497653b580fdc0af7c7e30878920a85aec71b6cc41c83e3b99bc84abbe63c6e7e8bb04371fe6cda49112245ce83de09ccca8a696f427
+  metadata.gz: 27848eabc18fca2cb68d75a062cab95157c4b2c8464910059ac45bf81eba0079aee491556d0e4c93d356bb2cebb506b64eb6435acbf6ea9ba10eb7138d3b96d2
+  data.tar.gz: 4603d6032e3762b1e16e805b63a328d52fb7766b6e4903dd351dfb5a69ca4db09614089e8a30a00cef69a0fa097f61706236f9d5b60fececd4d79fd8827cc70f

data/lib/udb/paths.rb

@@ -0,0 +1,91 @@
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# typed: true
+# frozen_string_literal: true
+
+require "pathname"
+require "sorbet-runtime"
+
+require_relative "version"
+
+module Udb
+  extend T::Sig
+
+  sig { returns(Pathname) }
+  def self.gem_path
+    @gem_path ||= Pathname.new(Gem::Specification.find_by_name("udb").full_gem_path)
+  end
+
+  sig { params(from_dir: Pathname).returns(T.nilable(Pathname)) }
+  def self.find_udb_root(from_dir)
+    if from_dir.root?
+      nil
+    elsif (from_dir / "do").executable? && (from_dir / "spec").directory?
+      from_dir
+    else
+      find_udb_root(from_dir.dirname)
+    end
+  end
+  private_class_method :find_udb_root
+
+  sig { returns(T.nilable(Pathname)) }
+  def self.repo_root
+    @root ||=
+      if ENV.key?("UDB_ROOT")
+        Pathname.new(ENV["UDB_ROOT"])
+      else
+        find_udb_root(Pathname.new(__dir__))
+      end
+  end
+
+  sig { returns(Pathname) }
+  def self.default_std_isa_path
+    if repo_root.nil?
+      # not in the udb repo. try for a copy of the database stored with the gem
+      gem_path / ".data" / "spec" / "std" / "isa"
+    else
+      T.must(repo_root) / "spec" / "std" / "isa"
+    end
+  end
+
+  sig { returns(Pathname) }
+  def self.default_custom_isa_path
+    if repo_root.nil?
+      # not in the udb repo. try for a copy of the database stored with the gem
+      gem_path / ".data" / "spec" / "custom" / "isa"
+    else
+      T.must(repo_root) / "spec" / "custom" / "isa"
+    end
+  end
+
+  sig { returns(Pathname) }
+  def self.default_schemas_path
+    if repo_root.nil?
+      # not in the udb repo. try for a copy of the database stored with the gem
+      gem_path / ".data" / "spec" / "schemas"
+    else
+      T.must(repo_root) / "spec" / "schemas"
+    end
+  end
+
+  sig { returns(Pathname) }
+  def self.default_gen_path
+    if repo_root.nil?
+      # not in the udb repo. use XDG path
+      data_home = Pathname.new(ENV.fetch("XDG_DATA_HOME", "#{ENV["HOME"]}/.local/share"))
+      data_home / "udb" / Udb.version / "gen"
+    else
+      T.must(repo_root) / "gen"
+    end
+  end
+
+  sig { returns(Pathname) }
+  def self.default_cfgs_path
+    if repo_root.nil?
+      gem_path / ".data" / "cfgs"
+    else
+      T.must(repo_root) / "cfgs"
+    end
+  end
+end

data/lib/udb/resolver.rb

@@ -9,88 +9,10 @@ require "concurrent/hash"
 require "sorbet-runtime"
 
 require_relative "cfg_arch"
+require_relative "paths"
 require_relative "yaml/yaml_resolver"
 
 module Udb
-  extend T::Sig
-
-  sig { returns(Pathname) }
-  def self.gem_path
-    @gem_path ||= Pathname.new(Gem::Specification.find_by_name("udb").full_gem_path)
-  end
-
-  sig { params(from_dir: Pathname).returns(T.nilable(Pathname)) }
-  def self.find_udb_root(from_dir)
-    if from_dir.root?
-      nil
-    elsif (from_dir / "do").executable? && (from_dir / "spec").directory?
-      from_dir
-    else
-      find_udb_root(from_dir.dirname)
-    end
-  end
-  private_class_method :find_udb_root
-
-  sig { returns(T.nilable(Pathname)) }
-  def self.repo_root
-    @root ||=
-      if ENV.key?("UDB_ROOT")
-        Pathname.new(ENV["UDB_ROOT"])
-      else
-        find_udb_root(Pathname.new(__dir__))
-      end
-  end
-
-  sig { returns(Pathname) }
-  def self.default_std_isa_path
-    if repo_root.nil?
-      # not in the udb repo. try for a copy of the database stored with the gem
-      gem_path / ".data" / "spec" / "std" / "isa"
-    else
-      T.must(repo_root) / "spec" / "std" / "isa"
-    end
-  end
-
-  sig { returns(Pathname) }
-  def self.default_custom_isa_path
-    if repo_root.nil?
-      # not in the udb repo. try for a copy of the database stored with the gem
-      gem_path / ".data" / "spec" / "custom" / "isa"
-    else
-      T.must(repo_root) / "spec" / "custom" / "isa"
-    end
-  end
-
-  sig { returns(Pathname) }
-  def self.default_schemas_path
-    if repo_root.nil?
-      # not in the udb repo. try for a copy of the database stored with the gem
-      gem_path / ".data" / "spec" / "schemas"
-    else
-      T.must(repo_root) / "spec" / "schemas"
-    end
-  end
-
-  sig { returns(Pathname) }
-  def self.default_gen_path
-    if repo_root.nil?
-      # not in the udb repo. use XDG path
-      data_home = Pathname.new(ENV.fetch("XDG_DATA_HOME", "#{ENV["HOME"]}/.local/share"))
-      data_home / "udb" / Udb.version / "gen"
-    else
-      T.must(repo_root) / "gen"
-    end
-  end
-
-  sig { returns(Pathname) }
-  def self.default_cfgs_path
-    if repo_root.nil?
-      gem_path / ".data" / "cfgs"
-    else
-      T.must(repo_root) / "cfgs"
-    end
-  end
-
   # resolves the specification in the context of a config, and writes to a generation folder
   #
   # The primary interface for users will be #cfg_arch_for

data/lib/udb/version.rb

@@ -5,5 +5,5 @@
 # frozen_string_literal: true
 
 module Udb
-  def self.version = "0.1.2"
+  def self.version = "0.1.3"
 end

data/lib/udb/yaml/yaml_resolver.rb

@@ -16,6 +16,7 @@ require "idlc"
 require_relative "comment_parser"
 require_relative "preserving_emitter"
 require_relative "../log"
+require_relative "../paths"
 
 module Udb
   module Yaml
@@ -44,11 +45,11 @@ module Udb
       end
 
       # Returns the path to JSON schema files.
-      # Defaults to <repo_root>/spec/schemas but can be overridden via the constructor.
+      # Defaults to Udb.default_schemas_path but can be overridden via the constructor.
       sig { returns(Pathname) }
       def schemas_path
         if @schemas_path.nil?
-          @schemas_path = Pathname.new(__dir__).parent.parent.parent.parent.parent.parent / "spec" / "schemas"
+          @schemas_path = Udb.default_schemas_path
         end
         T.must(@schemas_path)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udb
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Derek Hower
@@ -3058,6 +3058,7 @@ files:
 - lib/udb/obj/prm.rb
 - lib/udb/obj/profile.rb
 - lib/udb/obj/register_file.rb
+- lib/udb/paths.rb
 - lib/udb/portfolio_design.rb
 - lib/udb/presence.rb
 - lib/udb/prm_generator.rb