daigaku 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e51c3ee2e1a66caaa9175593f91548ad87775c715be4f73fbe431dac530cd17
-  data.tar.gz: 45e3fd1854e26d55c201aaf9922ed13255dd543b2b08d003836159df72df8880
+  metadata.gz: 3d2569151b28f6803d8c351ad6c131e13d741c7515a08e3d6e5ff2db007d085b
+  data.tar.gz: d53b84a072e46320f7e4555c00ba3955e9de81a0729037257c4c41e217e72c67
 SHA512:
-  metadata.gz: 64b9d02de58bf07df8d6c529c075f2799f6e6af436da46dc012b4c7555d7a991ac8ce71a82443f3a27f66c82cd08aabec8a6206e8133dfe85510c5756f25f657
-  data.tar.gz: 6fb51479ce5fa62bde15305f817c3e9979da389797dd678afe496e054e134f8b24f9c69bd44173448f8ece9290a032dae2d166192d13aabc24635c633b1d3984
+  metadata.gz: c3d43f800a282522f4cae4550e56785e92b1feee01f179306e5022e81223716437fd2b3b813adb37328d9d6b835cfafacd6842de8d7db5c8cbe05c4703deb4ad
+  data.tar.gz: 6373c4ae4ba47cb9ae150d5048b16898b98cf4e768d8f70b9f46d406e2b6951e0e4d260b141fe85e5602007be44dc92f55b25a3763000e81b366d55534e786c0

data/.travis.yml

@@ -4,10 +4,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.4.5
-  - 2.4.9
   - 2.5.0
-  - 2.5.7
   - 2.6.0
-  - 2.6.5
-  - ruby-head
+  - 2.7.0

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.4.5 or higher.
+Daigaku works with [MRI Ruby](https://www.ruby-lang.org/en/documentation/installation/) v2.5 or higher.
 
 Then open a terminal and install Daigaku by running:
 

data/bin/daigaku

@@ -6,7 +6,11 @@ begin
   require 'daigaku'
 rescue LoadError => e
   warn "could not load \"daigaku\"\n#{e}"
-  exit -1
+  exit(-1)
 end
 
-Daigaku::Terminal::CLI.start
+begin
+  Daigaku::Terminal::CLI.start
+rescue Interrupt
+  puts "\n\n\t👋 See you soon!"
+end

data/daigaku.gemspec

@@ -16,17 +16,17 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4.5'
+  spec.required_ruby_version = '>= 2.5'
 
   spec.add_runtime_dependency 'curses',        '~> 1.3'
   spec.add_runtime_dependency 'rspec',         '~> 3.0'
-  spec.add_runtime_dependency 'thor',          '~> 0.20'
+  spec.add_runtime_dependency 'thor',          '~> 1.0'
   spec.add_runtime_dependency 'os',            '~> 1.0'
   spec.add_runtime_dependency 'colorize',      '~> 0.8'
   spec.add_runtime_dependency 'rubyzip',       '~> 2.0'
   spec.add_runtime_dependency 'wisper',        '~> 2.0'
-  spec.add_runtime_dependency 'quick_store',   '~> 0.2'
-  spec.add_runtime_dependency 'code_breaker',  '~> 0.3'
+  spec.add_runtime_dependency 'quick_store',   '~> 1.0'
+  spec.add_runtime_dependency 'code_breaker',  '~> 1.0'
 
   spec.add_development_dependency 'bundler',     '~> 2.0'
   spec.add_development_dependency 'rake',        '~> 13.0'

data/lib/daigaku/github_client.rb

@@ -12,7 +12,7 @@ module Daigaku
     # Returns the timestamp of updated_at for the repo from the Github API.
     def self.updated_at(user_and_repo)
       url = "https://api.github.com/repos/#{user_and_repo}"
-      JSON.parse(open(url).read)['updated_at']
+      JSON.parse(URI.open(url).read)['updated_at']
     end
 
     # Returns whether the pushed_at time from Github API is newer than the

data/lib/daigaku/solution.rb

@@ -7,12 +7,13 @@ module Daigaku
     def initialize(unit_path)
       @unit_path = unit_path
       @path      = solution_path(unit_path)
-      @code      = File.read(@path).strip if File.file?(@path)
+      @code      = load_code(@path)
       @verified  = store_state
     end
 
     def verify!
-      result = Daigaku::Test.new(@unit_path).run(code)
+      @code = load_code(@path)
+      result = Daigaku::Test.new(@unit_path).run(@code)
       self.store_state = result.passed?
       result
     end
@@ -32,6 +33,10 @@ 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_directory = Storeable.key(directory_from(path))

data/lib/daigaku/terminal/cli.rb

@@ -9,6 +9,8 @@ module Daigaku
     class CLI < Thor
       include Terminal::Output
 
+      package_name 'Daigaku'
+
       desc 'courses [COMMAND]', 'Handle daigaku courses'
       subcommand 'courses', Terminal::Courses
 

data/lib/daigaku/terminal/courses.rb

@@ -37,7 +37,7 @@ module Daigaku
 
         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

data/lib/daigaku/test.rb

@@ -18,7 +18,7 @@ module Daigaku
       temp_spec = File.join(File.dirname(@path), "temp_#{File.basename(@path)}")
       create_temp_spec(temp_spec, patched_spec_code)
 
-      result = `rspec --color --format j #{temp_spec}`
+      result = `rspec --no-color --order defined --format j #{temp_spec}`
       remove_file(temp_spec)
 
       TestResult.new(result)

data/lib/daigaku/test_result.rb

@@ -2,17 +2,26 @@ require 'json'
 
 module Daigaku
   class TestResult
+    CODE_ERROR_MESSAGE = ':( You got an error in your code!'.freeze
+
     attr_reader :examples, :example_count, :failure_count
 
     def initialize(result_json)
       @result = begin
         JSON.parse(result_json, symbolize_names: true)
-      rescue
-        syntax_error_json
+      rescue => error
+        syntax_error_json(error)
       end
 
-      @example_count = @result[:summary][:example_count]
-      @failure_count = @result[:summary][:failure_count]
+      @example_count = @result.dig(:summary, :example_count)
+      @failure_count = @result.dig(:summary, :failure_count)
+      error_count = @result.dig(:summary, :errors_outside_of_examples_count) || 0
+
+      if error_count > 0
+        @failure_count = error_count
+        details = error_details(@result)
+        @result = error_json(details)
+      end
 
       @examples = @result[:examples].map do |example|
         description = example[:full_description]
@@ -52,32 +61,59 @@ module Daigaku
       message.join("\n" * 3)
     end
 
-    def syntax_error_json
+    def syntax_error_json(error)
+      details = failure_details(error)
+      error_json(details)
+    end
+
+    def error_details(result)
+      result[:messages]
+        .first
+        .split('\n')
+        .each_with_index
+        .select { |line, index| index > 0 && line.matches?(/temp_.+\.rb/) }
+        .first.to_s
+    end
+
+    def error_json(details)
       {
         summary: {},
         examples: [
           {
-            status: 'failed',
-            exception: { message: ':( You got an error in your code!' }
+            status: TestExample::FAILED,
+            exception: { message: "#{CODE_ERROR_MESSAGE}\n\n#{details}" }
           }
         ]
       }
     end
+
+    def failure_details(error)
+      line = error.backtrace.first
+      error_message = remove_colorization(error.message)
+      "#{error.class} in #{line}:\n#{error_message}"
+    end
+
+    def remove_colorization(text)
+      text.gsub(/\x1b\[[0-9]*m/i, '')
+    end
   end
 
   class TestExample
+    PASSED = 'passed'.freeze
+    FAILED = 'failed'.freeze
+
     attr_reader :description, :status, :message
 
     EXAMPLE_PASSED_MESSAGE = 'Your code passed this requirement.'.freeze
 
-    def initialize(description:, status:, message: nil)
+    def initialize(status:, description: nil, message: nil)
       @description = description
       @status      = status
       @message     = message || EXAMPLE_PASSED_MESSAGE
     end
 
     def passed?
-      @status == 'passed'
+      @status == PASSED
     end
   end
 end

data/lib/daigaku/unit.rb

@@ -16,7 +16,7 @@ module Daigaku
     end
 
     def solution
-      @solution = Solution.new(@path)
+      @solution ||= Solution.new(@path)
     end
 
     def mastered?

data/lib/daigaku/version.rb

@@ -1,3 +1,3 @@
 module Daigaku
-  VERSION = '0.6.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/daigaku/views/menu.rb

@@ -7,10 +7,10 @@ module Daigaku
       include Wisper::Publisher
 
       TOP_BAR_TEXT = [
-        'Use *UP KEY* and *DOWN KEY* for menu navigation',
-        'Enter menu with *RETURN*',
-        'Go back with *BACKSPACE*',
-        'Exit with *ESC*'
+        'Use * 🠕 * and * 🠗 * for menu navigation',
+        'Enter menu with * ⏎ *',
+        'Go back with * ⟵ *',
+        'Exit with *Esc*'
       ].join('  |  ').freeze
 
       attr_writer :items_info

data/lib/daigaku/views/task_view.rb

@@ -8,11 +8,11 @@ module Daigaku
       include Wisper::Publisher
 
       TOP_BAR_TEXT = [
-        'Scroll with *UP KEY* and *DOWN KEY*',
+        'Scroll with * 🠕 * and * 🠗 *',
         'Open solution file with *o*',
         'Verify solution with *v*',
         'Clear validation with *c*',
-        'Exit with *ESC*'
+        'Exit with *Esc*'
       ].join('  |  ').freeze
 
       def initialize
@@ -201,11 +201,10 @@ module Daigaku
         @lines = [''] + @test_result_lines + ['', ''] + @unit.task.markdown.lines
         @examples = result.examples
 
-        @example_heights = @examples.reduce({}) do |hash, example|
+        @example_heights = @examples.each_with_object({}) do |example, hash|
           start = hash.values.reduce(0) { |sum, results| sum + results.count }
           range = (start..(start + example.message.split("\n").count) + 2)
           hash[hash.keys.count] = range
-          hash
         end
 
         lines_count = @lines.count + @top_bar_height + @head_height
@@ -223,8 +222,8 @@ module Daigaku
       def code_error_lines(code)
         begin
           eval(code)
-        rescue StandardError => e
-          return e.inspect.gsub(/(\A.*#<|>.*$)/, '').lines.map(&:rstrip)
+        rescue StandardError, ScriptError => error
+          return error.inspect.gsub(/(\A.*#<|>.*$)/, '').lines.map(&:rstrip)
         end
 
         []

data/spec/daigaku/solution_spec.rb

@@ -62,10 +62,11 @@ describe Daigaku::Solution do
       end
 
       it 'sets the solution’s state in the store to unverified unless passed' do
-        subject.instance_variable_set(:@code, 'puts "I ❤ Daigaku!"')
+        allow(File).to receive(:read).and_return('puts "I ❤ Daigaku!"')
+        QuickStore.store.set(subject.store_key, true)
+
         subject.verify!
         mastered = QuickStore.store.get(subject.store_key)
-
         expect(mastered).to be_falsey
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: code_breaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +310,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.5
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Learning Ruby on the command line.