flist 0.1.30 → 0.1.32

data/db/migrate/050_create_dirz.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateDirz < ActiveRecord::Migration[6.0]
+  def self.up
+    create_table :Dirzs do |t|
+      t.column :path, :string, null: false
+      t.column :start_datetime, :datetime, null: false
+    end
+  end
+
+  def self.down
+    drop_table :Dirzs
+  end
+end

data/db/migrate/060_create_invaliddirz.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateInvaliddirz < ActiveRecord::Migration[6.0]
+  def self.up
+    create_table :invalidDirzs do |t|
+      t.column :org_id, :int, null: false
+      t.column :count_id, :int, null: true
+    end
+  end
+
+  def self.down
+    drop_table :invalidDirzs
+  end
+end

data/db/migrate/070_create_currentdirz.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateCurrentdirz < ActiveRecord::Migration[6.0]
+  def self.up
+    execute <<~SQL
+            CREATE VIEW currentDirzs AS SELECT id as org_id,
+      path , start_datetime
+            FROM Dirzs where not exists (select * from invalidDirzs where invalidDirzs.org_id = Dirzs.id )
+    SQL
+  end
+
+  def self.down
+    execute <<-SQL
+      DROP VIEW currentDirzs
+    SQL
+  end
+end

data/exe/flist

@@ -1,28 +1,37 @@
 #!/usr/bin/env ruby
-require 'arxutils'
-require "flist"
-
-dbconfig = Arxutils::Dbutil::DBCONFIG_MYSQL
-dbconfig = Arxutils::Dbutil::DBCONFIG_SQLITE3
-
-csv_fname = nil
-csv_fname = ARGV[0] if ARGV.size > 0
-csvin_fname = nil
-csvin_fname = ARGV[1] if ARGV.size > 1
-
-hs = {
-  "db_dir" => Arxutils::Dbutil::DB_DIR,
-  "migrate_dir" => Arxutils::Dbutil::MIGRATE_DIR,
-  "config_dir" => Arxutils::Dbutil::CONFIG_DIR,
-  "dbconfig" => dbconfig,
-  "log_fname" => Arxutils::Dbutil::DATABASELOG,
-  "csv_fname" => csv_fname ,
-  "csvin_fname" => csvin_fname,
-}
-
-
-fl = Flist::Flist.new(
-                      :db,
-                      hs
-                      )
-fl.list_a
+# frozen_string_literal: true
+
+require 'flist'
+require 'simpleoptparse'
+
+cli = Flist::Cli.new
+hash, opts = cli.setup
+
+banner = 'Usage: bundle exec ruby exe/flist --cmd=(x)]'
+
+Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Flist::VERSION, nil) do |parser|
+  parser.on('--cmd X', %w[x]) { |x| opts['cmd'] = x }
+end
+
+fi = Flist::Flist.new(
+  :DB,
+  hash,
+  opts
+)
+# fl.list_a
+puts '= simple'
+# listup_x('simple')
+fi.listup_simple
+
+puts '= simple2'
+# listup_x('simple2')
+fi.listup_simple2
+
+puts '= simple3'
+# listup_x('simple3')
+fi.listup_simple3
+puts '= repo'
+# listup_x('repo')
+fi.listup_repo
+
+fi.finish

data/flist.gemspec

@@ -1,33 +1,46 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'flist/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "flist"
+  spec.name          = 'flist'
   spec.version       = Flist::VERSION
-  spec.authors       = ["yasuo kominami"]
-  spec.email         = ["ykominami@gmail.com"]
+  spec.authors       = ['yasuo kominami']
+  spec.email         = ['ykominami@gmail.com']
+
+  spec.summary       = 'get flie listing in local machine.'
+  spec.description   = 'get flie listing in local machine.'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.7.0'
 
-  spec.summary       = %q{get flie listing in local machine.}
-  spec.description   = %q{get flie listing in local machine.}
-  spec.homepage      = ""
+  # if spec.respond_to?(:metadata)
+  #    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
+  # else
+  #   raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
+  # end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'arxutils_sqlite3'
+  spec.add_runtime_dependency 'encx'
+  spec.add_runtime_dependency 'ykutils'
+  spec.add_runtime_dependency 'ykxutils'
 
-  if spec.respond_to?(:metadata)
-#    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-  spec.add_dependency "rake", "~> 10.0"
+  spec.add_runtime_dependency 'evernote_oauth'
 
-  spec.add_runtime_dependency "activerecord"
-  spec.add_runtime_dependency "sqlite3"
-  spec.add_runtime_dependency "arxutils" , "~> 0.1.0"
-  spec.add_runtime_dependency "ykutils"  , "~> 0.1.0"
+  spec.add_runtime_dependency 'bundler'
+  spec.add_runtime_dependency 'rake'
+  spec.add_runtime_dependency 'rspec'
+  spec.add_runtime_dependency 'rubocop'
+  spec.add_runtime_dependency 'rubocop-rake'
+  spec.add_runtime_dependency 'rubocop-rspec'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency 'yard'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/dbacrecord.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Flist
+  module Dbutil
+    class Count < ActiveRecord::Base
+      has_many :invalidFlistzs
+      has_many :invalidDirzs
+    end
+
+    class Countdatetime < 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 Currentflistz < ActiveRecord::Base
+      belongs_to :flistz, foreign_key: 'org_id'
+    end
+
+    class Dirz < ActiveRecord::Base
+    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
+  end
+end

data/lib/flist/cli.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Flist
+  class Cli
+    include Ykutils::DebugUtils
+
+    def setup
+      debug_utils_init
+      set_debug(true)
+
+      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,
+        'dbconfig' => Arxutils_Sqlite3::Config::DBCONFIG_SQLITE3,
+        'env' => env,
+        'log_fname' => Arxutils_Sqlite3::Config::DATABASELOG,
+        'output_dir' => ::Flist::OUTPUT_DIR,
+        'pstore_dir' => ::Flist::PSTORE_DIR
+      }
+      opts = {}
+
+      [hash, opts]
+    end
+  end
+end

data/lib/flist/csvx.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Flist
+  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)
+
+      @fname = fname
+      @csv = if @fname
+               CSV.open(@fname, 'w',
+                        { encoding: 'UTF-8',
+                          headers: @headers_s,
+                          force_quotes: true,
+                          write_headers: true })
+             end
+    end
+
+    def finish
+      @csv&.close
+    end
+  end
+end

data/lib/flist/dbutil/dbmgr.rb

@@ -1,38 +1,31 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'active_record'
 require 'forwardable'
 require 'encx'
-require 'flist/dbutil/flistzmgr'
-require 'flist/dbutil/dirzmgr'
+# require 'flist/dbutil/flistzmgr'
+# require 'flist/dbutil/dirzmgr'
 
 module Flist
   module Dbutil
-    class Flistz < ActiveRecord::Base
-    end
-
-    class Dirz < ActiveRecord::Base
-    end
-    
-    class Invalidflistz < ActiveRecord::Base
-    end
-
-    class Currentflistz < ActiveRecord::Base
-      belongs_to :flistz , foreign_key: 'org_id'
-    end
-   
     class DbMgr
       extend Forwardable
-      
-      def_delegators( :@flistzmgr , :post_process , :fl)
-      def_delegator(  :@dirzmgr , :add , :dirz_add )
-      def_delegator(  :@flistzmgr , :add , :flistz_add )
-      def_delegator(  :@flistzmgr , :post_process , :flistz_post_process )
 
-      def initialize( register_time )
+      def_delegator(:@dirzmgr, :add, :dirz_add)
+      def_delegator(:@dirzmgr, :post_process, :dirz_post_process)
+      def_delegator(:@flistzmgr, :add, :flistz_add)
+      def_delegator(:@flistzmgr, :post_process, :flistz_post_process)
+
+      def initialize(register_time)
+        # DB接続タイムスタンプ
+        @register_time = register_time
+        # Flistを実行した回数とその時のDB接続タイムスタンプをDBに登録
+        @ct = Dbutil::Countdatetime.create(countdatetime: @register_time)
+
         @db_encoding = Encoding::UTF_8
         @encx = Encx::Encx.init(@db_encoding)
-        @flistzmgr = FlistzMgr.new( @encx, @db_encoding, register_time )
-        @dirzmgr = DirzMgr.new( @encx, @db_encoding, register_time )
+        @flistzmgr = FlistzMgr.new(@encx, @db_encoding, @register_time)
+        @dirzmgr = DirzMgr.new(@encx, @db_encoding, @register_time)
       end
     end
   end

data/lib/flist/dbutil/dirzmgr.rb

@@ -1,34 +1,85 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'pp'
 require 'flist/dbutil/dbmgr'
 
 module Flist
   module Dbutil
     class DirzMgr
-      def initialize(encx , db_encoding, register_time)
+      include Ykutils::DebugUtils
+
+      def initialize(encx, db_encoding, register_time)
+        # 指定エンコーディングの基づいたパス操作
         @encx = encx
+        # DBのエンコーディング
         @db_encoding = db_encoding
+        # DB接続時のタイムスタンプ
         @register_time = register_time
+        # DBに登録・更新したファイル情報をのハッシュ
+        # キーはパス
+        @hs_by_path = {}
+        # DBに登録・更新したファイル情報のハッシュ
+        # キーはファイル情報のobject_id
+        @hs_by_id = {}
       end
 
-      def add( path )
-        path_conv = @encx.convert( path , @db_encoding )
-        ary = Dirz.where( path: path_conv )
-        if ary.size == 0
+      # ディレクトリ情報追加・更新
+      # DBに未登録の時は追加し、登録済みの時は更新する
+      def add(path)
+        # pathをDBのエンコーディングに変換する
+        path_conv = @encx.convert(path, @db_encoding)
+        # パスが表すファイル情報をハッシュから得る
+        dirz = @hs_by_path[path]
+        # パスに対応するファイル情報が見つかれば何もしない
+        return dirz if dirz
+
+        # DirzのViewから、パスで指定したディレクトリ情報を得る
+        cur_dirz = Dbutil::Currentdirz.where(path: path_conv).limit(1)
+        if cur_dirz.size.zero?
+          # 見つからなければ、新たにファイル情報をDBに登録する
           begin
-            dirz = Dirz.create( path: path_conv , start_datetime: @register_time )
-          rescue => ex
-            p ex.class
-            p ex.message
-            pp ex.backtrace
+            d_puts '#### DirzMgr'
+            d_puts "path=#{path_conv}"
+            d_puts '#### FlistzMgr End'
+            dirz = Dirz.create(path: path_conv, start_datetime: @register_time)
+          rescue StandardError => e
+            p e.class
+            p e.message
+            pp e.backtrace
 
             dirz = nil
           end
         else
-          dirz = ary.first
+          # DBから見つかれば、最初に見つけたファイル情報を更新する
+          # current_curz = cur_dirz.first.dirz
+          current_dirz = cur_dirz[0].dirz
+          # hs = { atime: atime, ctime: ctime, mtime: mtime, repo: repo,
+          #        project: project, desc: desc, comment: comment }
+          # value_hs = hs.each_with_object({}) do |item, hsx|
+          #  hsx[item[0]] = item[1] if current_flistz[item[0]] != item[1]
+          # end
+          # current_flistz.update(value_hs) if value_hs.size.positive?
+          dirz = current_dirz
+        end
+        # DBに登録・更新したファイル情報をハッシュに格納
+        if dirz
+          @hs_by_path[path] = dirz
+          @hs_by_id[dirz.object_id] = dirz
         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
+      end
     end
   end
 end

data/lib/flist/dbutil/flistzmgr.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'pp'
 require 'flist/dbutil/dbmgr'
@@ -6,60 +6,95 @@ require 'flist/dbutil/dbmgr'
 module Flist
   module Dbutil
     class FlistzMgr
-      def initialize(encx , db_encoding , register_time)
+      include Ykutils::DebugUtils
+
+      def initialize(encx, db_encoding, register_time)
+        # 指定エンコーディングの基づいたパス操作
         @encx = encx
+        # DBのエンコーディング
         @db_encoding = db_encoding
+        # DB接続時のタイムスタンプ
         @register_time = register_time
+        # DBに登録・更新したファイル情報をのハッシュ
+        # キーはパス
         @hs_by_path = {}
+        # DBに登録・更新したファイル情報のハッシュ
+        # キーはファイル情報のobject_id
         @hs_by_id = {}
       end
 
-      def add( dir_id , level, kind, repo, path , project, desc, comment, atime, ctime, mtime )
-        flistz = @hs_by_path[path]
-        unless flistz
+      # ファイル情報追加・更新
+      # DBに未登録の時は追加し、登録済みの時は更新する
+      def add(dir_id, level, kind, repo, path, project, desc, comment, atime, ctime, mtime)
+        d_puts 'Flist::Dbutil::FlistzMgr add'
+        # pathをDBのエンコーディングに変換する
+        path_conv = @encx.convert(path, @db_encoding)
+        # パスが表すファイル情報をハッシュから得る
+        flistz = @hs_by_path[path_conv]
+        # パスに対応するファイル情報が見つかれば何もしない
+        return flistz if flistz
 
-          path_conv = @encx.convert( path , @db_encoding )
-          cur_flistz = Currentflistz.where( dir_id: dir_id , path: path_conv ).limit(1)
-          if cur_flistz.size == 0
-            begin
-              flistz = Flistz.create( dir_id: dir_id , level: level, kind: kind, repo: repo, path: path_conv , project: project, desc: desc, comment: comment, atime: atime, ctime: ctime, mtime: mtime , start_datetime: @register_time )
-            rescue => ex
-              p ex.class
-              p ex.message
-              pp ex.backtrace
+        # FlistzのViewから、dir_idとパスで指定したファイル情報を得る
+        cur_flistz = Currentflistz.where(dir_id: dir_id, path: path_conv).limit(1)
+        if cur_flistz.size.zero?
+          # 見つからなければ、新たにファイル情報をDBに登録する
+          begin
+            d_puts '#### FlistzMgr'
+            d_puts "dir_id=#{dir_id}"
+            d_puts "level=#{level}"
+            d_puts "kind=#{kind}"
+            d_puts "repo=#{repo}"
+            d_puts "path=#{path_conv}"
+            d_puts "project=#{project}"
+            d_puts "desc=#{desc}"
+            d_puts "comment=#{comment}"
+            d_puts "atime=#{atime}"
+            d_puts "ctime=#{ctime}"
+            d_puts "mtime=#{mtime}"
+            d_puts "@register_time=#{@register_time}"
+            d_puts '#### FlistzMgr End'
+            flistz = Flistz.create(dir_id: dir_id, level: level, kind: kind,
+                                   repo: repo, path: path_conv, project: project,
+                                   desc: desc, comment: comment,
+                                   atime: atime, ctime: ctime, mtime: mtime,
+                                   start_datetime: @register_time)
+          rescue StandardError => e
+            p e.class
+            p e.message
+            pp e.backtrace
 
-              flistz = nil
-            end
-          else
-            current_flistz = cur_flistz.first.flistz
-            hs = {atime:  atime, ctime: ctime , mtime: mtime , repo: repo,  project: project, desc: desc , comment:  comment}
-            value_hs = hs.reduce({}){ |hsx, item|
-              if current_flistz[ item[0] ] != item[1]
-                hsx[ item[0] ] = item[1]
-              end
-              hsx
-            }
-            current_flistz.update(value_hs) if value_hs.size > 0
+            flistz = nil
           end
         else
-          # ignore this case.
+          # DBから見つかれば、最初に見つけたファイル情報を更新する
+          # current_flistz = cur_flistz.first.flistz
+          current_flistz = cur_flistz[0].flistz
+          hs = { atime: atime, ctime: ctime, mtime: mtime, repo: repo,
+                 project: project, desc: desc, comment: comment }
+          value_hs = hs.each_with_object({}) do |item, hsx|
+            hsx[item[0]] = item[1] if current_flistz[item[0]] != item[1]
+          end
+          current_flistz.update(value_hs) if value_hs.size.positive?
+          flistz = current_flistz
         end
 
+        # DBに登録・更新したファイル情報をハッシュに格納
         if flistz
           @hs_by_path[path] = flistz
-          @hs_by_id[flistz.id] = flistz
+          @hs_by_id[flistz.object_id] = flistz
         end
         flistz
       end
 
-      def post_process( dir_id )
-        h_ids = Currentflistz.where( dir_id: dir_id).pluck(:org_id)
+      # DBに登録済データのうち、ハッシュに存在しないデータをInvalidflistzに登録する
+      def post_process(dir_id)
+        h_ids = Currentflistz.where(dir_id: dir_id).pluck(:org_id)
         t_ids = @hs_by_id.keys
         ids = h_ids - t_ids
-        if ids.size > 0
-          ids.each do |idx| 
-            Invalidflistz.create( org_id: idx , end_datetime: @register_time )
-          end
+        return unless ids.size.positive?
+
+        ids.each do |idx|
+          Invalidflistz.create(org_id: idx, end_datetime: @register_time)
         end
       end
     end

data/lib/flist/dbutil.rb

@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-require 'flist/dbutil/dbmgr'
-require 'flist/dbutil/dirzmgr'
-require 'flist/dbutil/flistzmgr'
+# frozen_string_literal: true
 
+require_relative 'dbutil/dbmgr'
+require_relative 'dbutil/dirzmgr'
+require_relative 'dbutil/flistzmgr'