daigaku 0.2.0 → 1.0.0

data/lib/daigaku/solution.rb

@@ -1,20 +1,20 @@
 module Daigaku
   class Solution
-
-    FILE_SUFFIX = '_solution.rb'
+    FILE_SUFFIX = '_solution.rb'.freeze
 
     attr_reader :code, :path, :errors
 
     def initialize(unit_path)
       @unit_path = unit_path
-      @path = solution_path(unit_path)
-      @code = File.read(@path).strip if File.file?(@path)
-      @verified = get_store_state
+      @path      = solution_path(unit_path)
+      @code      = load_code(@path)
+      @verified  = store_state
     end
 
     def verify!
-      result = Daigaku::Test.new(@unit_path).run(self.code)
-      set_store_state(result.passed?)
+      @code = load_code(@path)
+      result = Daigaku::Test.new(@unit_path).run(@code)
+      self.store_state = result.passed?
       result
     end
 
@@ -24,7 +24,7 @@ module Daigaku
 
     def store_key
       unless @store_key
-        part_path = path.split('/')[-3..-1].join('/').gsub(FILE_SUFFIX, '')
+        part_path  = path.split('/')[-3..-1].join('/').gsub(FILE_SUFFIX, '')
         @store_key = Storeable.key(part_path, prefix: 'verified')
       end
 
@@ -33,21 +33,29 @@ module Daigaku
 
     private
 
+    def load_code(path)
+      File.read(path).strip if File.file?(path)
+    end
+
     def solution_path(path)
-      local_path = Daigaku.config.solutions_path
-      sub_dirs = Storeable.key(path.split('/')[-3..-2].join('/').gsub(FILE_SUFFIX, ''))
-      file = Storeable.key(File.basename(path)) + FILE_SUFFIX
+      local_path    = Daigaku.config.solutions_path
+      sub_directory = Storeable.key(directory_from(path))
+      file          = Storeable.key(File.basename(path)) + FILE_SUFFIX
+
+      File.join(local_path, sub_directory, file)
+    end
 
-      File.join(local_path, sub_dirs, file)
+    def directory_from(path)
+      path.split('/')[-3..-2].join('/').gsub(FILE_SUFFIX, '')
     end
 
-    def set_store_state(verified)
+    def store_state=(verified)
       @verified = verified
       QuickStore.store.set(store_key, verified?)
     end
 
-    def get_store_state
+    def store_state
       QuickStore.store.get(store_key)
     end
   end
-end
+end

data/lib/daigaku/storeable.rb

@@ -1,15 +1,14 @@
 module Daigaku
   module Storeable
-
     LEADING_NUMBERS = /^\d+[\_\-\s]+/
-    PART_JOINTS = /[\_\-\s]+/
+    PART_JOINTS     = /[\_\-\s]+/
 
     class << self
       def key(text, options = {})
-        separator = QuickStore.config.key_separator
-        prefix = options[:prefix]
-        suffix = clean(options[:suffix])
-        suffixes = options[:suffixes]
+        separator      = QuickStore.config.key_separator
+        prefix         = options[:prefix]
+        suffix         = clean(options[:suffix])
+        suffixes       = options[:suffixes]
         suffixes_items = suffixes ? suffixes.map { |s| clean(s) }.compact : nil
 
         [prefix, clean(text), suffix || suffixes_items].compact.join(separator)
@@ -18,15 +17,15 @@ module Daigaku
       private
 
       def clean(text)
-        if text
-          parts = text.to_s.split(QuickStore.config.key_separator).map do |key|
-            key.gsub(LEADING_NUMBERS, '').gsub(PART_JOINTS, '_').downcase
-          end
+        return if text.nil?
+        parts(text.to_s).join(QuickStore.config.key_separator)
+      end
 
-          parts.join(QuickStore.config.key_separator)
+      def parts(text)
+        text.split(QuickStore.config.key_separator).map do |key|
+          key.gsub(LEADING_NUMBERS, '').gsub(PART_JOINTS, '_').downcase
         end
       end
     end
-
   end
 end

data/lib/daigaku/task.rb

@@ -3,7 +3,7 @@ module Daigaku
     attr_reader :markdown, :path
 
     def initialize(path)
-      @path = Dir[File.join(path, '*.md')].first
+      @path     = Dir[File.join(path, '*.md')].first
       @markdown = File.read(@path).strip
     end
   end

data/lib/daigaku/terminal.rb

@@ -1,12 +1,11 @@
 module Daigaku
   module Terminal
-
     # text should be of a width of 70 columns or less
     def self.text(file_name)
       texts_path = File.expand_path('../terminal/texts', __FILE__)
-      file = File.join(texts_path, "#{file_name.to_s}.txt")
-      (File.exist?(file) ? File.read(file).to_s : '')
-    end
+      file       = File.join(texts_path, "#{file_name}.txt")
 
+      File.exist?(file) ? File.read(file).to_s : ''
+    end
   end
 end

data/lib/daigaku/terminal/cli.rb

@@ -1,16 +1,16 @@
 require 'thor'
+require_relative 'courses'
+require_relative 'solutions'
+require_relative 'setup'
+require_relative 'output'
 
 module Daigaku
   module Terminal
-
-    require_relative 'courses'
-    require_relative 'solutions'
-    require_relative 'setup'
-    require_relative 'output'
-
     class CLI < Thor
       include Terminal::Output
 
+      package_name 'Daigaku'
+
       desc 'courses [COMMAND]', 'Handle daigaku courses'
       subcommand 'courses', Terminal::Courses
 
@@ -21,7 +21,7 @@ module Daigaku
       subcommand 'setup', Terminal::Setup
 
       def self.start
-        Daigaku.config.import!
+        Daigaku.config.import
         super
       end
 
@@ -40,7 +40,7 @@ module Daigaku
         generator = Generator.new
         generator.prepare
 
-        courses_path = Daigaku.config.courses_path
+        courses_path   = Daigaku.config.courses_path
         solutions_path = Daigaku.config.solutions_path
 
         generator.scaffold(courses_path, solutions_path)

data/lib/daigaku/terminal/courses.rb

@@ -1,14 +1,18 @@
+require 'os'
+require 'open-uri'
+require 'zip'
+require_relative 'output'
+
 module Daigaku
   module Terminal
-
-    require 'os'
-    require 'open-uri'
-    require 'zip'
-    require_relative 'output'
-
     class Courses < Thor
       include Terminal::Output
 
+      GITHUB         = /github\.com/
+      MASTER_ZIP_URL = %r{github.com\/(.*)\/archive\/master.zip}
+      URL            = /\A#{URI.regexp(%w(http https))}\z/
+      ZIP_FILE       = /\.zip/
+
       desc 'list', 'List your available daigaku courses'
       def list
         courses = Loading::Courses.load(Daigaku.config.courses_path)
@@ -22,22 +26,22 @@ module Daigaku
         url = GithubClient.master_zip_url(Daigaku.config.initial_course) if use_initial_course
         url = GithubClient.master_zip_url(options[:github]) if options[:github]
 
-        url_given = (url =~ /\A#{URI::regexp(['http', 'https'])}\z/)
-        github = use_initial_course || options[:github] || url.match(/github\.com/)
+        url_given = (url =~ URL)
+        github = use_initial_course || options[:github] || url.match(GITHUB)
 
         raise Download::NoUrlError unless url_given
-        raise Download::NoZipFileUrlError unless File.basename(url) =~ /\.zip/
+        raise Download::NoZipFileUrlError unless File.basename(url) =~ ZIP_FILE
 
         courses_path = Daigaku.config.courses_path
         FileUtils.makedirs(courses_path) unless Dir.exist?(courses_path)
 
         file_name = File.join(courses_path, url.split('/').last)
 
-        File.open(file_name, 'w') { |file| file << open(url).read }
+        File.open(file_name, 'w') { |file| file << URI.open(url).read }
         course = Course.unzip(file_name, github_repo: github)
 
         if github
-          user_and_repo = url.match(/github.com\/(.*)\/archive\/master.zip/).captures.first
+          user_and_repo = url.match(MASTER_ZIP_URL).captures.first
           store_repo_data(options[:github] || user_and_repo)
         end
 
@@ -46,11 +50,11 @@ module Daigaku
         scaffold_solutions
 
         say_info "Successfully #{action} the course \"#{course.title}\"!"
-      rescue Download::NoUrlError => e
+      rescue Download::NoUrlError
         print_download_warning(url, "\"#{url}\" is not a valid URL!")
-      rescue Download::NoZipFileUrlError => e
+      rescue Download::NoZipFileUrlError
         print_download_warning(url, "\"#{url}\" is not a URL of a *.zip file!")
-      rescue Exception => e
+      rescue StandardError => e
         print_download_warning(url, e.message)
       ensure
         FileUtils.rm(file_name) if File.exist?(file_name.to_s)
@@ -124,9 +128,9 @@ module Daigaku
       end
 
       def store_repo_data(user_and_repo)
-        parts = (user_and_repo ||= Daigaku.config.initial_course).split('/')
-        author = parts.first
-        course = parts.second
+        parts  = (user_and_repo ||= Daigaku.config.initial_course).split('/')
+        author = parts[0]
+        course = parts[1]
 
         course = Course.new(course)
         QuickStore.store.set(course.key(:author), author)
@@ -164,7 +168,7 @@ module Daigaku
       def print_course_not_available(course_name)
         text = [
           "The course \"#{course_name}\" is not available in",
-          "\"#{Daigaku.config.courses_path}\".\n",
+          "\"#{Daigaku.config.courses_path}\".\n"
         ]
 
         say_warning text.join("\n")
@@ -174,6 +178,5 @@ module Daigaku
         end
       end
     end
-
   end
 end

data/lib/daigaku/terminal/output.rb

@@ -1,78 +1,71 @@
 require 'thor'
-require 'active_support/concern'
 require 'colorize'
 
 module Daigaku
   module Terminal
-
     module Output
-      extend ActiveSupport::Concern
-
-      included do
-        private
-
-        def say(text)
-          output = text.split("\n").map {|line| "\t#{line}" }.join("\n")
-          $stdout.puts output
-        end
+      private
 
-        def empty_line
-          $stdout.puts ''
-        end
+      def say(text)
+        output = text.split("\n").map { |line| "\t#{line}" }.join("\n")
+        $stdout.puts output
+      end
 
-        def get(string)
-          $stdout.print "\n\t#{string} "
-          $stdin.gets.strip
-        end
+      def empty_line
+        $stdout.puts ''
+      end
 
-        def say_info(text)
-          say_box(text, ' ℹ', :light_blue)
-        end
+      def get(string)
+        $stdout.print "\n\t#{string} "
+        $stdin.gets.strip
+      end
 
-        def say_warning(text)
-          say_box(text, '⚠ ', :light_red)
-        end
+      def say_info(text)
+        say_box(text, ' ℹ', :light_blue)
+      end
 
-        def say_box(text, symbol, color)
-          empty_line
-          say line.send(color)
-          empty_line
+      def say_warning(text)
+        say_box(text, '⚠ ', :light_red)
+      end
 
-          indented_text = text.split("\n").join("\n#{' ' * (symbol.length + 1)}")
-          say indented_text.prepend("#{symbol} ").send(color)
+      def say_box(text, symbol, color)
+        empty_line
+        say line.send(color)
+        empty_line
 
-          empty_line
-          say line.send(color)
-          empty_line
-        end
+        indented_text = text.split("\n").join("\n#{' ' * (symbol.length + 1)}")
+        say indented_text.prepend("#{symbol} ").send(color)
 
-        def line(symbol = '-')
-          symbol * 70
-        end
+        empty_line
+        say line.send(color)
+        empty_line
+      end
 
-        def get_command(command, description)
-          say description
+      def line(symbol = '-')
+        symbol * 70
+      end
 
-          loop do
-            cmd = get '>'
+      def get_command(command, description)
+        say description
 
-            unless cmd == command
-              say "This was something else. Try \"#{command}\"."
-              next
-            end
+        loop do
+          cmd = get '>'
 
-            system cmd
-            break
+          unless cmd == command
+            say "This was something else. Try \"#{command}\"."
+            next
           end
-        end
 
-        def get_confirm(description)
-          say_warning description
-          confirm = get '(yes|no)'
-          yield if confirm == 'yes' && block_given?
+          system cmd
+          break
         end
       end
-    end
 
+      def get_confirm(description)
+        say_warning description
+        confirm = get '(yes|no)'
+        yield if confirm == 'yes' && block_given?
+      end
+    end
   end
 end

data/lib/daigaku/terminal/setup.rb

@@ -1,10 +1,8 @@
 require 'thor'
+require_relative 'output'
 
 module Daigaku
   module Terminal
-
-    require_relative 'output'
-
     class Setup < Thor
       include Terminal::Output
 
@@ -19,7 +17,7 @@ module Daigaku
           path = get 'path:'
 
           begin
-            @daigaku_path = File.expand_path("#{path}", Dir.pwd)
+            @daigaku_path = File.expand_path(path.to_s, Dir.pwd)
           rescue
             say_warning "#{path} is no valid path name. Try another!"
             next
@@ -29,7 +27,7 @@ module Daigaku
           say "\"#{@daigaku_path}\""
 
           confirmation = get '(yes|no)'
-          break if confirmation.downcase == 'yes'
+          break if confirmation.casecmp('yes').zero?
 
           empty_line
           say 'No Problem. Just type another one!'
@@ -61,8 +59,8 @@ module Daigaku
         solutions_path = options[:paths] || options[:solutions_path]
 
         if courses_path.nil? && solutions_path.nil?
-          say_warning "Please specify options when using this command!"
-          say %x{ daigaku setup help set }
+          say_warning 'Please specify options when using this command!'
+          say `daigaku setup help set`
           return
         end
 
@@ -76,11 +74,12 @@ module Daigaku
       private
 
       def prepare_directories(path)
-        courses_dir = Daigaku::Configuration::COURSES_DIR
+        courses_dir  = Daigaku::Configuration::COURSES_DIR
         courses_path = File.join(path, courses_dir)
+
         Daigaku.config.courses_path = courses_path
 
-        solutions_dir = Daigaku::Configuration::SOLUTIONS_DIR
+        solutions_dir  = Daigaku::Configuration::SOLUTIONS_DIR
         solutions_path = File.join(path, solutions_dir)
 
         if Dir.exist? solutions_path
@@ -92,7 +91,7 @@ module Daigaku
 
         text = [
           "Your Daigaku directory is now set up.\n",
-          "Daigaku created/updated following two paths for you:",
+          'Daigaku created/updated following two paths for you:',
           courses_path,
           solutions_path
         ]
@@ -101,15 +100,11 @@ module Daigaku
       end
 
       def update_config(attribute, value)
-        begin
-          path = File.expand_path(value, Dir.pwd)
-          Daigaku.config.send("#{attribute}=", path)
-        rescue Exception => e
-          say_warning e.message
-        end
+        path = File.expand_path(value, Dir.pwd)
+        Daigaku.config.send("#{attribute}=", path)
+      rescue StandardError => e
+        say_warning e.message
       end
-
     end
-
   end
 end