ruby_learner 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3893762a7773358735ead1eb6ea4739ee4f93e
-  data.tar.gz: d9feb7da78e6dc3c069ea52bcbc47a770cd30f2e
+  metadata.gz: 831412cfa90441e145673a5a5907343523b75ef4
+  data.tar.gz: 0f3a7087213102da48a7b6d37f5f83991678cb2a
 SHA512:
-  metadata.gz: 00ef94ebb1db3aea4ec3c418d0db58f7b9d5c5d9ee2a73a0f3849975d05f9b63123b2c2b3f8244e4a651d3593b5767bf330b12a3173918f18b62436c4d57551d
-  data.tar.gz: 4feb37766729553b8df1db578a04b77f4583858127cc3a6a051caf7dc94eee07dedc11603fe7fea36f4680e8b4cfaa29dd6c8357a3a6d40b261dd31ea2d3af37
+  metadata.gz: d51d0d7443729ff1727a99a37c730e8e4f75f70ff1051060ab9b11b527f823644fce3bafda8d70555dd35a0c3e31bf94e46891d83edbbd086882ee09768ee390
+  data.tar.gz: 4a698dccc635d9e898f75ca0ea88cebd928a1b6cc77c29c47c88134b3a6a186d1df9a19125fd7b8c7b5facb550d1b77b0e96abe861b50759592d829fb3b91e6f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_learner (1.2.6)
+    ruby_learner (1.2.7)
       rspec (~> 3.8)
       rubocop (~> 0.55.0)
       thor (~> 0.20.0)

data/contents/data/chdir_workshop.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+cd ~/.ruby_learner/workshop

data/contents/{datas → data}/emacs.d/black/answer.el

@@ -6,10 +6,10 @@
 (package-initialize)
 
 ;; elファイルの置き場所を設定
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/inits" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/ruby-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/org-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/themes" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/inits" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/ruby-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/org-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/themes" load-path))
 
 ;; 画面分割
 (setq w (selected-window))
@@ -23,8 +23,8 @@
 (ruby-mode)
 (find-file "~/.ruby_learner/workshop/lib/answer.rb")
 ;;setting_theme
-(add-to-list 'custom-theme-load-path "~/.ruby_learner/.datas/.emacs.d/themes")
-(setq custom-theme-directory "~/.ruby_learner/.datas/.emacs.d/themes")
+(add-to-list 'custom-theme-load-path "~/.ruby_learner/.data/.emacs.d/themes")
+(setq custom-theme-directory "~/.ruby_learner/.data/.emacs.d/themes")
 (load-theme 'my-wombat t)
 
 ;; 起動時にスタートアップ画面を表示しない 

data/contents/{datas → data}/emacs.d/black/init.el

@@ -6,13 +6,13 @@
 (package-initialize)
 
 ;; elファイルの置き場所を設定
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/inits" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/ruby-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/org-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/themes" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/inits" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/ruby-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/org-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/themes" load-path))
 ;;setting_theme
-(add-to-list 'custom-theme-load-path "~/.ruby_learner/.datas/.emacs.d/themes")
-(setq custom-theme-directory "~/.ruby_learner/.datas/.emacs.d/themes")
+(add-to-list 'custom-theme-load-path "~/.ruby_learner/.data/.emacs.d/themes")
+(setq custom-theme-directory "~/.ruby_learner/.data/.emacs.d/themes")
 (load-theme 'my-wombat t)
 
 ;; 起動時にスタートアップ画面を表示しない 

data/contents/{datas → data}/emacs.d/white/answer.el

@@ -6,10 +6,10 @@
 (package-initialize)
 
 ;; elファイルの置き場所を設定
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/inits" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/ruby-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/org-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/themes" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/inits" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/ruby-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/org-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/themes" load-path))
 
 ;; 画面分割
 (setq w (selected-window))
@@ -23,8 +23,8 @@
 (ruby-mode)
 (find-file "~/.ruby_learner/workshop/lib/answer.rb")
 ;;setting_theme
-(add-to-list 'custom-theme-load-path "~/.ruby_learner/.datas/.emacs.d/themes")
-(setq custom-theme-directory "~/.ruby_learner/.datas/.emacs.d/themes")
+(add-to-list 'custom-theme-load-path "~/.ruby_learner/.data/.emacs.d/themes")
+(setq custom-theme-directory "~/.ruby_learner/.data/.emacs.d/themes")
 (load-theme 'my-whiteboard t)
 
 ;; 起動時にスタートアップ画面を表示しない 

data/contents/{datas → data}/emacs.d/white/init.el

@@ -6,13 +6,13 @@
 (package-initialize)
 
 ;; elファイルの置き場所を設定
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/inits" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/ruby-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/org-mode" load-path))
-(setq load-path (cons "~/.ruby_learner/.datas/.emacs.d/themes" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/inits" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/ruby-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/org-mode" load-path))
+(setq load-path (cons "~/.ruby_learner/.data/.emacs.d/themes" load-path))
 ;;setting_theme
-(add-to-list 'custom-theme-load-path "~/.ruby_learner/.datas/.emacs.d/themes")
-(setq custom-theme-directory "~/.ruby_learner/.datas/.emacs.d/themes")
+(add-to-list 'custom-theme-load-path "~/.ruby_learner/.data/.emacs.d/themes")
+(setq custom-theme-directory "~/.ruby_learner/.data/.emacs.d/themes")
 (load-theme 'my-whiteboard t) 
 
 ;; 起動時にスタートアップ画面を表示しない 

data/lib/ruby_learner/common.rb

@@ -15,9 +15,9 @@ class Common
       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")
+      FileUtils.mkdir_p("#{local_dir}/.data")
+      system("cp -R #{gem_contents_dir}/data/* #{local_dir}/.data")
+      system("cd #{local_dir}/.data && 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")

data/lib/ruby_learner/rubocop_rspec_check.rb

@@ -9,13 +9,13 @@ class RubocopRspecCheck
     @local_dir = local_dir
     @workshop_dir = "#{local_dir}/workshop"
     @restore_dir = "#{local_dir}/restore"
-    @datas_dir = "#{local_dir}/.datas"
+    @data_dir = "#{local_dir}/.data"
     @gem_dir = gem_dir
     theme_color = ""
-    File.open("#{@datas_dir}/theme_color.txt") do |f|
+    File.open("#{@data_dir}/theme_color.txt") do |f|
       theme_color = f.gets.chomp
     end
-    @emacs_dir = "#{@datas_dir}/.emacs.d/#{theme_color}"
+    @emacs_dir = "#{@data_dir}/.emacs.d/#{theme_color}"
   end
 
   def action(mode_dir: String, is_copy: Bool)

data/lib/ruby_learner/ruby_learner.rb

@@ -4,7 +4,7 @@ require 'open3'
 require 'ruby_learner/version'
 require 'ruby_learner/common'
 require 'ruby_learner/sequential_check'
-require 'ruby_learner/sequential_check_real'
+require 'ruby_learner/sequential_check_manual'
 require 'ruby_learner/restore'
 require 'ruby_learner/copspec'
 
@@ -16,7 +16,7 @@ module RubyLearner
       @local_dir = "#{ENV['HOME']}/.ruby_learner"
       @workshop_dir = "#{@local_dir}/workshop"
       @restore_dir = "#{@local_dir}/restore"
-      @datas_dir = "#{@local_dir}/.datas"
+      @data_dir = "#{@local_dir}/.data"
       @gem_dir = File.expand_path("../../../", __FILE__)
       Common.allocate.init_mk_files(gem_dir: @gem_dir, local_dir: @local_dir)
     end
@@ -31,9 +31,9 @@ module RubyLearner
     option :image, aliases: :i, type: :boolean
     def emacs_key(*args)
       if options[:image]
-        system("open #{@datas_dir}/emacs_help.pdf")
+        system("open #{@data_dir}/emacs_help.pdf")
       else
-        system("cat #{@datas_dir}/emacs_help.org")
+        system("cat #{@data_dir}/emacs_help.org")
       end
     end
 
@@ -66,20 +66,21 @@ module RubyLearner
 
     desc 'sequential_check [section:1~11] [part:1~3]','learning drill'
     map "-s" => "sequential_check"
-    option :real, aliases: :r, type: :boolean
+    option :workshop, aliases: :w, typw: :boolean
+    option :manual, aliases: :m, 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
-        mode = File.read("#{@datas_dir}/sequential_mode.txt").chomp
+        mode = File.read("#{@data_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)
+          sequential_check = SequentialCheckManual.new(@gem_dir, @local_dir)
         end
         if options[:drill]
           sequential_check.drill_contents
@@ -87,10 +88,16 @@ module RubyLearner
           sequential_check.next_action
         elsif options[:last]
           sequential_check.last_re_action
-        elsif options[:real]
+        elsif options[:manual]
           sequential_check.change_mode
+          mode = File.read("#{@data_dir}/sequential_mode.txt").chomp
+          puts "active mode changed: #{mode}"
         elsif options[:copspec]
           CopSpec.copspec("#{@workshop_dir}/lib/workplace.rb")
+        elsif options[:workshop]
+          puts "#{@data_dir}/chdir_workshop.sh"
+          Dir.chdir "#{@workshop_dir}"
+          exec 'fish'
         else
           sequential_check.action(args[0], args[1])
         end
@@ -118,7 +125,7 @@ module RubyLearner
 
     desc 'install_emacs','install emacs in your mac'
     def install_emacs
-      file_path = "#{@datas_dir}/install_emacs.sh"
+      file_path = "#{@data_dir}/install_emacs.sh"
       system("sh #{file_path}")
     end
 
@@ -126,7 +133,7 @@ module RubyLearner
     def theme(*args)
       args[0].chomp
       if args[0] == 'black' || args[0] == 'white'
-        Common.allocate.change_theme(color: args[0], datas_dir: @datas_dir)
+        Common.allocate.change_theme(color: args[0], datas_dir: @data_dir)
       else
         puts "you can change the theme_color, only black or white."
       end

data/lib/ruby_learner/sequential_check.rb

@@ -8,10 +8,10 @@ class SequentialCheck
     @local_dir = local_dir
     @workshop_dir = "#{local_dir}/workshop"
     @restore_dir = "#{local_dir}/restore"
-    @datas_dir = "#{local_dir}/.datas"
+    @data_dir = "#{local_dir}/.data"
   end
 
-  # non opt, -next
+  # non opt
   def action(sec, par)
     puts "section_#{sec}/part_#{par}"
     seq_dir = "#{@gem_dir}/contents/questions/sequential_check/section_#{sec}/part_#{par}"
@@ -53,10 +53,10 @@ class SequentialCheck
 
   # -ch_mode
   def change_mode
-    mode_txt = "#{@datas_dir}/sequential_mode.txt"
+    mode_txt = "#{@data_dir}/sequential_mode.txt"
     case File.read(mode_txt).chomp
     when 'nomal'
-      File.write(mode_txt, 'real')
+      File.write(mode_txt, 'manual')
     else
       File.write(mode_txt, 'nomal')
     end
@@ -75,7 +75,7 @@ class SequentialCheck
 
   def write_final_history(sec, par)
     chmoded = 0
-    file_dir = "#{@datas_dir}/final_history_sequential.txt"
+    file_dir = "#{@data_dir}/final_history_sequential.txt"
     begin
       File.write(file_dir, "#{sec}-#{par}")
     rescue => error
@@ -89,7 +89,7 @@ class SequentialCheck
 
   def get_final_history
     final_history = ''
-    File.open("#{@datas_dir}/final_history_sequential.txt") do |f|
+    File.open("#{@data_dir}/final_history_sequential.txt") do |f|
       final_history = f.gets
     end
     final_sec = final_history.match(/(.*)\-/)[1].to_i

data/lib/ruby_learner/{sequential_check_real.rb → sequential_check_manual.rb}

@@ -2,28 +2,39 @@ require 'ruby_learner/common'
 require 'ruby_learner/sequential_check'
 require 'ruby_learner/rubocop_rspec_check'
 
-class SequentialCheckReal < SequentialCheck
+class SequentialCheckManual < SequentialCheck
   def initialize(x, y)
     super
-    @theme_color = File.read("#{@datas_dir}/theme_color.txt").chomp
+    @theme_color = File.read("#{@data_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"
+    intro_next_command
     restore = Restore.new
-    restore.save(file: "#{@workshop_dir}/lib/workplace.rb", elapsed_time: elapsed_time)
+    restore.save(file: "#{@workshop_dir}/lib/workplace.rb", elapsed_time: 0.0)
   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"
+    puts "This mode doesn't have last-option"
+  end
+
+  private
+
+  def intro_next_command
+    puts 'Practice setting ok.'
+    puts 'Put under commands.'
+    puts '$ emacs lib/sentence.org lib/workplace.rb'
+    puts '- rspec check'
+    puts '$ rspec spec'
+    puts '- rubocop check'
+    puts '$ rubocop lib/workplace.rb'
+    puts '- rspec and rubocop checks'
+    puts '$ ruby_learner -s -c'
   end
 end

data/lib/ruby_learner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_learner
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Takaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,30 +101,31 @@ files:
 - bin/console
 - bin/new_terminal
 - bin/setup
-- contents/datas/emacs.d/black/answer.el
-- contents/datas/emacs.d/black/init.el
-- contents/datas/emacs.d/inits/line-num.el
-- contents/datas/emacs.d/markdown-mode/markdown-mode.el
-- contents/datas/emacs.d/ruby-mode/inf-ruby.el
-- contents/datas/emacs.d/ruby-mode/rdoc-mode.el
-- contents/datas/emacs.d/ruby-mode/ruby-electric.el
-- contents/datas/emacs.d/ruby-mode/ruby-mode.el
-- contents/datas/emacs.d/ruby-mode/ruby-style.el
-- contents/datas/emacs.d/ruby-mode/rubydb2x.el
-- contents/datas/emacs.d/ruby-mode/rubydb3x.el
-- contents/datas/emacs.d/themes/dracula-theme.el
-- contents/datas/emacs.d/themes/iceberg-theme.el
-- contents/datas/emacs.d/themes/my-misterioso-theme.el
-- contents/datas/emacs.d/themes/my-whiteboard-theme.el
-- contents/datas/emacs.d/themes/my-wombat-theme.el
-- contents/datas/emacs.d/white/answer.el
-- contents/datas/emacs.d/white/init.el
-- contents/datas/emacs_help.org
-- 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/data/chdir_workshop.sh
+- contents/data/emacs.d/black/answer.el
+- contents/data/emacs.d/black/init.el
+- contents/data/emacs.d/inits/line-num.el
+- contents/data/emacs.d/markdown-mode/markdown-mode.el
+- contents/data/emacs.d/ruby-mode/inf-ruby.el
+- contents/data/emacs.d/ruby-mode/rdoc-mode.el
+- contents/data/emacs.d/ruby-mode/ruby-electric.el
+- contents/data/emacs.d/ruby-mode/ruby-mode.el
+- contents/data/emacs.d/ruby-mode/ruby-style.el
+- contents/data/emacs.d/ruby-mode/rubydb2x.el
+- contents/data/emacs.d/ruby-mode/rubydb3x.el
+- contents/data/emacs.d/themes/dracula-theme.el
+- contents/data/emacs.d/themes/iceberg-theme.el
+- contents/data/emacs.d/themes/my-misterioso-theme.el
+- contents/data/emacs.d/themes/my-whiteboard-theme.el
+- contents/data/emacs.d/themes/my-wombat-theme.el
+- contents/data/emacs.d/white/answer.el
+- contents/data/emacs.d/white/init.el
+- contents/data/emacs_help.org
+- contents/data/emacs_help.pdf
+- contents/data/final_history_sequential.txt
+- contents/data/install_emacs.sh
+- contents/data/sequential_mode.txt
+- contents/data/theme_color.txt
 - contents/questions/random_check/.rspec
 - contents/questions/random_check/random_h.rb
 - contents/questions/random_check/section_1/.rspec
@@ -422,7 +423,7 @@ files:
 - lib/ruby_learner/rubocop_rspec_check.rb
 - lib/ruby_learner/ruby_learner.rb
 - lib/ruby_learner/sequential_check.rb
-- lib/ruby_learner/sequential_check_real.rb
+- lib/ruby_learner/sequential_check_manual.rb
 - lib/ruby_learner/version.rb
 - ruby_learner.gemspec
 homepage: ''