shunkuntype 1.1.0 → 1.1.2

data/README.md

@@ -25,22 +25,11 @@ Usage: shunkuntype [options]
     -v, --version                    show program Version.
     -c, --check                      Check speed
     -d, --drill [VAL]                one minute Drill [VAL]
-    -h, --history                    view training History
-    -p, --plot                       Plot personal data
-    -s, --submit                     Submit data to dmz0
-        --review [VALUE]             Review training, VALUE=html or hiki
+    -h, --help                       show help message
+    -l, --log                        view training Log
 ```
 For the first time, shunkun makes .shunkuntype directory on the home dir, 
-and put three data files(training, speed, server).
-The training and speed data will be sent to the server, when --submit.
-The --review will get the data download, and show the training and speed data in hiki or html formats, 
-where the png files created by gnuplot.
-
-For activating server all training member has ssh access, and the write permission on the directory.
-The format of the server_data.txt is as follows:
-```
- [login_name]\@[server_name]:directory
-```
+and put two data files(training, speed).
 
 ## Development
 

data/lib/shunkuntype/db.rb

@@ -6,37 +6,25 @@ require 'fileutils'
 module DataFiles
 
   def self.prepare
-    data_path = File.join(ENV['HOME'], '.shunkuntype','training_data.txt')
+    speed_path = Shunkuntype::SPEED_FILE
+    training_path = Shunkuntype::TRAINING_FILE
 
-    create_file_if_not_exists(data_path)
+    create_file_if_not_exists(speed_path)
+    create_file_if_not_exists(training_path)
   end
 
   def self.create_file_if_not_exists(path)
     create_file_path(path)
-
-    return if File::exist?(path)
-    create_data_files
+    unless File.exist?(path)
+      File.open(path, 'w') {}  # 空ファイルを作成
+      puts "Created #{path}"
+    end
   end
 
   def self.create_file_path(path)
     FileUtils.mkdir_p File.dirname(path)
   end
 
-  def self.create_data_files
-    if File::exist?("./speed_data.txt") then
-      system "mv ./speed_data.txt #{Shunkuntype::SPEED_FILE}"
-      print "moving ./speed_data.txt #{Shunkuntype::SPEED_FILE}.\n"
-    end
-    if File::exist?("./training_data.txt") then
-      system "mv ./training_data.txt #{Shunkuntype::TRAINING_FILE}"
-      print "moving ./training_data.txt #{Shunkuntype::TRAINING_FILE}.\n"
-    if File::exist?(Shunkuntype::TRAINING_FILE) then
-      print "#{Shunkuntype::TRAINING_FILE} exits.\n"
-      File::open(Shunkuntype::TRAINING_FILE,'a')
-      print "make #{Shunkuntype::TRAINING_FILE}\n"
-    end
-    end
-  end
-  private_class_method :create_file_if_not_exists, :create_file_path, :create_data_files
+  private_class_method :create_file_if_not_exists, :create_file_path
 end
 

data/lib/shunkuntype/speed.rb

@@ -1,4 +1,5 @@
 require "shunkuntype"
+require_relative "db"  # 追加
 
 class SpeedCheck
   attr_reader :number, :period
@@ -22,17 +23,24 @@ class SpeedCheck
   end
 
   def check_data_files
+    retried = false
     begin
-      file=open(Shunkuntype::SPEED_FILE,"r")
+      file = open(Shunkuntype::SPEED_FILE, "r")
       if file
         puts "#{Shunkuntype::SPEED_FILE} opened succcessfully"
       end
     rescue
-      puts "#{Shunkuntype::SPEED_FILE} does not exist in this directory. --init or try in another dir."
-      exit
+      if retried
+        puts "Failed to create #{Shunkuntype::SPEED_FILE}. Please check permissions."
+        exit 1
+      end
+      puts "#{Shunkuntype::SPEED_FILE} does not exist in this directory. Creating required files..."
+      DataFiles.prepare
+      retried = true
+      retry
     end
   end
-  
+
   def mk_random_words
     data=[]
     data_dir=File.expand_path('../../../lib/data', __FILE__)

data/lib/shunkuntype/version.rb

@@ -2,6 +2,6 @@ require 'fileutils'
 require 'tmpdir'
 
 module Shunkuntype
-  VERSION = "1.1.0"
+  VERSION = "1.1.2"
   data_dir = File.join(ENV['HOME'], '.shunkuntype')
 end

data/lib/shunkuntype.rb

@@ -24,7 +24,6 @@ end
 class Command
 
   def self.run(argv=[])
-    print "Shunkuntype says 'Hello world'.\n"
     new(argv).execute
   end
 
@@ -35,7 +34,8 @@ class Command
   def execute
     DataFiles.prepare
 
-    @argv << '--help' if @argv.size==0
+    @mode = nil
+
     command_parser = OptionParser.new do |opt|
       opt.on('-v', '--version','show program Version.') { |v|
         opt.version = Shunkuntype::VERSION
@@ -45,8 +45,103 @@ class Command
       opt.on('-d', '--drill [VAL]','one minute Drill [VAL]', Integer) {|v| Training.new(v) }
       opt.on('-h', '--help','show help message') { puts opt; exit }
       opt.on('-l','--log','view training log') {|v| FinishCheck.new }
+      opt.on('-r MODE', '--record MODE',
+        "Show record data in readable format.\n" \
+        "  MODE can be:\n" \
+        "  all           Show both speed and training data (default)\n" \
+        "  plot          Output matplotlib code for plotting\n" \
+        "  speed_data    Show only speed data\n" \
+        "  training_data Show only training data"
+      ) {|mode| @mode = mode }
+#      opt.on('-r', '--record', 'Show both speed and training data (same as -r all)') { @mode = 'all' }
     end
     command_parser.parse!(@argv)
+    # データ表示
+    case @mode
+    when 'plot', 'python'
+      print_python_plot_code
+      exit
+    when 'speed_data'
+      print_csv_pretty(Shunkuntype::SPEED_FILE, %w[Time Words TimeSec Score])
+      exit
+    when 'training_data'
+      print_csv_pretty(Shunkuntype::TRAINING_FILE, %w[Time Words TimeSec Score])
+      exit
+    when 'all'
+      print_pretty_data
+      exit
+    end
+
+    @argv << '--help' if @argv.size==0
+    command_parser.parse!(@argv)
     exit
   end
+
+  private
+
+  def print_pretty_data
+    print_csv_pretty(Shunkuntype::SPEED_FILE, %w[Time Words TimeSec Score])
+    print_csv_pretty(Shunkuntype::TRAINING_FILE, %w[Time Words TimeSec Score])
+  end
+
+  def print_csv_pretty(path, headers)
+    if File.exist?(path)
+      puts "== #{File.basename(path)} =="
+      puts headers.join("\t")
+      File.foreach(path) do |line|
+        puts line.chomp.split(',').join("\t")
+      end
+      puts
+    else
+      puts "#{path} not found."
+    end
+  end
+
+  def print_python_plot_code
+    speed_path = Shunkuntype::SPEED_FILE
+    training_path = Shunkuntype::TRAINING_FILE
+    puts "# Python (matplotlib) code for plotting your typing data"
+    puts "# Save this as plot_typing.py and run: python plot_typing.py"
+    puts <<~PYTHON
+      import matplotlib.pyplot as plt
+      import csv
+      from datetime import datetime
+
+      def load_data(path):
+          times, scores = [], []
+          try:
+              with open(path) as f:
+                  reader = csv.reader(f)
+                  for row in reader:
+                      if len(row) < 4:
+                          continue
+                      # row[0]: time, row[2]: score
+                      try:
+                          t = datetime.strptime(row[0].split('.')[0], '%Y-%m-%d %H:%M:%S %z')
+                          s = float(row[2])
+                          times.append(t)
+                          scores.append(s)
+                      except Exception:
+                          continue
+          except FileNotFoundError:
+              pass
+          return times, scores
+
+      speed_times, speed_scores = load_data("#{speed_path}")
+      train_times, train_scores = load_data("#{training_path}")
+
+      plt.figure(figsize=(10,5))
+      if speed_times:
+          plt.plot(speed_times, speed_scores, 'o-', label='Speed')
+      if train_times:
+          plt.plot(train_times, train_scores, 's-', label='Training')
+      plt.xlabel('Date')
+      plt.ylabel('Score')
+      plt.title('Typing Progress')
+      plt.legend()
+      plt.grid(True)
+      plt.tight_layout()
+      plt.show()
+    PYTHON
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: shunkuntype
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Shigeto R. Nishitani
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -122,6 +121,8 @@ files:
 - ".hyper_card/docs/shunkun_report.pdf"
 - ".hyper_card/docs/speed.png"
 - ".hyper_card/docs/work.png"
+- ".hyper_card/history/plot_modes.md"
+- ".hyper_card/history/plot_modes_251118.md"
 - ".hyper_card/history/test_cli_bdd.md"
 - ".hyper_card/history/test_cli_bdd_251114.md"
 - ".hyper_card/history/tidy.md"
@@ -244,13 +245,10 @@ files:
 - lib/shunkuntype/training.rb
 - lib/shunkuntype/version.rb
 - shunkuntype.gemspec
-- shunkuntype/speed_data.txt
-- shunkuntype/training_data.txt
 homepage: https://github.com/daddygongon/shunkuntype
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -265,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: type training.
 test_files: []

data/shunkuntype/speed_data.txt

@@ -1,6 +0,0 @@
-2024-11-06 21:13:42 +0900,20,39.937564,184.7884362701741
-2025-09-09 17:30:33 +0900,20,37.889581,177.35746404796612
-2025-09-09 17:35:35 +0900,20,37.433635,160.28365933471326
-2025-11-14 11:37:14 +0900,20,46.516022,145.75622997168588
-2025-11-14 15:43:37 +0900,20,39.598636,165.1572038996495
-2025-11-14 16:08:21 +0900,20,37.490195,166.4435194322142

data/shunkuntype/training_data.txt

@@ -1,36 +0,0 @@
-2021-04-06 14:41:09 +0900,STEP-1.txt,28,60
-2021-04-06 14:42:24 +0900,STEP-2.txt,46,60
-2021-04-06 14:44:15 +0900,STEP-91.txt,28,60
-2021-06-02 17:42:48 +0900,STEP-1.txt,55,60
-2021-07-08 11:59:48 +0900,STEP-3.txt,23,60
-2021-07-08 12:01:20 +0900,STEP-36.txt,16,60
-2021-07-08 12:02:53 +0900,STEP-9.txt,15,60
-2022-03-08 15:16:08 +0900,STEP-1.txt,57,60
-2022-03-08 15:18:41 +0900,STEP-5.txt,38,60
-2022-03-08 15:20:14 +0900,STEP-7.txt,48,60
-2022-03-08 15:22:06 +0900,STEP-4.txt,1,60
-2022-03-08 15:23:58 +0900,STEP-4.txt,44,60
-2022-03-09 13:14:02 +0900,STEP-8.txt,35,60
-2022-04-14 14:40:28 +0900,STEP-3.txt,12,60
-2022-04-14 14:42:18 +0900,STEP-4.txt,40,60
-2022-04-18 14:00:48 +0900,STEP-1.txt,4,60
-2022-04-18 14:04:04 +0900,STEP-46.txt,47,60
-2022-04-20 16:38:30 +0900,STEP-1.txt,50,60
-2022-04-20 16:40:17 +0900,STEP-2.txt,51,60
-2022-06-02 13:09:59 +0900,STEP-2.txt,15,60
-2023-05-25 17:24:23 +0900,STEP-6.txt,50,60
-2023-05-25 17:25:40 +0900,STEP-10.txt,55,60
-2023-05-25 17:26:47 +0900,STEP-11.txt,39,60
-2023-05-25 17:27:59 +0900,STEP-12.txt,44,60
-2023-07-27 11:36:42 +0900,STEP-15.txt,36,60
-2024-04-24 11:36:58 +0900,STEP-1.txt,60,60
-2024-04-24 11:39:15 +0900,STEP-20.txt,48,60
-2024-08-22 11:57:27 +0900,STEP-51.txt,46,60
-2025-02-05 12:22:37 +0900,STEP-15.txt,42,60
-2025-11-14 11:35:56 +0900,STEP-16.txt,44,60
-2025-11-14 15:28:03 +0900,STEP-1.txt,0,60
-2025-11-14 15:31:52 +0900,STEP-1.txt,0,60
-2025-11-14 15:32:49 +0900,STEP-1.txt,0,60
-2025-11-14 15:39:20 +0900,STEP-1.txt,0,60
-2025-11-14 15:40:03 +0900,STEP-1.txt,0,60
-2025-11-14 15:53:27 +0900,STEP-1.txt,0,60