yaml-vfs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb77a02e5dff7b58ddbb164d61e7b1ffd1ffdd0ec0ddf816aaf6189462de0105
-  data.tar.gz: aea8cbd0ffb9eed48a942edc211fcbbc6378b1047aa72ff63e389dd31d513702
+  metadata.gz: 563791b343561d3ba0e548e099d21343a312290e6168e7021c71c76bfc47f785
+  data.tar.gz: 00fbb4e8b8f040e8d83876f7c22dd297e2ea49c555d1710daa9b3f486457e4ed
 SHA512:
-  metadata.gz: b6962cb728e59c07c08c00276a80a489b1707b3239c2d037d743159e04f907bbea961504944fb9b60b268b70e589e0bbcdf890d701eb5fa1aad5747d1339a03e
-  data.tar.gz: ad4386f7f3fb7d9c3643bb525de459b93a0c99b848226c34de64c15c1266ff40fb479d1f8e97408d8ae4813a804ea3044d5bb2ad5e2f1b9573106d988a65f706
+  metadata.gz: a1da9ac68ecfd753d4e51c013d7ff0f36cc4c506d259ed911dab334392fbde68ec2b8a00abb66332a1b6e0ac6f3df3bcb09aee3347f95a686bb1ce888db35578
+  data.tar.gz: cc0eefdb0598185f80861f68d93e71fcdb092c4eaf713c06bf49b9bd8d03eb0f110d3c8158fb34a9e87fabb09efb32df4dfe0121c7a687c1cdac8989a1bd6d59

data/lib/yaml-vfs/command/yaml_vfs_writer.rb

@@ -51,7 +51,8 @@ module VFS
       def run
         require 'yaml_vfs'
 
-        VFS::FileCollector.new_from_real_headers_dir(@framework_path, @real_modules_dir, @real_header_dir).write_mapping(@output_path)
+        entry = VFS::FileCollectorEntry.new_from_real_headers_dir(@framework_path, @real_modules_dir, @real_header_dir)
+        VFS::FileCollector.new([entry]).write_mapping(@output_path)
       end
     end
   end

data/lib/yaml-vfs/file_collector.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 require 'set'
-require 'yaml-vfs/yaml_vfs'
 
 module VFS
-  # vfs gen
-  class FileCollector
-    HEADER_FILES_EXTENSIONS = %w[.h .hh .hpp .ipp .tpp .hxx .def .inl .inc].freeze
+  HEADER_FILES_EXTENSIONS = %w[.h .hh .hpp .ipp .tpp .hxx .def .inl .inc].freeze
+
+  # vfs file collector entry
+  class FileCollectorEntry
 
     attr_reader :framework_path, :real_modules, :real_headers
 
     def self.new_from_real_headers_dir(framework_path, real_modules_dir, real_header_dir)
       raise ArgumentError, 'real_header_dir must set and exist' if real_header_dir.nil? || !real_header_dir.exist?
+      raise ArgumentError, 'real_modules_dir must set and exist' if real_modules_dir.nil? || !real_modules_dir.exist?
 
       files = Pathname.glob(Pathname(real_header_dir).join('**').join('*')).select do |file|
         HEADER_FILES_EXTENSIONS.include?(file.extname)
@@ -21,17 +22,25 @@ module VFS
     end
 
     def initialize(framework_path, real_modules, real_headers)
-      @seen = Set.new
-      @vfs_writer = YAMLVFSWriter.new
+      raise ArgumentError, 'framework_path must set' if framework_path.nil?
+      raise ArgumentError, 'real_modules and real_headers must set' if real_modules.empty?
+
       @real_headers = real_headers
       @framework_path = Pathname(framework_path)
       @real_modules = real_modules
     end
+  end
 
-    def write_mapping(name)
-      raise ArgumentError, 'framework_path must set' if @framework_path.nil?
-      raise ArgumentError, 'real_headers or real_header_dir one of them must set' if @real_headers.empty?
+  # vfs gen
+  class FileCollector
+    def initialize(entry)
+      raise ArgumentError, 'entry must not empty' if entry.empty?
+
+      @entry = entry
+      @vfs_writer = YAMLVFSWriter.new
+    end
 
+    def write_mapping(name)
       add_write_file
       @vfs_writer.case_sensitive = false
       path = Pathname(name).expand_path
@@ -44,15 +53,19 @@ module VFS
     private
 
     def add_write_file
-      wirte_f = lambda { |dir, files|
-        paths = @framework_path.join(dir)
+      wirte_f = lambda { |framework_path, dir, files|
+        return if dir.empty?
+
+        paths = framework_path.join(dir)
         files.each do |file|
           path = paths.join(file.basename)
           @vfs_writer.add_file_mapping(path, file)
         end
       }
-      wirte_f.call('Headers', real_headers) unless real_headers.empty?
-      wirte_f.call('Modules', real_modules) unless real_modules.empty?
+      @entry.each do |entry|
+        wirte_f.call(entry.framework_path, 'Headers', entry.real_headers)
+        wirte_f.call(entry.framework_path, 'Modules', entry.real_modules)
+      end
     end
   end
 end

data/lib/yaml-vfs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VFS
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/yaml_vfs.rb

@@ -16,10 +16,10 @@ module VFS
     end
   end
 
+  require_relative 'yaml-vfs/yaml_vfs'
   require_relative 'yaml-vfs/version'
   require_relative 'yaml-vfs/utils'
+  require_relative 'yaml-vfs/file_collector'
 
-
-  autoload :FileCollector, 'yaml-vfs/file_collector'
   autoload :Command, 'yaml-vfs/command'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-vfs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cat1237
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler