ruby_learner 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e467e2ece5ed832c2cb2e329ac6bcffb080344
-  data.tar.gz: 7aba3bf7a60ebb8ef8111bbfd839a28bafa0aee9
+  metadata.gz: a3869d64ff647ab1b56c965f07268670fbc96c27
+  data.tar.gz: 40ce344b3d77c003be5d8e4385ad94ac8f41fa46
 SHA512:
-  metadata.gz: df03c32c4d5bfb34f590c94faf32171e955602e6d9992143efedca1e7b7676a0c1d18d701b0718ec7fc17b5714da60c6bb423ab3c2fded61de6325419759b15b
-  data.tar.gz: 3fe245a5704587eebac29f6c600abde1d60a7fcee844890039412544e0aed8f72ebbb97c61dfd92931a0ea5e2a90f3f27c4b2286de008f539d4eaec8411c2aab
+  metadata.gz: bc6358593f83e3ae9ea1923aa5cd27f09b0b30c367a0c1f742be75f868e509a9a0c743d22453dcb12a67cd8d33e28a11e55228adf4b64cbd8875f1601e8b3388
+  data.tar.gz: fbefbd17018e40ece793648ac3dd2ccb5cc93d511b628b707878baa98f920d44a5c82103e3a425fbf6c193c6a5cf3eb948dfef1204d1887a510aef9570e4f61f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_learner (1.0.0)
+    ruby_learner (1.0.1)
       colorize
       diff-lcs
       minitest (~> 5.10.3)

data/README.md

@@ -1,6 +1,7 @@
 # RubyLearner
 
-Ruby mastering application
+Ruby mastering application.
+It checks your code using rspec and rubocop.
 
 ## Installation
 
@@ -18,24 +19,13 @@ Or install it yourself as:
 
     $ gem install ruby_learner
 
-Now it is not release. If you want to use it, you must under guides:
-
-    $ git clone git@github.com:Takaki0403/ruby_learner.git
-
-In this clone directory:
-
-    $ rake build  
-    $ rake install:local
-
-<Attention> If your Home_directory has ruby_learner, you must delete it.
-
-    $ rm -rf ~/ruby_learner
-
 ## Usage
 ```ruby
 Usage: ruby_learner [options]
-       emacs_key:					confirm emacs key-bindings
-       sequential_check [section:1~1] [part:1~2]:	learning drill.
+Options: emacs_key					- confirm emacs key-bindings.
+       	 sequential_check [section:1~11] [part:1~]	- learning drill.
+	 		  -drill			- confirm drill numbers
+			  -next				- learning next to final history
 ```
 
 In learning in this app, you can choice 3 mode.  
@@ -43,7 +33,6 @@ Mode 1: you can continue to answer the question:
 
      $ [RET]
 
-
 Mode 2: you can confirm answer example.
 
      $ answer + [RET]
@@ -52,6 +41,17 @@ Mode 3: you can stop answer the question.
 
      $ exit + [RET]
 
+## Workshop
+
+This app makes a directory in your Home-Directory, 'ruby_learner'. If you confirm your learning history, you should check ruby_learner/workshop/restore.
+
+## If it cannot be executed due to an error
+
+I think the cause is your workshop-directory. Please execute this command in your Home-Directory.
+
+     $ rm -rf ruby_learner
+
+
 ## 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 tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/lib/datas/final_history_sequential.txt

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

data/lib/ruby_learner/methods.rb

@@ -4,21 +4,147 @@
 # end
 require 'rubocop'
 
-def time_check(start_time: Time)
-  end_time = Time.now
-  elapsed_time = end_time - start_time - 1
-  return elapsed_time
+def drill_contents
+  puts "section_1  1~3"
+  puts "section_2  1~2"
+  puts "section_3  1"
+  puts "section_4  1"
+  puts "section_5  1~2"
+  puts "section_6  1~4"
+  puts "section_7  1~2"
+  puts "section_8  1"
+  puts "section_9  1~3"
+  puts "section_10 1~2"
+  puts "section_11 1~2"
 end
 
-def typing_discriminant(dir: workshop_dir)
-  loop do
-    flag_rspec = rspec_check(dir: dir)
-    flag_rubocop = rubocop_check(file: "#{dir}/lib/workplace.rb", dir: dir)
-    if flag_rspec == true && flag_rubocop == true
-      break
+def final_history(gem_dir)
+  docs_dir = "#{gem_dir}/lib/datas"
+  final_history = ''
+  final_sec = 0
+  final_par = 0
+  Dir::chdir(docs_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 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
+    else
+      next_sec = 3
+      next_par = 1
+    end
+  elsif final_sec == 3
+    next_sec = 4
+    next_par = 1
+  elsif final_sec == 4
+    next_sec = 5
+    next_par = 1
+  elsif final_sec == 5
+    if final_par == 1
+      next_sec = 5
+      next_par = 2
+    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
+    elsif final_par == 3
+      next_sec = 6
+      next_par = 4
+    else
+      next_sec = 7
+      next_par = 1
+    end
+  elsif final_sec == 7
+    if final_par == 1
+      next_sec = 7
+      next_par = 2
+    else
+      next_sec = 8
+      next_par = 1
+    end
+  elsif final_sec == 8
+    next_sec = 9
+    next_par = 1
+  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
+    else
+      next_sec = 11
+      next_par = 1
+    end
+  else
+    if final_par == 1
+      next_sec = 11
+      next_par = 2
+    else
+      next_sec = 1
+      next_par = 1
     end
   end
-  restore(file: "#{dir}/lib/workplace.rb", workshop_dir: dir)
+
+  return next_sec, next_par
+end
+
+def write_final_history(gem_dir, current_sec, current_par)
+  docs_dir = "#{gem_dir}/lib/datas"
+  Dir::chdir(docs_dir){
+    File.open("final_history_sequential.txt","w") do |f|
+      f.puts("#{current_sec}-#{current_par}")
+    end
+  }
+end
+
+def sequential_check_main(gem_dir, workshop_dir ,sec, par)
+  puts "section_#{sec}/part_#{par}"
+  seq_dir = "#{gem_dir}/questions/sequential_check/section_#{sec}/part_#{par}"
+  typing_prac_class = TypingPractice.new(workshop_dir: workshop_dir)
+  typing_prac_class.prac_sequence(mode_dir: seq_dir)
+  write_final_history(gem_dir, sec, par)
+end
+
+def time_check(start_time: Time)
+  end_time = Time.now
+  elapsed_time = end_time - start_time - 1
+  return elapsed_time
 end
 
 def instruct_print
@@ -31,6 +157,7 @@ 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")
   end
 end
 
@@ -50,18 +177,48 @@ def mk_training_data(elapsed_time: Time, prac_dir: String)
   end
 end
 
-def rspec_check(dir: workshop_dir)
+def typing_discriminant(workshop_dir)
+  file = "#{workshop_dir}/lib/workplace.rb"
+  loop do
+    flag_rspec, flag_rs_exit = rspec_check(workshop_dir)
+    if flag_rs_exit == true
+      break
+    end
+    flag_rubocop, flag_rub_exit = rubocop_check(file, workshop_dir)
+    if flag_rub_exit == true
+      break
+    end
+    if flag_rspec == true && flag_rubocop == true
+      puts "**********************************"
+      puts "Final Error Check"
+      puts "**********************************"
+      stdout, stderr, status = Open3.capture3("rspec #{workshop_dir}/spec/workplace_spec.rb")
+      if stdout[0] == '.'
+        puts "your code is perfect."
+        puts 'If you want to run your code, you execute the following command.'
+        puts " $ ruby #{workshop_dir}/lib/workplace.rb"
+        break
+      else
+        puts "not perfect, please fix your code."
+      end
+    end
+  end
+  restore(file: "#{workshop_dir}/lib/workplace.rb", workshop_dir: workshop_dir)
+end
+
+def rspec_check(workshop_dir)
   puts "**********************************"
   puts "RSpec Error Check"
   puts "**********************************"
   count = 0
   flag_rspec = false
+  flag_exit = false
   loop do
     count += 1
     puts "---------------------------"
     puts "Rspec try: #{count}"
     puts "---------------------------"
-    flag_rspec =  system "cd #{dir} && rspec spec/workplace_spec.rb"
+    flag_rspec =  system "cd #{workshop_dir} && rspec spec/workplace_spec.rb"
     if flag_rspec == true
       puts "Rspec check is clear!"
       break
@@ -69,24 +226,25 @@ def rspec_check(dir: workshop_dir)
       instruct_print
       select = STDIN.gets.chomp
       if select == 'exit'
-        flag_rspec = true
+        flag_exit = true
         break
       elsif select == 'answer'
-        system "cd #{dir}/lib && emacs -nw -q -l #{dir}/emacs.d/ruby_learner_init.el sentence.org workplace.rb"
+        system "cd #{workshop_dir}/lib && emacs -nw -q -l #{workshop_dir}/.emacs.d/ruby_learner_init.el sentence.org workplace.rb"
       else
-        system "cd #{dir}/lib && emacs -nw -q -l #{dir}/emacs.d/init.el  sentence.org workplace.rb"
+        system "cd #{workshop_dir}/lib && emacs -nw -q -l #{workshop_dir}/.emacs.d/init.el  sentence.org workplace.rb"
       end
     end
   end
-  return flag_rspec
+  return flag_rspec, flag_exit
 end
 
-def rubocop_check(file: String, dir: workshop_dir)
+def rubocop_check(file, workshop_dir)
   puts "**********************************"
   puts "Rubocop Error Check"
   puts "**********************************"
   count = 0
   flag_rubocop = false
+  flag_exit = false
   loop do
     count += 1
     puts "---------------------------"
@@ -100,22 +258,22 @@ def rubocop_check(file: String, dir: workshop_dir)
       instruct_print
       select = STDIN.gets.chomp
       if select == 'exit'
-        flag_rubocop = true
+        flag_exit = true
         break
       elsif select == 'answer'
-        system "cd #{dir}/lib && emacs -nw -q -l #{dir}/emacs.d/ruby_learner_init.el sentence.org workplace.rb"
+        system "cd #{workshop_dir}/lib && emacs -nw -q -l #{workshop_dir}/.emacs.d/ruby_learner_init.el sentence.org workplace.rb"
       else
-        system "cd #{dir}/lib && emacs -nw -q -l #{dir}/emacs.d/init.el  sentence.org workplace.rb"
+        system "cd #{workshop_dir}/lib && emacs -nw -q -l #{workshop_dir}/.emacs.d/init.el  sentence.org workplace.rb"
       end
     end
   end
-  return flag_rubocop
+  return flag_rubocop, flag_exit
 end
 
 def restore(file: String, workshop_dir: String)
   restore_file = ""
   line = File.open("#{workshop_dir}/lib/answer.rb") do |f|
-    0.times {
+    1.times {
       f.gets
     }
     restore_file = f.gets
@@ -124,7 +282,8 @@ def restore(file: String, workshop_dir: String)
   restore_file.delete!("#")
   Dir::chdir("#{workshop_dir}/restore"){
     file_count = Dir.glob("*.rb").count
-    restore_file.insert(-5, "[#{file_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}"

data/lib/ruby_learner/ruby_learner.rb

@@ -21,19 +21,27 @@ module RubyLearner
     end
 
     desc 'emacs_key', 'check emacs key-bindings'
-    def emacs_key(*_argv)
-      system("cat #{@workshop_dir}/emacs_help.org")
+    def emacs_key
+      system("cat #{@gem_dir}/lib/datas/emacs_help.org")
     end
 
-    desc 'sequential_check [section:1~1] [part:1~2]','learning drill'
+    desc 'sequential_check [section:1~11] [part:1~]','learning drill'
+    option :next, aliases: "-n", type: :boolean
+    option :drill, aliases: "-d", type: :boolean
     def sequential_check(*_argv, dir_num, file_num)
-      seq_dir = "#{@gem_dir}/questions/sequential_check/section_#{dir_num}/part_#{file_num}"
-      typing_prac_class = TypingPractice.new(workshop_dir: @workshop_dir)
-      typing_prac_class.prac_sequence(mode_dir: seq_dir)
+      if options[:drill]
+        drill_contents
+      elsif options[:next]
+        final_sec, final_par = final_history(@gem_dir)
+        next_sec, next_par = next_question(final_sec, final_par)
+        sequential_check_main(@gem_dir, @workshop_dir, next_sec, next_par)
+      else
+        sequential_check_main(@gem_dir, @workshop_dir, dir_num, file_num)
+      end
     end
 
     desc 'random_check', 'typing and editing practice.'
-    def random_check(*_argv)
+    def random_check
       rand_num = rand(1..2)
       rand_dir = "#{@gem_dir}/questions/random_check/section_#{rand_num}"
       typing_practice = TypingPractice.new(workshop_dir: @workshop_dir)

data/lib/ruby_learner/typing_practice.rb

@@ -5,15 +5,19 @@ class TypingPractice
 
   def initialize(workshop_dir: String)
     @workshop_dir = workshop_dir
+    gem_location = Open3.capture3('gem environment gemdir')
+      app_vers = Open3.capture3('gem list ruby_learner')
+      rl_ver = app_vers[0].chomp.tr(' ', '-').delete('()')
+      @gem_dir = File.join(gem_location[0].chomp, "/gems/#{rl_ver}")
   end
   def prac_sequence(mode_dir: String)
     FileUtils.cp("#{mode_dir}/lib/workplace.rb", "#{@workshop_dir}/lib/workplace.rb")
     FileUtils.cp("#{mode_dir}/lib/sentence.org", "#{@workshop_dir}/lib/sentence.org")
     FileUtils.cp("#{mode_dir}/lib/answer.rb", "#{@workshop_dir}/lib/answer.rb")
     FileUtils.cp("#{mode_dir}/spec/workplace_spec.rb", "#{@workshop_dir}/spec/workplace_spec.rb")
-    system "cd #{@workshop_dir}/lib && emacs -nw -q -l ~/ruby_learner/workshop/emacs.d/init.el sentence.org workplace.rb"
+    system "cd #{@workshop_dir}/lib && emacs -nw -q -l #{@workshop_dir}/.emacs.d/init.el sentence.org workplace.rb"
     start_time = Time.now
-    typing_discriminant(dir: @workshop_dir)
+    typing_discriminant(@workshop_dir)
     elapsed_time = time_check(start_time: start_time)
     p "#{elapsed_time} sec"
     # mk_training_data(elapsed_time: elapsed_time, prac_dir: @prac_dir)

data/lib/ruby_learner/version.rb

@@ -1,3 +1,3 @@
 module RubyLearner
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/questions/sequential_check/section_1/part_1/lib/answer.rb

@@ -1,9 +1,3 @@
-# 1.1-for_system.rb
-
-def for_system(aaa, bbb)
-  answer = 0
-  bbb.each do
-    answer += aaa
-  end
-  answer
-end
+# section_1/part_1/answer.rb
+# 1-1-print.rb
+print 'Hello, Ruby.'