ree 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b3d64c6833699e7eab9bb131f57e8f6bc6b3d68e609dcdc261b78029a22d070
-  data.tar.gz: 9092fc80679dd84185e74de7639771b6bb625f904d0d4883b00f46b705c448f4
+  metadata.gz: bf5e0c8684516ac9e2c26a6cbad0e0616a5ef1077da9a17952210bee81beaa8b
+  data.tar.gz: e35b6f677d0b3d448b68d67479a6ad8d9198387c6608db32f32dd5e38b3fec5e
 SHA512:
-  metadata.gz: 18e0f5cf506e899bc269ff31af9941b2e6fe9e47d0d3a36bb1acf7db5335326efb6511f1125434870354a425330f98c5d07f10081b2cd97d8416a7650a0661c5
-  data.tar.gz: 793ad63ee56c2af4ba302516ae4d1a82da280433a1eb5ac78abcb9217bb74d90f4ecba015066da845ad0828c4a0426bec67c5c1ea2286f80846f6c07fa8cd352
+  metadata.gz: 51f84f4eab9cc867af7a9785c9d7556e20a179fb5997800d52a49d4b2eb609a7063396d85ff856e78cd6c39f0c96d0e89ed3b2b47ae93a36948ba7f12cd3b365
+  data.tar.gz: dd60d3b7438b9c6a1b2d68a06308921653abe35724d4ed573eff5320ef1035dad87f0f17a5c19e41908cdc68cc6b237dee3b5b69890baccfaf13402a0e28f017

data/Gemfile.lock

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

data/lib/ree/core/object_schema.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal  = true
 
 module Ree::ObjectSchema
+  SCHEMA_VERSION_NUMBER = '1.0'
+
   SCHEMA_TYPE = 'schema_type'
   REE_VERSION = 'ree_version'
+  SCHEMA_VERSION = 'schema_version'
   NAME = 'name'
   OBJECT = 'object'
   LINKS = 'links'

data/lib/ree/core/object_schema_builder.rb

@@ -4,23 +4,17 @@ class Ree::ObjectSchemaBuilder
   Schema = Ree::ObjectSchema
 
   # @param [Ree::Object] object
-  # @param [String] - path to object.schema.json file (ex. /project/bc/accounts/schemas/accounts/accounts_cfg.schema.json)
-  # @return [String]
-  def call(object, schema_path)
+  # @return [Hash]
+  def call(object)
     Ree.logger.debug("generating object schema for '#{object.name}' package")
 
-    if !File.exists?(schema_path)
-      only_dir_path = schema_path.split('/')[0..-2]
-      FileUtils.mkdir_p(File.join(only_dir_path))
-    end
-
     if !object.loaded?
       raise Ree::Error.new("object `#{object.name}` from package `#{object.package_name}` is not loaded", :invalid_schema)
     end
 
     data = {
       Schema::SCHEMA_TYPE => Schema::OBJECT,
-      Schema::REE_VERSION => Ree::VERSION,
+      Schema::SCHEMA_VERSION => Schema::SCHEMA_VERSION_NUMBER,
       Schema::NAME => object.name,
       Schema::PATH => object.rpath,
       Schema::MOUNT_AS => object.mount_as,
@@ -37,10 +31,7 @@ class Ree::ObjectSchemaBuilder
       }
     }
 
-    json = JSON.pretty_generate(data)
-
-    File.write(schema_path, json, mode: 'w')
-    json
+    data
   end
 
   private

data/lib/ree/core/package.rb

@@ -3,11 +3,11 @@
 require 'pathname'
 
 class Ree::Package
-  attr_reader :ree_version, :name, :schema_rpath, :entry_rpath,
+  attr_reader :schema_version, :name, :schema_rpath, :entry_rpath,
               :module, :tags, :preload, :default_links, :gem_name
 
-  def initialize(ree_version, name, entry_rpath, schema_rpath, gem_name = nil)
-    @ree_version = ree_version
+  def initialize(schema_version, name, entry_rpath, schema_rpath, gem_name = nil)
+    @schema_version = schema_version
     @name = name
     @schema_rpath = schema_rpath
     @entry_rpath = entry_rpath
@@ -37,8 +37,8 @@ class Ree::Package
   end
 
   # @param [String] val
-  def set_ree_version(val)
-    @ree_version = val; self
+  def set_schema_version(val)
+    @schema_version = val; self
   end
 
   # @param [String] val

data/lib/ree/core/package_schema.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal  = true
 
 module Ree::PackageSchema
+  SCHEMA_VERSION_NUMBER = '1.0'
+
   SCHEMA_TYPE = 'schema_type'
   REE_VERSION = 'ree_version'
+  SCHEMA_VERSION = 'schema_version'
   NAME = 'name'
   PACKAGE = 'package'
   ENTRY_PATH = 'entry_path'

data/lib/ree/core/package_schema_builder.rb

@@ -7,22 +7,17 @@ class Ree::PackageSchemaBuilder
   Schema = Ree::PackageSchema
 
   # @param [Ree::Package] package
-  # @param [String] - abs_path Absolute path to Package.schema.json file (ex. /project/bc/accounts/Package.schema.json)
-  # @return [nil]
-  def call(package, abs_path)
+  # @return [Hash]
+  def call(package)
     Ree.logger.debug("generating package schema for '#{package.name}' package")
 
-    if !File.exists?(abs_path)
-      raise Ree::Error.new("File does not exist: #{abs_path}", :invalid_path)
-    end
-
     if !package.loaded?
       raise Ree::Error.new("package schema should be loaded", :invalid_schema)
     end
     
     data = {
       Schema::SCHEMA_TYPE => Schema::PACKAGE,
-      Schema::REE_VERSION => Ree::VERSION,
+      Schema::SCHEMA_VERSION => Schema::SCHEMA_VERSION_NUMBER,
       Schema::NAME => package.name,
       Schema::ENTRY_PATH => package.entry_rpath,
       Schema::TAGS => package.tags,
@@ -45,9 +40,6 @@ class Ree::PackageSchemaBuilder
       }
     }
 
-    json = JSON.pretty_generate(data)
-
-    File.write(abs_path, json, mode: 'w')
-    nil
+    data
   end
 end

data/lib/ree/core/package_schema_loader.rb

@@ -7,7 +7,7 @@ class Ree::PackageSchemaLoader
   # Sample Package.schema.json
   # {
   #   "schema_type": "package",
-  #   "ree_version": "1.2.3",
+  #   "schema_version": "1.2.3",
   #   "name": "accounts",
   #   "entry_path": "package/accounts.rb",
   #   "depends_on": [
@@ -49,7 +49,7 @@ class Ree::PackageSchemaLoader
     if !File.exists?(abs_schema_path)
       raise Ree::Error.new("File not found: #{abs_schema_path}", :invalid_package_schema)
     end
-    
+
     json_schema = begin
       JSON.load_file(abs_schema_path)
     rescue
@@ -57,12 +57,12 @@ class Ree::PackageSchemaLoader
     end
 
     schema_type = json_schema.fetch(Schema::SCHEMA_TYPE)
-    
+
     if schema_type != Schema::PACKAGE
       raise Ree::Error.new("Invalid schema type: #{abs_schema_path}", :invalid_package_schema)
     end
 
-    ree_version = json_schema.fetch(Schema::REE_VERSION)
+    schema_version = json_schema.fetch(Schema::SCHEMA_VERSION) { Schema::SCHEMA_VERSION_NUMBER }
     entry_rpath = json_schema.fetch(Schema::ENTRY_PATH)
     package_name = json_schema.fetch(Schema::NAME).to_sym
 
@@ -83,12 +83,12 @@ class Ree::PackageSchemaLoader
 
     package = if existing_package
       existing_package
-        .set_ree_version(ree_version)
+        .set_schema_version(schema_version)
         .set_entry_rpath(entry_rpath)
         .set_schema_rpath(schema_rpath)
     else
       Ree::Package.new(
-        ree_version,
+        schema_version,
         package_name,
         entry_rpath,
         schema_rpath,
@@ -118,7 +118,7 @@ class Ree::PackageSchemaLoader
         schema_rpath,
         Ree::PathHelper.object_rpath(schema_rpath),
       )
-      
+
       object.set_package(package.name)
 
       package.set_object(object)

data/lib/ree/core/packages_schema.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal  = true
 
 module Ree::PackagesSchema
+  SCHEMA_VERSION_NUMBER = '1.0'
+
   SCHEMA_TYPE = 'schema_type'
   REE_VERSION = 'ree_version'
+  SCHEMA_VERSION = 'schema_version'
   PACKAGES = 'packages'
   GEM_PACKAGES = 'gem_packages'
-  
+
   module Packages
     NAME = 'name'
     SCHEMA = 'schema'

data/lib/ree/core/packages_schema_builder.rb

@@ -20,7 +20,7 @@ class Ree::PackagesSchemaBuilder
     end
 
     result = {
-      Schema::REE_VERSION => Ree::VERSION,
+      Schema::SCHEMA_VERSION => Schema::SCHEMA_VERSION_NUMBER,
       Schema::SCHEMA_TYPE => Schema::PACKAGES,
       Schema::PACKAGES => packages.sort_by { _1[:name] }.map {
         {
@@ -36,14 +36,6 @@ class Ree::PackagesSchemaBuilder
         }
       },
     }
-
-    json = JSON.pretty_generate(result)
-
-    File.write(
-      File.join(Ree.root_dir, Ree::PACKAGES_SCHEMA_FILE),
-      json,
-      mode: 'w'
-    )
     
     result
   end

data/lib/ree/core/packages_schema_loader.rb

@@ -6,7 +6,7 @@ class Ree::PackagesSchemaLoader
   # Sample Packages.schema.json
   # {
   #   "schema_type": "packages",
-  #   "ree_version": "1.2.3",
+  #   "schema_version": "1.2.3",
   #   "packages": [
   #     {
   #       "name": "accounts",
@@ -18,9 +18,9 @@ class Ree::PackagesSchemaLoader
   #     }
   #   ]
   # }
-  
+
   Schema = Ree::PackagesSchema
-  
+
   # @param [String] path Absolute path to Packages.schema.json file
   # @param Nilor[Ree::PackagesStore] packages_store Existing packages store
   # @return [Ree::PackagesStore]
@@ -36,14 +36,14 @@ class Ree::PackagesSchemaLoader
     end
 
     schema_type = schema.fetch(Schema::SCHEMA_TYPE)
-    
+
     if schema_type != Schema::PACKAGES
       raise Ree::Error.new("Invalid schema type: #{abs_schema_path}", :invalid_packages_schema)
     end
 
-    ree_version = schema.fetch(Schema::REE_VERSION)
+    schema_version = schema.fetch(Schema::SCHEMA_VERSION) { Schema::SCHEMA_VERSION_NUMBER }
     data = schema.fetch(Schema::PACKAGES)
-    packages_store ||= Ree::PackagesStore.new(ree_version)
+    packages_store ||= Ree::PackagesStore.new()
     names = {}
 
     data.each do |item|
@@ -62,7 +62,7 @@ class Ree::PackagesSchemaLoader
       names[name] = true
 
       package = Ree::Package.new(
-        ree_version,
+        schema_version,
         name.to_sym,
         Ree::PathHelper.package_entry_path(schema_rpath),
         schema_rpath,
@@ -78,10 +78,10 @@ class Ree::PackagesSchemaLoader
           raise Ree::Error.new("Unable to add package `#{existing.name}` from `#{package.gem_name}` gem. Package was already added from `#{existing.gem_name}` gem.", :duplicate_package)
         end
       end
-      
+
       packages_store.add_package(
         Ree::Package.new(
-          ree_version,
+          schema_version,
           name.to_sym,
           Ree::PathHelper.package_entry_path(schema_rpath),
           schema_rpath,

data/lib/ree/dsl/object_dsl.rb

@@ -40,14 +40,12 @@ class Ree::ObjectDsl
   # @param [Symbol] object_name
   # @param [Nilor[Symbol]] as
   # @param [Nilor[Symbol]] from
-  # @param [Nilor[ArrayOf[Symbol]]] methods
   # @param [Nilor[Proc]] import
-  def link_object(object_name, as: nil, from: nil, methods: nil, import: nil)
+  def link_object(object_name, as: nil, from: nil, import: nil)
     check_arg(object_name, :object_name, Symbol)
     check_arg(as, :as, Symbol) if as
     check_arg(from, :from, Symbol) if from
     check_arg(import, :import, Proc) if import
-    check_arg_array_of(methods, :methods, Symbol) if methods
 
     link_package_name = from.nil? ? @object.package_name : from
     link_object_name = object_name

data/lib/ree/facades/packages_facade.rb

@@ -13,7 +13,17 @@ class Ree::PackagesFacade
   class << self
     def write_packages_schema
       Ree.logger.debug("write_packages_schema")
-      Ree::PackagesSchemaBuilder.new.call
+      packages_schema = Ree::PackagesSchemaBuilder.new.call
+
+      json = JSON.pretty_generate(packages_schema)
+
+      File.write(
+        File.join(Ree.root_dir, Ree::PACKAGES_SCHEMA_FILE),
+        json,
+        mode: 'w'
+      )
+
+      json
     end
   end
 
@@ -60,7 +70,16 @@ class Ree::PackagesFacade
 
     if package.dir
       schema_path = Ree::PathHelper.abs_package_schema_path(package)
-      Ree::PackageSchemaBuilder.new.call(package, schema_path)
+
+      if !File.exists?(schema_path)
+        raise Ree::Error.new("File does not exist: #{schema_path}", :invalid_path)
+      end
+
+      schema = Ree::PackageSchemaBuilder.new.call(package)
+      json = JSON.pretty_generate(schema)
+      File.write(schema_path, json, mode: 'w')
+
+      json
     end
   end
 
@@ -77,7 +96,16 @@ class Ree::PackagesFacade
 
     schema_path = Ree::PathHelper.abs_object_schema_path(object)
 
-    Ree::ObjectSchemaBuilder.new.call(object, schema_path)
+    if !File.exists?(schema_path)
+      only_dir_path = schema_path.split('/')[0..-2]
+      FileUtils.mkdir_p(File.join(only_dir_path))
+    end
+
+    schema = Ree::ObjectSchemaBuilder.new.call(object)
+    json = JSON.pretty_generate(schema)
+    File.write(schema_path, json, mode: 'w')
+
+    json
   end
 
   # @param [Symbol] package_name

data/lib/ree/link_dsl.rb

@@ -39,14 +39,12 @@ module Ree::LinkDSL
     # @param [Symbol] object_name
     # @param [Nilor[Symbol]] as
     # @param [Nilor[Symbol]] from
-    # @param [Nilor[ArrayOf[Symbol]]] methods
     # @param [Nilor[Proc]] import
-    def _link_object(object_name, as: nil, from: nil, methods: nil, import: nil)
+    def _link_object(object_name, as: nil, from: nil, import: nil)
       check_arg(object_name, :object_name, Symbol)
       check_arg(as, :as, Symbol) if as
       check_arg(from, :from, Symbol) if from
       check_arg(import, :import, Proc) if import
-      check_arg_array_of(methods, :methods, Symbol) if methods
 
       package_name = Ree::StringUtils.underscore(self.name.split('::').first).to_sym
       link_package_name = from.nil? ? package_name : from

data/lib/ree/version.rb

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

data/lib/ree.rb

@@ -244,6 +244,7 @@ module Ree
       facade.load_packages_schema
 
       facade.packages_store.packages.each do |package|
+        next if package.gem?
         puts("Generating Package.schema.json for :#{package.name} package") if !silence
 
         facade.load_entire_package(package.name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-23 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -170,13 +170,13 @@ files:
 - lib/ree/utils/string_utils.rb
 - lib/ree/version.rb
 - sig/ree.rbs
-homepage: https://github.com/glabix/ree/ree
+homepage: https://github.com/glabix/ree/tree/main/ree
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/glabix/ree/ree
-  source_code_uri: https://github.com/glabix/ree/ree
-  changelog_uri: https://github.com/glabix/ree/ree/CHANGELOG.md
+  homepage_uri: https://github.com/glabix/ree/tree/main/ree
+  source_code_uri: https://github.com/glabix/ree/tree/main/ree
+  changelog_uri: https://github.com/glabix/ree/blob/main/ree/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: