daigaku 0.3.0 → 0.4.0

data/spec/support/macros/path_helpers.rb

@@ -1,16 +1,16 @@
 module PathHelpers
-  LOCAL_DIR = '.daigaku'
-  CONFIGURATION_FILE = 'daigaku.settings'
-  COURSES = 'courses'
-  SOLUTIONS = 'solutions'
-  TEMP_PATH = File.expand_path("../../../../tmp/", __FILE__)
-  COURSE_DIR_NAMES = ['Course_A', 'Course_B']
-  CHAPTER_DIR_NAMES = ['1_Chapter-A', '2_Chapter-B']
-  UNIT_DIR_NAMES = ['1_unit-a', '2_unit-b']
-  TASK_NAME = 'task.md'
-  REFERENCE_SOLUTION_NAME = 'solution.rb'
-  TEST_NAME = 'solution_spec.rb'
-  STORAGE_FILE = 'daigaku.db.yml'
+  LOCAL_DIR               = '.daigaku'.freeze
+  CONFIGURATION_FILE      = 'daigaku.settings'.freeze
+  COURSES                 = 'courses'.freeze
+  SOLUTIONS               = 'solutions'.freeze
+  TEMP_PATH               = File.expand_path('../../../../tmp/', __FILE__).freeze
+  COURSE_DIR_NAMES        = %w(Course_A Course_B).freeze
+  CHAPTER_DIR_NAMES       = %w(1_Chapter-A 2_Chapter-B).freeze
+  UNIT_DIR_NAMES          = %w(1_unit-a 2_unit-b).freeze
+  TASK_NAME               = 'task.md'.freeze
+  REFERENCE_SOLUTION_NAME = 'solution.rb'.freeze
+  TEST_NAME               = 'solution_spec.rb'.freeze
+  STORAGE_FILE            = 'daigaku.db.yml'.freeze
 
   def temp_basepath
     TEMP_PATH
@@ -86,17 +86,17 @@ module PathHelpers
 
   def all_solution_file_paths
     all_unit_dirs.map do |unit_dir|
-      underscored_unit_dir =  File.basename(unit_dir).gsub(/[\_\-\.]+/, '_')
+      underscored_unit_dir = File.basename(unit_dir).gsub(/[\_\-\.]+/, '_')
       file_name = underscored_unit_dir + Daigaku::Solution::FILE_SUFFIX
 
       unit_path = File.join(solutions_basepath, unit_dir.split('/')[-3..-1])
-      parts = File.join(File.dirname(unit_path), file_name).split('/')
+      parts     = File.join(File.dirname(unit_path), file_name).split('/')
 
       course_parts = parts[-3..-1].map do |part|
         part.gsub(/^[\d]+\_/, '').gsub(/[\_\-]+/, '_').downcase
       end
 
-      [*parts[0...-3], *course_parts].join('/')
+      (parts[0...-3] + course_parts).join('/')
     end
   end
 

data/spec/support/macros/resource_helpers.rb

@@ -1,12 +1,12 @@
-module ResourceHelpers
-  require 'fileutils'
-  require 'zip'
+require 'fileutils'
+require 'zip'
 
+module ResourceHelpers
   def prepare_courses
-    FileUtils.mkdir_p(courses_basepath) unless Dir.exist?(courses_basepath)
+    create_directory(courses_basepath)
 
     course_dir_names.each do |course|
-      chapter_dir_names.each do |chapter|
+      chapter_dir_names.each do |_|
         unit_dirs(course).each do |units|
           units.each do |unit|
             create_directory(unit)
@@ -29,23 +29,19 @@ module ResourceHelpers
   def prepare_solutions
     all_solution_file_paths.each do |path|
       base_dir = File.dirname(path)
-      name = File.basename(path)
+      name     = File.basename(path)
       create_file(base_dir, name, solution_content)
     end
   end
 
-  def prepare_download(zip_file_name, options = {})
+  def prepare_download(zip_file_name, multiple_courses: false)
     zip_file_path = File.join(courses_basepath, zip_file_name)
-
-    unless Dir.exist?(File.dirname(zip_file_path))
-      FileUtils.makedirs(File.dirname(zip_file_path))
-    end
+    create_directory(File.dirname(zip_file_path))
 
     Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
       Dir[File.join(courses_basepath, '**', '**')].each do |file|
-        if course_match?(file, options[:multiple_courses])
-          zip_file.add(file.sub(courses_basepath, '')[1..-1], file) { true }
-        end
+        next unless course_match?(file, multiple_courses)
+        zip_file.add(file.sub(courses_basepath, '')[1..-1], file) { true }
       end
     end
 
@@ -54,16 +50,12 @@ module ResourceHelpers
 
   def prepare_github_download(zip_file_name)
     zip_file_path = File.join(courses_basepath, zip_file_name)
-
-    unless Dir.exist?(File.dirname(zip_file_path))
-      FileUtils.makedirs(File.dirname(zip_file_path))
-    end
+    create_directory(File.dirname(zip_file_path))
 
     Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
       Dir[File.join(courses_basepath, '**', '**')].each do |file|
-        if file.match(/.*\-master/)
-          zip_file.add(file.sub(courses_basepath, '')[1..-1], file) { true }
-        end
+        next unless file =~ /.*\-master/
+        zip_file.add(file.sub(courses_basepath, '')[1..-1], file) { true }
       end
     end
 
@@ -71,34 +63,41 @@ module ResourceHelpers
   end
 
   def course_match?(name, multiple_courses)
+    first_course_matches = name.match(course_dirs.first)
+
     if multiple_courses
-      name.match(course_dirs.first) || name.match(course_dirs.second)
+      first_course_matches || name.match(course_dirs.second)
     else
-      name.match(course_dirs.first)
+      first_course_matches
     end
   end
 
   def cleanup_download(zip_file_name)
     directory = course_dirs.first
-    zip_file = File.join(File.dirname(directory), zip_file_name)
-    FileUtils.rm(zip_file) if File.exist?(zip_file)
+    zip_file  = File.join(File.dirname(directory), zip_file_name)
+    remove_file(zip_file)
   end
 
   def cleanup_temp_data
-    FileUtils.remove_dir(temp_basepath) if Dir.exist?(temp_basepath)
+    remove_directory(temp_basepath)
+  end
+
+  def remove_directory(dir_path)
+    FileUtils.remove_dir(dir_path) if Dir.exist?(dir_path)
   end
 
   def create_directory(dir_path)
-    FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
+    FileUtils.makedirs(dir_path) unless Dir.exist?(dir_path)
   end
 
   def create_file(base_dir, name, content)
-    create_directory(base_dir) unless Dir.exist?(base_dir)
+    create_directory(base_dir)
     file_path = File.join(base_dir, name)
+    File.open(file_path, 'w') { |f| f.puts content }
+  end
 
-    if Dir.exist?(base_dir)
-      File.open(file_path, 'w') { |f| f.puts content }
-    end
+  def remove_file(file)
+    FileUtils.rm(file) if File.exist?(file)
   end
 
   def available_courses
@@ -114,8 +113,8 @@ module ResourceHelpers
   end
 
   def available_units(course_name, chapter_name)
-    units = unit_dirs(course_name).map do |units|
-      units.map do |path|
+    units = unit_dirs(course_name).map do |unit_dir|
+      unit_dir.map do |path|
         next unless path.split('/')[-2] == chapter_name
         Daigaku::Unit.new(path)
       end
@@ -128,7 +127,7 @@ module ResourceHelpers
     task = unit_dirs(course_name).map do |units|
       units.map do |path|
         split = path.split('/')
-        next if (split[-2] != chapter_name || split[-1] != unit_name)
+        next if split[-2] != chapter_name || split[-1] != unit_name
 
         Daigaku::Task.new(path)
       end
@@ -141,7 +140,7 @@ module ResourceHelpers
     solution = unit_dirs(course_name).map do |units|
       units.map do |path|
         split = path.split('/')
-        next if (split[-2] != chapter_name || split[-1] != unit_name)
+        next if split[-2] != chapter_name || split[-1] != unit_name
 
         Daigaku::ReferenceSolution.new(path)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -114,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: quick_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: code_breaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - lib/daigaku/loading/courses.rb
 - lib/daigaku/loading/units.rb
 - lib/daigaku/markdown.rb
+- lib/daigaku/markdown/printer.rb
 - lib/daigaku/markdown/ruby_doc.rb
 - lib/daigaku/reference_solution.rb
 - lib/daigaku/solution.rb
@@ -264,6 +265,7 @@ files:
 - lib/daigaku/views/main_menu.rb
 - lib/daigaku/views/menu.rb
 - lib/daigaku/views/splash.rb
+- lib/daigaku/views/subscriber.rb
 - lib/daigaku/views/task_view.rb
 - lib/daigaku/views/top_bar.rb
 - lib/daigaku/views/units_menu.rb
@@ -319,9 +321,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="