femis_hangman 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffed240b470293f0427e2b302c0007a80ef699dc
-  data.tar.gz: d14768e7f51bfb23c844ec9ec0c2fa12e39c92c4
+  metadata.gz: bc8e5ebdddb0d51dc27b78de8a03aaba40033dd7
+  data.tar.gz: 4871521fc341b6aa4821c2d7d5255f0cb6aff5fb
 SHA512:
-  metadata.gz: 88168c14e92463ae6c66de62e35e4fd23b2fd5e5d889e06b30f2fec9cb6bfa02b1adf75fc3b85b0eca7db020a7212cbf2cfb30da023fcbbff2b0c74c8f363774
-  data.tar.gz: 857f460b751fa780df5270f8ce9dfca1093fd485e6e28b72663835e280faa76570c60a4b385a1ede7c025adf4445eada5a2b23d11cb574cf53e2dba19933239b
+  metadata.gz: d89ba5e9f217569d4fc74bb733b1bfc0104c44c62ab52921316eefdfa9065540fe37b1721f971f3230a73ef4206b2492551b85cdd1510021ece1321441abf4e3
+  data.tar.gz: 0627e01a7ee8570f13aafd2f45838248459cc7474f2525c0f5510c2bfccd64573472a441eea24fa3800baa2b26fc2f4414363d3cd7dfabbe1832c5dcad05728c

data/README.md

@@ -6,10 +6,12 @@ Hangman is a game of guesses. A word is randomly selected from a predefined list
 
 The game has three levels:
 1) Beginner       |  4-8 words          |  8 turns
+
 2) Intermediate   |  9-12 words         |  9 turns
+
 3) Advanced       |  Above 12           |  10 turns
 
-The game also has an option of either a boring or graphic output. The boring feedback type looks like `You are dead. The word is unforgatable` while the graphic feedback looks something like:
+The game also has an option of either a boring or graphic output. The boring feedback type looks like `You are dead. The word is unforgatable` while the graphic feedback looks something like a match stick drawing.
 
 ## Installation
 

data/lib/femis_hangman/game.rb

@@ -13,12 +13,9 @@ module FemisHangman
     end
 
     def control(input)
-      if input.size > 1
-        commands(input)
-      elsif input.size == 1
-        play(input)
-      else
-        invalid_prompt
+      if input.size > 1 then commands(input)
+      elsif input.size == 1 then play(input)
+      else invalid_prompt
       end
     end
 
@@ -39,12 +36,11 @@ module FemisHangman
     def include_letter(letter, history)
       if history.include?(letter)
         duplicate_prompt(letter)
-        false
+        @history
       else
         history << letter
         @history = history
       end
-      @history
     end
 
     def check_game
@@ -57,9 +53,8 @@ module FemisHangman
     end
 
     def show_word
-      word = @word.split('')
       output = ''
-      word.each do |letter|
+      @word.split('').each do |letter|
         if @history.include?(letter)
           output << "#{letter} "
         else
@@ -70,13 +65,10 @@ module FemisHangman
     end
 
     def won?
-      word = @word.split('')
       length = 0
-      word.each {|val| length += 1 if @history.include?(val)}
-      if length == word.size
-        true
-      else
-        false
+      @word.split('').each {|val| length += 1 if @history.include?(val)}
+      if length == word.size then true
+      else false
       end
     end
 
@@ -105,10 +97,10 @@ module FemisHangman
     end
 
     def game_history
-      output = ''
       if @history.empty?
-        ''
+        'NO LETTER YET'
       else
+        output = ''
         @history.each {|letter| output << "#{letter} "}
       end
       output

data/lib/femis_hangman/message.rb

@@ -8,7 +8,7 @@ module Message
   end
 
   def load_prompt
-    puts "Choose the game you want to resume.rb from the list below\nPress the respective number"
+    puts "Choose the game you want to resume from the list below\nPress the respective number"
   end
 
   def begin_prompt
@@ -16,12 +16,22 @@ module Message
   end
 
   def instructions_prompt
-    puts "########################################################\n\nThis gem is an implementation of the hangman.rb game.\nAttempt to guess the missing letters correctly.\nYou have a limited number of tries.\nIf you use up all your chances without getting\nthe word correctly, you will be hanged.\n\n"
-    puts "To play a new game: Press 'p' or 'play'"
-    puts "To load a saved game: Press 'l' or 'load'"
-    puts "To show insructions: Press 'i' or 'instructions'"
-    puts "To quit Hangman: Press 'q' or 'quit'"
-    puts "\n########################################################"
+    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
+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 quit Hangman: Press 'q' or 'quit'
+
+########################################################
+    PUTS
   end
 
   def save_prompt
@@ -38,7 +48,7 @@ module Message
   end
 
   def lost_gui(word)
-    puts <<-DEAD
+    puts <<-PUTS
 -+----------+-
  |          |
  |          o
@@ -51,11 +61,11 @@ You are dead!
 ################
 The word is #{word}
 ################
-    DEAD
+    PUTS
   end
 
   def won_gui(word)
-   puts <<-DEAD
+    puts <<-PUTS
 -+----------+-
  |          |
  |
@@ -68,20 +78,20 @@ You are free to go
 ################
 The word is #{word}
 ################
-    DEAD
+    PUTS
   end
 
   def level_prompt
-    puts "Choose your difficulty level\n\n1: Beginner\n2: Intermediate\n3: Advanced"
+    puts "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"
+    puts "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"
+    puts "Press 'r' or 'restart' to play again\nPress 'q' to quit\n"
   end
 
   def invalid_prompt
@@ -109,6 +119,10 @@ The word is #{word}
   end
 
   def game_instruction_prompt
-    puts "Press ':h' or 'history' to view the letters you have used\nPress ':q' or 'quit' to quit (you can save before quiting)"
+    puts <<-PUTS
+Press ':h' or 'history' to view the letters you have used
+Press ':q' or 'quit' to quit (you can save before quiting)
+
+    PUTS
   end
 end

data/lib/femis_hangman/router.rb

@@ -11,12 +11,10 @@ module FemisHangman
       elsif @status == 'feedback' then choose_feedback(input)
       elsif @status == 'start' then begin_game(input)
       elsif @status == 'play' then play_game(input)
-      elsif @status == 'finish' then finish_game(input)
-      elsif @status == 'save' then save_game
+      elsif @status == 'finish' then restart_game(input)
       elsif @status == 'load' then load_game(input)
-      elsif @status == 'quit' || 'end' then quit_game
-      else
-        welcome(input)
+      elsif @status == 'quit' || 'save' then quit_game(input)
+      else welcome(input)
       end
     end
 
@@ -30,24 +28,31 @@ module FemisHangman
       end
     end
 
+    def start_game
+      @status = 'feedback'
+      welcome_prompt
+      feedback_prompt
+    end
+
     def choose_feedback(input)
-      @feedback = input.to_i
-      if @feedback < 1 || @feedback > 2
-        feedback_prompt
-        return
+      if input.to_i < 1 || input.to_i > 2
+        invalid_prompt
+        false
+      else
+        level_prompt
+        @feedback = input.to_i
+        @status = 'start'
       end
-      level_prompt
-      @status = 'start'
     end
 
     def begin_game(input)
-      @difficulty = input.to_i
-      if @difficulty < 1 || @difficulty > 3
+      if input.to_i < 1 || input.to_i > 3
         invalid_prompt
-        return
+      else
+        @difficulty = input.to_i
+        @status = 'play'
+        create_game
       end
-      @status = 'play'
-      create_game
     end
 
     def create_game
@@ -61,45 +66,25 @@ module FemisHangman
 
     def play_game(input)
       if @game.status == 'restart'
-        if input == 'r' || input == 'restart'
-          level_prompt
-          @status = 'start'
-        elsif input == 'q' || input == 'quit'
-          quit_game
-        else invalid_prompt
-        end
+        restart_game(input)
       elsif @game.status == 'quit'
-        if input == 's' || 'save' then save_game
-        elsif input == 'q' || 'quit' then quit_game
-        else
-          invalid_prompt
-        end
+        quit_game(input)
       else @game.control(input)
       end
     end
 
-    def start_game
-      @status = 'feedback'
-      welcome_prompt
-      feedback_prompt
-    end
-
-    def finish_game(input)
-      if input == 'r' || 'restart'
+    def restart_game(input)
+      if input == 'r' || input == 'restart'
+        level_prompt
         @status = 'start'
-        begin_game(input)
-      elsif input == 'q' || 'quit'
-        save_prompt
-        @status = 'save'
-      else
-        invalid_prompt
+      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))}
-      thanks_prompt
-      @status = 'end'
+      @status = 'quit'
     end
 
     def show_saved_games
@@ -108,37 +93,29 @@ module FemisHangman
       i = 0
       YAML.load_stream(File.open('./saved_games.yaml', 'r')).each do |game|
         print "#{i += 1}: "
-        word = game.word.split('')
-        history = game.history
-        word.each do |letter|
-          if history.include?(letter)
-            print "#{letter} "
-          else
-            print '_ '
-          end
-        end
+        print game.show_word
         print "(#{game.turns} turns left)"
         print "\n"
       end
     end
 
     def load_game(input)
-      game_id = input.to_i
-      i = 0
+      game_id = 0
       YAML.load_stream(File.open('./saved_games.yaml', 'r')).each do |game|
-        i += 1
-        if i == game_id
-          @status = 'play'
-          @game = game
-          @game.status = 'play'
-          @game.check_game
-        end
+        game_id += 1
+        @game = game
       end
+      @status = 'play'
+      @game.status = 'play'
+      @game.check_game
     end
 
-    def quit_game
-      @status = 'end'
-      thanks_prompt
+    def quit_game(input=nil)
+      if input.nil? then @status = 'quit'
+      elsif input == 's' || 'save' then save_game
+      elsif input == 'q' || 'quit' then quit_game
+      else invalid_prompt
+      end
     end
 
     def loop
@@ -146,8 +123,8 @@ module FemisHangman
         print prompt
         process(gets.chomp!)
       end
-
-      repl["% Hangman-#{FemisHangman::VERSION}: "] while @status != 'end'
+      repl['% Hangman-0.1.0: '] while @status != 'quit'
+      thanks_prompt
     end
   end
 end

data/lib/femis_hangman/version.rb

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

data/lib/femis_hangman/word.rb

@@ -5,10 +5,8 @@ module FemisHangman
       rand(41211).times { file.gets }
       word = clean_word($_)
       file.close
-      if confirm(difficulty, word)
-        word
-      else
-        generate(difficulty)
+      if confirm(difficulty, word) then word
+      else generate(difficulty)
       end
     end
 
@@ -21,7 +19,7 @@ module FemisHangman
     end
 
     def clean_word(word)
-      cleaned_word = word.gsub("\n", '')
+      word.delete("\n")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: femis_hangman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Femi Senjobi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler