daigaku 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4318ff789d428a55ecc01cefa1d55267a2193503
-  data.tar.gz: a3b3744b1bffe6a4ac11f25bbfe202d977ce3022
+  metadata.gz: b133fa5493044ca1533d21e52864d9603097e493
+  data.tar.gz: ab071c41328776194b3020be3d5f51150b1493d5
 SHA512:
-  metadata.gz: 46b6c10e541c8e38af57ef69f25535c87d358a9ae3e895d6a07d9efc873f938299a642e603d2371eecc0fb6cd8495ff57a6f0bd7a0da698d751a7bb9768a7113
-  data.tar.gz: 05b555e1144e5d6c1fda261463445484dcb1d32bf0ab9d873d6ee52e8974dcd9d575b083e558d41329c45a7c512b2dc5bf55f3aaf21fabed08d38d604af0ffab
+  metadata.gz: e8fdc1c221006d16e99b97e458878c2d2564ef2c16dd7b9f0080fd76b58b7945d94946df9e6d885ca9fe81e5e6bd2e8a263e5f7d06ef7d95432d7fdcfa2db30b
+  data.tar.gz: d84c449fcd505eacfb5c2c78bb1691d634963c74831af2360f3490ba24d46c4837b124b2c4f16f843385df769030de145e83fe97d83e7686ecc3b5ed64bf82ee

data/.travis.yml

@@ -5,7 +5,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.0.0
-  - 2.2.0
+  - 2.2.5
   - 2.3.0
-  - rbx-2
+  - 2.3.1

data/README.md

@@ -16,7 +16,7 @@ language-explaining programming tasks.
 ## Installation
 
 First of all make sure Ruby is installed on your computer.
-Daigaku works with [MRI Ruby](https://www.ruby-lang.org/en/documentation/installation/) v2.x and [Rubinius](http://rubini.us/doc/en/getting-started/) v2.x.
+Daigaku works with [MRI Ruby](https://www.ruby-lang.org/en/documentation/installation/) v2.2.5 or higher.
 
 Then open a terminal and install Daigaku by running:
 

data/daigaku.gemspec

@@ -3,37 +3,34 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'daigaku/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "daigaku"
+  spec.name          = 'daigaku'
   spec.version       = Daigaku::VERSION
-  spec.required_ruby_version = '~> 2.0'
-  spec.authors       = ["Paul Götze"]
-  spec.email         = ["paul.christoph.goetze@gmail.com"]
-  spec.summary       = %q{Learning Ruby on the command line.}
-  spec.description   = %q{Daigaku is the Japanese word for university. With Daigaku you can interactively learn the Ruby programming language using the command line.}
-  spec.homepage      = "https://github.com/daigaku-ruby/daigaku"
-  spec.license       = "MIT"
-
+  spec.authors       = ['Paul Götze']
+  spec.email         = ['paul.christoph.goetze@gmail.com']
+  spec.summary       = 'Learning Ruby on the command line.'
+  spec.description   = 'Daigaku is the Japanese word for university. With Daigaku you can interactively learn the Ruby programming language using the command line.'
+  spec.homepage      = 'https://github.com/daigaku-ruby/daigaku'
+  spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  if RUBY_VERSION >= '2.1'
-    spec.add_runtime_dependency "curses", "~> 1.0"
-  end
+  spec.required_ruby_version = '>= 2.2.5'
 
-  spec.add_runtime_dependency "activesupport", "~> 4.0"
-  spec.add_runtime_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency "thor", "~> 0.19.1"
-  spec.add_runtime_dependency "os", "~> 0.9.6"
-  spec.add_runtime_dependency "colorize", "~> 0.7.5"
-  spec.add_runtime_dependency "rubyzip", "~> 1.0"
-  spec.add_runtime_dependency "wisper", "~> 2.0.0.rc1"
-  spec.add_runtime_dependency "quick_store", "~> 0.1"
-  spec.add_runtime_dependency "code_breaker", "~> 0.1"
+  spec.add_runtime_dependency 'curses',        '~> 1.0'
+  spec.add_runtime_dependency 'activesupport', '~> 4.0'
+  spec.add_runtime_dependency 'rspec',         '~> 3.0'
+  spec.add_runtime_dependency 'thor',          '~> 0.19.1'
+  spec.add_runtime_dependency 'os',            '~> 0.9.6'
+  spec.add_runtime_dependency 'colorize',      '~> 0.7.5'
+  spec.add_runtime_dependency 'rubyzip',       '~> 1.0'
+  spec.add_runtime_dependency 'wisper',        '~> 1.6.1'
+  spec.add_runtime_dependency 'quick_store',   '~> 0.2'
+  spec.add_runtime_dependency 'code_breaker',  '~> 0.3'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "webmock", "~> 1.20.4"
-  spec.add_development_dependency "guard-rspec", "~> 4.5.0"
+  spec.add_development_dependency 'bundler',     '~> 1.7'
+  spec.add_development_dependency 'rake',        '~> 10.0'
+  spec.add_development_dependency 'webmock',     '~> 1.20.4'
+  spec.add_development_dependency 'guard-rspec', '~> 4.5.0'
 end

data/lib/daigaku.rb

@@ -6,7 +6,6 @@ Dir[File.join("#{File.dirname(__FILE__)}/**/*.rb")].sort.each do |file|
 end
 
 module Daigaku
-
   class << self
     def config
       Configuration.instance

data/lib/daigaku/chapter.rb

@@ -1,10 +1,9 @@
 module Daigaku
   class Chapter
-
     attr_reader :title, :path
 
     def initialize(path)
-      @path = path
+      @path  = path
       @title = File.basename(path).gsub(/\_+/, ' ')
     end
 
@@ -13,11 +12,11 @@ module Daigaku
     end
 
     def started?
-      units.reduce(false) { |started, unit| started ||= unit.mastered? }
+      units.any?(&:mastered?)
     end
 
     def mastered?
-      units.reduce(true) { |mastered, unit| mastered &&= unit.mastered? }
+      units.all?(&:mastered?)
     end
   end
 end

data/lib/daigaku/coloring.rb

@@ -6,20 +6,20 @@ module Daigaku
     extend ActiveSupport::Concern
 
     included do
-      COLOR_TEXT = Curses::COLOR_YELLOW         unless defined? COLOR_TEXT
-      COLOR_TEXT_EMPHASIZE = Curses::COLOR_CYAN unless defined? COLOR_TEXT_EMPHASIZE
-      COLOR_HEADING = Curses::COLOR_WHITE       unless defined? COLOR_HEADING
-      COLOR_RED = Curses::COLOR_BLUE            unless defined? COLOR_RED
-      COLOR_GREEN = Curses::COLOR_MAGENTA       unless defined? COLOR_GREEN
-      COLOR_YELLOW = Curses::COLOR_RED          unless defined? COLOR_YELLOW
+      COLOR_TEXT           = Curses::COLOR_YELLOW  unless defined? COLOR_TEXT
+      COLOR_TEXT_EMPHASIZE = Curses::COLOR_CYAN    unless defined? COLOR_TEXT_EMPHASIZE
+      COLOR_HEADING        = Curses::COLOR_WHITE   unless defined? COLOR_HEADING
+      COLOR_RED            = Curses::COLOR_BLUE    unless defined? COLOR_RED
+      COLOR_GREEN          = Curses::COLOR_MAGENTA unless defined? COLOR_GREEN
+      COLOR_YELLOW         = Curses::COLOR_RED     unless defined? COLOR_YELLOW
 
-      BACKGROUND = Curses::COLOR_WHITE          unless defined? BACKGROUND
-      FONT = Curses::COLOR_BLACK                unless defined? FONT
-      FONT_HEADING = Curses::COLOR_MAGENTA      unless defined? FONT_HEADING
-      FONT_EMPHASIZE = Curses::COLOR_BLUE       unless defined? FONT_EMPHASIZE
-      RED = Curses::COLOR_RED                   unless defined? RED
-      GREEN = Curses::COLOR_GREEN               unless defined? GREEN
-      YELLOW = Curses::COLOR_YELLOW             unless defined? YELLOW
+      BACKGROUND           = Curses::COLOR_WHITE   unless defined? BACKGROUND
+      FONT                 = Curses::COLOR_BLACK   unless defined? FONT
+      FONT_HEADING         = Curses::COLOR_MAGENTA unless defined? FONT_HEADING
+      FONT_EMPHASIZE       = Curses::COLOR_BLUE    unless defined? FONT_EMPHASIZE
+      RED                  = Curses::COLOR_RED     unless defined? RED
+      GREEN                = Curses::COLOR_GREEN   unless defined? GREEN
+      YELLOW               = Curses::COLOR_YELLOW  unless defined? YELLOW
 
       protected
 

data/lib/daigaku/configuration.rb

@@ -1,15 +1,15 @@
-module Daigaku
-  require 'singleton'
-  require 'fileutils'
+require 'singleton'
+require 'fileutils'
 
+module Daigaku
   class Configuration
     include Singleton
 
-    LOCAL_DIR = '.daigaku'
-    COURSES_DIR = 'courses'
-    SOLUTIONS_DIR = 'solutions'
-    STORAGE_FILE = 'daigaku.db.yml'
-    DAIGAKU_INITIAL_COURSE = 'daigaku-ruby/Get_started_with_Ruby'
+    LOCAL_DIR              = '.daigaku'.freeze
+    COURSES_DIR            = 'courses'.freeze
+    SOLUTIONS_DIR          = 'solutions'.freeze
+    STORAGE_FILE           = 'daigaku.db.yml'.freeze
+    DAIGAKU_INITIAL_COURSE = 'daigaku-ruby/Get_started_with_Ruby'.freeze
 
     attr_accessor :courses_path
     attr_reader :storage_file
@@ -26,52 +26,50 @@ module Daigaku
     end
 
     def solutions_path
-      @solutions_path || raise(Daigaku::ConfigurationError, 'Solutions path is not set.')
+      @solutions_path ||
+        raise(Daigaku::ConfigurationError, 'Solutions path is not set.')
     end
 
     def solutions_path=(path)
       full_path = File.expand_path(path, Dir.pwd)
 
       unless Dir.exist?(full_path)
-        error = [
+        raise(
           Daigaku::ConfigurationError,
-          "Solutions path \"#{path}\" isn't an existing directory."
-        ]
-
-        raise(*error)
+          "Solutions path \"#{path}\" isn’t an existing directory."
+        )
       end
 
       @solutions_path = full_path
     end
 
     def save
-      settings = self.instance_variables
+      settings = instance_variables
       settings.delete(:@storage_file)
 
       settings.each do |variable|
-        key = variable.to_s.delete('@')
-        value = self.instance_variable_get(variable.to_sym)
+        key   = variable.to_s.delete('@')
+        value = instance_variable_get(variable.to_sym)
         QuickStore.store.set(key, value)
       end
     end
 
-    def import!
-      @courses_path = QuickStore.store.courses_path || @courses_path
-      @solutions_path = QuickStore.store.solutions_path || @solutions_path
+    def import
+      store           = QuickStore.store
+      @courses_path   = store.courses_path || @courses_path
+      @solutions_path = store.solutions_path || @solutions_path
       self
     end
 
     def summary
-      settings = self.instance_variables
+      settings = instance_variables
       settings.delete(:@storage_file)
 
-      lines = settings.map do |variable|
-        key = variable.to_s.delete('@').gsub('_', ' ')
-        value = self.instance_variable_get(variable.to_sym)
-        "* #{key}: #{value}"
+      settings.reduce('') do |lines, variable|
+        key   = variable.to_s.delete('@').tr('_', ' ')
+        value = instance_variable_get(variable.to_sym)
+        lines + "* #{key}: #{value}\n"
       end
-
-      lines.join("\n")
     end
 
     def initial_course
@@ -85,5 +83,4 @@ module Daigaku
       File.expand_path(path, __FILE__)
     end
   end
-
 end

data/lib/daigaku/congratulator.rb

@@ -1,13 +1,25 @@
 module Daigaku
-
   class Congratulator
-
     def self.message
-      lines = Terminal.text(:congratulations).lines.map(&:strip).compact
-      count = lines.count.zero? ? 0 : (lines.count - 1)
-      random_value = rand(0..count)
+      new.message
+    end
+
+    def message
       lines[random_value]
     end
 
+    private
+
+    def lines
+      @lines ||= Terminal.text(:congratulations).lines.map(&:strip).compact
+    end
+
+    def random_value
+      rand(0..lines_count)
+    end
+
+    def lines_count
+      [lines.count - 1, 0].max
+    end
   end
 end

data/lib/daigaku/course.rb

@@ -2,12 +2,11 @@ require 'fileutils'
 
 module Daigaku
   class Course
-
     attr_reader :title, :path, :author, :link
 
     def initialize(path)
-      @path = path
-      @title = File.basename(path).gsub(/\_+/, ' ')
+      @path   = path
+      @title  = File.basename(path).gsub(/\_+/, ' ')
       @author = QuickStore.store.get(key(:author))
     end
 
@@ -16,11 +15,11 @@ module Daigaku
     end
 
     def started?
-      chapters.reduce(false) { |started, chapter| started ||= chapter.started? }
+      chapters.any?(&:started?)
     end
 
     def mastered?
-      chapters.reduce(true) { |mastered, chapter| mastered &&= chapter.mastered? }
+      chapters.all?(&:mastered?)
     end
 
     def key(key_name)
@@ -44,7 +43,6 @@ module Daigaku
 
         Zip::File.open(file_path) do |zip_file|
           zip_file.each do |entry|
-
             if options[:github_repo]
               first, *others = entry.to_s.split('/')
               directory = File.join(first.split('-')[0..-2].join('-'), others)
@@ -66,10 +64,13 @@ module Daigaku
         end
 
         FileUtils.rm(file_path)
-      rescue Exception => e
+      rescue StandardError => e
         puts e
         old_dir = "#{course_dir}_old/"
-        FileUtils.copy_entry(old_dir, "#{course_dir}/", true) if Dir.exist?(old_dir)
+
+        if Dir.exist?(old_dir)
+          FileUtils.copy_entry(old_dir, "#{course_dir}/", true)
+        end
       ensure
         old_dir = "#{course_dir}_old/"
         FileUtils.rm_r(old_dir) if Dir.exist?(old_dir)

data/lib/daigaku/exceptions.rb

@@ -1,5 +1,4 @@
 module Daigaku
-
   class Error < StandardError; end
   class CourseNotFoundError < Error; end
   class ChaptersNotFoundError < Error; end
@@ -15,5 +14,4 @@ module Daigaku
     class NoUrlError < Error; end
     class NoZipFileUrlError < Error; end
   end
-
 end

data/lib/daigaku/generator.rb

@@ -1,21 +1,23 @@
-module Daigaku
-  require 'fileutils'
-  require 'active_support'
-  require 'active_support/core_ext'
+require 'fileutils'
+require 'active_support'
+require 'active_support/core_ext'
 
+module Daigaku
   class Generator
+    LEADING_NUMBERS = /^\d+[\_\-\s]/
+    PART_JOINTS     = /[\_\-\s]+/
 
     def scaffold(courses_path, target_path)
-      Dir[File.join(courses_path, "*/*/*/*.md")].each do |file|
+      Dir[File.join(courses_path, '*/*/*/*.md')].each do |file|
         content_dir_parts = file.split('/')[-4..-2].map do |part|
           clean_up_path_part(part)
         end
 
         content_dir = File.join(content_dir_parts)
-        directory = File.join(target_path, File.dirname(content_dir))
+        directory   = File.join(target_path, File.dirname(content_dir))
 
         solution_file = File.basename(content_dir) + Solution::FILE_SUFFIX
-        file_path = File.join(directory, solution_file)
+        file_path     = File.join(directory, solution_file)
 
         create_dir(directory)
         create_file(file_path)
@@ -25,9 +27,9 @@ module Daigaku
     def prepare
       begin
         solutions_path = Daigaku.config.solutions_path
-      rescue ConfigurationError => e
-        base_dir = File.dirname(Daigaku.config.courses_path)
-        solutions_dir = Daigaku::Configuration::SOLUTIONS_DIR
+      rescue ConfigurationError
+        base_dir       = File.dirname(Daigaku.config.courses_path)
+        solutions_dir  = Daigaku::Configuration::SOLUTIONS_DIR
         solutions_path = File.join(base_dir, solutions_dir)
       end
 
@@ -52,9 +54,7 @@ module Daigaku
     end
 
     def clean_up_path_part(text)
-      leading_numbers = /^\d+[\_\-\s]/
-      part_joints = /[\_\-\s]+/
-      text.gsub(leading_numbers, '').gsub(part_joints, '_').downcase
+      text.gsub(LEADING_NUMBERS, '').gsub(PART_JOINTS, '_').downcase
     end
   end
 end

data/lib/daigaku/github_client.rb

@@ -4,7 +4,6 @@ require 'date'
 
 module Daigaku
   module GithubClient
-
     # Returns the url to the master zip file of the Github repo.
     def self.master_zip_url(user_and_repo)
       "https://github.com/#{user_and_repo}/archive/master.zip"
@@ -21,9 +20,10 @@ module Daigaku
     def self.updated?(user_and_repo)
       return false unless user_and_repo
 
-      course = Course.new(user_and_repo.split('/').last)
-      stored_time = QuickStore.store.get(course.key(:updated_at))
-      current_time = self.updated_at(user_and_repo)
+      course       = Course.new(user_and_repo.split('/').last)
+      stored_time  = QuickStore.store.get(course.key(:updated_at))
+      current_time = updated_at(user_and_repo)
+
       DateTime.parse(stored_time) < DateTime.parse(current_time)
     end
   end

data/lib/daigaku/loadable.rb

@@ -1,23 +1,19 @@
+require 'active_support/inflector'
+
 module Daigaku
   module Loadable
-
-    require 'active_support/inflector'
-
     def load(path)
-      if Dir.exist?(path)
-        dirs = Dir.entries(path).select do |entry|
-          !entry.match(/\./)
-        end
+      return [] unless Dir.exist?(path)
 
-        dirs.sort.map do |dir|
-          dir_path = File.join(path, dir)
-          class_name = self.to_s.demodulize.singularize
-          "Daigaku::#{class_name}".constantize.new(dir_path)
-        end
-      else
-        Array.new
+      dirs = Dir.entries(path).select do |entry|
+        !entry.match(/\./)
       end
-    end
 
+      dirs.sort.map do |dir|
+        dir_path   = File.join(path, dir)
+        class_name = to_s.demodulize.singularize
+        "Daigaku::#{class_name}".constantize.new(dir_path)
+      end
+    end
   end
 end