ree 1.0.43 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2673db96f54aa11d629b50c4edd402fcf44caebc3f41f64b0214aed053a70ab7
-  data.tar.gz: b71fe02e9ef5c6394d122b9ca300ee6fcb71c72912eef455a75bd49ede91441d
+  metadata.gz: 8c43c3e1b979b49169f1b33067b14987b9871eea52b4925d31d952c7112dc05b
+  data.tar.gz: fc4d2351614b71835912930c7e971d587ae83d397277438bcfbc057dfdcf6d00
 SHA512:
-  metadata.gz: 5144f814a5dce7e8b2a6a552c9b34ffeec076284e19f6950e34f2b9c1d19b22ecbaebb32b943365823ed3125517c273e562e5fcbf9153a0b7b4b4abcf19716ee
-  data.tar.gz: 22ad163ff20029f24232be9b98b51503f15ba0ce1c273a1c0b33461776e6ac00abf1be91a1432d2f2e6f2060cceea2a451f91c661a1a49b54708e9f825d2084f
+  metadata.gz: db2e4e9846094f89f07dc3ac2ea2ff2a37f1ecccb245a5708d58dcc0274aa32d31f395e05e54d26fa7243b2004715e4e86a654b2fc842405d577a254622b5380
+  data.tar.gz: 2d39527fb3b6abd0b355794e8b485c154b04ba74d5acba2f3f2c1a751b08243a0bc20b219670668eb2c97095779c9d60f441c9a5988861efbcaf6bbf1b2d9e7e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.43)
+    ree (1.0.44)
       commander (~> 5.0.0)
 
 GEM

data/lib/ree/cli/spec_runner.rb

@@ -107,7 +107,7 @@ module Ree
       def project_packages(packages)
         packages.reject(&:gem?)
       end
-      
+
       def non_existent_packages
         @package_names ? @package_names - packages.map(&:name) : []
       end
@@ -148,7 +148,7 @@ module Ree
 
         unless acc.include?(package.name)
           acc << package.name
-          
+
           package.deps.map(&:name).each do |pack|
             next if !packages_set.include?(pack)
             recursively_find_children_packages(pack, acc)

data/lib/ree/dsl/build_package_dsl.rb

@@ -127,7 +127,7 @@ class Ree::BuildPackageDsl
     name = Ree::StringUtils.underscore(list[0]).to_sym
 
     if !Ree.irb_mode? && name != name_from_path
-      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name 'name'. Fix file name or module name.")
+      raise Ree::Error.new("Package module '#{module_name}' does not correspond to package name '#{name}'. Fix file name or module name.")
     end
 
     package = @packages_facade.get_package(name, false)

data/lib/ree/facades/packages_facade.rb

@@ -207,6 +207,13 @@ class Ree::PackagesFacade
     @packages_store
   end
 
+  # @param [Symbol] package_name
+  # @return [Bool]
+  def has_package?(package_name)
+    check_arg(package_name, :package_name, Symbol)
+    !!@packages_store.get(package_name)
+  end
+
   # @param [Symbol] package_name
   # @return [Ree::Package]
   def get_package(package_name, raise_if_missing = true)

data/lib/ree/link_dsl.rb

@@ -50,29 +50,18 @@ module Ree::LinkDSL
         raise Ree::Error.new("target should be one of [:object, :class, :both]", :invalid_dsl_usage)
       end
 
-      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-      link_package_name = from.nil? ? package_name : from
+      packages = Ree.container.packages_facade
+      link_package_name = get_link_package_name(from, object_name)
       link_object_name = object_name
       link_as = as ? as : object_name
 
-      _check_package_dependency_added(link_package_name, package_name)
-
       if import
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build(
-            self,
-            link_package_name,
-            link_object_name,
-            import
-          )
+        Ree::LinkImportBuilder.new(packages).build(
+          self, link_package_name, link_object_name, import
+        )
       end
 
-      obj = Ree
-        .container
-        .packages_facade
-        .load_package_object(link_package_name, link_object_name)
-
+      obj = packages.load_package_object(link_package_name, link_object_name)
       target ||= obj.target
 
       if target == :both
@@ -133,12 +122,9 @@ module Ree::LinkDSL
 
       list = path.split('/')
       package_name = File.basename(list[0], ".*").to_sym
-      current_package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
-
-      _check_package_dependency_added(package_name, current_package_name)
-
-      Ree.container.packages_facade.load_package_entry(package_name)
-      package = Ree.container.packages_facade.get_package(package_name)
+      packages = Ree.container.packages_facade
+      packages.load_package_entry(package_name)
+      package = packages.get_package(package_name)
 
       file_path = File.join(
         Ree::PathHelper.abs_package_dir(package),
@@ -153,7 +139,7 @@ module Ree::LinkDSL
         end
       end
 
-      Ree.container.packages_facade.load_file(file_path, package.name)
+      packages.load_file(file_path, package.name)
 
       const_list = path.split('/').map { |_| Ree::StringUtils.camelize(_) }
       const_short = [const_list[0], const_list.last].join("::")
@@ -168,13 +154,9 @@ module Ree::LinkDSL
       end
 
       if import_proc
-        Ree::LinkImportBuilder
-          .new(Ree.container.packages_facade)
-          .build_for_const(
-            self,
-            file_const,
-            import_proc
-          )
+        Ree::LinkImportBuilder.new(packages).build_for_const(
+          self, file_const, import_proc
+        )
       end
 
       nil
@@ -182,33 +164,24 @@ module Ree::LinkDSL
 
     def _raise_error(text, code = :invalid_dsl_usage)
       msg = <<~DOC
-        object: :#{@object.name}
-        path: #{Ree::PathHelper.abs_object_path(@object)}
+        class: :#{self}
         error: #{text}
       DOC
 
       raise Ree::Error.new(msg, code)
     end
 
-    def _check_package_dependency_added(package_name, current_package_name)
-      return if package_name == current_package_name
-
-      facade = Ree.container.packages_facade
-      facade.load_package_entry(package_name)
-      facade.load_package_entry(current_package_name)
+    def get_link_package_name(from, object_name)
+      return from if from
 
-      current_package = facade.get_package(current_package_name)
+      package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
+      result = Ree.container.packages_facade.has_package?(package_name) ? package_name : nil
 
-      dep_package = current_package.deps.detect do |d|
-        d.name == package_name
+      if result.nil?
+        raise Ree::Error.new("package is not provided for link :#{object_name}", :invalid_dsl_usage)
       end
 
-      if dep_package.nil?
-        raise Ree::Error.new(
-          "Package :#{package_name} is not added as dependency for :#{current_package_name} package\npackage path: #{File.join(Ree.root_dir, current_package.entry_rpath || "")}\nclass:#{self.name}",
-          :invalid_dsl_usage
-        )
-      end
+      result
     end
   end
 end

data/lib/ree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ree
-  VERSION = "1.0.43"
+  VERSION = "1.0.44"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.44
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander