hemlock 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d70d3bc161e504779ce0922901c0fb349de8e0c
-  data.tar.gz: 406a77437e3f6e51dee336d209fb81626f533473
+  metadata.gz: 3f6d9f919d34b2f1fb39c71e7f006c2593d56445
+  data.tar.gz: 7ebe69e1fb5733f85cac5172cdb7a072d347cf9a
 SHA512:
-  metadata.gz: 233cba104acd1840d301a63c36b1e201de211a16c68ae4f336babf1567f7c40ced7d0461de0e7328b9be44285e39e337a6b1cb9813df2e45d001dbadbdff0f1c
-  data.tar.gz: 792a987c0aa5c82567b07da03a59c61506f2a569a30b089094137e58b51b7494bca8741b53e0f48489d759f6a219794e657547a48785332104c3d99fab803284
+  metadata.gz: e22ef8a5856e35337959221c73e1ace8fa74e9d564f1f630f0312ed5294eed15dcbeed001f6bed1608265a8b82468a7bcdda1f18521ff410ccd7fa27ab71e009
+  data.tar.gz: e964c17030b9cdbf7f2d077b060d0cde76d8efdc45ca46d06e96e959f862a077f8157340f416f1a55c0be05958665cdf9908e893e40aced414f0451313726220

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hemlock (0.0.8)
+    hemlock (0.0.9)
       gli (= 2.9.0)
       rainbow (= 1.99.1)
 
@@ -10,26 +10,31 @@ GEM
   specs:
     celluloid (0.15.2)
       timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     diff-lcs (1.2.5)
     ffi (1.9.3)
     formatador (0.2.4)
     gli (2.9.0)
-    guard (2.3.0)
+    guard (2.4.0)
       formatador (>= 0.2.4)
       listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.5)
+    guard-rspec (4.2.6)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    listen (2.4.0)
+    listen (2.5.0)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
+    nio4r (1.0.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)

data/bin/hemlock

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require 'gli'
 require 'hemlock'
-require 'readline'
 require 'rainbow'
 
 include GLI::App
@@ -10,42 +9,15 @@ program_desc 'Memorization through repetitive writing - Socrates is not amused'
 
 version Hemlock::VERSION
 
-pre do |global,command,options,args|
-  true
-end
-
 command :drink do |c|
   c.desc "Crito, we owe a rooster to Asclepius. Please, don't forget to pay the debt."
 
   c.action do |global_options, options, args|
-    if args.empty?
-      puts printf Rainbow("Using native flashcards").blue
-      args = []
-    end
-    flashcards = Hemlock::CSVtoFlashcards.create_flashcards(args.join)
-    exit_now!('There are no flashcards in this folder') if flashcards.empty?
-    5.times do
-      seed = rand(0..(flashcards.length - 1))
-      flashcard = flashcards[seed]
-      puts flashcard.question
-      answer = Readline.readline('>> ', false)
-      if flashcard.correct?(answer)
-        puts printf Rainbow('Correct').green
-      else
-        puts printf Rainbow('You must submit to the quarries').red
-        i = 1
-        while i < 3 do
-          puts flashcard.question
-          puts flashcard.answer
-          answer = Readline.readline('>> ', true)
-          if flashcard.correct?(answer)
-            i += 1
-          else
-            puts printf Rainbow('Who are you? Sisyphus?!').red
-            redo
-          end
-        end
-      end
+    number_of_turns = args.empty? ? 5 : args.first.to_i
+    flashcards = Hemlock::CSVtoFlashcards.create_flashcards
+    number_of_turns.times do
+      flashcard = flashcards.sample
+      Hemlock::Turn.new(flashcard).take_turn
     end
   end
 end

data/hemlock.gemspec

@@ -8,12 +8,8 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'https://github.com/shicholas/hemlock'
   s.platform = Gem::Platform::RUBY
   s.summary = 'Memorization through written repetition - Socrates is not amused'
-  s.files = `git ls-files`.split("
-")
-  s.require_paths << 'lib'
-  s.require_paths << 'flashcards'
-  s.has_rdoc = true
-  s.rdoc_options << '--title' << 'hemlock' << '--main' << '-ri'
+  s.files = `git ls-files`.split("\n")
+  s.require_paths << 'lib' << 'flashcards'
   s.bindir = 'bin'
   s.executables << 'hemlock'
   s.add_development_dependency('guard-rspec')

data/lib/hemlock/csv_to_flashcards.rb

@@ -4,9 +4,8 @@ require 'csv'
 module Hemlock
   class CSVtoFlashcards
 
-    def self.create_flashcards(folder_name)
-      folder_name = default_flashcard_directory if folder_name.empty?
-      folder_name = self.replace_tildes(folder_name)
+    def self.create_flashcards
+      folder_name = self.replace_tildes(default_flashcard_directory)
       flashcards = []
       Dir["#{folder_name}/*.csv"].each do |file|
         flashcards << self.from_file(file)

data/lib/hemlock/turn.rb

@@ -0,0 +1,38 @@
+require 'readline'
+
+module Hemlock
+  class Turn
+
+    def initialize(flashcard)
+      @flashcard = flashcard
+    end
+
+    def take_turn
+      puts @flashcard.question
+      guess = Readline.readline('>> ', false)
+      if @flashcard.correct?(guess)
+        puts printf Rainbow('Correct').green
+      else
+        puts printf Rainbow('You must submit to the quarries').red
+        punishment
+      end
+    end
+
+    private
+
+    def punishment
+      i = 1
+      while i < 3 do
+        puts @flashcard.question
+        puts @flashcard.answer
+        guess = Readline.readline('>> ', true)
+        if @flashcard.correct?(guess)
+          i += 1
+        else
+          puts printf Rainbow('Who are you? Sisyphus?!').red
+          redo
+        end
+      end
+    end
+  end
+end

data/lib/hemlock/version.rb

@@ -1,3 +1,3 @@
 module Hemlock
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/hemlock.rb

@@ -1,5 +1,6 @@
 require 'hemlock/version.rb'
 require 'hemlock/csv_to_flashcards'
+require 'hemlock/turn'
 
 module Hemlock
 end

data/spec/hemlock/turn_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Hemlock::Turn do
+
+  subject { described_class }
+  let(:flashcard) { Hemlock::Flashcard.new('blue', 'a great color') }
+  let(:flashcards) { [flashcard] }
+  let(:turn) { Hemlock::Turn.new(flashcard) }
+
+  context '#take_turn' do
+    it 'should print correct on a correct guess' do
+      # pending
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'hemlock/csv_to_flashcards'
+require 'hemlock/turn'
 require 'thor'
 require 'stringio'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hemlock
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nicholas Shook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
@@ -88,20 +88,18 @@ files:
 - lib/hemlock.rb
 - lib/hemlock/csv_to_flashcards.rb
 - lib/hemlock/flashcard.rb
+- lib/hemlock/turn.rb
 - lib/hemlock/version.rb
 - spec/hemlock/csv_to_flashcards_spec.rb
 - spec/hemlock/flashcard_spec.rb
+- spec/hemlock/turn_spec.rb
 - spec/spec_helper.rb
 - spec/stub.csv
 homepage: https://github.com/shicholas/hemlock
 licenses: []
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--title"
-- hemlock
-- "--main"
-- "-ri"
+rdoc_options: []
 require_paths:
 - lib
 - lib