daigaku 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579a43d2967ed7592ae65d76b826b2a14b7dac14
-  data.tar.gz: 54a8f9846c685f2b0184d3dd8e2f9e95921b5fae
+  metadata.gz: bc609a20eb768060e29650848a0c5e18c3734564
+  data.tar.gz: fe5a9c1b16ef1dbb90bd9bb5f93cb1f34d6cbb78
 SHA512:
-  metadata.gz: 8b94570b37b186fdb35b3b875f1cad97e355a95d62df87ed179536f5792dd3ffeb88d55d4b9aba1622720dd2c50e10d5e50666b497264141518c63ee7ed00f96
-  data.tar.gz: 9903fe01ea858ad2605d38888bd5bdc4527e2eca195b780ad7f9627af4d478200e68e83080bd8a263f5bbbaa3b9ee8eb731b741933116f02b7fb7fc4ee8cfaa2
+  metadata.gz: 3f602698e655947c62bb4ad461a2f6f0bb66ee5ffe8a809a10444a8d98096b02fef63f6f7e0149e66f8e7d78c1a8a5c1adb28a17aa37459bca0483b9002ac777
+  data.tar.gz: 06f241f79407d17e233e6c4d82993d6a54ef97de3a8d05b9a2c19b4bbac81373bc1b46cb9755a5562dac59ebd7b9f016c1415284d336baefe0d14be463234aea

data/lib/daigaku/course.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Daigaku
   class Course
 
@@ -24,5 +26,55 @@ module Daigaku
     def key(key_name)
       Storeable.key(title, prefix: 'courses', suffix: key_name)
     end
+
+    # Unzips a zipped file and removes the zipped file.
+    # Returns a Daigaku::Course of the unzipped content.
+    #
+    # Example:
+    #   Daigaku::Course.unzip('/path/to/file.zip')
+    #   # => Daigaku::Course
+    #
+    #   Daigaku::Course.unzip(/path/to/master.zip, github_repo: true)
+    #   # => Daigaku::Course
+    #
+    class << self
+      def unzip(file_path, options = {})
+        target_dir = File.dirname(file_path)
+        course_dir = nil
+
+        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)
+            else
+              directory = entry.to_s
+            end
+
+            if course_dir.nil? && directory != '/'
+              course_dir = File.join(target_dir, directory.gsub(/\/$/, ''))
+
+              if Dir.exist?(course_dir)
+                FileUtils.copy_entry("#{course_dir}/", "#{course_dir}_old/", true)
+                FileUtils.rm_rf("#{course_dir}/.", secure: true)
+              end
+            end
+
+            zip_file.extract(entry, "#{target_dir}/#{directory}") { true }
+          end
+        end
+
+        FileUtils.rm(file_path)
+      rescue Exception => e
+        puts e
+        old_dir = "#{course_dir}_old/"
+        FileUtils.copy_entry(old_dir, "#{course_dir}/", true) if Dir.exist?(old_dir)
+      ensure
+        old_dir = "#{course_dir}_old/"
+        FileUtils.rm_r(old_dir) if Dir.exist?(old_dir)
+        return Course.new(course_dir) if course_dir
+      end
+    end
   end
 end

data/lib/daigaku/terminal/courses.rb

@@ -34,19 +34,18 @@ module Daigaku
         file_name = File.join(courses_path, url.split('/').last)
 
         File.open(file_name, 'w') { |file| file << open(url).read }
-        course_name = unzip(file_name, github)
+        course = Course.unzip(file_name, github_repo: github)
 
         if github
           user_and_repo = url.match(/github.com\/(.*)\/archive\/master.zip/).captures.first
           store_repo_data(options[:github] || user_and_repo)
         end
 
-        course = Course.new(course_name)
         QuickStore.store.set(course.key(:url), url)
         QuickStore.store.set(course.key(:updated_at), Time.now.to_s)
         scaffold_solutions
 
-        say_info "Successfully #{action} the course \"#{course_name}\"!"
+        say_info "Successfully #{action} the course \"#{course.title}\"!"
       rescue Download::NoUrlError => e
         print_download_warning(url, "\"#{url}\" is not a valid URL!")
       rescue Download::NoZipFileUrlError => e
@@ -134,32 +133,6 @@ module Daigaku
         QuickStore.store.set(course.key(:github), user_and_repo)
       end
 
-      def unzip(file_path, github = false)
-        target_dir = File.dirname(file_path)
-        course_name = nil
-
-        Zip::File.open(file_path) do |zip_file|
-          zip_file.each do |entry|
-
-            if github
-              first, *others = entry.to_s.split('/')
-              directory = File.join(first.split('-')[0..-2].join('-'), others)
-            else
-              directory = entry.to_s
-            end
-
-            if directory != '/'
-              course_name ||= directory.split('/').first.gsub(/_+/, ' ')
-            end
-
-            zip_file.extract(entry, "#{target_dir}/#{directory}") { true }
-          end
-        end
-
-        FileUtils.rm(file_path)
-        course_name
-      end
-
       def scaffold_solutions
         generator = Generator.new
         generator.prepare

data/lib/daigaku/version.rb

@@ -1,3 +1,3 @@
 module Daigaku
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/daigaku/window.rb

@@ -122,8 +122,8 @@ module Daigaku
           emphasized = false
           highlighted = false
 
-          text.chars.each do |char|
-            if char == '*'
+          text.chars.each_with_index do |char, index|
+            if char == '*' && text[index - 1] != '\\'
               emphasized = !emphasized
               next
             end
@@ -133,22 +133,25 @@ module Daigaku
               next
             end
 
+            character = "#{text[index..(index + 1)]}" == '\\*' ? '' : char
+
             if highlighted
-              red(char)
+              red(character)
             elsif emphasized
-              emphasize(char)
+              emphasize(character)
             else
-              write(char)
+              write(character)
             end
           end
         when bold
-          text.chars.each do |char|
-            if char == '*'
+          text.chars.each_with_index do |char, index|
+            if char == '*' && text[index - 1] != '\\'
               emphasized = !emphasized
               next
             end
 
-            emphasized ? emphasize(char) : write(char)
+            character = "#{text[index..(index + 1)]}" == '\\*' ? '' : char
+            emphasized ? emphasize(character) : write(character)
           end
         when line
           write('-' * (Curses.cols - 2))
@@ -159,7 +162,7 @@ module Daigaku
           capture = text.match(/\(ruby-doc stdlib:\s?(.*)\)/).captures.first
           write text.gsub(ruby_doc_stdlib, ruby_doc_stdlib_link(capture))
         else
-          write(text)
+          write(text.gsub(/(\\#)/, '#'))
       end
     end
 

data/spec/daigaku/course_spec.rb

@@ -13,6 +13,8 @@ describe Daigaku::Course do
 
   let(:course_path) { course_dirs.first }
 
+  before { suppress_print_out }
+
   before(:all) do
     prepare_solutions
     Daigaku.config.solutions_path = solutions_basepath
@@ -20,6 +22,10 @@ describe Daigaku::Course do
 
   subject { Daigaku::Course.new(course_path) }
 
+  it "responds to ::unzip" do
+    expect(Daigaku::Course).to respond_to :unzip
+  end
+
   it "has the prescribed title" do
     expect(subject.title).to eq course_titles.first
   end
@@ -90,4 +96,106 @@ describe Daigaku::Course do
       expect(course.author).to eq author
     end
   end
+
+  describe "::unzip" do
+    before do
+      Daigaku.config.courses_path = local_courses_path
+      @zip_file_name = "unzip/repo.zip"
+      @zip_file_path = File.join(courses_basepath, @zip_file_name)
+      @file_content = prepare_download(@zip_file_name)
+    end
+
+    after do
+      cleanup_download(@zip_file_name)
+      dir = File.dirname(@zip_file_path)
+      FileUtils.rm_r(dir) if Dir.exist?(dir)
+    end
+
+    def expect_course_dirs_exists_to_be(boolean)
+      unit_dirs(course_dir_names.first).each do |chapter_dirs|
+        chapter_dirs.each do |dir|
+          path = [dir.split('/')[0..-4], 'unzip', dir.split('/')[-3..-1]].join('/')
+          expect(Dir.exist?(path)).to be boolean
+        end
+      end
+    end
+
+    it "unzips a course zip file" do
+      expect_course_dirs_exists_to_be false
+      Daigaku::Course.unzip(@zip_file_path)
+      expect_course_dirs_exists_to_be true
+    end
+
+    it "returns the unzipped course" do
+      dir = course_dirs.first
+      path = File.join(File.dirname(dir), 'unzip', File.basename(dir))
+      course = Daigaku::Course.new(path)
+
+      expect(Daigaku::Course.unzip(@zip_file_path).to_json).to eql course.to_json
+    end
+
+    it "removes the zip file" do
+      expect(File.exist?(@zip_file_path)).to be true
+      Daigaku::Course.unzip(@zip_file_path)
+      expect(File.exist?(@zip_file_path)).to be false
+    end
+
+    context "with the same course already available:" do
+      before do
+        dir = course_dirs.first
+        @path = File.join(File.dirname(dir), 'unzip', File.basename(dir))
+        @old_chapter_dir = File.join(@path, 'Old_chapter')
+
+        FileUtils.mkdir_p(@old_chapter_dir)
+      end
+
+      it "overwrites all chapters" do
+        expect(Dir.exist?(@old_chapter_dir)).to be true
+        Daigaku::Course.unzip(@zip_file_path)
+        expect(Dir.exist?(@old_chapter_dir)).to be false
+      end
+
+      context "if an errior occurs" do
+        before do
+          allow_any_instance_of(Zip::File)
+            .to receive(:extract) { raise Exception.new }
+        end
+
+        it "restores an old state if an error occurs" do
+          Daigaku::Course.unzip(@zip_file_path)
+          expect(Dir.exist?(@old_chapter_dir)).to be true
+          expect(Dir.exist?("#{@path}_old")).to be false
+        end
+
+        it "keeps the zip file if an error occurs" do
+          expect(File.exist?(@zip_file_path)).to be true
+          Daigaku::Course.unzip(@zip_file_path)
+          expect(File.exist?(@zip_file_path)).to be true
+        end
+      end
+    end
+
+    context "with the github_repo option:" do
+      before { @github_course_dir = prepare_github_course }
+      after { FileUtils.rm_r(@github_course_dir) }
+
+      it "removes the '-master' from the root directory" do
+        zip_file_name = "unzip/repo-master.zip"
+        zip_file_path = File.join(courses_basepath, zip_file_name)
+        prepare_github_download(zip_file_name)
+
+        expect(File.exist?(zip_file_path)).to be true
+        Daigaku::Course.unzip(zip_file_path, github_repo: true)
+
+        unit_dirs("#{course_dir_names.first}-master").each do |chapter_dirs|
+          chapter_dirs.each do |dir|
+            path = [dir.split('/')[0..-4], 'unzip', dir.split('/')[-3..-1]].join('/')
+            expect(Dir.exist?(path)).to be false
+          end
+        end
+
+        expect_course_dirs_exists_to_be true
+      end
+    end
+  end
 end

data/spec/daigaku/terminal/courses_spec.rb

@@ -39,6 +39,11 @@ describe Daigaku::Terminal::Courses do
       expect{ subject.download(@url) }.not_to raise_error
     end
 
+    it "uses Courses.unzip to unzip the course" do
+      expect(Daigaku::Course).to receive(:unzip).once
+      subject.download(@url)
+    end
+
     it "creates a new courses folder in the daigaku courses directory" do
       target_path = File.join(Daigaku.config.courses_path, File.basename(course_dirs.first))
       dirs = Dir[File.join(Daigaku.config.courses_path, '**')]
@@ -165,6 +170,24 @@ describe Daigaku::Terminal::Courses do
       expect(subject).not_to receive(:download)
       subject.update('Course_A')
     end
+
+    it "updates all courses if --all option is given" do
+      file_content = prepare_download(@zip_file_name, multiple_courses: true)
+
+      stub_request(:get, @url)
+        .with(
+          headers: {
+            'Accept' => '*/*',
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'User-Agent' => 'Ruby'
+          }
+        ).to_return(status: 200, body: file_content, headers: {})
+
+      allow(subject).to receive(:options) { { all: true } }
+      allow(subject).to receive(:download).exactly(course_dirs.count).times
+
+      subject.update
+    end
   end
 
   describe '#delete' do

data/spec/support/macros/resource_helpers.rb

@@ -19,6 +19,13 @@ module ResourceHelpers
     end
   end
 
+  def prepare_github_course
+    prepare_courses
+    github_course_dir = "#{course_dirs.first}-master/"
+    FileUtils.copy_entry("#{course_dirs.first}/", github_course_dir)
+    github_course_dir
+  end
+
   def prepare_solutions
     all_solution_file_paths.each do |path|
       base_dir = File.dirname(path)
@@ -27,14 +34,35 @@ module ResourceHelpers
     end
   end
 
-  def prepare_download(zip_file_name)
-    directory = File.dirname(course_dirs.first)
-    zip_file_path = File.join(File.dirname(directory), zip_file_name)
+  def prepare_download(zip_file_name, options = {})
+    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
+
+    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
+      end
+    end
+
+    File.read(zip_file_path)
+  end
+
+  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
 
     Zip::File.open(zip_file_path, Zip::File::CREATE) do |zip_file|
-      Dir[File.join(directory, '**', '**')].each do |file|
-        if file.match(course_dir_names.first)
-          zip_file.add(file.sub(directory, '')[1..-1], file) { true }
+      Dir[File.join(courses_basepath, '**', '**')].each do |file|
+        if file.match(/.*\-master/)
+          zip_file.add(file.sub(courses_basepath, '')[1..-1], file) { true }
         end
       end
     end
@@ -42,6 +70,14 @@ module ResourceHelpers
     File.read(zip_file_path)
   end
 
+  def course_match?(name, multiple_courses)
+    if multiple_courses
+      name.match(course_dirs.first) || name.match(course_dirs.second)
+    else
+      name.match(course_dirs.first)
+    end
+  end
+
   def cleanup_download(zip_file_name)
     directory = course_dirs.first
     zip_file = File.join(File.dirname(directory), zip_file_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses