femis_hangman 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8e5ebdddb0d51dc27b78de8a03aaba40033dd7
-  data.tar.gz: 4871521fc341b6aa4821c2d7d5255f0cb6aff5fb
+  metadata.gz: 531848c0a7aa6549600ba6fa38341dc908e240cc
+  data.tar.gz: 0a746682ce33a6ae9cf95a1b866ddceed4526df8
 SHA512:
-  metadata.gz: d89ba5e9f217569d4fc74bb733b1bfc0104c44c62ab52921316eefdfa9065540fe37b1721f971f3230a73ef4206b2492551b85cdd1510021ece1321441abf4e3
-  data.tar.gz: 0627e01a7ee8570f13aafd2f45838248459cc7474f2525c0f5510c2bfccd64573472a441eea24fa3800baa2b26fc2f4414363d3cd7dfabbe1832c5dcad05728c
+  metadata.gz: 4e47e32b83b5fc1c55e4ea3116cd2faef6039bb6e08403df76000c3d36efa42036df090e09af25f7d7f03906c36668cab8833fabd094853894770c1dbcf0a6fc
+  data.tar.gz: bf324adbcb177cb19dbec1b196c729a6fd1e9e553e3310429ddecb7d55c584bb2ecf2b86de2e75b46401e40c1e6e0cb7adb0b2f5dcae17bdf17d33d045ee4502

data/.gitignore

@@ -10,4 +10,5 @@
 /.idea/
 .idea*
 /.idea*
-.xml
+.xml
+/spec/message_spec.rb

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in femis_hangman.gemspec
 gem 'coveralls', require: false
 gemspec
+gem "bundler"

data/bin/hangman

@@ -3,5 +3,5 @@ require "bundler/setup"
 require "femis_hangman"
 
 s = FemisHangman::Router.new
-s.instructions_prompt
+puts s.instructions_prompt
 s.loop

data/bin/resume

@@ -4,10 +4,8 @@ require "femis_hangman"
 
 s = FemisHangman::Router.new
 
-
-if ARGV.length > 2
-  session.invalid_prompt
-else
+if ARGV.size == 1
   s.status = 'show'
-  s.show_saved_games
+  s.load_game(ARGV[0].to_i)
+  s.loop
 end

data/lib/femis_hangman.rb

@@ -1,6 +1,6 @@
+require 'YAML'
 require 'femis_hangman/version'
 require 'femis_hangman/message'
 require 'femis_hangman/word'
 require 'femis_hangman/game'
-require 'YAML'
 require 'femis_hangman/router'

data/lib/femis_hangman/game.rb

@@ -15,15 +15,15 @@ module FemisHangman
     def control(input)
       if input.size > 1 then commands(input)
       elsif input.size == 1 then play(input)
-      else invalid_prompt
+      else puts invalid_prompt
       end
     end
 
     def commands(input)
       case input
-        when ':h', 'history' then print_text("You have used: #{game_history}")
+        when ':h', 'history' then puts ("You have used: #{game_history}")
         when ':q', 'quit' then quit_game
-        else invalid_prompt
+        else puts invalid_prompt
       end
     end
 
@@ -35,7 +35,7 @@ module FemisHangman
 
     def include_letter(letter, history)
       if history.include?(letter)
-        duplicate_prompt(letter)
+        puts duplicate_prompt(letter)
         @history
       else
         history << letter
@@ -47,7 +47,7 @@ module FemisHangman
       if won? then game_won
       elsif lost? then game_lost
       else
-        turns_prompt(@turns)
+        puts turns_prompt(@turns)
         puts show_word
       end
     end
@@ -78,21 +78,21 @@ module FemisHangman
 
     def game_won
       if @feedback == 2
-        won_gui(@word)
+        puts won_gui(@word)
       else
-        won_prompt(@word)
+        puts won_prompt(@word)
       end
-      replay_prompt
+      puts replay_prompt
       @status = 'restart'
     end
 
     def game_lost
       if @feedback == 2
-        lost_gui(@word)
+        puts lost_gui(@word)
       else
-        lost_prompt(@word)
+        puts lost_prompt(@word)
       end
-      replay_prompt
+      puts replay_prompt
       @status = 'restart'
     end
 
@@ -108,7 +108,7 @@ module FemisHangman
 
     def quit_game
       @status = 'quit'
-      save_prompt
+      puts save_prompt
     end
   end
 end

data/lib/femis_hangman/message.rb

@@ -1,25 +1,24 @@
 module Message
   def welcome_prompt
-    puts 'Welcome to Hangman. Guess right or get hanged!'
+    'Welcome to Hangman. Guess right or get hanged!'
   end
 
   def size_prompt(size)
-    puts "Your word is a #{size} letter word"
+    "Your word is a #{size} letter word"
   end
 
   def load_prompt
-    puts "Choose the game you want to resume from the list below\nPress the respective number"
+    "Choose the game you want to resume from the list below\nPress the respective number"
   end
 
   def begin_prompt
-    puts "Let the games begin\n\n"
+    "Let the games begin\n\n"
   end
 
   def instructions_prompt
-    puts <<-PUTS
+    <<-PUTS
 ########################################################
 
-This gem is an implementation of the hangman game.
 Attempt to guess the missing letters correctly.
 You have a limited number of tries.
 If you use up all your chances without getting
@@ -27,7 +26,7 @@ the word correctly, you will be hanged.
 
 To play a new game: Press 'p' or 'play'
 To load a saved game: Press 'l' or 'load'
-To show insructions: Press 'i' or 'instructions'
+To show instructions: Press 'i' or 'instructions'
 To quit Hangman: Press 'q' or 'quit'
 
 ########################################################
@@ -35,20 +34,19 @@ To quit Hangman: Press 'q' or 'quit'
   end
 
   def save_prompt
-    puts "Press 's' or 'save' to save before quiting\nPress 'q' to quit anyway"
+    "Press 's' or 'save' to save before quiting\nPress 'q' to quit anyway"
   end
 
   def lost_prompt(word)
-    puts "You are dead!\nThe word is #{word}"
-    puts "Press any key to continue or 'q' to quit"
+    "You are dead!\nThe word is #{word}\nPress any key to continue or 'q' to quit"
   end
 
   def won_prompt(word)
-    puts "You win!\nThe word is #{word}"
+    "You win!\nThe word is #{word}"
   end
 
   def lost_gui(word)
-    puts <<-PUTS
+    <<-HEREDOC
 -+----------+-
  |          |
  |          o
@@ -61,11 +59,11 @@ You are dead!
 ################
 The word is #{word}
 ################
-    PUTS
+    HEREDOC
   end
 
   def won_gui(word)
-    puts <<-PUTS
+    <<-HEREDOC
 -+----------+-
  |          |
  |
@@ -78,48 +76,60 @@ You are free to go
 ################
 The word is #{word}
 ################
-    PUTS
+    HEREDOC
   end
 
   def level_prompt
-    puts "Choose your difficulty level\n\n1: Beginner\n2: Intermediate\n3: Advanced\n"
+    "Choose your difficulty level\n\n1: Beginner\n2: Intermediate\n3: Advanced\n"
   end
 
   def feedback_prompt
-    puts "Choose your feedback type\n\n1: Boring\n2: Funny\n"
+    "Choose your feedback type\n\n1: Boring\n2: Funny\n"
   end
 
 
   def replay_prompt
-    puts "Press 'r' or 'restart' to play again\nPress 'q' to quit\n"
+    "Press 'r' or 'restart' to play again\nPress 'q' to quit\n"
   end
 
   def invalid_prompt
-    puts 'Invalid entry!'
+    'Invalid entry!'
   end
 
   def empty_prompt
-    puts "You haven't used any letters yet."
+    "You haven't used any letters yet."
   end
 
   def duplicate_prompt(letter)
-    puts "You have used the letter #{letter} already"
+    "You have used the letter #{letter} already"
   end
 
   def turns_prompt(turns)
-    puts "You have #{turns} turns left"
+    "You have #{turns} turns left"
   end
 
   def print_text(text)
-    puts "#{text}"
+    "#{text}"
   end
 
   def thanks_prompt
-    puts 'Thank you for playing!'
+    'Thank you for playing!'
   end
 
+  def invalid_game_prompt
+    'There is no game with such ID'
+  end
+
+#   def help_prompt
+#     <<-HELP
+# Press:
+# hangman - to start the hangman game
+# resume `game id` - to resume saved game
+#     HELP
+#   end
+
   def game_instruction_prompt
-    puts <<-PUTS
+    <<-PUTS
 Press ':h' or 'history' to view the letters you have used
 Press ':q' or 'quit' to quit (you can save before quiting)
 

data/lib/femis_hangman/router.rb

@@ -13,7 +13,7 @@ module FemisHangman
       elsif @status == 'play' then play_game(input)
       elsif @status == 'finish' then restart_game(input)
       elsif @status == 'load' then load_game(input)
-      elsif @status == 'quit' || 'save' then quit_game(input)
+      elsif @status == 'quit' then quit_game(input)
       else welcome(input)
       end
     end
@@ -23,23 +23,23 @@ module FemisHangman
         when 'p', 'play' then start_game
         when 'q', 'quit' then quit_game
         when 'l', 'load' then show_saved_games
-        when 'i', 'instructions' then instructions_prompt
-        else invalid_prompt
+        when 'i', 'instructions' then puts instructions_prompt
+        else puts invalid_prompt
       end
     end
 
     def start_game
       @status = 'feedback'
-      welcome_prompt
-      feedback_prompt
+      puts welcome_prompt
+      puts feedback_prompt
     end
 
     def choose_feedback(input)
       if input.to_i < 1 || input.to_i > 2
-        invalid_prompt
+        puts invalid_prompt
         false
       else
-        level_prompt
+        puts level_prompt
         @feedback = input.to_i
         @status = 'start'
       end
@@ -47,7 +47,7 @@ module FemisHangman
 
     def begin_game(input)
       if input.to_i < 1 || input.to_i > 3
-        invalid_prompt
+        puts invalid_prompt
       else
         @difficulty = input.to_i
         @status = 'play'
@@ -56,12 +56,12 @@ module FemisHangman
     end
 
     def create_game
-      begin_prompt
+      puts begin_prompt
       @game = Game.new(@difficulty, @feedback)
-      size_prompt(@game.word.size)
-      turns_prompt(@game.turns)
-      game_instruction_prompt
-      print_text(@game.show_word)
+      puts size_prompt(@game.word.size)
+      puts turns_prompt(@game.turns)
+      puts game_instruction_prompt
+      puts (@game.show_word)
     end
 
     def play_game(input)
@@ -75,56 +75,65 @@ module FemisHangman
 
     def restart_game(input)
       if input == 'r' || input == 'restart'
-        level_prompt
+        puts level_prompt
         @status = 'start'
       elsif input == 'q' || input == 'quit' then quit_game
       else invalid_prompt
       end
     end
 
-    def save_game
-      File.open('./saved_games.yaml', 'a'){|f| f.write(YAML.dump(@game))}
+    def save_game(file='./saved_games.yaml')
+      File.open(file, 'a'){|f| f.write(YAML.dump(@game))}
       @status = 'quit'
     end
 
     def show_saved_games
       @status = 'load'
-      load_prompt
-      i = 0
+      puts load_prompt
+      counter = 0
       YAML.load_stream(File.open('./saved_games.yaml', 'r')).each do |game|
-        print "#{i += 1}: "
-        print game.show_word
-        print "(#{game.turns} turns left)"
-        print "\n"
+        counter += 1
+        puts saved_games_list(counter, game)
       end
     end
 
+    def saved_games_list(counter, game)
+      "#{counter}: " << game.show_word << "(#{game.turns} turns left)"
+    end
+
     def load_game(input)
       game_id = 0
       YAML.load_stream(File.open('./saved_games.yaml', 'r')).each do |game|
         game_id += 1
-        @game = game
+        if game_id == input.to_i then resume_game(game)
+        else
+          puts invalid_game_prompt
+          show_saved_games
+        end
       end
+    end
+
+    def resume_game(game)
+      @game = game
       @status = 'play'
       @game.status = 'play'
       @game.check_game
     end
 
     def quit_game(input=nil)
-      if input.nil? then @status = 'quit'
+      if input.nil? || input == 'q' || 'quit' then @status = 'quit'
       elsif input == 's' || 'save' then save_game
-      elsif input == 'q' || 'quit' then quit_game
-      else invalid_prompt
+      else puts invalid_prompt
       end
     end
 
     def loop
       repl = lambda do |prompt|
         print prompt
-        process(gets.chomp!)
+        process(STDIN.gets.chomp.downcase)
       end
       repl['% Hangman-0.1.0: '] while @status != 'quit'
-      thanks_prompt
+      puts thanks_prompt
     end
   end
 end

data/lib/femis_hangman/version.rb

@@ -1,3 +1,3 @@
 module FemisHangman
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/save_test_games.yaml

@@ -0,0 +1,140 @@
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...
+--- 
+...

data/saved_games.yaml

@@ -5,18 +5,6 @@ turns: 10
 feedback: 2
 status: quit
 --- !ruby/object:FemisHangman::Game
-word: fin-de-siecle
-history:
-- e
-- r
-- n
-- s
-- d
-- y
-turns: 7
-feedback: 2
-status: quit
---- !ruby/object:FemisHangman::Game
 word: delegation
 history:
 - f

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: femis_hangman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Femi Senjobi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - bin/hangman
 - bin/resume
 - bin/setup
+- circle.yml
 - dictionary.txt
 - femis_hangman.gemspec
 - lib/femis_hangman.rb
@@ -87,6 +88,7 @@ files:
 - lib/femis_hangman/router.rb
 - lib/femis_hangman/version.rb
 - lib/femis_hangman/word.rb
+- save_test_games.yaml
 - saved_games.yaml
 homepage: https://github.com/andela-fsenjobi/femis_hangman
 licenses: