flist 0.1.32 → 0.1.33

data/lib/dbacrecord.rb

@@ -1,37 +1,36 @@
-# frozen_string_literal: true
-
 module Flist
-  module Dbutil
-    class Count < ActiveRecord::Base
-      has_many :invalidFlistzs
-      has_many :invalidDirzs
-    end
+module Dbutil
+  class Count < ActiveRecord::Base
+    has_many :invalidFlistzs
+    has_many :invalidDirzs
+  end
 
-    class Countdatetime < ActiveRecord::Base
-    end
+  class Countdatetime < ActiveRecord::Base
+  end
 
-    class Flistz < ActiveRecord::Base
-    end
+  class Flistz < ActiveRecord::Base
+  end
 
-    class Invalidflistz < ActiveRecord::Base
-      belongs_to :flistz, foreign_key: 'org_id'
-      belongs_to :count, foreign_key: ''
-    end
+  class Invalidflistz < ActiveRecord::Base
+    belongs_to :flistz, foreign_key: 'org_id'
+    belongs_to :count, foreign_key: ''
+  end
 
-    class Currentflistz < ActiveRecord::Base
-      belongs_to :flistz, foreign_key: 'org_id'
-    end
+  class Currentflistz < ActiveRecord::Base
+    belongs_to :flistz, foreign_key: 'org_id'
+  end
 
-    class Dirz < ActiveRecord::Base
-    end
+  class Dirz < ActiveRecord::Base
+  end
 
-    class Invaliddirz < ActiveRecord::Base
-      belongs_to :dirz, foreign_key: 'org_id'
-      belongs_to :count, foreign_key: ''
-    end
+  class Invaliddirz < ActiveRecord::Base
+    belongs_to :dirz, foreign_key: 'org_id'
+    belongs_to :count, foreign_key: ''
+  end
 
-    class Currentdirz < ActiveRecord::Base
-      belongs_to :dirz, foreign_key: 'org_id'
-    end
+  class Currentdirz < ActiveRecord::Base
+    belongs_to :dirz, foreign_key: 'org_id'
   end
+
+end
 end

data/lib/flist/cli.rb

@@ -1,18 +1,24 @@
 # frozen_string_literal: true
 
 module Flist
+  # コマンドライン処理クラス
   class Cli
     include Ykutils::DebugUtils
 
-    def setup
+    def initialize(verbose)
       debug_utils_init
-      set_debug(true)
+      set_debug(verbose)
+    end
+
+    # 構成情報設定
+    def setup
+      setup_config
 
       env = ENV.fetch('ENV', nil)
       # env ||= "development"
       env ||= 'production'
 
-      hash = {
+      {
         'db_dir' => Arxutils_Sqlite3::Config::DB_DIR,
         'migrate_dir' => Arxutils_Sqlite3::Config::MIGRATE_DIR,
         'config_dir' => Arxutils_Sqlite3::Config::CONFIG_DIR,
@@ -22,9 +28,22 @@ module Flist
         'output_dir' => ::Flist::OUTPUT_DIR,
         'pstore_dir' => ::Flist::PSTORE_DIR
       }
-      opts = {}
+    end
+
+    def setup_config
+      scope = {}
+      value_hash = {}
+      content = Ykutils::Erubyx.erubi_render_with_template_file(::Flist::ERB_CONFIG_YAML_FILE, scope, value_hash)
+      File.write(::Flist::SAMPLE_CONFIG_YAML_FILE, content)
+      Ykxutils.yaml_load_compati(content)
+    end
 
-      [hash, opts]
+    # setting.ymlのロード
+    def load_config_yaml_file
+      # settingファイル
+      config_yaml_file = ::Flist::CONFIG_YAML_FILE
+      config = Ykxutils.yaml_load_compati(config_yaml_file) if config_yaml_file.exist?
+      config
     end
   end
 end

data/lib/flist/config.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Flist
+  # 構成情報クラス
+  class Config
+    include Ykutils::DebugUtils
+
+    def setup_config
+      scope = {}
+      value_hash = {}
+      content = Ykutils::Erubyx.erubi_render_with_template_file(ERB_CONFIG_YAML_FILE, scope, value_hash)
+      Ykxutils.yaml_load_comati(content)
+      File.write(SAMPLE_CONFIG_YAML_FILE, content)
+    end
+  end
+end

data/lib/flist/csvx.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module Flist
+  # CSV操作用クラス
   class Csvx
     attr_reader :headers_s
     attr_accessor :csv
 
+    # 初期化
     def initialize(fname)
       @headers_sym = %i[level kind repo path project comment atime ctime mtime]
       @headers_s = @headers_sym.map(&:to_s)
@@ -19,6 +21,7 @@ module Flist
              end
     end
 
+    # 終了処理
     def finish
       @csv&.close
     end

data/lib/flist/dbutil/dbmgr.rb

@@ -8,6 +8,7 @@ require 'encx'
 
 module Flist
   module Dbutil
+    # DBマネージャクラス
     class DbMgr
       extend Forwardable
 
@@ -16,6 +17,7 @@ module Flist
       def_delegator(:@flistzmgr, :add, :flistz_add)
       def_delegator(:@flistzmgr, :post_process, :flistz_post_process)
 
+      # 初期化
       def initialize(register_time)
         # DB接続タイムスタンプ
         @register_time = register_time
@@ -27,6 +29,12 @@ module Flist
         @flistzmgr = FlistzMgr.new(@encx, @db_encoding, @register_time)
         @dirzmgr = DirzMgr.new(@encx, @db_encoding, @register_time)
       end
+
+      # 後処理
+      def post_process
+        dirz_post_process
+        flistz_post_process
+      end
     end
   end
 end

data/lib/flist/dbutil/dirzmgr.rb

@@ -5,9 +5,11 @@ require 'flist/dbutil/dbmgr'
 
 module Flist
   module Dbutil
+    # ディレクトリ情報マネージャ
     class DirzMgr
       include Ykutils::DebugUtils
 
+      # 初期化
       def initialize(encx, db_encoding, register_time)
         # 指定エンコーディングの基づいたパス操作
         @encx = encx
@@ -21,6 +23,8 @@ module Flist
         # DBに登録・更新したファイル情報のハッシュ
         # キーはファイル情報のobject_id
         @hs_by_id = {}
+        # DBに登録・更新したディレクトリ情報に対応するパス
+        @set_of_dir_path = Set.new
       end
 
       # ディレクトリ情報追加・更新
@@ -65,20 +69,28 @@ module Flist
         if dirz
           @hs_by_path[path] = dirz
           @hs_by_id[dirz.object_id] = dirz
+          @set_of_dir_path.add(path)
         end
         dirz
       end
 
-      # DBに登録済データのうち、ハッシュに存在しないデータをInvaliddirzに登録する
+      # 後処理
       def post_process
-        # h_ids = Currentdirz.where(dir_id: dir_id).pluck(:org_id)
-        # t_ids = @hs_by_id.keys
-        # ids = h_ids - t_ids
-        # if ids.size.positive?
-        #   ids.each do |idx|
-        #     Invaliddirz.create(org_id: idx, end_datetime: @register_time)
-        #   end
-        # end
+        @set_of_dir_path.each do |path|
+          post_process_for_dir_path(path)
+        end
+      end
+
+      # 後処理（パス指定）
+      def post_process_for_dir_path(path)
+        h_ids = Currentdirz.where(path: path).pluck(:org_id)
+        t_ids = @hs_by_id.keys
+        ids = h_ids - t_ids
+        return unless ids.size.positive?
+
+        ids.each do |idx|
+          Invaliddirz.create(org_id: idx, end_datetime: @register_time)
+        end
       end
     end
   end

data/lib/flist/dbutil/flistzmgr.rb

@@ -5,6 +5,7 @@ require 'flist/dbutil/dbmgr'
 
 module Flist
   module Dbutil
+    # ファイル情報マネージャ
     class FlistzMgr
       include Ykutils::DebugUtils
 
@@ -21,6 +22,8 @@ module Flist
         # DBに登録・更新したファイル情報のハッシュ
         # キーはファイル情報のobject_id
         @hs_by_id = {}
+        # DBに登録・更新したファイル情報に対応するディレクトリID
+        @set_of_dir_id = Set.new
       end
 
       # ファイル情報追加・更新
@@ -82,12 +85,21 @@ module Flist
         if flistz
           @hs_by_path[path] = flistz
           @hs_by_id[flistz.object_id] = flistz
+          @set_of_dir_id.add(dir_id)
         end
         flistz
       end
 
+      # 後処理
+      def post_process
+        @set_of_dir_id.each do |dir_id|
+          post_process_for_dir_id(dir_id)
+        end
+      end
+
+      # 後処理（ディレクトリID)
       # DBに登録済データのうち、ハッシュに存在しないデータをInvalidflistzに登録する
-      def post_process(dir_id)
+      def post_process_for_dir_id(dir_id)
         h_ids = Currentflistz.where(dir_id: dir_id).pluck(:org_id)
         t_ids = @hs_by_id.keys
         ids = h_ids - t_ids

data/lib/flist/flist/filelist.rb

@@ -4,6 +4,7 @@ require 'ykutils/debugutils'
 
 module Flist
   class Flist
+    # 詳細ファイルリストクラス
     class Filelist
       include Ykutils::DebugUtils
 
@@ -40,14 +41,7 @@ module Flist
 
         # 設定ファイルの"topdirhs"で定義されたグループに含まれるサブディレクトリを表すID
         @dir_id = dir_id
-        unless @dir_id
-          p "invalid @dir_id=#{@dir_id}"
-          exit
-        end
-        # debug_utils_init
-        # set_debug(true)
-
-        # @cur_item = self.class.make_instance_of_item_class
+        raise InvalidDirIdError, "invalid @dir_id=#{@dir_id}" unless @dir_id
 
         # 全Itemを収めるハッシュ(キーはそのItemを指すパス)
         @items = {}
@@ -121,7 +115,6 @@ module Flist
         else
           d_puts 'F'
         end
-        # p ret
         d_puts "In dot_directory? basename=#{basename}|ret=#{ret}"
         ret
       end
@@ -170,6 +163,8 @@ module Flist
       end
 
       def make_fileinfo(path)
+        raise InvalidMakeItemArgsError, "path=#{path}" unless path.instance_of?(String)
+
         atime = File.atime(path)
         ctime = File.ctime(path)
         mtime = File.mtime(path)
@@ -177,8 +172,8 @@ module Flist
         # @@fileinfo_class.new( atime , ctime, mtime )
       end
 
-      def repository_files(kind, level, repo, dir, x_str, path_s)
-        register_item(kind, level, repo, dir, make_fileinfo(x_str), 1)
+      def repository_files(kind, level, repo, dir, fileinfo, path_s)
+        register_item(kind, level, repo, dir, fileinfo, 1)
 
         @dirs[path_s] = @encx.make_regexp("^#{path_s}") unless @dirs[path_s]
         @skip_dirs[path_s] = @encx.make_regexp("^#{path_s}") unless @skip_dirs[path_s]
@@ -186,17 +181,25 @@ module Flist
         [repo, dir]
       end
 
-      def scanx_sub(item, bundle_repo, level, repo)
+      def scanx_sub(item, bundle_repo, level, _level_limit, repo)
         dir = nil
         if File.directory?(item)
           kind = 'D'
           dir = @encx.convert(@cur_dir)
+          unless item.instance_of?(String)
+            p item
+            raise InvalidSacnxSubArgumentError, "item=#{item}"
+          end
           x_item = @encx.convert(item)
           path_s = File.expand_path(File.join(dir, x_item))
           if repository?(x_item, bundle_repo)
             # カレントディレクトリの直下にリポジトリが存在すれば、カレントディレクトリをプロジェクトとして登録する。リポジトリ自体は登録しない（管理外とする）。
             d_puts "REPOSITORY #{dir}|#{path_s}"
             # return nil
+            unless x_item.instance_of?(String)
+              p x_item
+              raise InvalidSacnxSubArgumentError, "x_item=#{x_item}"
+            end
             return repository_files(kind, level, x_item, dir, make_fileinfo(x_item), path_s)
           elsif ignore_directory?(x_item)
             d_puts "SKIP_DIRECTORY #{x_item}|#{path_s}"
@@ -214,9 +217,7 @@ module Flist
           path_s = File.expand_path(File.join(dir, x_item))
           register_item(kind, level, '', path_s, make_fileinfo(x_item), 0)
         end
-        # p "scan_sub"
-        # p repo
-        # p dir
+
         [repo, dir]
       end
 
@@ -231,7 +232,9 @@ module Flist
         @skip_dirs[dir] = @encx.make_regexp("^#{abs_dir_path}") unless skip_dirs[dir]
       end
 
-      def non_skip_files(abs_dir_path, level)
+      def non_skip_files(abs_dir_path, level, level_limit)
+        next_level = level + 1
+        next_level_limit = level_limit - 1
         Dir.chdir(abs_dir_path) do
           d_puts "non_skip_files chdir #{abs_dir_path}"
           repo = nil
@@ -239,26 +242,30 @@ module Flist
           @cur_dir = Dir.getwd
           bundle_repo = bundle_repository
 
-          Dir.foreach('.') do |x|
-            next if ['.', '..'].include?(x)
+          if next_level_limit <= 0
+            Dir.foreach('.') do |x|
+              next if ['.', '..'].include?(x)
 
-            # d_puts "scanx x=#{x}"
-            # d_puts "=========#{x.encoding}"
-            # d_puts "@cur_dir=#{@cur_dir}"
-            x_str = @encx.convert(x)
-            repo, dir = scanx_sub(x_str, bundle_repo, level, repo)
-            dirs << dir if dir
-          end
-          unless repo.nil?
-            dirs.each do |d|
-              scanx(d, level + 1)
+              # d_puts "scanx x=#{x}"
+              # d_puts "=========#{x.encoding}"
+              # d_puts "@cur_dir=#{@cur_dir}"
+              x_str = @encx.convert(x)
+              repo, dir = scanx_sub(x_str, bundle_repo, next_level, next_level_limit, repo)
+              dirs << dir if dir
+            end
+            unless repo.nil?
+              dirs.each do |d|
+                scanx(d, next_level, next_level_limit)
+              end
             end
           end
         end
       end
 
-      def scanx(abs_dir_path, level)
-        d_puts "######### scanx abs_dir_path=#{abs_dir_path}"
+      def scanx(abs_dir_path, level, level_limit)
+        d_puts "######### scanx abs_dir_path=#{abs_dir_path} level=#{level} level_limit=#{level_limit}"
+        next_level = level + 1
+        next_level_limit = level_limit - 1
         # d_puts "=scanx====#{Dir.pwd}"
         # d_puts "abs_dir_path=#{abs_dir_path}"
         # d_puts "abs_dir_path.encoding=#{abs_dir_path.encoding}"
@@ -268,8 +275,10 @@ module Flist
         if project_directory?(abs_dir_path)
           project_directory_files
         else
+          return if next_level_limit <= 0
+
           # スッキプすべきとして登録されたディレクトリまたは、そのサブディレクトリであれば、スキップする
-          non_skip_files(abs_dir_path, level) unless need_skip?(abs_dir_path)
+          non_skip_files(abs_dir_path, next_level, next_level_limit) unless need_skip?(abs_dir_path)
         end
       end
 
@@ -290,7 +299,10 @@ module Flist
           @cur_dir = Dir.getwd
         end
         d_puts "scan @cur_dir=#{@cur_dir} call scanx @top_dir=#{@top_dir}"
-        scanx(@top_dir, 0)
+        next_level = 0
+        next_level_limit = 2
+        scanx(@top_dir, next_level, next_level_limit)
+
         d_puts '########## scan End'
       end
 
@@ -317,19 +329,9 @@ module Flist
           d_puts "ctime=#{v.ctime}"
           d_puts "mtime=#{v.mtime}"
           d_puts '#### Flilelist End'
-          unless @dir_id
-            puts "invalid @dir_id=#{@dir_id}"
-            exit
-          end
-          unless v.repo
-            puts "invalid v.repo=#{v.repo}"
-            exit
-          end
-
-          unless v.comment
-            puts "invalid v.comment=#{v.comment}"
-            exit
-          end
+          raise InvalidDirIdError, "invalid @dir_id=#{@dir_id}" unless @dir_id
+          raise InvalidRepoError, "invalid v.repo=#{v.repo}" unless v.repo
+          raise InvalidCommitError, "invalid v.comment=#{v.comment}" unless v.comment
 
           @dbmgr.flistz_add(@dir_id, v.level, v.kind, v.repo, v.path, v.project,
                             v.desc, v.comment, v.atime, v.ctime, v.mtime)