shunkuntype 1.0.15 → 1.1.1

data/lib/shunkuntype/speed.rb

@@ -1,37 +1,46 @@
+require "shunkuntype"
+require_relative "db"  # 追加
 
 class SpeedCheck
   attr_reader :number, :period
 
-  # print key positions
-  def print_keyboard
-    content = <<-EOF
- q \\ w \\ e \\ r t \\ y u \\ i \\ o \\ p
-  a \\ s \\ d \\ f g \\ h j \\ k \\ l \\ ; enter
-sh z \\ x \\ c \\ v b \\ n m \\ , \\\ . \\  shift
-EOF
-    print content
-  end
-
   def initialize
     @number = 20 #default 20
     @period = 60
     check_data_files
     data = mk_random_words
-    t0,t1,count = exec_speed_check(data)
-    keep_record(t0,t1,count)
+    t0, t1, count = exec_speed_check(data)
+    # ここでnilチェック
+    if t0.nil? || t1.nil?
+      puts "Speed check was interrupted or no input was given."
+      return
+    end
+    keep_record(t0, t1, count)
+  end
+
+  def print_keyboard
+    Shunkuntype.print_keyboard
   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__)
@@ -50,36 +59,44 @@ EOF
     print "\n\n"+number.to_s+" words should be cleared."
     print "\nType return-key to start."
     p ''
-    line=$stdin.gets
+    line = $stdin.gets
+    return [nil, nil, nil] if line.nil?  # breakの代わりにreturnで早期リターン
+    line = line.chomp
 
-    t0=Time.now
-    count=0
+    t0 = Time.now
+    count = 0
     @number.times do |i|
       print_keyboard()
       puts (i+1).to_s
       word = data[i]
-      count+=word.length
-      while line!=word do
+      count += word.length
+      while line != word do
         puts word
         p ''
-        line=$stdin.gets.chomp
+        line = $stdin.gets
+        return [t0, Time.now, count] if line.nil?  # ここもnilチェック
+        line = line.chomp
       end
     end
-    t1=Time.now
-    return t0,t1,count
+    t1 = Time.now
+    return t0, t1, count
   end
 
-  def keep_record(t0,t1,count)
-    statement = t0.to_s+","
-    statement << @number.to_s+","
-    statement << (t1-t0).to_s+","
-    icount=@period/(t1-t0)*count
-    statement << icount.to_s+"\n"
-    data_file=open(Shunkuntype::SPEED_FILE,"a+")
+  def keep_record(t0, t1, count)
+    return if t0.nil? || t1.nil?
+    # テスト環境なら記録しない
+    return if ENV['TEST'] == 'true'
+
+    statement = t0.to_s + ","
+    statement << @number.to_s + ","
+    statement << (t1 - t0).to_s + ","
+    icount = @period / (t1 - t0) * count
+    statement << icount.to_s + "\n"
+    data_file = open(Shunkuntype::SPEED_FILE, "a+")
     data_file << statement
     p statement
 
-    printf("%5.3f sec\n",Time.now-t0)
-    printf("%4d characters.\n",icount)
+    printf("%5.3f sec\n", Time.now - t0)
+    printf("%4d characters.\n", icount)
   end
 end

data/lib/shunkuntype/training.rb

@@ -1,3 +1,5 @@
+require "shunkuntype"
+
 class Training
   def initialize(val_i)
     val_i ||= 47
@@ -10,11 +12,15 @@ class Training
 
     @time_flag=true
     print_keyboard
-    start_time,data=init_proc(file_name)
-    #size_training(file_name,data,start_time)
+    start_time,data = init_proc(file_name)
+    return if start_time.nil?
     time_training(base_name,data,start_time)
   end
 
+  def print_keyboard
+    Shunkuntype.print_keyboard
+  end
+
   # count correct spelling
   def counter(word1,word2)
     ws1=word1.split(/\s+/)
@@ -39,28 +45,25 @@ class Training
     end
   end
 
-  # print key positions
-  def print_keyboard
-    content = <<-EOF
- q \\ w \\ e \\ r t \\ y u \\ i \\ o \\ p
-  a \\ s \\ d \\ f g \\ h j \\ k \\ l \\ ; enter
-sh z \\ x \\ c \\ v b \\ n m \\ , \\\ . \\  shift
-EOF
-    print content
-  end
-
   def init_proc(file_name)
     data=File.readlines(file_name)
     data.each{|word| print word }
     print "\nRepeat above sentences. Type return-key to start."
-#    p ''
     line=STDIN.gets
+    if line.nil?
+      # 入力がなければnilを返して呼び出し元で処理
+      return nil, data
+    end
+    line = line.chomp
     start_time = Time.now
-    return start_time,data
+    return start_time, data
   end
 
-  def keep_record(start_time,file_name,period)
-    data_file=open(Shunkuntype::TRAIN_FILE,"a")
+  def keep_record(start_time, file_name, period)
+    # テスト環境なら記録しない
+    return if ENV['TEST'] == 'true'
+
+    data_file = open(Shunkuntype::TRAINING_FILE, "a+")
     data_file << "#{start_time},#{file_name},#{@counter},#{period}\n"
     exit
   end
@@ -69,18 +72,13 @@ EOF
     data.each do |sentence|
       break if @time_flag == false
       puts sentence
-#      p ''
-      line=STDIN.gets.chomp
-      counter(sentence,line)
+      line = STDIN.gets
+      break if line.nil?
+      line = line.chomp
+      counter(sentence, line)
     end
   end
 
-  def size_training(file_name,data,start_time)
-    type_loop(data)
-    exit_proc(start_time,file_name,(Time.now-start_time).to_i)
-    return
-  end
-
   def time_training(base_name,data,start_time)
     loop_thread(@period)
     data2=[]

data/lib/shunkuntype/version.rb

@@ -2,11 +2,6 @@ require 'fileutils'
 require 'tmpdir'
 
 module Shunkuntype
-  VERSION = "1.0.15"
+  VERSION = "1.1.1"
   data_dir = File.join(ENV['HOME'], '.shunkuntype')
-#  SPEED_FILE="./shunkuntype_speed_data.txt"
-  SPEED_FILE=File.join(data_dir,"speed_data.txt")
-#  TRAIN_FILE="./shunkuntype_training_data.txt"
-  TRAIN_FILE=File.join(data_dir,"training_data.txt")
-  SERVER_FILE=File.join(data_dir,"server_data.txt")
-end
+end

data/lib/shunkuntype.rb

@@ -1,128 +1,52 @@
 require 'optparse'
-require "shunkuntype/version"
 require "shunkuntype/speed"
 require "shunkuntype/training"
 require "shunkuntype/finished_check"
-require "shunkuntype/plot"
-require "shunkuntype/mk_summary"
-require "shunkuntype/plot_data"
 require "shunkuntype/db"
-require "shunkuntype/merge"
 require 'systemu'
+require "shunkuntype/version"
 
 module Shunkuntype
-  class Command
-
-    def self.run(argv=[])
-      print "Shunkuntype says 'Hello world'.\n"
-      new(argv).execute
-    end
-
-    def initialize(argv=[])
-      @argv = argv
-    end
+  DATA_DIR = File.join(ENV['HOME'], '.shunkuntype')
+  TRAINING_FILE = File.join(DATA_DIR, "training_data.txt")
+  SPEED_FILE = File.join(DATA_DIR, "speed_data.txt")
+
+  def self.print_keyboard
+    content = <<-EOF
+ q \\ w \\ e \\ r t \\ y u \\ i \\ o \\ p
+  a \\ s \\ d \\ f g \\ h j \\ k \\ l \\ ; enter
+sh z \\ x \\ c \\ v b \\ n m \\ , \\\ . \\  shift
+EOF
+    print content
+  end
+end
 
-    def execute
-      DataFiles.prepare
+class Command
 
-      @argv << '--help' if @argv.size==0
-      command_parser = OptionParser.new do |opt|
-        opt.on('-v', '--version','show program Version.') { |v|
-          opt.version = Shunkuntype::VERSION
-          puts opt.ver
-        }
-        opt.on('-c', '--check','Check speed') {|v| SpeedCheck.new }
-        opt.on('-d', '--drill [VAL]','one minute Drill [VAL]', Integer) {|v| Training.new(v) }
-        opt.on('-h', '--history','view training History') {|v| FinishCheck.new }
-        opt.on('-p', '--plot','Plot personal data') { |v| PlotPersonalData.new }
-        opt.on('-s', '--submit','Submit data to dmz0') { |v| report_submit()}
-        opt.on('--reset','reset training data') { |v| reset_data()}
-        opt.on('--review [FILE]','Review training, TAGs=html or hiki'){|v| data_viewing(v)}
-      end
-      command_parser.parse!(@argv)
-      exit
-    end
-
-    def reset_data
-      data_dir = File.join(ENV['HOME'], '.shunkuntype')
-      FileUtils.cd(data_dir)
-      begin
-        FileUtils.mkdir('old_data',:verbose => true)
-      rescue Errno::EEXIST
-        print "Directory 'old_data' exists at #{data_dir}.\n\n"
-      end
-      time=Time.now.strftime("%Y%m%d%H%M%S")
-      ['speed_data','training_data'].each{|file|
-        target = File.join(data_dir,'old_data',"#{file}_#{time}.txt")
-        FileUtils.mv(file+'.txt',target,:verbose=>true)
-      }
-    end
+  def self.run(argv=[])
+    print "Shunkuntype says 'Hello world'.\n"
+    new(argv).execute
+  end
 
-    def report_submit
-      p 'report submission'
-      p data_dir = File.join(ENV['HOME'], '.shunkuntype')
-      FileUtils.cd(data_dir)
-      unless File.exists?(Shunkuntype::SERVER_FILE)
-        print "Input server_directory?:"
-        p tmp = gets
-        File.open(Shunkuntype::SERVER_FILE,'w'){|f| f.print(tmp) }
-      end
-      server_info=File.readlines(Shunkuntype::SERVER_FILE)
-      p @server_directory=server_info[0].chomp
-      p @user_name=server_info[0].split('@')[0]
-      ['training_data.txt','speed_data.txt'].each{|ext|
-        file_merge(ext)
-        system "scp tmp_data.txt #{ext}"
-      }
-    end
+  def initialize(argv=[])
+    @argv = argv
+  end
 
-    def file_merge(ext_name)
-      file_name=ext_name
-      file_current = File.readlines(file_name)
-      tmp_file = File.open("./tmp_data.txt",'w')
-      sta, out, stderror = systemu "scp #{@server_directory}/#{@user_name}_#{ext_name} ."
-      p stderror
-      unless stderror.include?(" No such file or directory") then
-        file_server = File.readlines("#{@user_name}_#{ext_name}")
-        tmp_file.print data_merge(file_current,file_server)
-      else
-        p " No such file or directory in server.\n"
-        tmp_file.print file_current.join
-      end
-      tmp_file.close
-      system "cat tmp_data.txt"
-      system "scp tmp_data.txt #{@server_directory}/#{@user_name}_#{ext_name}"
-    end
+  def execute
+    DataFiles.prepare
 
-    def data_viewing(file)
-      # opts for MkPlots could be described in file
-      # Not coded yet at all!!!
-      if file==nil then
-        opts = {}
-      end
-      server_info=File.readlines(Shunkuntype::SERVER_FILE)
-      p server_directory=server_info[0].chomp
-      Dir.mktmpdir('shunkun'){|tmp_dir|
-#      ['tmp_dir'].each{|tmp_dir|
-        p tmp_dir
-        FileUtils.mkdir_p(File.join(tmp_dir,'mem_data'))
-        system "scp -r #{server_directory}/* #{tmp_dir}/mem_data"
-p       table = MkSummary.new(tmp_dir)         # read data from files
-        MkPlots.new(tmp_dir,opts)
-        File.open('./tmp.html','a'){|f|
-          f.write("<html>\n")
-          f.write(table.mk_html_table())
-          f.write("<p><img src=\"./work.png\" /></p>")
-          f.write("<p><img src=\"./speed.png\" /></p>")
-          f.write("</html>\n")
-        }
-        File.open('./tmp.hiki','a'){|f|
-          f.write(table.mk_hiki_table())
-          f.write('||{{attach_view(work.png)}}')
-          f.write('||{{attach_view(speed.png)}}')
-          f.write("\n")
-        }
+    @argv << '--help' if @argv.size==0
+    command_parser = OptionParser.new do |opt|
+      opt.on('-v', '--version','show program Version.') { |v|
+        opt.version = Shunkuntype::VERSION
+        puts opt.ver
       }
+      opt.on('-c', '--check','Check speed') {|v| SpeedCheck.new }
+      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 }
     end
+    command_parser.parse!(@argv)
+    exit
   end
 end

data/shunkuntype.gemspec

@@ -27,11 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "systemu", "~>2.5.1"
+  spec.add_dependency "systemu"
   spec.add_dependency "gnuplot"
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "yard", "~> 0.8"
-#  spec.add_development_dependency "test-unit"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-reporters"
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: shunkuntype
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.1.1
 platform: ruby
 authors:
 - Shigeto R. Nishitani
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gnuplot
   requirement: !ruby/object:Gem::Requirement
@@ -42,46 +41,46 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,36 +102,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
-- ".ruby-version"
+- ".hyper_card/docs/.Shunkuntype.hiki.swp"
+- ".hyper_card/docs/Shunkuntype.hiki"
+- ".hyper_card/docs/Shunkuntype_Coding.hiki"
+- ".hyper_card/docs/Shunkuntype_Coding_PlotData.hiki"
+- ".hyper_card/docs/Shunkuntype_Coding_gnuplot.hiki"
+- ".hyper_card/docs/Shunkuntype_GroupHearing_20160128.pdf"
+- ".hyper_card/docs/Shunkuntype_gemizing.hiki"
+- ".hyper_card/docs/Shunkuntype_manual.hiki"
+- ".hyper_card/docs/Shunkuntype_report.hiki"
+- ".hyper_card/docs/TouchTypespeedResult.png"
+- ".hyper_card/docs/TouchTypetrainingResult.png"
+- ".hyper_card/docs/TouchTypewhole_workResult.png"
+- ".hyper_card/docs/donkey_and_fujimoto.png"
+- ".hyper_card/docs/readme_en.hiki"
+- ".hyper_card/docs/readme_ja.hiki"
+- ".hyper_card/docs/res.png"
+- ".hyper_card/docs/shunkun_report.pdf"
+- ".hyper_card/docs/speed.png"
+- ".hyper_card/docs/work.png"
+- ".hyper_card/history/test_cli_bdd.md"
+- ".hyper_card/history/test_cli_bdd_251114.md"
+- ".hyper_card/history/tidy.md"
+- ".hyper_card/history/tidy_251114.md"
 - ".travis.yml"
-- ".yardopts"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- Rakefile.rb
 - bin/console
 - bin/setup
-- docs/Shunkuntype.hiki
-- docs/Shunkuntype_Coding.hiki
-- docs/Shunkuntype_Coding_PlotData.hiki
-- docs/Shunkuntype_Coding_gnuplot.hiki
-- docs/Shunkuntype_GroupHearing_20160128.pdf
-- docs/Shunkuntype_gemizing.hiki
-- docs/Shunkuntype_manual.hiki
-- docs/Shunkuntype_report.hiki
-- docs/TouchTypespeedResult.png
-- docs/TouchTypetrainingResult.png
-- docs/TouchTypewhole_workResult.png
-- docs/donkey_and_fujimoto.png
-- docs/readme_en.hiki
-- docs/readme_ja.hiki
-- docs/res.png
-- docs/shunkun_report.pdf
-- docs/speed.png
-- docs/work.png
 - exe/shunkuntype
 - lib/data/STEP-1.txt
 - lib/data/STEP-10.txt
@@ -236,29 +237,16 @@ files:
 - lib/data/trans2.rb
 - lib/data/word.list
 - lib/shunkuntype.rb
-- lib/shunkuntype/#db.rb#
-- lib/shunkuntype/#mk_summary.rb#
 - lib/shunkuntype/db.rb
 - lib/shunkuntype/finished_check.rb
-- lib/shunkuntype/merge.rb
-- lib/shunkuntype/mk_summary.rb
-- lib/shunkuntype/options.rb
-- lib/shunkuntype/plot.rb
-- lib/shunkuntype/plot_data.rb
 - lib/shunkuntype/speed.rb
 - lib/shunkuntype/training.rb
 - lib/shunkuntype/version.rb
 - shunkuntype.gemspec
-- shunkuntype_bob/.gitignore
-- shunkuntype_bob/Rakefile
-- shunkuntype_bob/hiki_help.yml
-- shunkuntype_bob/report.hiki
-- shunkuntype_bob/shunkuntype_bob.hiki
 homepage: https://github.com/daddygongon/shunkuntype
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -273,9 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: type training.
 test_files: []

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.ruby-version

@@ -1 +0,0 @@
-2.4.3

data/.yardopts

@@ -1,3 +0,0 @@
--
-**/*.md
-

data/Rakefile.rb

@@ -1 +0,0 @@
-./Rakefile

data/lib/shunkuntype/#db.rb#

@@ -1,49 +0,0 @@
-#encoding: utf-8
-
-require 'fileutils'
-#require 'init'
-
-module DataFiles
-
-  def self.prepare
-    data_path = File.join(ENV['HOME'], '.shunkuntype','training_data.txt')
-
-    create_file_if_not_exists(data_path)
-  end
-
-  def self.create_file_if_not_exists(path)
-    create_file_path(path)
-
-    return if File::exists?(path)
-    create_data_files
-  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::TRAIN_FILE}"
-      print "moving ./training_data.txt #{Shunkuntype::TRAIN_FILE}.\n"
-    end
-    if File::exist?(Shunkuntype::SPEED_FILE) then
-      print "#{Shunkuntype::SPEED_FILE} exits.\n"
-    else
-      File::open(Shunkuntype::SPEED_FILE,'a')
-      print "make #{Shunkuntype::SPEED_FILE}\n"
-    end
-    if File::exist?(Shunkuntype::TRAIN_FILE) then
-      print "#{Shunkuntype::TRAIN_FILE} exits.\n"
-    else
-      File::open(Shunkuntype::TRAIN_FILE,'a')
-      print "make #{Shunkuntype::TRAIN_FILE}\n"
-    end
-  end
-  private_class_method :create_file_if_not_exists, :create_file_path, :create_data_files
-end
-