CppUmlClass 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a663be325a0c0bc0a2737ee6a80d28e36ceb82e797dd280c7a6dcd2e8622de1f
-  data.tar.gz: f52916b31de6c3bf8c9c2d1ae98d3c64863109a07d2bae0a792bc8dba26e9003
+  metadata.gz: d91adb75b0a5641d9f10d7555a21cd5deb3286062305f05d381c8293b4dde212
+  data.tar.gz: 598cf985599e675fe3143c1df39bf931975b54f9eabda4f69eb7b7c5dd864622
 SHA512:
-  metadata.gz: f12f7c88cce03eb7ab4cbcdcf247c807fb5390d12dc7c7fae4e20bf0147da888a9b5f386e1e54d86e698694ef0adec9e63b2993779498dfe40ce425dd919aba0
-  data.tar.gz: ae7103faad064ddceacd6d5062c401f0d82e7d90a9be860d093bd6fc589735b7c5fca88816afcb4349d446746472638e10ba59093f075750f092325ade11cd8f
+  metadata.gz: 86d1b0f57c6caf5b6a730bf8a1835876480460f7220d958f6c157d14f6c3043d013b256a10729752770a2ccb1c9da507e2271d19ef71d0ba80ae4d7e78468713
+  data.tar.gz: 466a3db42c822f71df2ea2c840ebd107c620333f8cdd4096d4d7e453b1e452384bda2ca1949d6d758162867d4fa4d60cf04afff40914fdca5aec6bd5fdac663b

data/README.md

@@ -25,12 +25,47 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
     $ sudo gem install CppUmlClass
 
-## Usage
+## Usage(GUI)
+A browser-based GUI opens.
 
     $ start_cpp_uml_class.rb
     
 https://github.com/user-attachments/assets/dfd68556-bf4d-43b7-8fef-b6f951c9147d
 
+## Usage(command line)
+command line interface
+```
+Usage: create_cpp_uml_class.rb [options] cpp_source_directory out_file
+    -c config_file
+```
+config_file defaults to CppUmlClass/config/setting.json in your home directory.
+
+Example
+
+    $ create_cpp_uml_class.rb ~/tool/cpp_test /tmp/test.pu
+
+
+## clsss color support
+
+![class_color](img/class_color.png)
+
+## Setting
+
+- plant uml command
+- editor to open plant uml file
+- default class color 1
+- source path of the class that sets the color 1
+- default class color 2
+- source path of the class that sets the color 2
+- default class color 3
+- source path of the class that sets the color 2
+
+The setting file is saved in the home directory under CppUmlClass/config/setting.json.
+
+![setting](img/setting.png)
+
+
+
 ## Development
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/exe/create_cpp_uml_class.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+require "json"
+require "optparse"
+
+def config_json_hash(json)
+  config = {}
+  json["setting_list"].each do |j|
+    config[j["name"]] = j["value"]
+  end
+  return config
+end
+
+opt = Hash.new
+opts = OptionParser.new
+opts.banner = "Usage: create_cpp_uml_class.rb [options] cpp_source_directory out_file"
+
+opts.on("-c config_file") { |v| opt[:config_file] = v } # config file path
+opts.parse!(ARGV)
+in_dir = ARGV[0]
+out_file = ARGV[1]
+if in_dir == nil or out_file == nil
+  puts opts.help
+  exit
+end
+
+dir = File.dirname(File.expand_path(__FILE__ + "/../"))
+puts "dir=#{dir}"
+home_dir = ENV["HOME"] + "/" + dir.split("/")[-1].gsub(/-[0-9\.-]+/, "")
+puts "home_dir=#{home_dir}"
+
+if opt[:config_file] == nil
+  json = JSON.parse(File.read("#{home_dir}/config/setting.json"))
+else
+  json = JSON.parse(File.read(opt[:config_file]))
+end
+json_config = config_json_hash(json)
+
+file = "#{dir}/lib/create_uml_class.rb"
+puts file
+load file
+
+@config = json_config
+uml = create_uml_class(in_dir, out_file)
+
+File.open(out_file, "w") do |f|
+  f.puts uml
+end
+
+# PlantUMLの実行
+out_svg = out_file.gsub(File.extname(out_file), "") + ".svg"
+FileUtils.rm_f out_svg
+cmd = "#{@config["plantuml"]} #{out_file}"
+puts cmd
+system cmd
+if File.exist? out_svg
+  puts File.binread out_file
+  puts "create #{out_svg}"
+else
+  puts "plantuml error"
+  puts cmd
+end

data/img/.gitattributes

@@ -0,0 +1 @@
+*.mp4 filter=lfs diff=lfs merge=lfs -text

data/img/CppUMLClass.mp4

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43fb6dce6aa5c9aeee337d06b1eff8dd56235077773f7380a464a256b93d9e40
+size 37373705

data/lib/CppUmlClass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CppUmlClass
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/config/setting.json

@@ -15,9 +15,58 @@
       "select": "",
       "description": "UMLを開くエディタ"
     },
+    {
+      "name": "default_class_color",
+      "value": "#LightGray",
+      "type": "input",
+      "select": "",
+      "description": "デフォルトのクラス色"
+    },
+    {
+      "name": "class_color_path1",
+      "value": "(path1)",
+      "type": "input",
+      "select": "",
+      "description": "色を付けるクラスのソースパス1（正規表現）"
+    },
+    {
+      "name": "class_color1",
+      "value": "#LightBlue",
+      "type": "input",
+      "select": "",
+      "description": "ソースパスと一致するクラス色1"
+    },
+    {
+      "name": "class_color_path2",
+      "value": "(path2)",
+      "type": "input",
+      "select": "",
+      "description": "色を付けるクラスのソースパス2（正規表現）"
+    },
+    {
+      "name": "class_color2",
+      "value": "#LightGreen",
+      "type": "input",
+      "select": "",
+      "description": "ソースパスと一致するクラス色2"
+    },
+    {
+      "name": "class_color_path3",
+      "value": "(path3)",
+      "type": "input",
+      "select": "",
+      "description": "色を付けるクラスのソースパス3（正規表現）"
+    },
+    {
+      "name": "class_color3",
+      "value": "#orange",
+      "type": "input",
+      "select": "",
+      "description": "ソースパスと一致するクラス色3"
+    },
     {
       "name": "exclude_path",
-      "value": "(/test/)",
+      "value": "(exclude_path)",
       "type": "input",
       "select": "",
       "description": "除外するパス（正規表現）"

data/lib/create_uml_class.rb

@@ -10,7 +10,8 @@ CStruct = Struct.new(:type,
                      :var_list,
                      :method_list,
                      :inherit_list,
-                     :composition_list)
+                     :composition_list,
+                     :class_color)
 
 def get_gcc_path
   kernel = Facter.value(:kernel)
@@ -43,18 +44,20 @@ def get_unifdef_path
 end
 
 def get_clang_format_path
+  dir = File.dirname(File.expand_path(__FILE__)) + "/"
   kernel = Facter.value(:kernel)
   if kernel == "windows"
     ENV["PATH"].split(";").each do |path|
       clang_format_path = "#{path}\\clang-format"
       if File.exists? clang_format_path
-        return "rubyw " + clang_format_path + " --style=file:'.clang-format' "
+        return "rubyw " + clang_format_path + " --style=file:'#{dir}.clang-format' "
       end
     end
     return ""
   else
   end
-  return "clang-format --style=file:'.clang-format' "
+  #puts "clang-format --style=file:'#{dir}.clang-format' "
+  return "clang-format --style=file:'#{dir}.clang-format' "
 end
 
 # ソースコードの整形
@@ -108,7 +111,7 @@ def print_uml(out, out_list)
       out.push "namespace #{o_list.name} {"
     elsif o_list.type == :class_end
       pp o_list if o_list.name == ""
-      out.push "class #{o_list.name} {"
+      out.push "class #{o_list.name} #{o_list.class_color}{"
       # インスタンス変数の出力
       o_list.var_list.uniq.each do |iv|
         out.push iv
@@ -120,11 +123,11 @@ def print_uml(out, out_list)
       out.push "}"
       # 継承リストの出力
       o_list.inherit_list.each do |ih|
-        out.push "#{o_list.name} -[#blue]--|> #{ih}"
+        out.push "#{o_list.name} -[#black]--|> #{ih}"
       end
       # compo
       o_list.composition_list.uniq.each do |co|
-        out.push "#{o_list.name} *-[#green]-- #{co}"
+        out.push "#{o_list.name} *-[#{o_list.class_color}]-- #{co}"
       end
     elsif o_list.type == :module_end
       # インスタンス変数がある場合はモジュール名と同じクラスを定義
@@ -145,11 +148,11 @@ def print_uml(out, out_list)
         out.push "}"
         # 継承リストの出力
         o_list.inherit_list.each do |ih|
-          out.push "#{o_list.name} -[#blue]--|> #{ih}"
+          out.push "#{o_list.name} -[#black]--|> #{ih}"
         end
         # compo
         o_list.composition_list.uniq.each do |co|
-          out.push "#{o_list.name} *-[#green]-- #{co}"
+          out.push "#{o_list.name} *-[#{o_list.class_color}]-- #{co}"
         end
       end
       out.push "}"
@@ -204,7 +207,7 @@ def composition_list_create(in_dir, out_list)
         #base_name = work.split(" : ")[1].to_s.split(" ")[1].to_s.gsub(/<.*>/, "")
         #puts "start class #{class_name}"
         if class_name.to_s != ""
-          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
+          cstruct_list.push CStruct.new(:class_start, class_name, block_count, [], [], [], [])
         end
       end
       # 関数の開始
@@ -318,7 +321,16 @@ def create_uml_class(in_dir, out_file)
           next
         end
         out_list.push CStruct.new(:class_start, class_name, block_count, [], [], [], [])
-        cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [])
+        if @config["class_color_path1"].to_s != "" and file =~ Regexp.new(@config["class_color_path1"])
+          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [], @config["class_color1"])
+        elsif @config["class_color_path2"].to_s != "" and file =~ Regexp.new(@config["class_color_path2"])
+          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [], @config["class_color2"])
+        elsif @config["class_color_path3"].to_s != "" and file =~ Regexp.new(@config["class_color_path3"])
+          pp file
+          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [], @config["class_color3"])
+        else
+          cstruct_list.push CStruct.new(:class_end, class_name, block_count, [], [], [], [], @config["default_class_color"])
+        end
         base_name.each do |name|
           name.gsub!(/,/, "")
           #puts "base_name=#{name}"

data/lib/css/index.css

@@ -94,7 +94,7 @@ textarea.long {
 }
 
 .setting_name {
-    width: 200px;
+    width: 300px;
     color: #ffffff;
     background-color: #000000;
     font-size: 14px;

data/lib/js/main.js

@@ -252,8 +252,8 @@ function setting_dialog(open_id, dialog_id, json_file) {
             , show: "slide"         //表示時のアニメーション
             , hide: "explode"       //閉じた時のアニメーション
             , title: "Setting"   //ダイアログのタイトル
-            , width: 580            //ダイアログの横幅
-            , height: 400           //ダイアログの高さ
+            , width: 650            //ダイアログの横幅
+            , height: 500           //ダイアログの高さ
             , resizable: true      //リサイズ可
             , closeOnEscape: false  //[ESC]キーで閉じられなくする
             , draggable: true      //ダイアログの移動を可に
@@ -384,10 +384,10 @@ function openFile(file) {
 $(document).ready(function () {
 
     // サーバに接続
-    server_connect("ws://localhost:38249/wsserver")
+    server_connect("ws://localhost:34731/wsserver")
     window.onload = function (e) {
         // サーバに接続
-        //server_connect("ws://localhost:38249/wsserver")
+        //server_connect("ws://localhost:34731/wsserver")
     }
 
     // menu

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CppUmlClass
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Masataka Kuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_app_base
@@ -28,6 +28,7 @@ description: Create a C++ UML class diagram.
 email:
 - masataka.kuwayama@gmail.com
 executables:
+- create_cpp_uml_class.rb
 - start_cpp_uml_class.rb
 - start_cpp_uml_class.rbw
 extensions: []
@@ -44,8 +45,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/create_cpp_uml_class.rb
 - exe/start_cpp_uml_class.rb
 - exe/start_cpp_uml_class.rbw
+- img/.gitattributes
+- img/CppUMLClass.mp4
+- img/class_color.png
+- img/setting.png
 - lib/.clang-format
 - lib/CppUmlClass.rb
 - lib/CppUmlClass/version.rb