quizgame 0.0.2 → 0.0.3

data/CHANGES

@@ -1,5 +1,13 @@
-== Master (for 0.0.2)
+= quizgame Changelog
+
+== Master (for 0.0.4)
+
+== Version 0.0.3
+  Adjust to WeightedPicker-0.1.0.
+
+== Version 0.0.2
   bin/quizgame raise error when _wts.yaml includes a float weight.
+  fix the bug when NaN occur with quit when no problem is answered.
 
 == Version 0.0.1
   bugfix

data/Gemfile

@@ -7,9 +7,10 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.3"
+  gem "bundler", "~> 1.3.4"
   gem "jeweler", "~> 1.8.3"
   gem "simplecov", ">= 0"
   gem "builtinextension", ">= 0.0.0"
-  gem "weightedpicker", ">= 0.0.0"
+  gem "weightedpicker", ">= 0.1.0"
+  #gem "psych", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/quizgame

@@ -57,13 +57,6 @@ data["problems"].each do |id, ary|
   problems[id] = Problem.new(*ary)
 end
 weight_yaml = ARGV[0].sub(/\.yaml$/, "_wts.yaml")
-begin
-  picker = WeightedPicker.new(weight_yaml, problems.keys)
-rescue WeightedPicker::InvalidWeightError
-  puts "Error!"
-  puts "#{weight_yaml} contains float weight. Use integers as weights."
-  exit
-end
 
-game = QuizGame.new(requirement, problems, picker)
+game = QuizGame.new(requirement, problems, weight_yaml)
 game.run(OPTIONS[:norma])

data/lib/quizgame/quizgame.rb

@@ -24,15 +24,28 @@ class QuizGame
   class QuizGame::NoQuizError < Exception; end
 
   # クイズデータを読み込む。
-  def initialize(requirement, problems, picker)
+  def initialize(requirement, problems, picker_file)
     @requirement = requirement
     @problems    = problems
-    @picker      = picker
+    @weight_file = picker_file
   end
 
   # 条件を満たすまでクイズを実行。
   # norma は終了条件の数
   def run(norma)
+    begin
+      picker = WeightedPicker.load_file @weight_file
+      picker.merge @problems.keys
+    rescue WeightedPicker::InvalidWeightError
+      puts "Error!"
+      puts "#{@weight_file} contains float weight. Use integers as weights."
+      exit
+    rescue Errno::ENOENT
+      #puts "TEST"
+      picker = WeightedPicker.new({})
+      picker.merge @problems.keys
+    end
+
     correct_count = 0
     problem_count = 0
     show_statement(norma)
@@ -41,7 +54,7 @@ class QuizGame
     start_time = Time.new
 
     while (problem_count < norma )
-      id = @picker.pick
+      id = picker.pick
       problem = @problems[id]
 
       puts "-"*60
@@ -55,9 +68,9 @@ class QuizGame
       problem_count += 1
       if problem.correct?(input_str)
         correct_count += 1
-        @picker.lighten(id)
+        picker.lighten(id)
       else
-        @picker.weigh(id)
+        picker.weigh(id)
       end
 
       puts show_result(problem, input_str)
@@ -69,6 +82,8 @@ class QuizGame
         correct_count, problem_count, norma)
     end
 
+    File.open(@weight_file, "w"){|io| picker.dump(io) }
+
     puts "="*60
     sleep(0.35) #Visual effect. A little stop before showing results.
     if (correct_count == norma)
@@ -77,7 +92,12 @@ class QuizGame
 
     printf("result: [%d correct / %d problems]",
         correct_count, problem_count)
-    printf("  %2d\%\n", (correct_count.to_f/ problem_count*100).to_i)
+
+    begin
+      printf("  %2d\%\n", (correct_count.to_f/ problem_count*100).to_i)
+    rescue FloatDomainError
+      puts "  No problem is answered."
+    end
 
     print "Time: ", Time.now - start_time, "\n"
   end

data/quizgame.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "quizgame"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2012-07-13"
+  s.date = "2013-04-10"
   s.description = "This gem privide framework for quiz game. This gem can be used for spaced repetition study. The more frequently mistaken problems are given more frequently."
   s.email = "ippei94da@gmail.com"
   s.executables = ["quizgame"]
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ippei94da/quizgame"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.23"
   s.summary = "Framework for game with quiz format."
 
   if s.respond_to? :specification_version then
@@ -50,26 +50,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<builtinextension>, [">= 0.0.0"])
-      s.add_development_dependency(%q<weightedpicker>, [">= 0.0.0"])
+      s.add_development_dependency(%q<weightedpicker>, [">= 0.1.0"])
     else
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<builtinextension>, [">= 0.0.0"])
-      s.add_dependency(%q<weightedpicker>, [">= 0.0.0"])
+      s.add_dependency(%q<weightedpicker>, [">= 0.1.0"])
     end
   else
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<builtinextension>, [">= 0.0.0"])
-    s.add_dependency(%q<weightedpicker>, [">= 0.0.0"])
+    s.add_dependency(%q<weightedpicker>, [">= 0.1.0"])
   end
 end
 

data/test/test_quizgame.rb

@@ -23,8 +23,7 @@ class TC_QuizGame < Test::Unit::TestCase
       "p1" => Problem.new( "1", "one", "いち" ),
       "p2" => Problem.new( "2", "two", "に" )
     }
-    wp = WeightedPicker.new(QUIZ_FILE, ["p1", "p2"])
-    @qg00 = QuizGame.new(requirement, problems, wp)
+    @qg00 = QuizGame.new(requirement, problems, QUIZ_FILE)
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quizgame
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &76458570 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *76458570
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76457990 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *76457990
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76457280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *76457280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &76456750 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76456750
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builtinextension
-  requirement: &76487640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +85,28 @@ dependencies:
         version: 0.0.0
   type: :development
   prerelease: false
-  version_requirements: *76487640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: weightedpicker
-  requirement: &76487140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *76487140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: This gem privide framework for quiz game. This gem can be used for spaced
   repetition study. The more frequently mistaken problems are given more frequently.
 email: ippei94da@gmail.com
@@ -122,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 975847731
+      hash: -593133475
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Framework for game with quiz format.