ankit 0.0.6 → 0.0.7

data/lib/ankit/challenge.rb

@@ -1,3 +1,4 @@
+require 'ankit/errors'
 require 'ankit/coming_command'
 require 'ankit/fail_command'
 require 'ankit/find_command'
@@ -466,6 +467,7 @@ module Ankit
         # XXX: Care the case where |card| < limit
         limit = [self.session.limit, Slot::BATCH_SIZE].min
         slots = Coming.coming_paths(self.runtime).take(limit).map { |path| Slot.new(path, nil) }
+        raise ExpectedFatalError, "You have no card yet" if slots.empty?
         QuestionState.new(Progress.new(self.session, slots))
       end
     end

data/lib/ankit/errors.rb

@@ -0,0 +1,4 @@
+
+module Ankit
+  class ExpectedFatalError < StandardError; end
+end

data/lib/ankit/event.rb

@@ -27,7 +27,8 @@ module Ankit
     def best() @values["best"] || maturity; end
     def card?() type == "card"; end
     def round() @envelope.round or 0; end
-    def next_round() round + 2**maturity; end
+    #def next_round() round + 2**maturity; end
+    def next_round() round + scaled_maturity; end
 
     def initialize(env, values)
       @envelope, @values = env, values
@@ -44,7 +45,7 @@ module Ankit
     end
 
     def to_failed(env)
-      Event.new(env, @values.merge({ "verb" => "failed", "maturity" => 0, "best" => best }))
+      Event.new(env, @values.merge({ "verb" => "failed", "maturity" => -1, "best" => best }))
     end
 
     def self.for_card(name, verb, env)
@@ -61,6 +62,12 @@ module Ankit
 
     private
 
+    def scaled_maturity
+      return  (2**( self.maturity-1)) if 0 < maturity
+      return -(2**(-self.maturity+1)) if 0 > maturity
+      0
+    end
+
     def next_maturity
       maturity + [(best - maturity)/2, 1].max
     end

data/lib/ankit/runtime.rb

@@ -3,6 +3,7 @@ require 'optparse'
 require 'fileutils'
 require 'highline'
 require 'ankit/command'
+require 'ankit/errors'
 require 'ankit/add_command'
 require 'ankit/challenge_command'
 require 'ankit/coming_command'
@@ -107,6 +108,9 @@ module Ankit
       else
         r.dispatch(splitted[:subcommand])
       end
+    rescue ExpectedFatalError
+      print("Error:", $!.message, "\n")
+      exit(1)
     end
     
     def initialize(config)

data/test/command_test.rb

@@ -5,7 +5,6 @@ require 'test/unit'
 require 'fileutils'
 require 'tmpdir'
 require 'tempfile'
-require 'mocha'
 
 class CommandTest < Test::Unit::TestCase
   include Ankit
@@ -110,7 +109,7 @@ class RoundTest < Test::Unit::TestCase
   include Ankit::TestHelper
 
   def test_hello
-    assert_equal(make_runtime.dispatch_then(["round"]).printed_line, "6 9")
+    assert_equal(make_runtime.dispatch_then(["round"]).printed_line, "6 7")
   end
 
   def test_vanilla
@@ -230,14 +229,14 @@ class FailPassTest < Test::Unit::TestCase
 
   def test_pass_vanilla
     run_test_against("pass", VANILLA) do |events|
-      assert_equal(events[0].name, VANILLA)
-      assert_equal(events[0].maturity, 1)
+      assert_equal([events[0].maturity, events[0].name], [2, JUNIOR])
+      assert_equal([events[1].maturity, events[1].name], [1, VANILLA])
     end
   end
 
   def test_pass_vintage
     run_test_against("pass", VINTAGE) do |events|
-      assert_equal(events.map(&:name), [VANILLA, JUNIOR, MIDDLE, VINTAGE])
+      assert_equal(events.map(&:name), [JUNIOR, VANILLA, MIDDLE, VINTAGE])
     end
   end
 
@@ -251,14 +250,14 @@ class FailPassTest < Test::Unit::TestCase
   def test_fail_vanilla
     run_test_against("fail", VANILLA) do |events|
       assert_equal(events[0].name, VANILLA)
-      assert_equal(events[0].maturity, 0)
+      assert_equal(events[0].maturity, -1)
     end
   end
 
   def test_fail_vintage
     run_test_against("fail", VINTAGE) do |events|
-      assert_equal(events.map(&:name), [VANILLA, VINTAGE, JUNIOR, MIDDLE])
-      assert_equal(events[0].maturity, 0)
+      assert_equal(events.map(&:name), [VINTAGE, VANILLA, JUNIOR, MIDDLE])
+      assert_equal(events[0].maturity, -1)
     end
   end
 end
@@ -289,6 +288,14 @@ class ChallengeTest < Test::Unit::TestCase
     assert_equal(actual.progress.size, 2)
   end
 
+  def test_empty_repo
+    runtime = make_runtime(EMPTY_REPO)
+    command = runtime.make_command(["challenge", "--limit", "2"])
+    assert_raise(ExpectedFatalError) do
+      command.execute
+    end
+  end
+
   def test_initial_state_limit_rc
     file = Tempfile.new('foo')
     begin
@@ -431,7 +438,7 @@ EOF
     with_runtime_on_temp_repo do |runtime|
       actual = ChallengeCommand.new(runtime, ["--limit", "2"]).initial_state
       actual = pass_two(actual)
-      p actual.class
+      #p actual.class
       actual = agree_pump(actual, "n")
       assert_instance_of(Challenge::QuestionState, actual)
     end

data/test/event_test.rb

@@ -35,7 +35,7 @@ class EventTest < Test::Unit::TestCase
   end
 
   def test_to_failed
-    json = JSON.parse('{"type":"card","verb":"failed","name":"hello","maturity":0,"best":1}')
+    json = JSON.parse('{"type":"card","verb":"failed","name":"hello","maturity":-1,"best":1}')
     expected = Event.new(@next_envelope, json)
     actual = @target.to_failed(@next_envelope)
     assert_equal(actual, expected)
@@ -45,6 +45,7 @@ class EventTest < Test::Unit::TestCase
   end
 
   def test_next_round
-    assert_equal(@target.next_round, 3)
+    assert_equal(@target.next_round, 2)
   end
+  
 end

data/test/helpers.rb

@@ -2,12 +2,14 @@
 require 'ankit/runtime'
 require 'stringio'
 require 'fileutils'
+require 'mocha'
 
 module Ankit
   TEST_DATA_BASE = File.join(File.dirname(__FILE__), "data")
   HELLO_REPO = File.join(TEST_DATA_BASE, "hello_repo")
   VANILLA_REPO = File.join(TEST_DATA_BASE, "vanilla_repo")
   NUMBER_REPO = File.join(TEST_DATA_BASE, "number_repo")
+  EMPTY_REPO = File.join(TEST_DATA_BASE, "empty_repo")
 
   class RuntimeWithMockedIO < Runtime
     def initialize(config)

data/test/progress_test.rb

@@ -1,6 +1,7 @@
 
 require 'ankit/runtime'
 require 'test/unit'
+require 'helpers'
 
 class ProgressTest < Test::Unit::TestCase
   include Ankit
@@ -24,7 +25,7 @@ class ProgressTest < Test::Unit::TestCase
       assert_equal(target.index, 0)
       assert_equal(target.slots[0].rating, :failed)
       assert_equal(target.slots[0].event, fetched_event)
-      assert_equal(0, fetched_event.maturity)
+      assert_equal(-1, fetched_event.maturity)
       assert(runtime.printed_line.empty?)
       assert_equal(1, target.nfailed)
       assert_equal(0, target.npassed)
@@ -82,7 +83,7 @@ class ProgressTest < Test::Unit::TestCase
       assert_equal(target.index, 1)
       assert_equal(target.slots[0].rating, :failed)
       assert_equal(target.slots[0].event, fetched_event)
-      assert_equal(0, fetched_event.maturity)
+      assert_equal(-1, fetched_event.maturity)
 
       assert_equal(1, target.nfailed)
       assert_equal(0, target.npassed)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ankit
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &13315100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *13315100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &13314460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *13314460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13313900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +53,28 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *13313900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &13313420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.4
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *13313420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 description: ! 'Ankit is a CLI and terminal based flashcard program to learn your
   new language.
 
@@ -66,53 +86,54 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ankit
+- lib/ankit.rb
+- lib/ankit/score_command.rb
+- lib/ankit/runtime.rb
+- lib/ankit/round_command.rb
+- lib/ankit/challenge_command.rb
+- lib/ankit/fail_command.rb
+- lib/ankit/event_traversing_command.rb
+- lib/ankit/list_command.rb
 - lib/ankit/pass_command.rb
-- lib/ankit/card.rb
 - lib/ankit/coming_command.rb
+- lib/ankit/find_command.rb
 - lib/ankit/text_reading_command.rb
-- lib/ankit/challenge_command.rb
-- lib/ankit/command.rb
-- lib/ankit/add_command.rb
-- lib/ankit/event.rb
+- lib/ankit/card.rb
+- lib/ankit/challenge.rb
 - lib/ankit/hello_command.rb
-- lib/ankit/find_command.rb
-- lib/ankit/event_traversing_command.rb
-- lib/ankit/round_command.rb
-- lib/ankit/runtime.rb
-- lib/ankit/name_command.rb
-- lib/ankit/score_command.rb
+- lib/ankit/event.rb
 - lib/ankit/card_happening_command.rb
-- lib/ankit/challenge.rb
-- lib/ankit/fail_command.rb
-- lib/ankit/list_command.rb
-- lib/ankit.rb
+- lib/ankit/add_command.rb
+- lib/ankit/command.rb
+- lib/ankit/errors.rb
+- lib/ankit/name_command.rb
+- test/card_test.rb
+- test/helpers.rb
+- test/progress_test.rb
 - test/data/vanilla_repo/anemone.journal
-- test/data/hope-and-luck.txt
-- test/data/hello_card.card
-- test/data/hello_repo/cards/foo/this_is_not_a_card.txt
-- test/data/hello_repo/cards/foo/vanilla-please.card
-- test/data/hello_repo/cards/foo/hello.card
 - test/data/hello_repo/baobab.journal
 - test/data/hello_repo/anemone.journal
-- test/data/hope.card
+- test/data/hello_repo/cards/foo/hello.card
+- test/data/hello_repo/cards/foo/this_is_not_a_card.txt
+- test/data/hello_repo/cards/foo/vanilla-please.card
+- test/data/bye_card.card
+- test/data/hello_card.card
 - test/data/luck.card
 - test/data/hello_config.rb
-- test/data/bye_card.card
-- test/data/number_repo/cards/one.card
-- test/data/number_repo/cards/five.card
+- test/data/hope-and-luck.txt
+- test/data/number_repo/anemone.journal
 - test/data/number_repo/cards/three.card
-- test/data/number_repo/cards/eight.card
-- test/data/number_repo/cards/four.card
 - test/data/number_repo/cards/seven.card
+- test/data/number_repo/cards/one.card
+- test/data/number_repo/cards/four.card
 - test/data/number_repo/cards/two.card
 - test/data/number_repo/cards/six.card
-- test/data/number_repo/anemone.journal
+- test/data/number_repo/cards/eight.card
+- test/data/number_repo/cards/five.card
+- test/data/hope.card
 - test/event_test.rb
 - test/runtime_test.rb
 - test/command_test.rb
-- test/helpers.rb
-- test/card_test.rb
-- test/progress_test.rb
 homepage: https://github.com/omo/ankit
 licenses: []
 post_install_message: 
@@ -133,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A CLI Flashcard.