ruby_learner 1.1.15 → 1.2.0

data/{questions → contents/questions}/sequential_check/section_6/part_1/lib/sentence.org

@@ -8,6 +8,7 @@
 ** 使用方法
     - 配列作成...配列名 = [オブジェクト，オブジェクト，オブジェクト]．オブジェクトは複数格納できるが何も格納しなくても良い．
     - 要素呼び出し...配列名[index] (このindexとは配列の要素番号である．)
+    - 要素追加...配列 << 新しい要素
     - 要素番号...配列の要素は0から数える．
     - 要素変更...配列名[index] = オブジェクト
     - 配列の大きさ(要素数)...配列名.size

data/lib/ruby_learner/common.rb

@@ -1,7 +1,7 @@
 class Common
-  def restore(file: String, workshop_dir: String)
-  restore_file = ""
-    line = File.open("#{workshop_dir}/lib/answer.rb") do |f|
+  def save_restore(file: String, local_dir: String)
+    restore_file = ""
+    line = File.open("#{local_dir}/workshop/lib/answer.rb") do |f|
       1.times {
         f.gets
       }
@@ -9,13 +9,12 @@ class Common
     end
     restore_file.gsub!(" ", "")
     restore_file.delete!("#")
-    Dir::chdir("#{workshop_dir}/restore"){
+    Dir::chdir("#{local_dir}/restore"){
       file_count = Dir.glob("*.rb").count
-      # restore_file.insert(-5, "[#{file_count}]")
       restore_file.insert(0, "[#{file_count}]")
     }
-    system "touch #{workshop_dir}/restore/#{restore_file}"
-    system "cp #{workshop_dir}/lib/workplace.rb #{workshop_dir}/restore/#{restore_file}"
+    system "touch #{local_dir}/restore/#{restore_file}"
+    system "cp #{local_dir}/workshop/lib/workplace.rb #{local_dir}/restore/#{restore_file}"
   end
 
   def time_check(start_time: Time)
@@ -30,25 +29,25 @@ class Common
     puts "check answer >>> 'answer' + [RET]"
   end
 
-  def init_mk_files(gem_dir: String, workshop_dir: String)
-    if Dir.exist?(workshop_dir) != true then
-      FileUtils.mkdir_p(workshop_dir)
-      system("cp -R #{gem_dir}/workshop/* #{workshop_dir}")
-      system("cd #{workshop_dir} && mv emacs.d .emacs.d")
-      system("cd #{workshop_dir} && mv rspec .rspec")
-      system("cd #{workshop_dir} && mv rubocop.yml .rubocop.yml")
+  def init_mk_files(gem_dir: String, local_dir: String)
+    gem_contents_dir = "#{gem_dir}/contents"
+    if Dir.exist?(local_dir) != true then
+      FileUtils.mkdir_p("#{local_dir}/workshop")
+      system("cp -R #{gem_contents_dir}/workshop/* #{local_dir}/workshop")
+      FileUtils.mkdir_p("#{local_dir}/restore")
+      system("cp -R #{gem_contents_dir}/restore/* #{local_dir}/restore")
+      FileUtils.mkdir_p("#{local_dir}/.datas")
+      system("cp -R #{gem_contents_dir}/datas/* #{local_dir}/.datas")
+      system("cd #{local_dir}/.datas && mv emacs.d .emacs.d")
+      system("cd #{local_dir}/workshop && mv rspec .rspec")
+      system("cd #{local_dir}/workshop && mv rubocop.yml .rubocop.yml")
+      system("cd #{local_dir}/restore && mv empty.rb .empty.rb")
     end
   end
 
-  def get_app_ver(app_name: String)
-    app_vers = Open3.capture3("gem list #{app_name}")
-    latest_ver = app_vers[0].chomp.gsub(' (', '-').gsub(')','')
-    return latest_ver
-  end
-
-  def change_theme(color: String, gem_dir: String)
+  def change_theme(color: String, datas_dir: String)
     chmoded = 0
-    file_path = "#{gem_dir}/lib/datas/theme_color.txt"
+    file_path = "#{datas_dir}/theme_color.txt"
     begin
       File.write(file_path, "#{color}")
       puts "your ruby_learner's color is #{color}!!"

data/lib/ruby_learner/ruby_learner.rb

@@ -10,9 +10,12 @@ module RubyLearner
   class CLI < Thor
     def initialize(*args)
       super
-      @workshop_dir = "#{ENV['HOME']}/.ruby_learner/workshop"
+      @local_dir = "#{ENV['HOME']}/.ruby_learner"
+      @workshop_dir = "#{@local_dir}/workshop"
+      @restore_dir = "#{@local_dir}/restore"
+      @datas_dir = "#{@local_dir}/.datas"
       @gem_dir = File.expand_path("../../../", __FILE__)
-      Common.allocate.init_mk_files(gem_dir: @gem_dir, workshop_dir: @workshop_dir)
+      Common.allocate.init_mk_files(gem_dir: @gem_dir, local_dir: @local_dir)
     end
 
     desc '-v', 'show program version'
@@ -22,52 +25,84 @@ module RubyLearner
     end
 
     desc 'emacs_key', 'check emacs key-bindings'
-    def emacs_key
-      system("cat #{@gem_dir}/lib/datas/emacs_help.org")
+    option :image, aliases: :i, type: :boolean
+    def emacs_key(*args)
+      if options[:image]
+        system("open #{@datas_dir}/emacs_help.pdf")
+      else
+        system("cat #{@datas_dir}/emacs_help.org")
+      end
     end
 
     desc 'sequential_check [section:1~11] [part:1~]','learning drill'
     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, @workshop_dir)
+        sequential_main = SequentialMain.new(@gem_dir, @local_dir)
         if options[:drill]
           sequential_main.drill_contents
         elsif options[:next]
-          final_sec, final_par = sequential_main.get_final_history(@gem_dir)
+          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)
+        elsif options[:last]
+          sequential_main.last_re_action()
         else
           sequential_main.action(args[0], args[1])
         end
       rescue => error
         puts "Error.message: #{error.message}"
         puts 'sequential_check has 3-modes'
-        puts 'mode-1: $ sequential_check [section:1~11] [part:1~] ,ex) sequential_check 1 3'
+        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'
       end
     end
 
     desc 'restore','check your restore'
     option :refresh, aliases: :r, 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, "[")}
       if options[:refresh]
-        system("rm -rf #{@workshop_dir}/restore/")
-        system("mkdir #{@workshop_dir}/restore")
-      elsif args.empty? == true then
-        system("ls #{@workshop_dir}/restore")
-        print("\n If you want to open a restore_file, you execute 'ruby_learner restore [file_name]'")
-        print("\n If you want to remove all restore_files, you execute 'ruby_learner restore -r'")
+        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'"
       else
-        system("emacs #{@workshop_dir}/restore/#{args[0]}")
+        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
       end
     end
 
     desc 'install_emacs','install emacs in your mac'
     def install_emacs
-      file_path = "#{@gem_dir}/lib/datas/install_emacs.sh"
+      file_path = "#{@datas_dir}/install_emacs.sh"
       system("sh #{file_path}")
     end
 
@@ -75,7 +110,7 @@ module RubyLearner
     def theme(*args)
       args[0].chomp
       if args[0] == 'black' || args[0] == 'white'
-        Common.allocate.change_theme(color: args[0], gem_dir: @gem_dir)
+        Common.allocate.change_theme(color: args[0], datas_dir: @datas_dir)
       else
         puts "you can change the theme_color, only black or white."
       end