yaml-vfs 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563791b343561d3ba0e548e099d21343a312290e6168e7021c71c76bfc47f785
-  data.tar.gz: 00fbb4e8b8f040e8d83876f7c22dd297e2ea49c555d1710daa9b3f486457e4ed
+  metadata.gz: 2528e2b145ef1734b823a7e4174e391d846f5c6773e19449048b04a38a0522b7
+  data.tar.gz: 97a724b9fc2af1dce2cd0887af5620989643021249deb5bd68e52c8dfe460ea0
 SHA512:
-  metadata.gz: a1da9ac68ecfd753d4e51c013d7ff0f36cc4c506d259ed911dab334392fbde68ec2b8a00abb66332a1b6e0ac6f3df3bcb09aee3347f95a686bb1ce888db35578
-  data.tar.gz: cc0eefdb0598185f80861f68d93e71fcdb092c4eaf713c06bf49b9bd8d03eb0f110d3c8158fb34a9e87fabb09efb32df4dfe0121c7a687c1cdac8989a1bd6d59
+  metadata.gz: c430b27aa060bc8ea91e0b762d9a54a44b3dfb826e791bef313017aa434dd2982730b967cdd3f28b0e3a7e64ab3e97baea9287c3d2113d79ad7c54a7a6026282
+  data.tar.gz: 4d7db0450e0e45ac155329d845264ce261e6ef85c73fbbdef993b46b6ae0cadaa7e2eaa8aeafa6b9a16f71f610a7c09021f230bd6d92802a5e02f6f3353911ac

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

@@ -3,7 +3,7 @@
 module VFS
   class Command
     # vfs yaml file gen cmd
-    class YAMLWriter < Command
+    class Framework < Command
       # summary
       self.summary = 'Virtual the framework and modules dir, and map to real path'
 
@@ -51,8 +51,61 @@ module VFS
       def run
         require 'yaml_vfs'
 
-        entry = VFS::FileCollectorEntry.new_from_real_headers_dir(@framework_path, @real_modules_dir, @real_header_dir)
-        VFS::FileCollector.new([entry]).write_mapping(@output_path)
+        entrys = VFS::FileCollectorEntry.entrys_from_framework_dir(@framework_path, @real_header_dir, @real_modules_dir)
+        VFS::FileCollector.new(entrys).write_mapping(@output_path)
+      end
+    end
+    class Target < Command
+      # summary
+      self.summary = 'Virtual the target public and private headers, and map to real path'
+
+      self.description = <<-DESC
+        Gen VFS Yaml file. To map target virtual path to real path.
+      DESC
+
+      self.arguments = [
+        # target_p, public_header, private_header
+        CLAide::Argument.new('--target-path', true),
+        CLAide::Argument.new('--public-headers-dir', true),
+        CLAide::Argument.new('--private-headers-dir', true),
+        CLAide::Argument.new('--output-path', false)
+      ]
+
+      def initialize(argv)
+        super
+
+        target_path = argv.option('target-path')
+        @target_path = Pathname(target_path) unless target_path.nil?
+        public_headers_dir = argv.option('public-headers-dir')
+        @public_headers_dir = Pathname(public_headers_dir) unless public_headers_dir.nil?
+        private_headers_dir = argv.option('private-headers-dir')
+        @private_headers_dir = Pathname(private_headers_dir) unless private_headers_dir.nil?
+        output_path = argv.option('output-path')
+        @output_path = output_path.nil? ? Pathname('.') : Pathname(output_path)
+      end
+
+      def validate!
+        super
+        help! 'must set --target-path' if @target_path.nil?
+        help! 'must set --public-headers-dir' if @public_headers_dir.nil?
+        help! 'must set --private-headers-dir' if @private_headers_dir.nil?
+      end
+
+      # help
+      def self.options
+        [
+          ['--target-pathh=<path>', 'target path'],
+          ['--public-headers-dir=<path>', 'real public headers path'],
+          ['--private-headers-dir=<path>', 'real private headers path'],
+          ['--output-path=<path>', 'vfs yaml file output path']
+        ].concat(super)
+      end
+
+      def run
+        require 'yaml_vfs'
+
+        entrys = VFS::FileCollectorEntry.entrys_from_target_dir(@target_path, @public_headers_dir, @private_headers_dir)
+        VFS::FileCollector.new(entrys).write_mapping(@output_path)
       end
     end
   end

data/lib/yaml-vfs/file_collector.rb

@@ -4,39 +4,87 @@ require 'set'
 
 module VFS
   HEADER_FILES_EXTENSIONS = %w[.h .hh .hpp .ipp .tpp .hxx .def .inl .inc].freeze
+  VFS_FILES_EXTENSIONS = %w[.yaml .yml .json].freeze
 
   # vfs file collector entry
   class FileCollectorEntry
+    attr_reader :real_path, :virtual_path
 
-    attr_reader :framework_path, :real_modules, :real_headers
+    def initialize(real_path, virtual_path)
+      raise ArgumentError, 'real_path or virtual_path must set' if real_path.nil? || virtual_path.empty?
 
-    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?
+      @real_path = Pathname(real_path)
+      @virtual_path = Pathname(virtual_path)
+    end
 
-      files = Pathname.glob(Pathname(real_header_dir).join('**').join('*')).select do |file|
-        HEADER_FILES_EXTENSIONS.include?(file.extname)
+    def self.entrys_from_framework(framework_path, public_headers, private_headers, real_modules)
+      entrys = []
+      unless public_headers.empty?
+        entrys += public_headers.map do |header|
+          v_p = File.join(framework_path, 'Headers', File.basename(header))
+          new(header, v_p)
+        end
+      end
+      unless private_headers.empty?
+        entrys += private_headers.map do |header|
+          v_p = File.join(framework_path, 'PrivateHeaders', File.basename(header))
+          new(header, v_p)
+        end
+      end
+      unless real_modules.empty?
+        entrys += real_modules.map do |m|
+          v_p = File.join(framework_path, 'Modules', File.basename(m))
+          new(m, v_p)
+        end
       end
-      real_modules = Pathname(real_modules_dir).glob('module*.modulemap')
-      new(framework_path, real_modules, files)
+      entrys
     end
 
-    def initialize(framework_path, real_modules, real_headers)
-      raise ArgumentError, 'framework_path must set' if framework_path.nil?
-      raise ArgumentError, 'real_modules and real_headers must set' if real_modules.empty?
+    def self.entrys_from_framework_dir(framework_path, real_header_dir, real_modules_dir)
+      raise ArgumentError, 'real_header must set and exist' if real_header_dir.nil? || !File.exist?(real_header_dir)
+      raise ArgumentError, 'real_modules must set and exist' if real_header_dir.nil? || !File.exist?(real_header_dir)
+
+      real_header_dir = File.join(real_header_dir, '**', '*')
+      real_headers = Pathname.glob(real_header_dir).select { |file| HEADER_FILES_EXTENSIONS.include?(file.extname) }
+      real_modules = Pathname(real_modules_dir).glob('module*.modulemap') || []
+      entrys_from_framework(framework_path, real_headers, real_modules)
+    end
+
+    def self.entrys_from_target(target_path, public_headers, private_headers)
+      entrys = []
+      unless private_headers.empty?
+        entrys += private_headers.map do |header|
+          v_p = File.join(target_path, 'PrivateHeaders', File.basename(header))
+          new(header, v_p)
+        end
+      end
+      unless public_headers.empty?
+        entrys += public_headers.map do |header|
+          v_p = File.join(target_path, 'Headers', File.basename(header))
+          new(header, v_p)
+        end
+      end
+      entrys
+    end
 
-      @real_headers = real_headers
-      @framework_path = Pathname(framework_path)
-      @real_modules = real_modules
+    def self.entrys_from_target_dir(target_path, public_dir, private_dir)
+      headers = lambda do |dir|
+        unless dir.nil? && File.exist?(dir)
+          Pathname.glob(File.join(dir, '**', '*')).select do |file|
+            HEADER_FILES_EXTENSIONS.include?(file.extname)
+          end
+        end
+      end
+      private_headers = headers.call(private_dir) || []
+      public_headers = headers.call(public_dir) || []
+      entrys_from_target(target_path, public_headers, private_headers)
     end
   end
 
   # vfs gen
   class FileCollector
-    def initialize(entry)
-      raise ArgumentError, 'entry must not empty' if entry.empty?
-
-      @entry = entry
+    def initialize(entrys)
+      @entrys = entrys || []
       @vfs_writer = YAMLVFSWriter.new
     end
 
@@ -44,27 +92,19 @@ module VFS
       add_write_file
       @vfs_writer.case_sensitive = false
       path = Pathname(name).expand_path
-      path = path.join('all-product-headers.yaml') if path.directory?
+      unless VFS_FILES_EXTENSIONS.include?(File.extname(path))
+        path.mkpath unless path.exist?
+        path = path.join('all-product-headers.yaml')
+      end
       stream = @vfs_writer.write
-      path.dirname.mkpath
       File.open(path, 'w') { |f| f.write(stream) }
     end
 
     private
 
     def add_write_file
-      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
-      }
-      @entry.each do |entry|
-        wirte_f.call(entry.framework_path, 'Headers', entry.real_headers)
-        wirte_f.call(entry.framework_path, 'Modules', entry.real_modules)
+      @entrys.each do |entry|
+        @vfs_writer.add_file_mapping(entry.virtual_path, entry.real_path)
       end
     end
   end

data/lib/yaml-vfs/version.rb

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

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: yaml-vfs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Cat1237
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement