nerd_quiz 0.2.0 → 0.2.1

data/lib/nerd_quiz/question.rb

@@ -47,13 +47,15 @@ module NerdQuiz
       text << @parsed["text"]
       (1..4).each do |i|
         key = "a#{i}"
-        text << "#{key}) #{@parsed[key]}"
+        # When the answer has significant whitespace, wrap the answer in quotes
+        answer = @parsed[key] =~ /^\s/ || @parsed[key] =~ /\s$/ ? "\"#{@parsed[key]}\"" : @parsed[key]
+        text << "#{i}) #{answer}"
       end
       @question[:text] = text.join("\n")
     end
 
     def extract_answer
-      @question[:answer] = @parsed["right_answer"]
+      @question[:answer] = @parsed["right_answer"][1]
     end
 
     def extract_label

data/lib/nerd_quiz/quiz.rb

@@ -30,6 +30,7 @@ module NerdQuiz
     def ask
       out("Question #{@scorecard.next_question + 1} #{label}:", :blue)
       out(question)
+      out('>> ', :blue, :bold, :no_new_line)
     end
 
     def listen
@@ -45,7 +46,10 @@ module NerdQuiz
     end
 
     def reply
-      @input.gets.strip
+      reply = @input.gets
+      # Ctrl-D (EOF) user action cause @input.gets to be nil
+      # On this action, lets exit like the user asked
+      reply.nil? ? exit : reply.strip
     end
 
     def start
@@ -81,7 +85,8 @@ module NerdQuiz
         bold = args[2].is_a?(Symbol) ? true : false
         text = set_color(text, color, bold)
       end
-      @output.puts text
+      method = args[3].nil? ? :puts : :print
+      @output.send(method, text)
     end
 
     def handle_signals

data/lib/nerd_quiz/version.rb

@@ -1,3 +1,3 @@
 module NerdQuiz
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/nerd_quiz/question_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 module NerdQuiz
   describe Question do
     describe '.get' do
-      let(:path) { File.expand_path('../../../NerdPursuit/questions/yo_dawg.json', __FILE__) }
+      let(:path) { File.expand_path('../../../NerdPursuit/questions/kernel-sprintf-2.json', __FILE__) }
       let(:text) do
-        "Yo dawg, I herd you like ...\n" +
-        "a1) music, so I put a tape in your pants so you can listen while you sleep!\n" +
-        "a2) cars, so I put a car in your car so you can drive while you drive!\n" +
-        "a3) cheating, so I put a bread in your bag so you can run while you eat!\n" +
-        "a4) drinking, so I put a hat in your pocket so you can listen while you dance!"
+        "What's the output of '%-020s' % 'dude is here'?\n" +
+        "1) dude is here\n" +
+        "2) \"dude is here        \"\n" +
+        "3) \"        dude is here\"\n" +
+        "4) dude is"
       end
-      let(:answer) { "a2" }
-      let(:label) { "(culture)" }
+      let(:answer) { "2" }
+      let(:label) { "(backend - ruby)" }
 
       subject { Question.get(path) }
 

data/spec/nerd_quiz/quiz_spec.rb

@@ -5,7 +5,7 @@ module NerdQuiz
     let(:question)  { 'What is the answer to life, the universe and everything?' }
     let(:answer)    { '42' }
     let(:label)     { '(culture)' }
-    let(:output)    { double('output').as_null_object }
+    let(:output)    { double('output', :send => "").as_null_object }
     let(:input)     { double('input').as_null_object }
     let(:scorecard) { NerdQuiz::Scorecard.new }
     subject         { Quiz.new(input, output, scorecard) }
@@ -17,18 +17,18 @@ module NerdQuiz
       subject.stub(:answer).and_return(answer)
     end
 
-    # Only public API is the run loop, so it must be run for each test
-    after(:each) do
-      subject.run
-    end
-
     describe '#run' do
+      # Only public API is the run loop, so it must be run for each test
+      after(:each) do
+        subject.run
+      end
+
       it 'loads all the questions' do
         subject.should_receive(:questions).once
       end
 
       it 'sends a welcome message' do
-        output.should_receive(:puts).with("\e[34mWelcome to Nerd Quiz\e[0m")
+        output.should_receive(:send).with(:puts, "\e[34mWelcome to Nerd Quiz\e[0m")
       end
 
       it 'asks all the questions' do
@@ -37,7 +37,7 @@ module NerdQuiz
 
       it 'labels each question' do
         (1..10).each do |i|
-          output.should_receive(:puts).with("\e[34mQuestion #{i} (culture):\e[0m").once
+          output.should_receive(:send).with(:puts, "\e[34mQuestion #{i} (culture):\e[0m").once
         end
       end
 
@@ -56,7 +56,7 @@ module NerdQuiz
           end
 
           it 'notifies it received the right answer' do
-            output.should_receive(:puts).with("\e[1m\e[32mRight!\e[0m").exactly(10).times
+            output.should_receive(:send).with(:puts, "\e[1m\e[32mRight!\e[0m").exactly(10).times
           end
 
           it 'tallies the right answer' do
@@ -70,11 +70,11 @@ module NerdQuiz
           end
 
           it 'notifies it received the wrong answer' do
-            output.should_receive(:puts).with("\e[1m\e[31mWrong!\e[0m").exactly(10).times
+            output.should_receive(:send).with(:puts, "\e[1m\e[31mWrong!\e[0m").exactly(10).times
           end
 
           it 'and displays the right answer' do
-            output.should_receive(:puts).with("\e[31mYou should have answered \e[0m\e[1m\e[31m42\e[0m").exactly(10).times
+            output.should_receive(:send).with(:puts, "\e[31mYou should have answered \e[0m\e[1m\e[31m42\e[0m").exactly(10).times
           end
 
           it 'tallies the wrong answer' do
@@ -84,21 +84,29 @@ module NerdQuiz
       end
 
       it 'proclaims the quiz over' do
-        output.should_receive(:puts).with("\e[34mThanks For Playing!\e[0m")
+        output.should_receive(:send).with(:puts, "\e[34mThanks For Playing!\e[0m")
       end
 
       it 'displays the final score' do
         scorecard.stub(:score).and_return('10/10')
-        output.should_receive(:puts).with("\e[33mFinal Score 10/10\e[0m")
+        output.should_receive(:send).with(:puts, "\e[33mFinal Score 10/10\e[0m")
       end
 
       it 'always says bye' do
-        output.should_receive(:puts).with("\e[1m\e[34mBye!\e[0m")
+        output.should_receive(:send).with(:puts, "\e[1m\e[34mBye!\e[0m")
       end
 
       it 'catches SIGINTs' do
         Signal.should_receive(:trap).with('INT', 'EXIT').once
       end
     end
+
+    it 'exits when sent Ctrl-D (EOF)' do
+      lambda {
+        input.stub(:gets).and_return(nil)
+        output.should_receive(:send).with(:puts, "\e[1m\e[34mBye!\e[0m")
+        subject.run
+      }.should raise_error(SystemExit)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nerd_quiz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70200808752580 !ruby/object:Gem::Requirement
+  requirement: &70271390761360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70200808752580
+  version_requirements: *70271390761360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70200808751840 !ruby/object:Gem::Requirement
+  requirement: &70271390760620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70200808751840
+  version_requirements: *70271390760620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70200808751220 !ruby/object:Gem::Requirement
+  requirement: &70271390759980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70200808751220
+  version_requirements: *70271390759980
 description: Test your nerd skills by answering NerdPursuit questions!
 email:
 - sfw@simeonfosterwillbanks.com
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3758517233295047994
+      hash: -61159159520021561
 requirements: []
 rubyforge_project: nerd_quiz
 rubygems_version: 1.8.11