ree 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3080db0341788d95f77d172fec9b207e3c27a98d31e785a977d245942298eb
-  data.tar.gz: d6eedaf9b82609693d2c3c8b3131e45ae59e6fbc04a9038e6f5e6edc762bf60e
+  metadata.gz: c1b2264b5461e4f29c6a6a09d71b4f594607777e30b7fd9ee04eb581f8ca4c27
+  data.tar.gz: f56ccea02c51d34be30d0a53da9cb2a855265510b6167d19986b4ceb708a92f7
 SHA512:
-  metadata.gz: bce075c79b1fec9acf13f397acff99edb159d2ba0074ed314b5a959be9688d0093eb46e18e59801e2f9be1fea358cd8596b1220ec8e40340b745e9bdf112e071
-  data.tar.gz: adcf4a8b7d7e94c0b9e89c8ee4ff98fe193f7fc76c6c62578f421a0e20c6bbd5c686e59481785669f42c26988fd5280c09a3ca7212524ac0486b0c6724b00a76
+  metadata.gz: c423007aa3b01f9251f820eb432186ef18d909dbfc06c52d6c6748eddc7ab6d35e1d38c337ad5afcefea302a0b057832ec29eb50dda7dd4ba053bdc9ddee7913
+  data.tar.gz: f3f0ed83742454c2f4ae91c7eb47be2a1cbce89ee2775ef220c5a73682bed9b051f9c79196b46990ab800783c630e5ef015fd9ab665a727ef9f8b8ef9b04b723

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree (1.0.8)
+    ree (1.0.10)
       commander (~> 4.6.0)
 
 GEM

data/exe/ree

@@ -148,7 +148,7 @@ class ReeCliRunner
       c.option      '--silence', String, 'Silence all logs'
       c.option      '--project_path [ROOT_PROJECT_DIR]', String, 'Root project dir path'
       c.action do |args, options|
-        package_name = args[0]&.to_sym
+        package_name = args[0]
         object_path = args[1]
         options_hash = options.__hash__
 
@@ -251,7 +251,7 @@ class ReeCliRunner
         package_abs_path = Ree::PathHelper.abs_package_dir(package)
         exec_abs_path    = Pathname.new(package_abs_path).join(Pathname.new(executable_path)).to_s
 
-        raise Ree::Error.new("File #{exec_abs_path} not found") unless File.exists?(exec_abs_path)
+        raise Ree::Error.new("File #{exec_abs_path} not found") unless File.exist?(exec_abs_path)
 
         system("chmod +x #{exec_abs_path}") if run_chmod_x
         system(exec_abs_path)

data/lib/ree/cli/delete_object_schema.rb

@@ -19,7 +19,7 @@ module Ree
           schema_path = Ree::PathHelper.object_schema_rpath(object_path)
           abs_schema_path = File.join(dir, schema_path)
 
-          if File.exists?(abs_schema_path)
+          if File.exist?(abs_schema_path)
             FileUtils.rm(abs_schema_path)
 
             puts(" #{schema_path}: is deleted") if !silence

data/lib/ree/cli/generate_object_schema.rb

@@ -25,12 +25,11 @@ module Ree
           if facade.has_object?(package_name, object_name)
             object = facade.load_package_object(package_name, object_name)
             Ree.write_object_schema(package.name, object.name)
-
-            obj_path = Ree::PathHelper.abs_object_schema_path(object)
+            facade.dump_package_schema(package_name)
           else
             file_path = File.join(dir, object_path)
 
-            if File.exists?(file_path)
+            if File.exist?(file_path)
               facade.load_file(file_path, package_name)
               facade.dump_package_schema(package_name)
 

data/lib/ree/cli/generate_package_schema.rb

@@ -25,7 +25,7 @@ module Ree
 
           facade = Ree.container.packages_facade
           facade.load_packages_schema
-          Ree.load_package(package_name)
+          facade.load_entire_package(package_name)
           facade.write_package_schema(package_name)
 
           package = facade.get_package(package_name)

data/lib/ree/contracts/contractable.rb

@@ -6,16 +6,14 @@ require_relative 'engine_proxy'
 
 module Ree::Contracts
   module Contractable
-    if !Ree::Contracts.no_contracts?
-      def method_added(name)
-        MethodDecorator.new(name, false, self).call
-        super
-      end
+    def method_added(name)
+      MethodDecorator.new(name, false, self).call
+      super
+    end
 
-      def singleton_method_added(name)
-        MethodDecorator.new(name, true, self).call
-        super
-      end
+    def singleton_method_added(name)
+      MethodDecorator.new(name, true, self).call
+      super
     end
 
     def doc(str)

data/lib/ree/core/package_loader.rb

@@ -38,11 +38,6 @@ class Ree::PackageLoader
     @loaded_packages[name] = true
     package = @packages_store.get(name)
 
-    if package.dir.nil?
-      package.set_schema_loaded
-      return package
-    end
-
     if !package
       raise Ree::Error.new(
         "Package :#{name} was not found. Did you mistype the name? Run `ree gen.packages_json` to update Packages.schema.json",
@@ -50,6 +45,11 @@ class Ree::PackageLoader
       )
     end
 
+    if package.dir.nil?
+      package.set_schema_loaded
+      return package
+    end
+
     not_loaded = Set.new(
       [name, package.deps.map(&:name)]
         .uniq

data/lib/ree/core/package_schema_loader.rb

@@ -46,7 +46,7 @@ class Ree::PackageSchemaLoader
   # @param [Nilor[Ree::Package]] existing_package Loaded package
   # @return [Ree::Package]
   def call(abs_schema_path, existing_package = nil)
-    if !File.exists?(abs_schema_path)
+    if !File.exist?(abs_schema_path)
       raise Ree::Error.new("File not found: #{abs_schema_path}", :invalid_package_schema)
     end
 

data/lib/ree/core/packages_detector.rb

@@ -6,7 +6,7 @@ class Ree::PackagesDetector
   # @param [String] dir Packages root dir
   # @return [ArrayOf[{name: String, entry_path: String, package_schema_path: String, gem_name: Nilor[String]}]]
   def call(dir, gem_name = nil)
-    if !Dir.exists?(dir)
+    if !Dir.exist?(dir)
       raise Ree::Error.new("dir does not exist: #{dir}", :invalid_dir)
     end
 
@@ -22,7 +22,7 @@ class Ree::PackagesDetector
       name = package_schema_path.split('/')[-2]
       entry_path = Ree::PathHelper.package_entry_path(package_schema_path)
 
-      if !File.exists?(File.join(dir, entry_path))
+      if !File.exist?(File.join(dir, entry_path))
         Ree.logger.error("Entry file does not exist for '#{name}' package: #{entry_path}")
       end
 

data/lib/ree/core/packages_schema_loader.rb

@@ -25,7 +25,7 @@ class Ree::PackagesSchemaLoader
   # @param Nilor[Ree::PackagesStore] packages_store Existing packages store
   # @return [Ree::PackagesStore]
   def call(abs_schema_path, packages_store = nil, gem_name = nil)
-    if !File.exists?(abs_schema_path)
+    if !File.exist?(abs_schema_path)
       raise Ree::Error.new("File not found: #{abs_schema_path}", :invalid_packages_schema)
     end
 

data/lib/ree/dsl/object_dsl.rb

@@ -165,10 +165,10 @@ class Ree::ObjectDsl
       Ree::PACKAGE, path
     )
 
-    if !File.exists?(file_path)
+    if !File.exist?(file_path)
       file_path = "#{file_path}.rb"
 
-      if !File.exists?(file_path)
+      if !File.exist?(file_path)
         raise_error("Unable to link '#{path}'. File not found #{file_path}")
       end
     end
@@ -223,7 +223,7 @@ class Ree::ObjectDsl
       raise Ree::Error.new("Mount as should be one of #{MOUNT_AS.inspect}", :invalid_dsl_usage)
     end
 
-    object_name_from_path = if File.exists?(path) && !Ree.irb_mode?
+    object_name_from_path = if File.exist?(path) && !Ree.irb_mode?
       File.basename(path, ".*").to_sym
     end
 

data/lib/ree/dsl/package_require.rb

@@ -12,11 +12,11 @@ def package_require(path)
     Ree::PathHelper.abs_package_module_dir(package), list.join('/')
   )
 
-  if !File.exists?(path)
+  if !File.exist?(path)
     path = path + '.rb'
   end
 
-  if !File.exists?(path)
+  if !File.exist?(path)
     raise Ree::Error.new("file not found: #{path}")
   end
 
@@ -37,8 +37,8 @@ def package_file_exists?(path)
     Ree::PathHelper.abs_package_module_dir(package), list.join('/')
   )
 
-  return true if File.exists?(path)
+  return true if File.exist?(path)
 
   path = path + '.rb'
-  File.exists?(path)
+  File.exist?(path)
 end

data/lib/ree/facades/packages_facade.rb

@@ -78,7 +78,7 @@ class Ree::PackagesFacade
     if package.dir
       schema_path = Ree::PathHelper.abs_package_schema_path(package)
 
-      if !File.exists?(schema_path)
+      if !File.exist?(schema_path)
         raise Ree::Error.new("File does not exist: #{schema_path}", :invalid_path)
       end
 
@@ -101,7 +101,7 @@ class Ree::PackagesFacade
     if package.dir
       schema_path = Ree::PathHelper.abs_package_schema_path(package)
 
-      if !File.exists?(schema_path)
+      if !File.exist?(schema_path)
         raise Ree::Error.new("File does not exist: #{schema_path}", :invalid_path)
       end
 
@@ -126,7 +126,7 @@ class Ree::PackagesFacade
 
     schema_path = Ree::PathHelper.abs_object_schema_path(object)
 
-    if !File.exists?(schema_path)
+    if !File.exist?(schema_path)
       only_dir_path = schema_path.split('/')[0..-2]
       FileUtils.mkdir_p(File.join(only_dir_path))
     end

data/lib/ree/handlers/template_handler.rb

@@ -80,7 +80,7 @@ class Ree::TemplateHandler
       rendered_abs_path = Ree::TemplateRenderer.handle(get_destination_path(path), @locals)
       rendered_rel_path = Pathname.new(rendered_abs_path).relative_path_from Pathname.new(project_path)
 
-      if File.file?(rendered_abs_path) && File.exists?(rendered_abs_path)
+      if File.file?(rendered_abs_path) && File.exist?(rendered_abs_path)
         @stdout.puts "Warning! #{rendered_rel_path} already exists. Skipping file creation..."
         next
       end

data/lib/ree/link_dsl.rb

@@ -107,10 +107,10 @@ module Ree::LinkDSL
         Ree::PACKAGE, path
       )
 
-      if !File.exists?(file_path)
+      if !File.exist?(file_path)
         file_path = "#{file_path}.rb"
 
-        if !File.exists?(file_path)
+        if !File.exist?(file_path)
           _raise_error("Unable to link '#{path}'. File not found #{file_path}")
         end
       end

data/lib/ree/rspec_link_dsl.rb

@@ -1,19 +1,61 @@
 module Ree::RSpecLinkDSL
-  def link(obj_name, as: nil, from:)
-    obj = Ree.container.compile(from, obj_name)
+  def link(obj_name, import_proc = nil, as: nil, from: nil)
+    if obj_name.is_a?(Symbol)
+      obj = link_object(from, obj_name)
 
-    if obj.nil?
-      raise Ree::Error.new("object :#{obj_name} was not found for package :#{from}")
-    end
-    
-    as ||= obj_name
-
-    define_method as do |*args, **kwargs, &proc|
-      if obj.object?
-        obj.klass.new
-      else
-        obj.klass.new.call(*args, **kwargs, &proc)
+      if obj.nil?
+        raise Ree::Error.new("object :#{obj_name} was not found for package :#{from}")
+      end
+
+      as ||= obj_name
+
+      define_method as do |*args, **kwargs, &proc|
+        if obj.object?
+          obj.klass.new
+        else
+          obj.klass.new.call(*args, **kwargs, &proc)
+        end
       end
+    elsif obj_name.is_a?(String)
+      const_list = link_file(from, obj_name, import_proc)
+      const_list.each do |const|
+        Object.const_set(const.name, self.const_get(const.name))
+      end
+    else
+      raise Ree::Error.new("Invalid link DSL usage. Args should be Hash or String")
+    end  
+  end
+
+  private
+
+  def link_object(from_package_name, obj_name)
+    Ree.container.compile(from_package_name, obj_name)
+  end
+
+  def link_file(from_package_name, path, import_proc)
+    Ree.container.packages_facade.load_package_entry(from_package_name)
+    package = Ree.container.packages_facade.get_package(from_package_name)
+
+    file_path = File.join(
+        Ree::PathHelper.abs_package_dir(package),
+        Ree::PACKAGE, path
+    )
+    Ree.container.packages_facade.load_file(file_path, package.name)
+
+    const_list = path.split('/').map { |_| Ree::StringUtils.camelize(_) }
+    const_short = [const_list[0], const_list.last].join("::")
+    const_long = const_list.join("::")
+
+    file_const = if Object.const_defined?(const_long)
+      Object.const_get(const_long)
+    elsif Object.const_defined?(const_short)
+      Object.const_get(const_short)
+    else
+      raise Ree::Error.new("Unable to link '#{path}'. #{const_long} or #{const_short} was not defined in #{file_path}")
     end
+
+    const_list = Ree::LinkImportBuilder
+      .new(Ree.container.packages_facade)
+      .build_for_const(self, file_const, import_proc)
   end
 end

data/lib/ree/templates/template_detector.rb

@@ -26,7 +26,7 @@ class Ree::TemplateDetector
   def template_file_path(template_name, relative_path)
     file_path = [detect_template_folder(template_name), DEFAULT_TEMPLATES_DIRECTORY]
       .map {|folder| File.join(folder, relative_path)}
-      .detect {|file| File.exists?(file)}
+      .detect {|file| File.exist?(file)}
 
       raise Ree::Error.new('Template does not exist') if file_path.nil?
 

data/lib/ree/version.rb

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

data/lib/ree.rb

@@ -144,7 +144,7 @@ module Ree
     def init(dir, irb: false)
       check_arg(dir, :dir, String)
 
-      if !Dir.exists?(dir)
+      if !Dir.exist?(dir)
         raise Ree::Error.new("Dir does not exist: #{dir}", :invalid_root_dir)
       end
 
@@ -153,7 +153,7 @@ module Ree
 
       ree_setup_path = File.join(@root_dir, REE_SETUP)
 
-      if File.exists?(ree_setup_path)
+      if File.exist?(ree_setup_path)
         require(ree_setup_path)
       end
 
@@ -192,7 +192,7 @@ module Ree
         raise Ree::Error.new("Ree already registered gem `#{name}`", :duplicate_gem)
       end
 
-      if !Dir.exists?(dir)
+      if !Dir.exist?(dir)
         raise Ree::Error.new("Dir does not exist: #{dir}", :invalid_gem_dir)
       end
 
@@ -201,7 +201,7 @@ module Ree
       gem_dir = Pathname.new(packages_schema_path).dirname.to_s
       ree_setup_path = File.join(gem_dir, REE_SETUP)
 
-      if File.exists?(ree_setup_path)
+      if File.exist?(ree_setup_path)
         require(ree_setup_path)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.24
 signing_key: 
 specification_version: 4
 summary: Ruby framework to create modular applications