flist 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e7ec0fbf6850f7f3b9b5b3ceca1c4c4a11b2c8b74a423c2f8c1b3f49a59b0e
-  data.tar.gz: '093504b47a1c64d03c614824c5de93a2ad65b3bda0259b9d17ea8dfe30260820'
+  metadata.gz: d39ef08e21cea0fdd6d2ad26d2a23e6f8d711507486a92e70152fb02925f5b91
+  data.tar.gz: dca998382f32a359f9b42453927d65f646b3384e72e2f75ab794b5cb7ecfb412
 SHA512:
-  metadata.gz: 3e8316a22176851509c7efb0e819847df4e17bcdb1e925a760962d8eb1a54245f19023d9908d2bda10c4791c3aee1e03201fb968b2d8a8adf5752b5da742ecc8
-  data.tar.gz: bbbbb98cb399d2025db71b4a4e4f3bf7d8615fe88d491865367fa56cb6225c52be5dada3047c9ac108b10ae4358a41484f6c9fa8835b644e21c98eaf1b93d05a
+  metadata.gz: 817da79ec789360c3a9294475a411d916920b3a3de6019fb847de25436ba1a664fe0373d856df8f807d460b39a0c9c62bddab0dcaade6eaae3f4799a6276c426
+  data.tar.gz: 185d888808486747ff851570dc2b47493479ef61fc32e1bcf8fe8e8621bad468c4831ef50b3dcb9fbd0ce7ff075d9af67e94ea346eede60a4bc6d7167bcde486

data/.github/workflows/main.yml

@@ -0,0 +1,31 @@
+name: Ruby
+
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run the arx task
+        run: bundle exec rake arx:arxutils_sqlite3
+      - name: Run the flists task
+        run: bundle exec rake flists
+      - name: Run the default task
+        run: bundle exec rake

data/.rubocop.yml

@@ -7,3 +7,6 @@ AllCops:
 require:
   - rubocop-rake
   - rubocop-rspec
+
+
+

data/.rubocop_todo.yml

@@ -1,31 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-09-28 00:57:30 UTC using RuboCop version 1.36.0.
+# on 2022-09-30 22:38:11 UTC using RuboCop version 1.36.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'lib/dbacrecord.rb'
+
 # Offense count: 2
-Lint/HashCompareByIdentity:
+# This cop supports safe autocorrection (--autocorrect).
+Layout/HeredocIndentation:
   Exclude:
-    - 'lib/flist/dbutil/dirzmgr.rb'
-    - 'lib/flist/dbutil/flistzmgr.rb'
+    - 'db/migrate/040_create_currentflistz.rb'
+    - 'db/migrate/070_create_currentdirz.rb'
 
 # Offense count: 1
-Lint/UnreachableCode:
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
+Layout/IndentationWidth:
   Exclude:
-    # - 'lib/flist/flist/filelist.rb'
+    - 'lib/dbacrecord.rb'
 
-# Offense count: 8
-Lint/UselessAssignment:
+# Offense count: 2
+Lint/HashCompareByIdentity:
   Exclude:
-    # - 'exe/flist'
-    # - 'lib/flist/dbutil/flistzmgr.rb'
-    # - 'lib/flist/flist.rb'
-    # - 'lib/flist/flist/filelist.rb'
+    - 'lib/flist/dbutil/dirzmgr.rb'
+    - 'lib/flist/dbutil/flistzmgr.rb'
 
-# Offense count: 14
+# Offense count: 12
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 61
@@ -39,17 +49,17 @@ Metrics/BlockLength:
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 258
+  Max: 270
 
 # Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 19
+# Offense count: 17
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 47
+  Max: 48
 
 # Offense count: 7
 # Configuration parameters: CountKeywordArgs.
@@ -57,52 +67,61 @@ Metrics/ParameterLists:
   Max: 11
   MaxOptionalParameters: 11
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 10
 
 # Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    # - 'lib/flist/flist/filelist.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, AllowedPatterns, IgnoredPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  Exclude: # -  'lib/_arx_flistz.rb'
-
-# Offense count: 5
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: as, at, by, db, id, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
+# This cop supports safe autocorrection (--autocorrect).
+Style/BlockComments:
   Exclude:
-    # - 'lib/flist/flist.rb'
-    # - 'lib/flist/flist/filelist.rb'
-    # - 'lib/flist/flist/store.rb'
+    - 'config/dbsetup.rb'
 
-# Offense count: 17
+# Offense count: 7
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
-  Enabled: false
-
-# Offense count: 4
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
   Exclude:
-    # - 'flist.gemspec'
-    # - 'lib/flist/csvx.rb'
-    # - 'lib/flist/dbutil/flistzmgr.rb'
-    # - 'lib/flist/flist/filelist.rb'
-
-# Offense count: 1
+    # - 'spec/**/*'
+    - 'test/**/*'
+    - 'db/migrate/010_create_countdatetime.rb'
+    - 'db/migrate/020_create_flistz.rb'
+    - 'db/migrate/030_create_invalidflistz.rb'
+    - 'db/migrate/040_create_currentflistz.rb'
+    - 'db/migrate/050_create_dirz.rb'
+    - 'db/migrate/060_create_invaliddirz.rb'
+    - 'db/migrate/070_create_currentdirz.rb'
+
+# Offense count: 9
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'config/dbsetup.rb'
+    - 'db/migrate/010_create_countdatetime.rb'
+    - 'db/migrate/020_create_flistz.rb'
+    - 'db/migrate/030_create_invalidflistz.rb'
+    - 'db/migrate/040_create_currentflistz.rb'
+    - 'db/migrate/050_create_dirz.rb'
+    - 'db/migrate/060_create_invaliddirz.rb'
+    - 'db/migrate/070_create_currentdirz.rb'
+    - 'lib/dbacrecord.rb'
+
+# Offense count: 21
 # This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either, consistent
+Style/HashSyntax:
   Exclude:
-    # - 'lib/flist/flist/filelist.rb'
+    - 'db/migrate/010_create_countdatetime.rb'
+    - 'db/migrate/020_create_flistz.rb'
+    - 'db/migrate/030_create_invalidflistz.rb'
+    - 'db/migrate/050_create_dirz.rb'
+    - 'db/migrate/060_create_invaliddirz.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https

data/Gemfile

@@ -14,6 +14,7 @@ gem 'evernote_oauth'
 gem 'ykxutils'
 
 gem 'ykutils', '> 0.1.3'
+# gem 'ykutils', '> 0.1.3', path: '../ykutils'
 
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'

data/Rakefile

@@ -14,12 +14,40 @@ require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
 # task :default => :spec
+efname = 'env-a1.yaml'
+# efname = "env-a2.yaml"
+# efname = "env-a3.yaml"
+cfname = 'config/config.yml'
+
+desc 'Flist related operation'
+task :flists do
+  sh "bundle exec exe/flist --cmd=s --env=#{efname} --config=#{cfname}"
+end
+
+desc 'Flist related operation'
+task :flistfs1 do
+  sh "bundle exec exe/flist --cmd=fs1 --env=#{efname} --config=#{cfname}"
+end
+
 desc 'Flist related operation'
-task :flist do
-  sh 'bundle exec exe/flist'
+task :flistfs2 do
+  sh "bundle exec exe/flist --cmd=fs2 --env=#{efname} --config=#{cfname}"
 end
 
 desc 'Flist related operation'
+task :flistfs3 do
+  sh "bundle exec exe/flist --cmd=fs3 --env=#{efname} --config=#{cfname}"
+end
+
+desc 'Flist related operation'
+task :flistfr do
+  sh "bundle exec exe/flist --cmd=fr --env=#{efname} --config=#{cfname}"
+end
+
+desc 'Flist related operation'
+task flistall: %i[flistfs1 flistfs2 flistfs3 flistfr]
+
+desc 'Flist spec rubocop'
 task default: %i[spec rubocop]
 
 # task :default => :spec

data/bin/setup

@@ -2,6 +2,8 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+bundle config path --local vendor/bundle
 bundle install
+bundle exec ruby exe/flist --cmd="s"
 
 # Do any other automated setup that you need to do here

data/config/config.yml

@@ -0,0 +1,14 @@
+---
+- #  home: '/home/ykominami'
+  home: '/mnt/z/BACKUP/ykomi-202008'
+  c: '/mnt/c'
+  e: '/mnt/e'
+  v: '/mnt/e/V'
+  x: '/mnt/e/X'
+  z: '/mnt/z'
+- home: '/home/ykominami'
+  c: 'C:'
+  e: 'E:'
+  v: 'E:\V'
+  x: 'E:\X'
+  z: 'Z:'

data/config/config_sample.yml

@@ -0,0 +1,15 @@
+---
+-
+  home: '/home/ykominami'
+  c: '/mnt/c'
+  e: '/mnt/e'
+  v: '/mnt/e/V'
+  x: '/mnt/e/X'
+  z: '/mnt/z'
+-
+  home: '/home/ykominami'
+  c: 'C:'
+  e: 'E:'
+  v: 'E:\V'
+  x: 'E:\X'
+  z: 'Z:'

data/config/config_yml.sample

@@ -0,0 +1,15 @@
+---
+-
+  home: '/home/ykominami'
+  c: '/mnt/c'
+  e: '/mnt/e'
+  v: '/mnt/e/V'
+  x: '/mnt/e/X'
+  z: '/mnt/z'
+-
+  home: '/home/ykominami'
+  c: 'C:'
+  e: 'E:'
+  v: 'E:\V'
+  x: 'E:\X'
+  z: 'Z:'

data/config/dbsetup.rb

@@ -1,7 +1,6 @@
-# frozen_string_literal: true
-
 require_relative '../lib/dbacrecord'
 
+# テスト用クラス
 class Dbsetup
   def initialize(connect_time)
     @connect_time = connect_time
@@ -9,47 +8,49 @@ class Dbsetup
     @hs_by_notebook = {}
     @hs_by_id = {}
   end
-  #   # 指定stack(文字列)にノートブック(文字列)、ノートブック数、タグ数を追加
-  #   def add( stack , notebook, count, tag_count )
-  #     ennblist = @hs_by_notebook[notebook]
-  #     unless ennblist
-  #       cur_ennblist = Currentennblist.where( notebook: notebook ).limit(1)
-  #       if cur_ennblist.size == 0
-  #         begin
-  #           ennblist = Ennblist.create( stack: stack, notebook: notebook ,
-  #                                       count: count, tag_count: tag_count ,
-  #                                       start_datetime: @register_time )
-  #           evnb = Evnb.create( time_id: @ct.id , ennb_id: ennblist.id )
-  #         rescue => ex
-  #           p ex.class
-  #           p ex.message
-  #           pp ex.backtrace
-  #
-  #           ennblist = nil
-  #           evnb = nil
-  #         end
-  #       else
-  #         current_ennblist = cur_ennblist.first.ennblist
-  #         hs = {:stack => stack, :count => count , :tag_count => tag_count }
-  #         value_hs = hs.reduce({}){ |hsx,item|
-  #           if current_ennblist[ item[0] ] != item[1]
-  #             hsx[ item[0] ] = item[1]
-  #           end
-  #           hsx
-  #         }
-  #         if value_hs.size > 0
-  #           if value_hs.all? { |item| item[1] != nil }
-  #             current_ennblist.update(value_hs)
-  #           end
-  #         end
-  #       end
-  #     else
-  #       # ignore this case.
-  #     end
-  #     if ennblist
-  #       @hs_by_notebook[notebook] = ennblist
-  #       @hs_by_id[ennblist.id] = ennblist
-  #     end
-  #     ennblist
-  #   end
+=begin
+  # 指定stack(文字列)にノートブック(文字列)、ノートブック数、タグ数を追加
+  def add( stack , notebook, count, tag_count )
+    ennblist = @hs_by_notebook[notebook]
+    unless ennblist
+      cur_ennblist = Currentennblist.where( notebook: notebook ).limit(1)
+      if cur_ennblist.size == 0
+        begin
+          ennblist = Ennblist.create( stack: stack, notebook: notebook ,
+                                      count: count, tag_count: tag_count ,
+                                      start_datetime: @register_time )
+          evnb = Evnb.create( time_id: @ct.id , ennb_id: ennblist.id )
+        rescue => ex
+          p ex.class
+          p ex.message
+          pp ex.backtrace
+
+          ennblist = nil
+          evnb = nil
+        end
+      else
+        current_ennblist = cur_ennblist.first.ennblist
+        hs = {:stack => stack, :count => count , :tag_count => tag_count }
+        value_hs = hs.reduce({}){ |hsx,item|
+          if current_ennblist[ item[0] ] != item[1]
+            hsx[ item[0] ] = item[1]
+          end
+          hsx
+        }
+        if value_hs.size > 0
+          if value_hs.all? { |item| item[1] != nil }
+            current_ennblist.update(value_hs)
+          end
+        end
+      end
+    else
+      # ignore this case.
+    end
+    if ennblist
+      @hs_by_notebook[notebook] = ennblist
+      @hs_by_id[ennblist.id] = ennblist
+    end
+    ennblist
+  end
+=end
 end

data/db/migrate/010_create_countdatetime.rb

@@ -1,9 +1,7 @@
-# frozen_string_literal: true
-
 class CreateCountdatetime < ActiveRecord::Migration[6.0]
   def self.up
     create_table :countdatetimes do |t|
-      t.column :countdatetime, :datetime, null: false
+      t.column :countdatetime, :datetime, :null => false
     end
   end
 

data/db/migrate/020_create_flistz.rb

@@ -1,20 +1,18 @@
-# frozen_string_literal: true
-
 class CreateFlistz < ActiveRecord::Migration[6.0]
   def self.up
     create_table :Flistzs do |t|
-      t.column :dir_id, :integer, null: false
-      t.column :level, :integer, null: false
-      t.column :kind, :string, null: false
-      t.column :repo, :string, null: false
-      t.column :path, :string, null: false
-      t.column :project, :string, null: false
-      t.column :desc, :string, null: true
-      t.column :comment, :string, null: true
-      t.column :atime, :datetime, null: false
-      t.column :ctime, :datetime, null: false
-      t.column :mtime, :datetime, null: false
-      t.column :start_datetime, :datetime, null: false
+      t.column :dir_id, :integer, :null => false
+      t.column :level, :integer, :null => false
+      t.column :kind, :string, :null => false
+      t.column :repo, :string, :null => false
+      t.column :path, :string, :null => false
+      t.column :project, :string, :null => false
+      t.column :desc, :string, :null => true
+      t.column :comment, :string, :null => true
+      t.column :atime, :datetime, :null => false
+      t.column :ctime, :datetime, :null => false
+      t.column :mtime, :datetime, :null => false
+      t.column :start_datetime, :datetime, :null => false
     end
   end
 

data/db/migrate/030_create_invalidflistz.rb

@@ -1,10 +1,9 @@
-# frozen_string_literal: true
-
 class CreateInvalidflistz < ActiveRecord::Migration[6.0]
   def self.up
     create_table :invalidFlistzs do |t|
-      t.column :org_id, :int, null: false
-      t.column :count_id, :int, null: true
+      t.column :org_id, :int, :null => false
+      t.column :count_id, :int, :null => true
+      t.column :end_datetime, :datetime, :null => false
     end
   end
 

data/db/migrate/040_create_currentflistz.rb

@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
 class CreateCurrentflistz < ActiveRecord::Migration[6.0]
   def self.up
-    execute <<~SQL
-            CREATE VIEW currentFlistzs AS SELECT id as org_id,
-      dir_id , level , kind , repo , path , project , desc , comment , atime , ctime , mtime , start_datetime
-            FROM Flistzs where not exists (select * from invalidFlistzs where invalidFlistzs.org_id = Flistzs.id )
+    execute <<-SQL
+      CREATE VIEW currentFlistzs AS SELECT id as org_id,
+dir_id , level , kind , repo , path , project , desc , comment , atime , ctime , mtime , start_datetime
+      FROM Flistzs where not exists (select * from invalidFlistzs where invalidFlistzs.org_id = Flistzs.id )
     SQL
   end
 

data/db/migrate/050_create_dirz.rb

@@ -1,10 +1,8 @@
-# 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
+      t.column :path, :string, :null => false
+      t.column :start_datetime, :datetime, :null => false
     end
   end
 

data/db/migrate/060_create_invaliddirz.rb

@@ -1,10 +1,9 @@
-# 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
+      t.column :org_id, :int, :null => false
+      t.column :count_id, :int, :null => true
+      t.column :end_datetime, :datetime, :null => false
     end
   end
 

data/db/migrate/070_create_currentdirz.rb

@@ -1,11 +1,9 @@
-# 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 )
+    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
 

data/exe/flist

@@ -4,34 +4,78 @@
 require 'flist'
 require 'simpleoptparse'
 
-cli = Flist::Cli.new
-hash, opts = cli.setup
+banner = 'Usage: bundle exec ruby exe/flist --cmd=[s|fs1|fs2|fs3|fr] --config config-yaml --env env-yaml --verbose'
 
-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 }
+opts = {}
+opts['verbose'] = false
+begin
+  Simpleoptparse::Simpleoptparse.parse(ARGV, opts, banner, Flist::VERSION, nil) do |parser|
+    parser.on('--cmd=X', %w[s fs1 fs2 fs3 fr]) { |x| opts['cmd'] = x }
+    parser.on('--config=config-yaml') { |x| opts['config'] = x }
+    parser.on('--env=env-yaml') { |x| opts['env'] = x }
+    parser.on('--verbose') { |_x| opts['verbose'] = true }
+  end
+rescue OptionParser::InvalidArgument => e
+  puts e.message
+  puts banner
+  exit Flist::EXIT_CODE_INVALID_CODE
 end
+cli = Flist::Cli.new(opts['verbose'])
+hash = cli.setup
+
+# puts "hash=#{hash}"
+
+# opts['env'] = "env-a1.yaml"
+# opts["config"] = "config/config.yml"
+cmd = opts['cmd']
+# p cmd
+# p opts
+case cmd
+when 's'
+  cli.setup_config
+when 'fs1'
+  fi = Flist::Flist.new(
+    hash,
+    opts
+  )
+  # fl.list_a
+  puts '= simple'
+  # listup_x('simple')
+  fi.listup_simple
+
+  fi.post_process
+when 'fs2'
+  fi = Flist::Flist.new(
+    hash,
+    opts
+  )
 
-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
+  puts '= simple2'
+  # listup_x('simple2')
+  fi.listup_simple2
+
+  fi.post_process
+when 'fs3'
+  fi = Flist::Flist.new(
+    hash,
+    opts
+  )
+  puts '= simple3'
+  # listup_x('simple3')
+  fi.listup_simple3
+
+  fi.post_process
+when 'fr'
+  fi = Flist::Flist.new(
+    hash,
+    opts
+  )
+  puts '= repo'
+  # listup_x('repo')
+  fi.listup_repo
+
+  fi.post_process
+else
+  puts 'Invalid command 2'
+  puts banner
+end