ruby_learner 1.2.6 → 1.2.7

data/lib/ruby_learner/ruby_learner.rb

@@ -1,10 +1,12 @@
 require 'fileutils'
 require 'thor'
-require 'ruby_learner/version.rb'
 require 'open3'
-require 'ruby_learner/common.rb'
-require 'ruby_learner/sequential_main'
-require 'ruby_learner/pair_timer.rb'
+require 'ruby_learner/version'
+require 'ruby_learner/common'
+require 'ruby_learner/sequential_check'
+require 'ruby_learner/sequential_check_real'
+require 'ruby_learner/restore'
+require 'ruby_learner/copspec'
 
 module RubyLearner
   # ruby_learner CLI main class
@@ -43,85 +45,74 @@ module RubyLearner
         return
       end
       time = args[0].to_i
-      popup_file = File.expand_path("../popup_per_time_for_background.rb", __FILE__)
-      system("ruby #{popup_file} #{time} &")
+      file = File.expand_path("../pair_timer.rb", __FILE__)
+      system("ruby #{file} #{time} &")
     end
 
-    desc 'sequential_check [section:1~11] [part:1~]','learning drill'
+    desc 'copspec [file_path]','check rspec and rubocop'
+    map "-c" => "copspec"
+    option :sequential_check, aliases: :s, type: :boolean
+    def copspec(*args)
+      begin
+        if options[:sequential_check]
+          CopSpec.copspec("#{@workshop_dir}/lib/workplace.rb")
+        else
+          CopSpec.copspec(args[0])
+        end
+      rescue => error
+        puts "Error.message: #{error.message}"
+      end
+    end
+
+    desc 'sequential_check [section:1~11] [part:1~3]','learning drill'
     map "-s" => "sequential_check"
+    option :real, aliases: :r, type: :boolean
+    option :copspec, aliases: :c, type: :boolean
     option :next, aliases: :n, type: :boolean
     option :drill, aliases: :d, type: :boolean
     option :last, aliases: :l, type: :boolean
     def sequential_check(*args)
       begin
-        sequential_main = SequentialMain.new(@gem_dir, @local_dir)
-        if args[0] == '-p'
-          pair_timer = PairTimer.new do
-            pair_timer.popup_per_time_for_exe(600)
-          end
-          args[0] = args[1]
-          args[1] = args[2]
+        mode = File.read("#{@datas_dir}/sequential_mode.txt").chomp
+        puts "active mode: #{mode}"
+        sequential_check = nil
+        if mode == 'nomal'
+          sequential_check = SequentialCheck.new(@gem_dir, @local_dir)
+        else
+          sequential_check = SequentialCheckReal.new(@gem_dir, @local_dir)
         end
-
         if options[:drill]
-          Thread.kill(pair_timer) if pair_timer != nil
-          sequential_main.drill_contents
+          sequential_check.drill_contents
         elsif options[:next]
-          final_sec, final_par = sequential_main.get_final_history()
-          next_sec, next_par = sequential_main.get_next_question(final_sec, final_par)
-          sequential_main.action(next_sec, next_par)
+          sequential_check.next_action
         elsif options[:last]
-          sequential_main.last_re_action()
+          sequential_check.last_re_action
+        elsif options[:real]
+          sequential_check.change_mode
+        elsif options[:copspec]
+          CopSpec.copspec("#{@workshop_dir}/lib/workplace.rb")
         else
-          sequential_main.action(args[0], args[1])
+          sequential_check.action(args[0], args[1])
         end
-        Thread.kill(pair_timer) if pair_timer != nil
       rescue => error
         puts "Error.message: #{error.message}"
-        puts 'sequential_check has 5-modes'
-        puts 'mode-1: $ sequential_check [section:1~11] [part:1~], ex) sequential_check 1 3'
-        puts 'mode-2: $ sequential_check -d, check drill contents'
-        puts 'mode-3: $ sequential_check -n, learn next to your last-question'
-        puts 'mode-4: $ sequential_check -l, learn your last-question'
-        puts 'mode-5: $ sequential_check -p [1 2, -d, -n, -l], learn with partner, change per 10 minutes.'
+        sequential_check.instruct_modes
       end
     end
 
     desc 'restore','check your restore'
+    map "-r" => "restore"
     option :refresh, aliases: :r, type: :boolean
+    option :copspec, aliases: :c, type: :boolean
     def restore(*args)
-      restores = []
-      dir = Dir.open(@restore_dir)
-      dir.each do |file|
-        if file != '.' && file != '..' && file != '.empty.rb'
-          restores << file.slice(1..file.length)
-        end
-      end
-      sorted_restores = restores.sort_by{|item| item.to_i}
-      sorted_restores.each{|item| item.insert(0, "[")}
+      restore = Restore.new
       if options[:refresh]
         system("rm -rf #{@restore_dir}")
         system("mkdir #{@restore_dir}")
       elsif args.empty? == true
-        if sorted_restores.size < 20
-          puts sorted_restores
-        else
-          system("ls #{@restore_dir}")
-          puts "\nlast 5 restore history."
-          puts sorted_restores[-5..-1], "\n"
-        end
-        puts "If you want to open a restore_file, you execute 'ruby_learner restore [number]'"
-        puts "ex) ruby_learner restore 3"
-        print "If you want to remove all restore_files, you execute 'ruby_learner restore -r'"
+        restore.output
       else
-        case args[0].to_i
-        when 0..sorted_restores.size-1
-          filename = sorted_restores[args[0].to_i]
-          system("emacs #{@restore_dir}/#{filename}")
-        else
-          puts "you have #{sorted_restores.size} restore_files."
-          puts "you must put 'ruby_learner restore 0~#{sorted_restores.size - 1}.'"
-        end
+        restore.open(args[0].to_i)
       end
     end
 

data/lib/ruby_learner/sequential_check.rb

@@ -0,0 +1,110 @@
+require 'ruby_learner/rubocop_rspec_check'
+require 'fileutils'
+
+class SequentialCheck
+
+  def initialize(gem_dir, local_dir)
+    @gem_dir = gem_dir
+    @local_dir = local_dir
+    @workshop_dir = "#{local_dir}/workshop"
+    @restore_dir = "#{local_dir}/restore"
+    @datas_dir = "#{local_dir}/.datas"
+  end
+
+  # non opt, -next
+  def action(sec, par)
+    puts "section_#{sec}/part_#{par}"
+    seq_dir = "#{@gem_dir}/contents/questions/sequential_check/section_#{sec}/part_#{par}"
+    rubocop_rspec_check = RubocopRspecCheck.new(@local_dir, @gem_dir)
+    rubocop_rspec_check.action(mode_dir: seq_dir, is_copy: true)
+    write_final_history(sec, par)
+  end
+
+  # -next
+  def next_action
+    final_sec, final_par = get_final_history
+    next_sec, next_par = get_next_question(final_sec, final_par)
+    action(next_sec, next_par)
+  end
+
+  # -last
+  def last_re_action
+    final_sec, final_par = get_final_history
+    puts "section_#{final_sec}/part_#{final_par}"
+    rubocop_rspec_check = RubocopRspecCheck.new(@local_dir, @gem_dir)
+    rubocop_rspec_check.action(mode_dir: "#{@local_dir}/workshop", is_copy: false)
+  end
+
+  # -drill
+  def drill_contents
+    puts "section  \t part\t contents"
+    puts "section_1\t 1~3\t standard_output"
+    puts "section_2\t 1~3\t standard_input"
+    puts "section_3\t 1~3\t standard_I/O summary"
+    puts "section_4\t 1~3\t comparisons & conditionals"
+    puts "section_5\t 1~3\t loop_methods"
+    puts "section_6\t 1~3\t array & hash & symbol"
+    puts "section_7\t 1~3\t function"
+    puts "section_8\t 1~3\t class"
+    puts "section_9\t 1~3\t regular_expression"
+    puts "section_10\t 1~3\t file_operation"
+    puts "section_11\t 1~3\t library"
+  end
+
+  # -ch_mode
+  def change_mode
+    mode_txt = "#{@datas_dir}/sequential_mode.txt"
+    case File.read(mode_txt).chomp
+    when 'nomal'
+      File.write(mode_txt, 'real')
+    else
+      File.write(mode_txt, 'nomal')
+    end
+  end
+
+  def instruct_modes
+    puts 'sequential_check has 5-modes'
+    puts 'mode-1: $ -s [section:1~11] [part:1~], ex) sequential_check 1 3'
+    puts 'mode-2: $ -s -d, check drill contents'
+    puts 'mode-3: $ -s -n, learn next to your last-question'
+    puts 'mode-4: $ -s -l, learn your last-question'
+    puts 'mode-5: $ -s -c, change behavior'
+  end
+
+  private
+
+  def write_final_history(sec, par)
+    chmoded = 0
+    file_dir = "#{@datas_dir}/final_history_sequential.txt"
+    begin
+      File.write(file_dir, "#{sec}-#{par}")
+    rescue => error
+      system "sudo chmod go+w #{file_dir}"
+      chmoded += 1
+      retry if chmoded < 2
+      puts "FileWrite error #{error.message}"
+      puts "you should input $sudo chmod go+w #{file_dir}"
+    end
+  end
+
+  def get_final_history
+    final_history = ''
+    File.open("#{@datas_dir}/final_history_sequential.txt") do |f|
+      final_history = f.gets
+    end
+    final_sec = final_history.match(/(.*)\-/)[1].to_i
+    final_par = final_history.match(/\-(.*)/)[1].to_i
+    return final_sec, final_par
+  end
+
+  def get_next_question(final_sec, final_par)
+    if final_par == 3
+      next_sec = final_sec + 1
+      next_sec = 1 if next_sec >= 12
+      return next_sec, 1
+    else
+      return final_sec, final_par+1
+    end
+  end
+
+end

data/lib/ruby_learner/sequential_check_real.rb

@@ -0,0 +1,29 @@
+require 'ruby_learner/common'
+require 'ruby_learner/sequential_check'
+require 'ruby_learner/rubocop_rspec_check'
+
+class SequentialCheckReal < SequentialCheck
+  def initialize(x, y)
+    super
+    @theme_color = File.read("#{@datas_dir}/theme_color.txt").chomp
+  end
+
+  def action(sec, par)
+    start_time = Time.now
+    puts "section_#{sec}/part_#{par}"
+    mode_dir = "#{@gem_dir}/contents/questions/sequential_check/section_#{sec}/part_#{par}"
+    %w{lib/workplace.rb lib/sentence.org lib/answer.rb spec/workplace_spec.rb}.each do |path|
+      FileUtils.cp("#{mode_dir}/#{path}", "#{@workshop_dir}/#{path}")
+    end
+    system "cd #{@workshop_dir}/lib && emacs -nw -q -l #{@datas_dir}/.emacs.d/#{@theme_color}/init.el sentence.org workplace.rb"
+    write_final_history(sec, par)
+    elapsed_time = Common.allocate.time_check(start_time: start_time)
+    p "#{elapsed_time} sec"
+    restore = Restore.new
+    restore.save(file: "#{@workshop_dir}/lib/workplace.rb", elapsed_time: elapsed_time)
+  end
+
+  def last_re_action
+    system "cd #{@workshop_dir}/lib && emacs -nw -q -l #{@datas_dir}/.emacs.d/#{@theme_color}/init.el sentence.org workplace.rb"
+  end
+end

data/lib/ruby_learner/version.rb

@@ -1,3 +1,3 @@
 module RubyLearner
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_learner
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Takaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - contents/datas/emacs_help.pdf
 - contents/datas/final_history_sequential.txt
 - contents/datas/install_emacs.sh
+- contents/datas/sequential_mode.txt
 - contents/datas/theme_color.txt
 - contents/questions/random_check/.rspec
 - contents/questions/random_check/random_h.rb
@@ -388,27 +389,40 @@ files:
 - docs/happy_ruby/TanoshiiRuby_v5_c2-3.pdf
 - docs/happy_ruby/c2.ipynb
 - docs/happy_ruby/c3_4.ipynb
+- docs/manual.org
 - docs/seminar/10-18.org
 - docs/seminar/10-18.rb
 - docs/seminar/8-1.org
 - docs/seminar/8-30.org
 - docs/seminar/9-16.org
+- docs/seminar/9-27.org
 - docs/seminar/ruby_kansai_9-1.org
 - docs/seminar/seminer_9_20.org
-- docs/thesis/competing_services.org
-- docs/thesis/manual.org
-- docs/thesis/mid_term.pptx
-- docs/thesis/~$mid_term.pptx
-- docs/todo/9-27.org
+- docs/thesis/final_presentation/IMRD/ctrlZ_fg_method.org
+- docs/thesis/final_presentation/IMRD/why_not_web.org
+- docs/thesis/midterm_presentation/others/5464_takaki_midterm.pptx
+- docs/thesis/midterm_presentation/others/mid_term.pptx
+- docs/thesis/midterm_presentation/ruby_learner_thesis/.ruby_learner.tex.swp
+- docs/thesis/midterm_presentation/ruby_learner_thesis/jlisting.sty
+- docs/thesis/midterm_presentation/ruby_learner_thesis/rspec_rubocop.png
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.aux
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.dvi
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.log
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.md
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.pdf
+- docs/thesis/midterm_presentation/ruby_learner_thesis/ruby_learner.tex
+- docs/thesis/midterm_presentation/ruby_learner_thesis/test.md
+- docs/thesis/research/competing_services.org
 - exe/ruby_learner
 - lib/ruby_learner/.ruby-version
 - lib/ruby_learner/common.rb
+- lib/ruby_learner/copspec.rb
 - lib/ruby_learner/pair_timer.rb
-- lib/ruby_learner/popup_per_time_for_background.rb
-- lib/ruby_learner/practice_datas.txt
+- lib/ruby_learner/restore.rb
+- lib/ruby_learner/rubocop_rspec_check.rb
 - lib/ruby_learner/ruby_learner.rb
-- lib/ruby_learner/sequential_main.rb
-- lib/ruby_learner/typing_practice.rb
+- lib/ruby_learner/sequential_check.rb
+- lib/ruby_learner/sequential_check_real.rb
 - lib/ruby_learner/version.rb
 - ruby_learner.gemspec
 homepage: ''

data/lib/ruby_learner/popup_per_time_for_background.rb

@@ -1,14 +0,0 @@
-require 'open3'
-
-time = ARGV[0].to_i
-
-loop do
-  sleep time
-  system('afplay /System/Library/Sounds/Submarine.aiff')
-  o, e, s = Open3.capture3("osascript -e 'tell app \"System Events\" to display dialog \"#{time}s passed.\nPut cancel to stop pair-mode.\nPut OK to continue pair-mode.\"'")
-  
-  if o != "button returned:OK\n"
-    Open3.capture3("osascript -e 'tell app \"System Events\" to display dialog \"pair_popup_mode is stopped.\"'")
-    break
-  end
-end

data/lib/ruby_learner/sequential_main.rb

@@ -1,207 +0,0 @@
-require 'ruby_learner/typing_practice'
-require 'fileutils'
-
-class SequentialMain
-
-  def initialize(gem_dir, local_dir)
-    @gem_dir = gem_dir
-    @local_dir = local_dir
-    @workshop_dir = "#{local_dir}/workshop"
-    @restore_dir = "#{local_dir}/restore"
-    @datas_dir = "#{local_dir}/.datas"
-  end
-
-  def action(sec, par)
-    puts "section_#{sec}/part_#{par}"
-    seq_dir = "#{@gem_dir}/contents/questions/sequential_check/section_#{sec}/part_#{par}"
-    typing_prac_class = TypingPractice.new(@local_dir, @gem_dir)
-    typing_prac_class.prac_sequence(mode_dir: seq_dir)
-    write_final_history(sec, par)
-  end
-
-  def last_re_action()
-    final_sec, final_par = get_final_history()
-    puts "section_#{final_sec}/part_#{final_par}"
-    theme_color = ""
-    File.open("#{@datas_dir}/theme_color.txt") do |f|
-      theme_color = f.gets.chomp
-    end
-    emacs_dir = "#{@datas_dir}/.emacs.d/#{theme_color}"
-    system "cd #{@workshop_dir}/lib && emacs -nw -q -l #{emacs_dir}/init.el sentence.org workplace.rb"
-    start_time = Time.now
-    typing_prac_class = TypingPractice.new(@local_dir, @gem_dir)
-    typing_prac_class.typing_discriminant
-    elapsed_time = Common.allocate.time_check(start_time: start_time)
-    p "#{elapsed_time} sec"
-  end
-
-  def write_final_history(sec, par)
-    chmoded = 0
-    file_dir = "#{@datas_dir}/final_history_sequential.txt"
-    begin
-      File.write(file_dir, "#{sec}-#{par}")
-    rescue => error
-      system "sudo chmod go+w #{file_dir}"
-      chmoded += 1
-      retry if chmoded < 2
-      puts "FileWrite error #{error.message}"
-      puts "you should input $sudo chmod go+w #{file_dir}"
-    end
-  end
-
-  def drill_contents
-    puts "section  \t part\t contents"
-    puts "section_1\t 1~3\t standard_output"
-    puts "section_2\t 1~3\t standard_input"
-    puts "section_3\t 1~3\t standard_I/O summary"
-    puts "section_4\t 1~3\t comparisons & conditionals"
-    puts "section_5\t 1~3\t loop_methods"
-    puts "section_6\t 1~3\t array & hash & symbol"
-    puts "section_7\t 1~3\t function"
-    puts "section_8\t 1~3\t class"
-    puts "section_9\t 1~3\t regular_expression"
-    puts "section_10\t 1~3\t file_operation"
-    puts "section_11\t 1~3\t library"
-  end
-
-  def get_final_history()
-    final_history = ''
-    final_sec = 0
-    final_par = 0
-    Dir::chdir(@datas_dir){
-      File.open("final_history_sequential.txt") do |f|
-      final_history = f.gets
-      end
-      final_sec = final_history.match(/(.*)\-/)[1].to_i
-      final_par = final_history.match(/\-(.*)/)[1].to_i
-    }
-    return final_sec, final_par
-  end
-
-  def get_next_question(final_sec, final_par)
-    if final_sec == 1
-      if final_par == 1
-        next_sec = 1
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 1
-        next_par = 3
-      else
-        next_sec = 2
-        next_par = 1
-      end
-    elsif final_sec == 2
-      if final_par == 1
-        next_sec = 2
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 2
-        next_par = 3
-      else
-        next_sec = 3
-        next_par = 1
-      end
-    elsif final_sec == 3
-      if final_par == 1
-        next_sec = 3
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 3
-        next_par = 3
-      else
-        next_sec = 4
-        next_par = 1
-      end
-    elsif final_sec == 4
-      if final_par == 1
-        next_sec = 4
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 4
-        next_par = 3
-      else
-        next_sec = 5
-        next_par = 1
-      end
-    elsif final_sec == 5
-      if final_par == 1
-        next_sec = 5
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 5
-        next_par = 3
-      else
-        next_sec = 6
-        next_par = 1
-      end
-    elsif final_sec == 6
-      if final_par == 1
-        next_sec = 6
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 6
-        next_par = 3
-      else
-        next_sec = 7
-        next_par = 1
-      end
-    elsif final_sec == 7
-      if final_par == 1
-        next_sec = 7
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 7
-        next_par = 3
-      else
-        next_sec = 8
-        next_par = 1
-      end
-    elsif final_sec == 8
-      if final_par == 1
-        next_sec = 8
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 8
-        next_par = 3
-      else
-        next_sec = 9
-        next_par = 1
-      end
-    elsif final_sec == 9
-      if final_par == 1
-        next_sec = 9
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 9
-        next_par = 3
-      else
-        next_sec = 10
-        next_par = 1
-      end
-    elsif final_sec == 10
-      if final_par == 1
-        next_sec = 10
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 10
-        next_par = 3
-      else
-        next_sec = 11
-        next_par = 1
-      end
-    else
-      if final_par == 1
-        next_sec = 11
-        next_par = 2
-      elsif final_par == 2
-        next_sec = 11
-        next_par = 3
-      else
-        next_sec = 1
-        next_par = 1
-      end
-    end
-    return next_sec, next_par
-  end
-
-end