mk_semi_lattice 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd367913e384f82dbbb7b8db40d35646855a82d5006715a51fc4eaa6601bc0ca
-  data.tar.gz: fed2c0e74140c8dd15933c13ec8eb4e6466f72ac8f7f5a899c063046e62a6ce8
+  metadata.gz: 15f1e816692dca4dce63d49abf961749e3b242f96877a1bc998b2b4208e3eb83
+  data.tar.gz: 646e5f22cec25a61c7d2c8c8e9de6e31377a4d8693a1bc14f1f31724d840700c
 SHA512:
-  metadata.gz: b44216e9db854f9a28d5f9b27463f0bfd119aaa0dece1e70cdd4e35c0628ee1c5720d5f780985c35e548c32dd63f71c46af9781e7f35960d3d8ec98b680b6a3f
-  data.tar.gz: 8984c903dc85dcdf6e32bf80405d0ef6aae28718c8e776e5496554f385604a30d73bacecda8af54b7b0b6eadaaaae9ce6ef48e48844898de1adc7407f54e4bda
+  metadata.gz: 6379e532b1dd399efd9b41ceae6aff47770520e79d0603fa413da2d4092fc78781ba6bd68af5a05e1a0870030a2fe849695f9737872d24c90835f2850af93767
+  data.tar.gz: 35d3e0c85d3a34ec4ac774339703a4026d1ebd2cfb4b2db5e52ea0ce9941f6c01cc9e223bef36d91ccfebb2f5922dd463ce47a945feeb6ba87f2af0972a3daa3

data/.hyper_card/history/20251022_0725_add_color_index.md

@@ -1,4 +1,4 @@
-daddygongon: 描かれたnodeにidも表示するoptionとして-i, -indexを追加．
+**daddygongon**: 描かれたnodeにidも表示するoptionとして-i, -indexを追加．
 
 GitHub Copilot: ### [mk_semi_lattice.rb](file:///Users/bob/git_hub/mk_semi_lattice/lib/mk_semi_lattice.rb)
 

data/.hyper_card/history/add_icon_shape_251208.md

@@ -0,0 +1,197 @@
+# head
+date: 2025-12-08
+author: bob
+
+## User
+重複してますね．refactorしましょう．
+
+## Copilot
+重複している`@text`生成部分をまとめて、`dir`/それ以外で分岐する部分を簡潔にリファクタリングできます。
+以下のように書き換えるとスッキリします。
+
+```ruby
+# ...existing code...
+def create_graphics
+  return if @created
+  font_path = japanese_font
+
+  # テキスト生成（共通化）
+  if font_path && File.exist?(font_path)
+    @text = Text.new(label, x: x-28, y: y-10, size: 18, color: 'black', font: font_path, z: 11)
+  else
+    @text = Text.new(label, x: x-28, y: y-10, size: 18, color: 'black', z: 11)
+  end
+
+  # アイコン生成
+  @circle = if @type == 'dir'
+              Folder.new(x: x, y: y, color: NODE_COLOR, z: 10)
+            else
+              Circle.new(x: x, y: y, radius: 30, color: NODE_COLOR, z: 10)
+            end
+  @created = true
+end
+# ...existing code...
+```
+
+- `@text`の生成を一度だけにまとめました。
+- `@circle`の分岐のみを残しています。
+
+このようにすることで、重複がなくなり、保守性も向上します。
+
+## User
+pngファイルを表示するように変更．
+
+## Copilot
+`Folder`クラスでフォルダアイコンを図形からPNG画像表示に変更するには、`Rectangle`の代わりに`Image`を使います。
+下記のように修正してください。
+
+```ruby
+# ...existing code...
+class Folder
+  # フォルダアイコンをRuby2Dの画像で描画するクラス
+  attr_accessor :x, :y, :name, :label, :fixed, :linked, :dx, :dy, :type, :file_path
+  def initialize(attrs = {})
+    @x = attrs[:x]
+    @y = attrs[:y]
+    @z = attrs[:z]
+    @color = attrs[:color]
+    @image = Image.new(
+      './icons/folder.png', # PNGファイルのパス
+      x: @x-28, y: @y-20, width: 56, height: 32, z: @z
+    )
+  end
+
+  def color=(c)
+    # 画像には直接色をつけられません。必要なら画像を加工してください。
+  end
+
+  def x=(x)
+    @image.x = x - 28
+  end
+
+  def y=(y)
+    @image.y = y - 20
+  end
+end
+# ...existing code...
+```
+
+- `./icons/folder.png` をプロジェクト内に配置してください。
+- `color=` メソッドは画像には使えません（必要なら画像自体を加工してください）。
+
+この修正で、フォルダアイコンがPNG画像で表示されるようになります。
+
+## User
+codeが重複しています．親クラスとしてNodeShapeを作り，派生クラスとしてFolder2, Document, Folderを作成してください．
+
+## Copilot
+以下のように、共通部分を`NodeShape`親クラスにまとめ、`Folder2`, `Document`, `Folder`を継承する形でリファクタリングできます。
+
+```ruby
+# ...existing code...
+class NodeShape
+  attr_accessor :x, :y, :name, :label, :fixed, :linked, :dx, :dy, :type, :file_path
+
+  def initialize(attrs = {})
+    @x = attrs[:x]
+    @y = attrs[:y]
+    @z = attrs[:z]
+    @color = attrs[:color]
+    @name = attrs[:name]
+    @label = attrs[:label]
+    @fixed = attrs[:fixed]
+    @linked = attrs[:linked]
+    @dx = attrs[:dx]
+    @dy = attrs[:dy]
+    @type = attrs[:type]
+    @file_path = attrs[:file_path]
+    setup_shape
+  end
+
+  def color=(c)
+    # 派生クラスでオーバーライド
+  end
+
+  def x=(x)
+    # 派生クラスでオーバーライド
+  end
+
+  def y=(y)
+    # 派生クラスでオーバーライド
+  end
+
+  def setup_shape
+    # 派生クラスでオーバーライド
+  end
+end
+
+class Folder2 < NodeShape
+  def setup_shape
+    @image = Image.new(
+      './icons/folder.png',
+      x: @x-28, y: @y-20, width: 56, height: 36, z: @z
+    )
+  end
+
+  def color=(c)
+    # 画像には直接色をつけられません
+  end
+
+  def x=(x)
+    @image.x = x - 28
+  end
+
+  def y=(y)
+    @image.y = y - 20
+  end
+end
+
+class Document < NodeShape
+  def setup_shape
+    @image = Image.new(
+      './icons/document.png',
+      x: @x-28, y: @y-20, width: 38, height: 56, z: @z
+    )
+  end
+
+  def color=(c)
+    # 画像には直接色をつけられません
+  end
+
+  def x=(x)
+    @image.x = x - 28
+  end
+
+  def y=(y)
+    @image.y = y - 20
+  end
+end
+
+class Folder < NodeShape
+  def setup_shape
+    @folder1 = Rectangle.new(x: @x-28, y: @y-10, width: 56, height: 32, color: @color, z: @z)
+    @folder2 = Rectangle.new(x: @x-28, y: @y-20, width: 26, height: 12, color: @color, z: @z)
+  end
+
+  def color=(c)
+    @folder1.color = c
+    @folder2.color = c
+  end
+
+  def x=(x)
+    @folder1.x = x - 28
+    @folder2.x = x - 28
+  end
+
+  def y=(y)
+    @folder1.y = y - 10
+    @folder2.y = y - 20
+  end
+end
+# ...existing code...
+```
+
+- `NodeShape`で共通属性・初期化をまとめ、`setup_shape`を各派生クラスで実装します。
+- `color=`, `x=`, `y=`も必要に応じてオーバーライドします。
+
+この構造で重複が大幅に減り、拡張・保守が容易になります。

data/exe/{sl → mk_sl}

@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
 
 require "mk_semi_lattice"
-
-

data/lib/mk_semi_lattice/.semi_lattice/dir_node_edge.yaml

@@ -0,0 +1,63 @@
+---
+:nodes:
+- :id: 1
+  :name: mk_semi_lattice/
+  :type: dir
+  :file_path: "."
+- :id: 2
+  :name: option_manager.rb
+  :type: file
+  :file_path: "./option_manager.rb"
+- :id: 3
+  :name: ruby2d_action.rb
+  :type: file
+  :file_path: "./ruby2d_action.rb"
+- :id: 4
+  :name: version.rb
+  :type: file
+  :file_path: "./version.rb"
+- :id: 5
+  :name: init_env.rb
+  :type: file
+  :file_path: "./init_env.rb"
+- :id: 6
+  :name: sl_components.rb
+  :type: file
+  :file_path: "./sl_components.rb"
+- :id: 7
+  :name: manage_yaml/
+  :type: dir
+  :file_path: "./manage_yaml"
+- :id: 8
+  :name: mk_semi_lattice.rb
+  :type: file
+  :file_path: "./manage_yaml/mk_semi_lattice.rb"
+- :id: 9
+  :name: mk_node_edge.rb
+  :type: file
+  :file_path: "./manage_yaml/mk_node_edge.rb"
+:edges:
+- :from: 1
+  # from: mk_semi_lattice/, to: option_manager.rb
+  :to: 2
+- :from: 1
+  # from: mk_semi_lattice/, to: ruby2d_action.rb
+  :to: 3
+- :from: 1
+  # from: mk_semi_lattice/, to: version.rb
+  :to: 4
+- :from: 1
+  # from: mk_semi_lattice/, to: init_env.rb
+  :to: 5
+- :from: 1
+  # from: mk_semi_lattice/, to: sl_components.rb
+  :to: 6
+- :from: 1
+  # from: mk_semi_lattice/, to: manage_yaml/
+  :to: 7
+- :from: 7
+  # from: manage_yaml/, to: mk_semi_lattice.rb
+  :to: 8
+- :from: 7
+  # from: manage_yaml/, to: mk_node_edge.rb
+  :to: 9

data/lib/mk_semi_lattice/.semi_lattice/dir_tree.yaml

@@ -0,0 +1,10 @@
+---
+mk_semi_lattice/:
+  option_manager.rb:
+  ruby2d_action.rb:
+  version.rb:
+  init_env.rb:
+  sl_components.rb:
+  manage_yaml/:
+    mk_semi_lattice.rb:
+    mk_node_edge.rb:

data/lib/mk_semi_lattice/.semi_lattice/semi_lattice.yaml

@@ -0,0 +1,99 @@
+---
+:nodes:
+- :id: 1
+  :name: mk_semi_lattice/
+  :type: dir
+  :file_path: "."
+  :x: 275.02162808595216
+  :y: 314.87430515494754
+  :color: orange
+  :fixed: false
+- :id: 2
+  :name: option_manager.rb
+  :type: file
+  :file_path: "./option_manager.rb"
+  :x: 346.9161695907995
+  :y: 269.19879019844353
+  :color: orange
+  :fixed: false
+- :id: 3
+  :name: ruby2d_action.rb
+  :type: file
+  :file_path: "./ruby2d_action.rb"
+  :x: 217.6026086862854
+  :y: 377.3833947075089
+  :color: orange
+  :fixed: false
+- :id: 4
+  :name: version.rb
+  :type: file
+  :file_path: "./version.rb"
+  :x: 196.70324002652094
+  :y: 282.82727426583205
+  :color: orange
+  :fixed: false
+- :id: 5
+  :name: init_env.rb
+  :type: file
+  :file_path: "./init_env.rb"
+  :x: 336.69859191671014
+  :y: 373.90134873437574
+  :color: orange
+  :fixed: false
+- :id: 6
+  :name: sl_components.rb
+  :type: file
+  :file_path: "./sl_components.rb"
+  :x: 275.5713052007363
+  :y: 230.10419857002472
+  :color: orange
+  :fixed: false
+- :id: 7
+  :name: manage_yaml/
+  :type: dir
+  :file_path: "./manage_yaml"
+  :x: 299.7712906846464
+  :y: 399.95204864889575
+  :color: orange
+  :fixed: false
+- :id: 8
+  :name: mk_semi_lattice.rb
+  :type: file
+  :file_path: "./manage_yaml/mk_semi_lattice.rb"
+  :x: 376.1077960220242
+  :y: 361.86505364409146
+  :color: orange
+  :fixed: false
+- :id: 9
+  :name: mk_node_edge.rb
+  :type: file
+  :file_path: "./manage_yaml/mk_node_edge.rb"
+  :x: 293.40510780338064
+  :y: 484.3912842691303
+  :color: orange
+  :fixed: false
+:edges:
+- :from: 1
+  # from: mk_semi_lattice/, to: option_manager.rb
+  :to: 2
+- :from: 1
+  # from: mk_semi_lattice/, to: ruby2d_action.rb
+  :to: 3
+- :from: 1
+  # from: mk_semi_lattice/, to: version.rb
+  :to: 4
+- :from: 1
+  # from: mk_semi_lattice/, to: init_env.rb
+  :to: 5
+- :from: 1
+  # from: mk_semi_lattice/, to: sl_components.rb
+  :to: 6
+- :from: 1
+  # from: mk_semi_lattice/, to: manage_yaml/
+  :to: 7
+- :from: 7
+  # from: manage_yaml/, to: mk_semi_lattice.rb
+  :to: 8
+- :from: 7
+  # from: manage_yaml/, to: mk_node_edge.rb
+  :to: 9

data/lib/mk_semi_lattice/init_env.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+require 'yaml'
+require 'fileutils'
+require 'colorize'
+
+module InitEnv
+  def self.init_env(parent_dir)
+    Config.setup
+    Log.event("started", parent_dir: parent_dir)
+    MkSemiLatticeDir.setup(parent_dir)
+  end
+
+  class MkSemiLatticeDir
+    SEMI_LATTICE_DIR = ".semi_lattice"
+    ICONS_DIR = "icons"
+
+    def self.setup(parent_dir)
+      semi_dir = File.join(parent_dir, SEMI_LATTICE_DIR)
+      icons_dir = File.join(semi_dir, ICONS_DIR)
+      FileUtils.mkdir_p(icons_dir)
+      copy_default_icons(icons_dir)
+    end
+
+    def self.copy_default_icons(icons_dir)
+      icons_src_dir = File.expand_path(File.join(__dir__, "..", "..", "app", "assets", "icons"))
+      ["folder.png", "document.png"
+      ].each do |icon_name|
+        src_path = File.join(icons_src_dir, icon_name)
+        dest_path = File.join(icons_dir, icon_name)
+        FileUtils.cp(src_path, dest_path) unless File.exist?(dest_path)
+      end
+    end
+  end
+
+  class Config
+    CONFIG_DIR = File.expand_path("~/.config/semi_lattice")
+    CONF_PATH = File.join(CONFIG_DIR, "semi_lattice.conf")
+    LOG_PATH = File.join(CONFIG_DIR, "semi_lattice_history")
+
+    @conf = { "log" => false }
+
+    class << self
+      attr_reader :conf
+
+      def setup
+        FileUtils.mkdir_p(CONFIG_DIR)
+        load_conf
+      end
+
+      def load_conf
+        if File.file?(CONF_PATH)
+          begin
+            loaded = YAML.load_file(CONF_PATH)
+            if loaded.is_a?(Hash)
+              @conf.merge!(loaded)
+            else
+              puts "Warning: #{CONF_PATH} is not a hash. Using default config.".yellow
+            end
+          rescue
+            puts "Warning: #{CONF_PATH} is invalid. Using default config.".yellow
+          end
+        end
+      end
+
+      def save_conf
+        File.write(CONF_PATH, @conf.to_yaml)
+      end
+
+      def log_enabled?
+        @conf["log"]
+      end
+
+      def set_log(value)
+        @conf["log"] = value
+        save_conf
+      end
+
+      def log_path
+        LOG_PATH
+      end
+    end
+  end
+
+  require 'yaml'
+
+  class Log
+    class << self
+      def event(action, target_dir: nil, parent_dir: Dir.pwd)
+        return unless Config.log_enabled?
+        log_entry = {
+          timestamp: Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+          action: action
+        }
+        log_entry[:target_dir] = target_dir if target_dir
+        log_entry[:where] = parent_dir
+        logs = []
+        if File.exist?(Config.log_path)
+          begin
+            logs = YAML.load_file(Config.log_path) || []
+          rescue
+            logs = []
+          end
+        end
+        logs << log_entry
+        File.write(Config.log_path, logs.to_yaml)
+      end
+    end
+  end
+end

data/lib/mk_semi_lattice/{mk_node_edge.rb → manage_yaml/mk_node_edge_yaml.rb}

@@ -1,6 +1,6 @@
 require 'pathname'
 
-module MkSemiLattice
+module ManageYaml
   class MkNodeEdge
     def initialize(input_path:, output_path:)
       dir_tree = YAML.load_file(input_path)
@@ -99,10 +99,3 @@ module MkSemiLattice
     end
   end
 end
-
-# 実行部分例（必要なら有効化）
-# if __FILE__ == $0
-#   input_path = File.join(File.dirname(__FILE__), '.semi_lattice', 'dir.yaml')
-#   output_path = File.join(File.dirname(__FILE__), '.semi_lattice', 'dir_node_edge.yaml')
-#   SemiLattice::MkNodeEdge.run(input_path: input_path, output_path: output_path)
-# end

data/lib/mk_semi_lattice/manage_yaml/mk_semi_lattice_yaml.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module ManageYaml
+  class MkSemiLattice
+    def initialize(options)
+      @parent_dir = options[:parent_dir]
+      @semi_dir = options[:semi_dir]
+      @semi_lattice_yaml_path = options[:semi_lattice_yaml_path]
+      @options = options
+      p @options
+    end
+
+    # ARGV[0]とoptionsから初期ファイル・初期ステップを決定
+    def select_init_file_and_step
+      p ['ARGV', ARGV]
+      if (ARGV[0] == '.' || ARGV[0].nil?) && !@options[:file]
+        if File.exist?(@semi_lattice_yaml_path)
+          [@semi_lattice_yaml_path, :from_semi_lattice]
+        else
+          ['.', :from_dir]
+        end
+      else
+        [ARGV[0], @options[:init_step]]
+      end
+    end
+
+    # 初期ステップに応じて入力ファイルとwith_semi_lattice_yamlを決定
+    def select_input_path_and_flag(init_file, init_step)
+      case init_step
+      when :from_dir
+        Dir.mkdir(@semi_dir) unless Dir.exist?(@semi_dir)
+        in_path = init_file
+        out_path = File.join(@semi_dir, 'dir_tree.yaml')
+        MkDirYaml.new(path: in_path, layer: @options[:layer], output_file: out_path)
+        in_path = out_path
+        out_path = File.join(@semi_dir, 'dir_node_edge.yaml')
+        MkNodeEdge.new(input_path: in_path, output_path: out_path)
+        [out_path, false]
+      when :from_tree
+        init_file = @options[:file]
+        base = File.basename(init_file, File.extname(init_file))
+        in_path = init_file
+        out_path = File.join(@parent_dir, "#{base}_node_edge.yaml")
+        MkNodeEdge.new(input_path: in_path, output_path: out_path)
+        [out_path, false]
+      when :from_node_edge
+        if File.exist?(File.join(@parent_dir, 'semi_lattice.yaml'))
+          puts "Warning: semi_lattice.yaml already exists in current directory.".yellow
+          exit 1
+        end
+        [@options[:file], false]
+      when :from_semi_lattice
+        [init_file, true]
+      else
+        raise "Unknown init_step: #{init_step}"
+      end
+    end
+
+    # 新メソッド: 初期ファイル・ステップ・入力パス・フラグをまとめて取得
+    def prepare_paths_and_flags
+      init_file, init_step = select_init_file_and_step
+      p ["init_file", init_file, init_step]
+      input_path, with_semi_lattice_yaml = select_input_path_and_flag(init_file, init_step)
+      p ["input_path", input_path, with_semi_lattice_yaml]
+      [input_path, with_semi_lattice_yaml]
+    end
+
+    # アプリ終了時の状態保存
+    def self.at_exit_action(app, semi_dir, parent_dir)
+      nodes_data = app.nodes.map do |n|
+        #p [n.label, n.fixed, n.color]
+        {
+          id: app.node_table.key(n),
+          name: n.name,
+          type: n.type,
+          file_path: n.file_path,
+          icon_path: n.icon_path,
+          x: n.x,
+          y: n.y,
+          color: n.color,
+          fixed: n.fixed
+        }
+      end
+      edges_data = app.edges.map do |e|
+        {
+          from: app.node_table.key(e.from),
+          to: app.node_table.key(e.to)
+        }
+      end
+
+      yaml_data = { nodes: nodes_data, edges: edges_data }
+      yaml_text = MkNodeEdge.add_edge_comments(yaml_data)
+      if Dir.exist?(semi_dir)
+        File.write(File.join(semi_dir, "semi_lattice.yaml"), yaml_text)
+        puts "Semi-lattice state saved to #{File.join(semi_dir, "semi_lattice.yaml")}"
+      else
+        File.write(File.join('.', "semi_lattice.yaml"), yaml_text)
+        puts "Semi-lattice state saved to #{File.join('.', "semi_lattice.yaml")}"
+      end
+      InitEnv::Log.event("exited", parent_dir: parent_dir)
+    end
+  end
+ 
+  class MkDirYaml
+    def initialize(path: '.', layer: 2, output_file: 'dir.yaml')
+      abs_path = File.expand_path(path)
+      root_key = File.basename(abs_path) + '/'
+
+      # layerの数だけ深さを調整
+      result = { root_key => dir_tree(path, layer - 1) }
+      p ["MkDirYaml result", result]
+      File.write(output_file, result.to_yaml)
+      puts "Directory structure exported to #{output_file}"
+    end
+
+    def dir_tree(path, depth)
+      return nil if depth < 0
+      tree = {}
+      Dir.children(path).each do |entry|
+        next if entry.start_with?('.')
+        full = File.join(path, entry)
+        # .yamlファイルは含めないが、semi_lattice.yamlは含める
+        next if File.file?(full) && File.extname(entry) == '.yaml' && entry != 'semi_lattice.yaml'
+        next if entry.end_with?('~')
+        if File.symlink?(full)
+          target = File.readlink(full)
+          tree[entry] = "-> #{target}"
+        elsif File.directory?(full)
+          subtree = dir_tree(full, depth - 1)
+          if subtree
+            tree["#{entry}/"] = subtree
+          else
+            tree["#{entry}/"] = nil
+          end
+        else
+          tree[entry] = nil
+        end
+      end
+      tree
+    end
+  end
+
+end

data/lib/mk_semi_lattice/ruby2d_action.rb

@@ -74,7 +74,7 @@ module Ruby2dAction
         end
       end
       puts comm
-      Log.event("open", target_dir: abs_path, parent_dir: parent_dir)
+      InitEnv::Log.event("open", target_dir: abs_path, parent_dir: parent_dir)
       system comm
     else
       puts "no link error"