daigaku 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c6f1f336e0af615495359124f476852ef7dfa36
-  data.tar.gz: 2baf4a0586e8b933fb30cd9af7bbe2be9a3fe983
+  metadata.gz: 4318ff789d428a55ecc01cefa1d55267a2193503
+  data.tar.gz: a3b3744b1bffe6a4ac11f25bbfe202d977ce3022
 SHA512:
-  metadata.gz: 537a9fa9742cda1129165bf8f0a163213d415fd3d6f221e93c54244f6a0eb379451146ba9e4e7f094c705416e9aef9f6ed350e9b849030fa6cba0278ac33eb19
-  data.tar.gz: c4a943a667fd22f0d420838ee6f83cac333613b4740ba889d3a24b8b32e989ca63813ab80206bd2aa8afb1429cc739a3f9717c07d9dc2ba3a9818b93794b1198
+  metadata.gz: 46b6c10e541c8e38af57ef69f25535c87d358a9ae3e895d6a07d9efc873f938299a642e603d2371eecc0fb6cd8495ff57a6f0bd7a0da698d751a7bb9768a7113
+  data.tar.gz: 05b555e1144e5d6c1fda261463445484dcb1d32bf0ab9d873d6ee52e8974dcd9d575b083e558d41329c45a7c512b2dc5bf55f3aaf21fabed08d38d604af0ffab

data/.travis.yml

@@ -1,6 +1,11 @@
 language: ruby
+
+before_install:
+  - gem update --system
+  - gem install bundler
+
 rvm:
   - 2.0.0
   - 2.2.0
+  - 2.3.0
   - rbx-2
-  - ruby-head

data/README.md

@@ -32,7 +32,7 @@ Daigaku will lead you through the setup and some important commands.
 
 ## Command line interface
 
-Daigaku's command line interface provides several commands which you
+Daigaku’s command line interface provides several commands which you
 can use in your terminal to setup the system, download new courses,
 and navigate through your solutions.
 
@@ -42,7 +42,7 @@ Please visit the [Daigaku Wiki](https://github.com/daigaku-ruby/daigaku/wiki/How
 
 ## Daigaku screen
 
-Daigaku's text based interface - the Daigaku screen - shows your installed courses and allows you to navigate through their chapters and units. In the task view you can read the unit's task and validate your solution code.
+Daigaku’s text based interface—the Daigaku screen—shows your installed courses and allows you to navigate through their chapters and units. In the task view you can read the unit’s task and validate your solution code.
 
 Please visit the [Diagaku Wiki](https://github.com/daigaku-ruby/daigaku/wiki/How-to-learn-Ruby-in-the-Daigaku-screen) to learn how to use the Daigaku screen.
 
@@ -56,10 +56,10 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 ### Creating Daigaku courses
 
-Daigaku is a great tool, but it's nothing without courses to learn from.
+Daigaku is a great tool, but it’s nothing without courses to learn from.
 Go ahead and help with making Daigaku a worthwile and fun resource for learning Ruby!
 
-Daigaku uses the course "Get started with Ruby" by default.
+Daigaku uses the course “Get started with Ruby” by default.
 Any contributions to the basic Daigaku course are more than welcome.
 To add chapters to the course fork it from https://github.com/daigaku-ruby/Get_started_with_Ruby
 and follow its guidelines for adding chapters or units.
@@ -72,7 +72,7 @@ Learn how to create a Daigaku course in the [Daigaku Wiki](https://github.com/da
 Any ideas, feature proposals, filing and feedback on issues are very welcome.
 We use the [git branching model](http://nvie.com/posts/a-successful-git-branching-model/) described by [nvie](https://github.com/nvie).
 
-Here's how to contribute:
+Here’s how to contribute:
 
 1. Fork it ( https://github.com/daigaku-ruby/daigaku/fork )
 2. Create your feature branch (`git checkout -b feature/my-new-feature develop`)
@@ -82,7 +82,7 @@ Here's how to contribute:
 
 Please try to add RSpec tests with your new features. This will ensure that your code does not break existing functionality and that your feature is working as expected.
 
-Ah, don't forget step 6: Celebrate that you made Daigaku a better tool after your code was merged in! :octocat: :tada:
+Ah, don’t forget step 6: Celebrate that you made Daigaku a better tool after your code was merged in! :octocat: :tada:
 
 ### License
 

data/lib/daigaku/markdown/ruby_doc.rb

@@ -43,19 +43,19 @@ module Daigaku
       end
 
       def doc_regex(type, capture)
-        /\(ruby-doc #{type}: #{capture}\)/
+        Regexp.new(Regexp.escape("(ruby-doc #{type}: #{capture})"))
       end
 
       def core_link(text)
         constants = ruby_constants(text).join('/')
-        method = ruby_method(text)
+        method    = ruby_method(text)
 
         "#{CORE_BASE_URL}/#{constants}.html#{method}"
       end
 
       def stdlib_link(text)
-        constants = ruby_constants(text).join('/')
-        method = ruby_method(text)
+        constants   = ruby_constants(text).join('/')
+        method      = ruby_method(text)
         libdoc_part = "libdoc/#{ruby_stdlib(text)}/rdoc"
 
         "#{STDLIB_BASE_URL}/#{libdoc_part}/#{constants}.html#{method}"
@@ -68,7 +68,7 @@ module Daigaku
       # Else the lib is created from the constants, e.g.
       #   (ruby-doc stdlib: Time) => 'time'
       def ruby_stdlib(text)
-        parts = text.split(' ')
+        parts = text.split
 
         if parts.length > 1
           parts.first.strip.downcase
@@ -78,7 +78,7 @@ module Daigaku
       end
 
       def ruby_constants(text)
-        parts = text.split(' ').last.split(/::|#/)
+        parts = text.split.last.split(/::|#/)
         select_capitalized(parts)
       end
 
@@ -92,7 +92,9 @@ module Daigaku
       end
 
       def select_capitalized(parts)
-        parts.select { |part| part[0] == part[0].upcase }
+        parts.select do |part|
+          part[0].match(/\w/) && part[0] == part[0].upcase
+        end
       end
 
       def downcased?(text)

data/lib/daigaku/test_result.rb

@@ -59,7 +59,7 @@ module Daigaku
         examples: [
           {
             status: 'failed',
-            exception: { message: ":( You got a syntax error in your code!" }
+            exception: { message: ":( You got an error in your code!" }
           }
         ]
       }

data/lib/daigaku/version.rb

@@ -1,3 +1,3 @@
 module Daigaku
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

data/lib/daigaku/views/task_view.rb

@@ -186,7 +186,7 @@ module Daigaku
 
       def print_test_results(window)
         result = @unit.solution.verify!
-        @test_result_lines = result.summary_lines
+        @test_result_lines = test_result_lines(result)
 
         if result.passed?
           code_lines = @unit.reference_solution.code_lines
@@ -213,6 +213,22 @@ module Daigaku
         initialize_window(height)
       end
 
+      def test_result_lines(result)
+        lines  = result.summary_lines
+        lines += code_error_lines(@unit.solution.code) unless result.passed?
+        lines
+      end
+
+      def code_error_lines(code)
+        begin
+          eval(code)
+        rescue Exception => e
+          return e.inspect.gsub(/(^.*#<|>.*$)/, '').lines.map(&:rstrip)
+        end
+
+        []
+      end
+
       def reset_screen(window)
         @test_result_lines = nil
         @lines = @unit.task.markdown.lines
@@ -228,7 +244,7 @@ module Daigaku
       end
 
       def example_index(heights, index)
-        heights.values.index { |range| range.include?(index) }
+        heights.values.index { |range| range.include?(index) }.to_i
       end
     end
 

data/spec/daigaku/markdown/ruby_doc_spec.rb

@@ -56,6 +56,15 @@ describe Daigaku::Markdown::RubyDoc do
         expect(parse(markdown)).to eq "#{base_url}/Enumerator/Lazy.html#method-i-flat_map"
       end
 
+      it 'returns the right link for an instance method not starting with word characters' do
+        markdown = '(ruby-doc core: Array#<<)'
+        expect(parse(markdown)).to eq "#{base_url}/Array.html#method-i-3C-3C"
+      end
+
+      it 'returns the right link for an instance method with regex characters' do
+        markdown = '(ruby-doc core: Array#any?)'
+        expect(parse(markdown)).to eq "#{base_url}/Array.html#method-i-any-3F"
+      end
     end
 
     context 'for a text containing a stdlib doc markup' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Learning Ruby on the command line.