ree 1.0.20 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c918563b19918a184e724b4795fab01c9fdb6b31cbe8e7a321e193bf349b4966
-  data.tar.gz: 6b44ff0dd17d8da6294e0bc09812c8c459889a62e20edc883e04ede47ccb82ce
+  metadata.gz: 972811cf5375f041b94d6b27312ec7abf79301c5d3bf84e28e2bd386250ff069
+  data.tar.gz: 5da92138c93885000b6dad4b0f6a380ef1ab3edec2967b1a814fac8a9419128c
 SHA512:
-  metadata.gz: 605816e65eed5ae58b67a4d436eb47df091df3d0ed7fed2d9bab22dd54f3c65146e3c9824e5ab6d42e3f855642f5347e4d72613759fad9dac1f41dca8adfd03f
-  data.tar.gz: 7131b3e96084e66fd935e89d072eb2ed1d2d685e51fa56513ca0549acce99ade653edd2c068c97793a4adaeb9770019cf49670c0dee30db901fa3cf2fb3e80db
+  metadata.gz: e3e656e9eb4edfde775740363105ec9fb08ecd53ab0d1dcae016c1d3d29580601a4f41b3d0474932996edb1c6807c971950babf2397df753db9883227897c698
+  data.tar.gz: 126671be60919618cedc2381cf5aaff4b3a4fb4b65c2d1e50a8821c5394612cdf93b845df4ac5df2d371521ed3b2e7334b8280108d2ab42d5d1eda3274e2b7d6

data/Gemfile.lock

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

data/lib/ree/cli/delete_object_schema.rb

@@ -22,6 +22,16 @@ module Ree
           if File.exist?(abs_schema_path)
             FileUtils.rm(abs_schema_path)
 
+            facade = Ree.container.packages_facade
+            package_name = Ree::PathHelper.package_name_from_dir(File.dirname(object_path))
+            if package_name
+              package_name = package_name.to_sym
+              facade.load_package_entry(package_name)
+              package = facade.get_package(package_name)
+              package.remove_object(object_name)
+              facade.dump_package_schema(package_name)
+            end
+
             puts(" #{schema_path}: is deleted") if !silence
           end
 

data/lib/ree/cli/{index_package.rb → indexing/index_package.rb}

@@ -14,16 +14,25 @@ module Ree
 
           facade = Ree.container.packages_facade
 
+          hsh = {}
+          hsh[:package_schema] = {}
+          hsh[:classes] = {}
+          hsh[:objects] = {}
+
           package_name = package_name.to_sym
+          facade.load_entire_package(package_name)
           package = facade.get_loaded_package(package_name)
-          package_hsh = map_package_entry(package)
+          package_hsh = index_package_entry(package)
+
+          hsh[:package_schema] = package_hsh
+          hsh = index_package_files(package, dir, hsh)
 
-          JSON.pretty_generate(package_hsh)
+          JSON.pretty_generate(hsh)
         end
 
         private
 
-        def map_package_entry(package)
+        def index_package_entry(package)
           package_hsh = {}
           package_hsh[:name] = package.name
           package_hsh[:schema_rpath] = package.schema_rpath
@@ -110,6 +119,10 @@ module Ree
             }
           ]
         end
+
+        def index_package_files(package, dir, index_hash)
+          Ree::CLI::IndexProject.send(:index_package_files, package, dir, index_hash)
+        end
       end
     end
   end

data/lib/ree/cli/{index_project.rb → indexing/index_project.rb}

@@ -10,16 +10,15 @@ module Ree
 
           Ree.init(dir)
 
-          @index_hash = {}
+          index_hash = {}
           # completion/etc data
-          @index_hash[:classes] = {}
-          @index_hash[:objects] = {}
+          index_hash[:classes] = {}
+          index_hash[:objects] = {}
 
           # schema data
-          @index_hash[:gem_paths] = {}
-          @index_hash[:packages_schema] = {}
-          @index_hash[:packages_schema][:packages] = []
-          @index_hash[:packages_schema][:gem_packages] = []
+          index_hash[:packages_schema] = {}
+          index_hash[:packages_schema][:packages] = []
+          index_hash[:packages_schema][:gem_packages] = []
 
           facade = Ree.container.packages_facade
 
@@ -48,7 +47,7 @@ module Ree
                 }
               }
 
-              @index_hash[:packages_schema][:gem_packages] << gem_package_hsh
+              index_hash[:packages_schema][:gem_packages] << gem_package_hsh
 
               next
             end
@@ -57,61 +56,76 @@ module Ree
               
             facade.load_entire_package(package.name)
 
-            package_hsh = Ree::CLI::IndexPackage.send(:map_package_entry, package)
+            package_hsh = Ree::CLI::IndexPackage.send(:index_package_entry, package)
 
-            @index_hash[:packages_schema][:packages] << package_hsh
+            index_hash[:packages_schema][:packages] << package_hsh
 
-            objects_class_names = package.objects.map(&:class_name)
+            index_hash = index_package_files(package, dir, index_hash)
+          end
 
-            files = Dir[
-              File.join(
-                Ree::PathHelper.abs_package_module_dir(package), '**/*.rb'
-              )
-            ]
+          if facade.get_package(:ree_errors, false)
+            index_hash = index_exceptions(facade.get_package(:ree_errors), index_hash)
+          end
 
-            files.each do |file_name|
-              begin
-                const_string_from_file_name = Ree::StringUtils.camelize(file_name.split('/')[-1].split('.rb')[0])
-                const_string_with_module = "#{package.module}::#{const_string_from_file_name}"
-                klass = Object.const_get(const_string_with_module)
+          JSON.pretty_generate(index_hash)
+        end
 
-                if klass.include?(ReeEnum::DSL)
-                  index_enum(klass, file_name, package.name, dir, const_string_from_file_name)
+        private
 
-                  next
-                end
+        def index_package_files(package, dir, index_hash)
+          objects_class_names = package.objects.map(&:class_name)
 
-                if klass.include?(ReeDao::DSL)
-                  index_dao(klass, file_name, package.name, dir, const_string_from_file_name)
-                  next
-                end
+          files = Dir[
+            File.join(
+              Ree::PathHelper.abs_package_module_dir(package), '**/*.rb'
+            )
+          ]
 
-                if klass.include?(ReeMapper::DSL)
-                  # TODO
-                  next
-                end
+          files.each do |file_name|
+            begin
+              const_string_from_file_name = Ree::StringUtils.camelize(file_name.split('/')[-1].split('.rb')[0])
+              const_string_with_module = "#{package.module}::#{const_string_from_file_name}"
+              klass = Object.const_get(const_string_with_module)
 
-                if !objects_class_names.include?(const_string_with_module)
-                  index_class(klass, file_name, package.name, dir, const_string_from_file_name)
+              if klass.include?(ReeEnum::DSL)
+                hsh = index_enum(klass, file_name, package.name, dir, const_string_from_file_name)
+                hash_key = const_string_from_file_name
+                index_hash[:classes][hash_key] ||= []
+                index_hash[:classes][hash_key] << hsh
 
-                  next
-                end
-              rescue NameError
                 next
               end
-            end
-          end
 
-          if facade.get_package(:ree_errors, false)
-            index_exceptions(facade.get_package(:ree_errors))
+              if klass.include?(ReeDao::DSL)
+                hsh = index_dao(klass, file_name, package.name, dir, const_string_from_file_name)
+                obj_name_key = Ree::StringUtils.underscore(const_string_from_file_name)
+                index_hash[:objects][obj_name_key] ||= []
+                index_hash[:objects][obj_name_key] << hsh
+
+                next
+              end
+
+              if klass.include?(ReeMapper::DSL)
+                # TODO
+                next
+              end
+
+              if !objects_class_names.include?(const_string_with_module)
+                hsh = index_class(klass, file_name, package.name, dir, const_string_from_file_name)
+                hash_key = const_string_from_file_name
+                index_hash[:classes][hash_key] ||= []
+                index_hash[:classes][hash_key] << hsh
+
+                next
+              end
+            rescue NameError
+              next
+            end
           end
-          
 
-          JSON.pretty_generate(@index_hash)
+          index_hash
         end
 
-        private
-
         def index_class(klass, file_name, package_name, root_dir, hash_key)
           all_methods = klass.public_instance_methods(false)
           orig_methods = all_methods.grep(/original/)
@@ -127,14 +141,12 @@ module Ree
             }
 
           rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
-          hsh = {
+
+          {
             path: rpath_from_root_file_path,
             package: package_name,
             methods: methods
           }
-
-          @index_hash[:classes][hash_key] ||= []
-          @index_hash[:classes][hash_key] << hsh
         end
 
         def index_enum(klass, file_name, package_name, root_dir, hash_key)
@@ -152,20 +164,16 @@ module Ree
               }
             }
 
-          obj_name_key = Ree::StringUtils.underscore(hash_key)
           rpath_from_root_file_path = Pathname.new(file_name).relative_path_from(Pathname.new(root_dir)).to_s
 
-          hsh = {
+          {
             path: rpath_from_root_file_path,
             package: package_name,
             methods: filters
           }
-
-          @index_hash[:objects][obj_name_key] ||= []
-          @index_hash[:objects][obj_name_key] << hsh
         end
 
-        def index_exceptions(errors_package)
+        def index_exceptions(errors_package, index_hash)
           errors_package.objects.each do |obj|
             const_name = obj.class_name.split("::")[-1]
             file_name = File.join(
@@ -179,9 +187,11 @@ module Ree
               methods: []
             }
 
-            @index_hash[:classes][const_name] ||= []
-            @index_hash[:classes][const_name] << hsh
+            index_hash[:classes][const_name] ||= []
+            index_hash[:classes][const_name] << hsh
           end
+
+          index_hash
         end
       end
     end

data/lib/ree/cli.rb

@@ -9,9 +9,9 @@ module Ree
     autoload :DeleteObjectSchema, 'ree/cli/delete_object_schema'
     autoload :GeneratePackage, 'ree/cli/generate_package'
     autoload :GenerateTemplate, 'ree/cli/generate_template'
-    autoload :IndexProject, 'ree/cli/index_project'
-    autoload :IndexFile, 'ree/cli/index_file'
-    autoload :IndexPackage, 'ree/cli/index_package'
+    autoload :IndexProject, 'ree/cli/indexing/index_project'
+    autoload :IndexFile, 'ree/cli/indexing/index_file'
+    autoload :IndexPackage, 'ree/cli/indexing/index_package'
     autoload :SpecRunner, 'ree/cli/spec_runner'
   end
 end

data/lib/ree/core/package.rb

@@ -165,6 +165,16 @@ class Ree::Package
     @objects_store[object.name] = object
   end
 
+  # @param [Symbol] name
+  # @return [nil]
+  def remove_object(name)
+    if @objects_store[name]
+      @objects_store.delete(name)
+    end
+
+    nil
+  end
+
   # @param [Symbol] name
   # @return [Nilor[Ree::Object]]
   def get_object(name)

data/lib/ree/core/path_helper.rb

@@ -52,6 +52,22 @@ class Ree::PathHelper
       File.join(dir, "#{Ree::PACKAGE}/#{name}.rb")
     end
 
+    # @param [String] directory inside package
+    # @return [String] name of package
+    def package_name_from_dir(dir)
+      package_schema = File.join(dir, Ree::PACKAGE_SCHEMA_FILE)
+
+      if File.exist?(package_schema)
+        return package_schema.split('/')[-2]
+      end
+
+      if dir == '/'
+        return nil
+      end
+
+      package_name_from_dir(File.expand_path('..', dir))
+    end
+
     # @param [Ree::Package] package Package schema
     # @return [String] Absolute package entry path (ex. /data/project/bc/accounts/package/accounts.rb)
     def abs_package_entry_path(package)

data/lib/ree/dsl/build_package_dsl.rb

@@ -47,8 +47,6 @@ class Ree::BuildPackageDsl
       raise_error("Dependent package :#{depends_on} was not found in #{Ree::PACKAGES_SCHEMA_FILE}. Run `ree gen.packages_json` to update schema or fix package name")
     end
 
-    @packages_facade.load_package_entry(dep_package.name)
-
     package_dep
   end
 

data/lib/ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.22
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -69,9 +69,9 @@ files:
 - lib/ree/cli/generate_package_schema.rb
 - lib/ree/cli/generate_packages_schema.rb
 - lib/ree/cli/generate_template.rb
-- lib/ree/cli/index_file.rb
-- lib/ree/cli/index_package.rb
-- lib/ree/cli/index_project.rb
+- lib/ree/cli/indexing/index_file.rb
+- lib/ree/cli/indexing/index_package.rb
+- lib/ree/cli/indexing/index_project.rb
 - lib/ree/cli/init.rb
 - lib/ree/cli/spec_runner.rb
 - lib/ree/container.rb