mk_semi_lattice 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c82ca311d171778531ddf25c26e0d7b3228e358a5c77ee3308100ae788d8787
-  data.tar.gz: 33590bb27ad318428025207187e6f3126d24fa6546fe886cf9d9393d8323d4f4
+  metadata.gz: ab93185225f98ff9decc294bcd22bcb730910405bce57f9e5b8abd9b98f0942e
+  data.tar.gz: 7a7ca43878ef13f9e32495b6a813da62ea551c423dd581b76aa9492ad0ab3be0
 SHA512:
-  metadata.gz: 58608e9f2cba2911dc8787b87351a709e332a502f2160422dd94d686633a54d2c63cacfbc41a288c1df65acb5c316d16d4c249876df7f389aa3c6d8e5d5e2020
-  data.tar.gz: ae3ccad4bf58d0f28ef50c080f702826bf3c9f03a763c079a8fa2fe4aa46c0c2395202b8aec5d35cc65a47df8eaf71a93f7fb353ef60c414ed6fba47d4ab6fa9
+  metadata.gz: 3260b0bc9e85d536d0ffc53231ffa20cb26cceaf790dceae083f2ff4c1cb2f5279473823eef61c69d92bc641e9a3df2d3416cde82faeef600951540611822cbf
+  data.tar.gz: 80b233d58003d4b7b39915bb7220852a5ebfe5fc267c0a6d2bfaaf1b66d8c4fe28c9eb049a8fe6f7f04e3ab54fc0fdc125993313efb77c779a24c2ce54cffa35

data/lib/abbrev_checker/abbrev_yamls/command_tree.yaml

@@ -18,8 +18,12 @@
   ssh=secure shell=安全なremote shell接続:
 #path=path=パス，小径:
   full_path=full path=フルパス:
-  abs_oath=abosolute path=絶対(absolute)パス:
+  abs_path=abosolute path=絶対(absolute)パス:
   rel_path=relative path=相対パス:
+# etc:
+  fish=friendly interactive shell:
+  apt=advanced package tool:
+  sudo=super user do:
 #c-keys=controll-keys=fishコマンド編集keyバインド:
   c-a/ahead=行頭へ移動:
   c-e/end=行末へ移動:

data/lib/abbrev_checker/abbrev_yamls/initialism_tree.yaml

@@ -12,5 +12,6 @@ IP=internet protocol:
 OS=operating system:
 pdf=portable document format:
 tar=tape archive:
+wsl=windows subsystem fro linux:
 
 

data/lib/mk_semi_lattice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MkSemiLattice
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/mk_stack/mk_stack.rb

@@ -4,12 +4,13 @@ require 'fileutils'
 require 'optparse'
 require 'date'
 
+
 module StackOperations
   class OptionParserWrapper
     attr_reader :options, :args
 
     def initialize(argv)
-      @options = { flatten: false, nest: false, dryrun: true, reverse: false }
+      @options = { flatten: false, nest: false, dryrun: true, reverse: false, empty: false, no_dir_move: false }
       @args = []
       OptionParser.new do |opts|
         opts.banner = "Usage: hc stack [options]"
@@ -27,13 +28,50 @@ module StackOperations
     end
   end
 
-  class MkStack
+  class MkTree
+    def mk_dir_tree(dir, current_level = 1, max_level = 2, dirs_only: false)
+      tree = {}
+      return tree unless File.directory?(dir)
+
+      Dir.children(dir).sort.each do |entry|
+        path = File.join(dir, entry)
+        is_dir = File.directory?(path)
+        next if dirs_only && !is_dir
+
+        if is_dir
+          tree[entry] = current_level < max_level ? mk_dir_tree(path, current_level + 1, max_level, dirs_only: dirs_only) : {}
+        else
+          tree[entry] = nil
+        end
+      end
+      tree
+    end
+
+    def print_tree(tree, is_last_arr = [])
+      entries = tree.keys
+      entries.each_with_index do |entry, idx|
+        is_last = idx == entries.size - 1
+        prefix = ""
+        is_last_arr.each { |last| prefix += last ? "    " : "│   " }
+        prefix += is_last ? "└── " : "├── "
+        
+        is_dir = tree[entry].is_a?(Hash)
+        name = is_dir ? "#{entry}/" : entry
+        puts "#{prefix}#{name}"
+        
+        if is_dir
+          print_tree(tree[entry], is_last_arr + [is_last])
+        end
+      end
+    end
+  end
+
+  class MkStack < MkTree
     def initialize(options, args)
       @options = options
       @root_name = args[0]
       @date = args[1] || Date.today.strftime('%y%m%d')
     end
-
     def ordinal(n)
       abs_n = n.to_i.abs
       if (11..13).include?(abs_n % 100)
@@ -47,7 +85,6 @@ module StackOperations
         end
       end
     end
-
     def pull_root_name(dir_name)
       if dir_name =~ /^_stack_(.+)_(\d{6})$/
         $1
@@ -55,7 +92,6 @@ module StackOperations
         dir_name
       end
     end
-
     def next_available_dir(root_name, date)
       n = 1
       if root_name =~ /^(\d+)(st|nd|rd|th)$/
@@ -82,218 +118,213 @@ module StackOperations
       dir = "_stack_#{base_name}_#{date}"
       [base_name, dir]
     end
-
     def find_max_ordinal
       candidates = Dir.glob("_stack_*_*").select { |d| d =~ /^_stack_(\d+)(st|nd|rd|th)_(\d{6})$/ }
-      ordinals = candidates.map do |d|
-        if d =~ /^_stack_(\d+)(st|nd|rd|th)_(\d{6})$/
-          $1.to_i
-        else
-          nil
-        end
-      end.compact
+      ordinals = candidates.map { |d| d[/^_stack_(\d+)/, 1].to_i }.compact
       ordinals.any? ? ordinals.max : 0
     end
-
     def ensure_root_name
-      if @root_name.nil? || @root_name.strip.empty?
+      if @root_name.nil? || @root_name.empty?
         max_num = find_max_ordinal
-        @root_name = max_num > 0 ? ordinal(max_num) : "1st"
+        @root_name = max_num > 0 ? "#{max_num}th" : "1st"
       end
     end
+    def run
+      ensure_root_name
+      @root_name, dir = next_available_dir(@root_name, @date)
 
-    def create_dir(dir)
-      if @options[:dryrun]
-        puts "[Dry Run] mkdir #{dir}"
-      else
-        Dir.mkdir(dir) unless Dir.exist?(dir)
-        puts "Created directory: #{dir}"
+      # 1. 現在のツリーを取得
+      current_tree = mk_dir_tree(".", 1, 1)
+
+      # 2. 移動対象の決定
+      exclude = ['.', '..', dir, '.vscode', 'project.code-workspace', '.git']
+      all_entries = Dir.glob('*', File::FNM_DOTMATCH) - exclude
+      moved_entries = []
+      
+      unless @options[:empty]
+        all_entries.each do |entry|
+          next if @options[:no_dir_move] && File.directory?(entry)
+          moved_entries << entry
+        end
       end
-    end
-
-    def move_entries(dir)
-      exclude = ['.', '..', dir, '.vscode', 'project.code-workspace']
-      entries = Dir.glob('*', File::FNM_DOTMATCH) - exclude
 
-      if @options[:no_hidden]
-        entries.reject! { |entry| entry.start_with?('.') }
+      # 3. 仮想ツリーの構築 (Hashの操作としてmvをシミュレート)
+      virtual_tree = {}
+      current_tree.each do |k, v|
+        virtual_tree[k] = v unless moved_entries.include?(k)
       end
-
-      if @options[:empty]
-        entries.select! { |entry| File.directory?(entry) && entry.start_with?('_stack') }
+      
+      moved_tree = {}
+      moved_entries.each do |entry|
+        moved_tree[entry] = current_tree[entry]
       end
+      virtual_tree[dir] = moved_tree
+      virtual_tree = virtual_tree.sort.to_h
 
-      entries.each do |entry|
-        next if @options[:no_dir_move] && File.directory?(entry)
-        if @options[:dryrun]
-          puts "[Dry Run] mv #{entry} (to) #{dir}"
-        else
-          FileUtils.mv(entry, dir, force: true)
+      # 4. Before表示
+      puts "Before stack:"
+      puts "."
+      print_tree(current_tree)
+
+      # 5. 操作の表示 (Dry Run or Execute)
+      puts "\nOperations:"
+      prefix = @options[:dryrun] ? "[Dry Run] " : ""
+      puts "#{prefix}mkdir #{dir}"
+      if moved_entries.empty?
+        puts "#{prefix}mv nothing (to) #{dir}"
+      else
+        moved_entries.each do |entry|
+          puts "#{prefix}mv #{entry} (to) #{dir}"
         end
       end
 
-      if @options[:dryrun]
-        puts "[Dry Run] mv #{entries.empty? ? 'nothing' : entries.join(', ')} (to) #{dir}"
-      else
-        puts "Moved #{entries.empty? ? 'nothing' : entries.join(', ')} to #{dir}"
-      end
-    end
+      # 6. After表示
+      puts "\nAfter stack:"
+      puts "."
+      print_tree(virtual_tree)
 
-    def run
-      ensure_root_name
-      @root_name, dir = next_available_dir(@root_name, @date)
-      create_dir(dir)
-      move_entries(dir)
+      # 7. 実行 (-e 指定時)
+      unless @options[:dryrun]
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+        moved_entries.each do |entry|
+          FileUtils.mv(entry, dir)
+        end
+        puts "\nExecution completed."
+      end
     end
   end
 
-  class MkFlatten
+  class MkFlatten < MkTree
     def initialize(options, args)
       @options = options
       @target_dir = args[0] || "."
       @target_dir = @target_dir.chomp("/")
     end
-
-    # 指定ディレクトリ以下のtree構造を表示（ディレクトリのみ）
-    def print_tree(dir, prefix = "", is_last_arr = [])
-      puts "#{prefix}#{File.basename(dir)}"
-      if File.directory?(dir)
-        entries = Dir.children(dir).sort.select { |entry| File.directory?(File.join(dir, entry)) }
-        entries.each_with_index do |entry, idx|
-          path = File.join(dir, entry)
-          is_last = idx == entries.size - 1
-          # インデント生成
-          new_prefix = ""
-          is_last_arr.each { |last| new_prefix += last ? "    " : "│   " }
-          new_prefix += is_last ? "└── " : "├── "
-          print_tree(path, new_prefix, is_last_arr + [is_last])
-        end
-      end
-    end
-
-    # flatten後のtree構造を表示（@target_dir直下に全ての_stack_*_*ディレクトリを並べる）
-    def print_flattened_tree
-      stacks = []
+    def build_virtual_tree
       search_dirs = Dir.glob(File.join(@target_dir, "**/_stack_*_*")).select { |d| File.directory?(d) }
-      # ルート直下の_stack_*_*も含める
       root_stacks = Dir.glob(File.join(@target_dir, "_stack_*_*")).select { |d| File.directory?(d) }
       all_stacks = (root_stacks + search_dirs).uniq
-      all_stacks.map! { |d| File.basename(d) }
-      all_stacks.each do |d|
-        puts "└── #{d}"
+      
+      tree = {}
+      all_stacks.map { |d| File.basename(d) }.sort.each do |d|
+        tree[d] = {}
       end
+      tree
     end
-
-    # flattenで移動するディレクトリのmvコマンドをdryrun表示
-    def print_flatten_moves
-      flatten_moves.each do |src, dest|
-        puts "[Dry Run] mv '#{src}' '#{dest}'"
+    def flatten_moves
+      search_dirs = Dir.glob(File.join(@target_dir, "**/_stack_*_*")).select { |d| File.directory?(d) }
+      root_stacks = Dir.glob(File.join(@target_dir, "_stack_*_*")).select { |d| File.directory?(d) }
+      stacks = (root_stacks + search_dirs).uniq
+      
+      # 深い階層から順に移動させるため、パスの深さで降順ソート
+      stacks.sort_by! { |d| -d.count('/') }
+      
+      moves = []
+      stacks.each do |src|
+        dest = File.join(@target_dir, File.basename(src))
+        moves << [src, dest] unless src == dest
       end
+      moves
     end
+    def run
+      puts "Before flatten:"
+      puts @target_dir == "." ? "." : "#{File.basename(@target_dir)}/"
+      print_tree(mk_dir_tree(@target_dir, 1, 999, dirs_only: true))
 
-    def flatten_moves
-      stacks = Dir.glob(File.join(@target_dir, "**/_stack_*_*")).select { |d| File.directory?(d) }
-      stacks.sort_by! { |d| -d.count(File::SEPARATOR) }
-      stacks.map { |src| [src, File.join(".", File.basename(src))] }
-    end
+      moves = flatten_moves
 
-    def execute_flatten_moves
-      flatten_moves.each do |src, dest|
-        # mv元とmv先が同じ場合はスキップ
-        if File.expand_path(src) == File.expand_path(dest)
-          puts "[Skip] mv '#{src}' '#{dest}' (same path)"
-          next
+      puts "\nOperations:"
+      prefix = @options[:dryrun] ? "[Dry Run] " : ""
+      if moves.empty?
+        puts "#{prefix}nothing to flatten"
+      else
+        moves.each do |src, dest|
+          puts "#{prefix}mv #{src} (to) #{dest}"
         end
-        puts "mv '#{src}' '#{dest}'"
-        FileUtils.mv(src, dest)
       end
-    end
 
-    def run
-      puts "Before flatten:"
-      puts "."
-      print_tree(@target_dir, "", [])
       puts "\nAfter flatten:"
       puts "."
-      print_flattened_tree
-      puts "\nFlatten moves:"
-      if @options[:dryrun]
-        print_flatten_moves
-      else
-        execute_flatten_moves
+      print_tree(build_virtual_tree)
+
+      unless @options[:dryrun]
+        moves.each do |src, dest|
+          FileUtils.mv(src, dest)
+        end
+        puts "\nExecution completed."
       end
     end
   end
 
-  class MkNest
+  class MkNest < MkTree
     def initialize(options, args)
       @options = options
       @target_dir = args[0] || "."
     end
-
-    # yymmdd順に並べ替え（reverseオプションで順序切替）
     def sorted_stacks
-      stacks = Dir.glob(File.join(@target_dir, "_stack_*_*"))
-         .select { |d| File.directory?(d) && d =~ /_stack_.+_\d{6}$/ }
-         .sort_by { |d| d[/_stack_.+_(\d{6})$/, 1].to_i }
-        #.select { |d| File.directory?(d) }
-        #.sort_by { |d| d[/^_stack_(\d+)(st|nd|rd|th)_/, 1].to_i }
+      stacks = Dir.glob(File.join(@target_dir, "_stack_*_*")).select { |d| File.directory?(d) }
+      stacks = stacks.sort_by { |d| d[/_stack_(\d+)(st|nd|rd|th)_/, 1].to_i }
+      # デフォルトはFILO（新しいものがルート: 7th, 6th, 5th...）
+      # -r オプションでFIFO（古いものがルート: 1st, 2nd, 3rd...）
       @options[:reverse] ? stacks : stacks.reverse
     end
-
-    # ディレクトリのみtree表示
-    def print_tree(dir, prefix = "", is_last_arr = [])
-      puts "#{prefix}#{File.basename(dir)}"
-      if File.directory?(dir)
-        entries = Dir.children(dir).sort.select { |entry| File.directory?(File.join(dir, entry)) }
-        entries.each_with_index do |entry, idx|
-          path = File.join(dir, entry)
-          is_last = idx == entries.size - 1
-          # インデント生成
-          new_prefix = ""
-          is_last_arr.each { |last| new_prefix += last ? "    " : "│   " }
-          new_prefix += is_last ? "└── " : "├── "
-          print_tree(path, new_prefix, is_last_arr + [is_last])
-        end
-      end
-    end
-
-    # nest後のtree構造を表示
-    def print_nested_tree
-      p stacks = sorted_stacks
-      return if stacks.empty?
-      puts "."
-      stacks.each_with_index do |dir, idx|
-        indent = "  " * idx + "└── "
-        puts "#{indent}#{File.basename(dir)}"
+    def build_virtual_tree
+      stacks = sorted_stacks
+      tree = {}
+      return tree if stacks.empty?
+      
+      current = tree
+      stacks.each do |dir|
+        name = File.basename(dir)
+        current[name] = {}
+        current = current[name]
       end
+      tree
     end
-
-    # nestのmvコマンド生成＆実行/表示
     def nest_moves
       stacks = sorted_stacks
-      # 子から親へ（パスが変わらないように逆順でmv）
-      moves = stacks.each_cons(2).to_a.reverse
-      moves.each do |parent, child|
+      moves = []
+      return moves if stacks.size < 2
+      
+      # ENOENTエラーを防ぐため、一番奥（深い階層）に入るものから順に親へ移動する
+      # 例: stacks = [7th, 6th, 5th] の場合
+      # 1. 5th を 6th へ移動
+      # 2. 6th を 7th へ移動
+      (0...stacks.size - 1).to_a.reverse.each do |i|
+        parent = stacks[i]
+        child = stacks[i + 1]
         dest = File.join(parent, File.basename(child))
-        if @options[:dryrun]
-          puts "[Dry Run] mv '#{child}' '#{dest}'"
-        else
-          puts "mv '#{child}' '#{dest}'"
-          FileUtils.mkdir_p(parent) unless Dir.exist?(parent)
-          FileUtils.mv(child, dest)
-        end
+        moves << [child, dest]
       end
+      moves
     end
-
     def run
       puts "Before nest:"
-      puts "."
-      print_tree(@target_dir, "", [])
+      puts @target_dir == "." ? "." : "#{File.basename(@target_dir)}/"
+      print_tree(mk_dir_tree(@target_dir, 1, 999, dirs_only: true))
+
+      moves = nest_moves
+
+      puts "\nOperations:"
+      prefix = @options[:dryrun] ? "[Dry Run] " : ""
+      if moves.empty?
+        puts "#{prefix}nothing to nest"
+      else
+        moves.each do |child, dest|
+          puts "#{prefix}mv #{child} (to) #{dest}"
+        end
+      end
+
       puts "\nAfter nest:"
-      print_nested_tree
-      puts "\nNest moves:"
-      nest_moves
+      puts "."
+      print_tree(build_virtual_tree)
+
+      unless @options[:dryrun]
+        moves.each do |child, dest|
+          FileUtils.mv(child, dest)
+        end
+        puts "\nExecution completed."
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mk_semi_lattice
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Shigeto R. Nishitani