tobi-mastermind 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90c82361b37324c107990abb8336d085795b1dfd
-  data.tar.gz: 38cc4b58d57efcc9066588c0ee0e00e19aa27e36
+  metadata.gz: 371b62b6e9da0e85c74d914c8bb1d53f76f1be71
+  data.tar.gz: ca7fbd38b813e053ce1069a604a6ae8002a87dde
 SHA512:
-  metadata.gz: bab88ba83c5ca30683d603a55b468b35d7587c4ab228287dbe05d92ec0b2d0064e26582d02add45693b1f826580f9c463e98b317061119ea6b00bf0325f22c3b
-  data.tar.gz: f5f456ec4734be6503cc6441e64ef488b7cd1941588aa03dcfb3aff1fec1c85df3b247c531081033d2f3012a9ff44a089dadb955e571652e8e8f08856638a2b1
+  metadata.gz: 1bcb4b69fdcc746c3ebc4959fb0111348aa99d5ab2a71d6d8c61679f13695f927fc1757cc1813b3515dc411dcc4105596a6eb5b9479602fde8207903d86b0fa5
+  data.tar.gz: d3a217459fce55788ad12f776f0fcd9acf3de982794ff3c8893fc8f6c46e79ad70867b15d24b6e91e13f56ab1a9fa2303246be77b9b359ce1f931fade7a98b36

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "tobi/mastermind"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "tobi/mastermind"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/mastermind

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
-
-require 'mastermind_start'
-
+#!/usr/bin/env ruby
+
+require 'mastermind_start'
+
 MasterMind::Tobi.start

data/bin/setup

@@ -1,7 +1,7 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/mastermind/tobi/gamehelper.rb

@@ -1,106 +1,88 @@
-require 'ui'
-require 'logic'
-require 'single_game'
-require 'multi_game'
-
-module MasterMind
-  module Tobi
-    module GameHelper
-      def user_choice
-        option_chosen = false
-        
-        while !option_chosen
-          option_chosen = true                              # assume user selects valid option so as to quit loop
-          
-          input = gets.chomp.downcase
-          option_chosen = validate_input?(input)
-        end
-      end
-      
-      def validate_input?(input)
-        case input
-          when "p", "play" then play_game
-          when "r", "read"
-            print_help
-            return false                                     # continue loop after displaying help message
-          when "q", "quit" then exit
-          else                                               # user selects an invalid option
-            print UI::INVALID_MESSAGE
-            return false
-        end
-        return true
-      end
-      
-      def play_game
-        game_logic = GameLogic.new(ask_level); sequence = game_logic.generate_sequence
-        ask_mode(sequence, game_logic)
-        puts ""
-        print UI::OPTIONS_MESSAGE + UI::INPUT_PROMPT
-        user_choice
-      end
-      
-      def ask_mode(sequence, game_logic)
-        print UI::MODE_SELECT
-        option_chosen = false
-        
-        while !option_chosen
-          option_chosen = true                              # assume user selects valid option so as to quit loop
-          
-          input = gets.chomp.downcase
-          case input
-          when "s", "single" then SinglePlayer.new(sequence, game_logic).start_game
-          when "m", "multi"
-            print UI::PASSWORD_MESSAGE
-            hide_guess = MasterMind::Tobi::GameHelper.yes_or_no?
-            MultiPlayer.new(sequence, game_logic, hide_guess).start_game
-          else 
-            print UI::INVALID_MESSAGE
-            option_chosen = false
-          end
-        end
-        
-      end
-      
-      def self.yes_or_no?
-        option_chosen = false
-        
-        while !option_chosen
-          option_chosen = true                              # assume user selects valid option so as to quit loop
-          
-          input = gets.chomp.downcase
-          case input                                        
-          when "y", "yes" then return true
-          when "n", "no" then return false
-          else                                               # user selects an invalid option
-            print UI::INVALID_MESSAGE
-            option_chosen = false
-          end  
-        end
-      end
-      
-      def print_help
-        puts UI::HELP_MESSAGE
-        print UI::OPTIONS_MESSAGE + UI::INPUT_PROMPT
-      end
-      
-      def ask_level
-        print UI::LEVEL_MESSAGE
-        option_chosen = false
-        
-        while !option_chosen
-          option_chosen = true                              # assume user selects valid level so as to quit loop
-          
-          input = gets.chomp.downcase
-          case input                                        
-          when "b", "beginner" then return GameLogic::BEGINNER
-          when "i", "intermediate" then return GameLogic::INTERMEDIATE
-          when "a", "advanced" then return GameLogic::ADVANCED
-          else                                               # user selects an invalid level
-            print UI::INVALID_MESSAGE
-            option_chosen = false
-          end  
-        end
-      end
-    end 
-  end
+require 'ui'
+require 'logic'
+require 'single_game'
+require 'multi_game'
+
+module MasterMind
+  module Tobi
+    class GameHelper
+      def user_choice
+        option_chosen = false
+        
+        while !option_chosen
+          option_chosen = true                              # assume user selects valid option so as to quit loop
+          
+          input = gets.chomp.downcase
+          option_chosen = validate_input?(input)
+        end
+      end
+      
+      def validate_input?(input)
+        case input
+          when "p", "play" then play_game
+          when "r", "read"
+            print_help
+            return false                                     # continue loop after displaying help message
+          when "q", "quit" then exit
+          else                                               # user selects an invalid option
+            print UI::INVALID_MESSAGE
+            return false
+        end
+      end
+      
+      def play_game
+        game_logic = GameLogic.new(ask_level); sequence = game_logic.generate_sequence
+        ask_mode(sequence, game_logic)
+        puts ""
+        print UI::OPTIONS_MESSAGE + UI::INPUT_PROMPT
+        user_choice
+      end
+      
+      def ask_mode(sequence, game_logic)
+        print UI::MODE_SELECT
+        option_chosen = false
+        
+        while !option_chosen
+          option_chosen = true                              # assume user selects valid option so as to quit loop
+          
+          input = gets.chomp.downcase
+          case input
+          when "s", "single" then SinglePlayer.new(sequence, game_logic).start_game
+          when "m", "multi"
+            print UI::PASSWORD_MESSAGE
+            hide_guess = MasterMind::Tobi::GameMethods.new.yes_or_no?
+            MultiPlayer.new(sequence, game_logic, hide_guess).start_game
+          else 
+            print UI::INVALID_MESSAGE
+            option_chosen = false
+          end
+        end
+        
+      end
+      
+      def print_help
+        puts UI::HELP_MESSAGE
+        print UI::OPTIONS_MESSAGE + UI::INPUT_PROMPT
+      end
+      
+      def ask_level
+        print UI::LEVEL_MESSAGE
+        option_chosen = false
+        
+        while !option_chosen
+          option_chosen = true                              # assume user selects valid level so as to quit loop
+          
+          input = gets.chomp.downcase
+          case input                                        
+          when "b", "beginner" then return GameLogic::BEGINNER
+          when "i", "intermediate" then return GameLogic::INTERMEDIATE
+          when "a", "advanced" then return GameLogic::ADVANCED
+          else                                               # user selects an invalid level
+            print UI::INVALID_MESSAGE
+            option_chosen = false
+          end  
+        end
+      end
+    end 
+  end
 end

data/lib/mastermind/tobi/gamemethods.rb

@@ -1,91 +1,107 @@
-require 'ui'
-require 'gamehelper'
-module MasterMind
-  module Tobi
-    module GameMethods
-      
-      def average_string(top_ten_list, current_player)                                    # generates user's performance compared to average
-        time_diff, guess_diff = difference(top_ten_list, current_player)
-        
-        "That's %s %s and %s %s %s the average\n" % [time_convert(time_diff.abs), time_diff < 0 ? "slower" : "faster",
-          guess_diff.abs, guess_diff.abs == 1 ? "guess" : "guesses", guess_diff < 0 ? "more" : "fewer"]
-      end
-      
-      def difference(top_ten_list, current_player)
-        total_time = 0
-        total_guess = 0
-        
-        diff_hash = top_ten_list.each{ |player| 
-          total_time += player.time
-          total_guess += player.guesses 
-        }
-        
-        average_time = (total_time.to_f/top_ten_list.length).round - current_player.time
-        average_guess = (total_guess.to_f/top_ten_list.length).round - current_player.guesses
-        
-        return average_time, average_guess
-      end
-      
-      def print_top_ten(current_player)
-        top_ten_list = get_top_ten
-        
-        puts average_string(top_ten_list, current_player) if top_ten_list.length > 1     # print out user's performance compared to average
-        
-        # print out top ten results
-        if !top_ten_list.nil?
-          puts ""
-          puts UI::TOP_TEN                                                                  
-          top_ten_list.each_with_index{|player, index| puts "#{index+1}. " + player.to_s }
-        end
-      end
-      
-      def get_top_ten
-        YAML.load_stream(File.open(UI::DB_STORE)).sort{|player1, player2|  # load player objects from db and sort by guesses/time
-          by_guess = player1.guesses <=> player2.guesses                                  # first sort by guesses
-          by_guess == 0 ? player1.time <=> player2.time : by_guess                        # then sort by time
-        }[0...10]  if File.file?(UI::DB_STORE)                                            # pick out top ten
-      end
-      
-      def store_game(sequence, guesses, time)      #get player name and store details to file  
-        print UI::NAME_MESSAGE
-        name = get_name
-        current_player = Player.new(name, sequence, time, guesses)  # create new player object
-        
-        # write player object to file if file does not exist, or verify whether to add record from user, and write if it exists
-        File.open(UI::DB_STORE, 'a'){|file| file.write(YAML.dump(current_player))} if user_permits_store?
-         
-        current_player
-      end
-      
-      def user_permits_store?                    # confirm from user to add record to top-scores if file exists
-        return true if !File.exist?(UI::DB_STORE)    # if file does not exist, return true
-        print UI::OVERWRITE_MESSAGE
-        print UI::INPUT_PROMPT
-        option_chosen = false
-        
-        return MasterMind::Tobi::GameHelper.yes_or_no?
-      end
-      
-      def get_name
-        name = ""
-        
-        while name.eql?("")
-          name = gets.chomp.capitalize
-          print UI::INVALID_MESSAGE if name.eql?("")  
-        end
-        
-        name
-      end
-         
-      def print_history(history)
-        if history.empty?
-          print "No history yet. Enter a guess"  + UI::INPUT_PROMPT
-        else
-          puts ""
-          puts history
-          print UI::INPUT_PROMPT 
-        end
-      end
-    end
-  end
+require 'ui'
+require 'gamehelper'
+module MasterMind
+  module Tobi
+    class GameMethods
+      def average_string(top_ten_list, current_player)                                    # generates user's performance compared to average
+        time_diff, guess_diff = difference(top_ten_list, current_player)
+        
+        "That's %s %s and %s %s %s the average\n" % [time_convert(time_diff.abs), time_diff < 0 ? "slower" : "faster",
+          guess_diff.abs, guess_diff.abs == 1 ? "guess" : "guesses", guess_diff < 0 ? "more" : "fewer"]
+      end
+      
+      def difference(top_ten_list, current_player)
+        total_time = 0
+        total_guess = 0
+        
+        diff_hash = top_ten_list.each{ |player| 
+          total_time += player.time
+          total_guess += player.guesses 
+        }
+        
+        average_time = (total_time.to_f/top_ten_list.length).round - current_player.time
+        average_guess = (total_guess.to_f/top_ten_list.length).round - current_player.guesses
+        
+        return average_time, average_guess
+      end
+      
+      def print_top_ten(current_player)
+        top_ten_list = get_top_ten
+        
+        puts average_string(top_ten_list, current_player) if top_ten_list.length > 1     # print out user's performance compared to average
+        
+        # print out top ten results
+        if !top_ten_list.nil?
+          puts ""
+          puts UI::TOP_TEN                                                                  
+          top_ten_list.each_with_index{|player, index| puts "#{index+1}. " + player.to_s }
+        end
+      end
+      
+      def get_top_ten
+        YAML.load_stream(File.open(UI::DB_STORE)).sort{|player1, player2|  # load player objects from db and sort by guesses/time
+          by_guess = player1.guesses <=> player2.guesses                                  # first sort by guesses
+          by_guess == 0 ? player1.time <=> player2.time : by_guess                        # then sort by time
+        }[0...10]  if File.file?(UI::DB_STORE)                                            # pick out top ten
+      end
+      
+      def store_game(sequence, guesses, time)      #get player name and store details to file  
+        print UI::NAME_MESSAGE
+        name = get_name
+        current_player = Player.new(name, sequence, time, guesses)  # create new player object
+        
+        # write player object to file if file does not exist, or verify whether to add record from user, and write if it exists
+        File.open(UI::DB_STORE, 'a'){|file| file.write(YAML.dump(current_player))} if user_permits_store?
+         
+        current_player
+      end
+      
+      def user_permits_store?                    # confirm from user to add record to top-scores if file exists
+        return true if !File.exist?(UI::DB_STORE)    # if file does not exist, return true
+        print UI::OVERWRITE_MESSAGE
+        print UI::INPUT_PROMPT
+        option_chosen = false
+        
+        return yes_or_no?
+      end
+      
+      def yes_or_no?
+        option_chosen = false
+        
+        while !option_chosen
+          option_chosen = true                              # assume user selects valid option so as to quit loop
+          
+          input = gets.chomp.downcase
+          case input                                        
+          when "y", "yes" then return true
+          when "n", "no" then return false
+          else                                               # user selects an invalid option
+            print UI::INVALID_MESSAGE
+            option_chosen = false
+          end  
+        end
+      end
+      
+      def get_name
+        name = ""
+        
+        while name.eql?("")
+          name = gets.chomp.capitalize
+          print UI::INVALID_MESSAGE if name.eql?("")  
+        end
+        
+        name
+      end
+         
+      def print_history(history)
+        if history.empty?
+          print "No history yet. Enter a guess"  + UI::INPUT_PROMPT
+        else
+          puts ""
+          puts history
+          print UI::INPUT_PROMPT 
+        end
+      end
+    end
+  end
 end