check 2

s-gala · s-gala · commit c4cf533d5904 · 2025-01-11T13:22:34.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 .venv
+.python-version
 demo.cast
-__pycache__/
+__pycache__
+.idea
+.DS_Store
+**/__pycache__/
diff --git a/Makefile b/Makefile
@@ -4,12 +4,27 @@ install:
 brain-games:
 	uv run brain-games
 
+brain-even:
+	uv run brain-even
+
+brain-calc:
+	uv run brain-calc
+
+brain-gcd:
+	uv run brain-gcd
+
+brain-progression:
+	uv run brain-progression
+
+brain-prime:
+	uv run brain-prime
+
 build:
 	uv build
 
 package-install:
 	uv tool install dist/*.whl --force
 	
-make lint:
+lint:
 	uv run ruff check brain_games
 
diff --git a/README.md b/README.md
@@ -1,20 +1,60 @@
+The game "Brain-games" includes 5 games. 
+To win each game, you need to give 3 correct answers.
+
+brain-even:
+You need to answer "yes" if given number is even, otherwise answer "no".
+
+brain-calc:
+You need to write down thr calculation resuits.
+
+brain-gcd:
+Find the greatest common divisor of given numbers.
+
+brain-progression:
+You need to write down which number is missing in the progression.
+
+brain-prime:
+You need to answer "yes" if given number is prime. Otherwise answer "no".
+
+### Commands for calling games:
+brain-even
+brain-calc
+brain-gcd
+brain-progression
+brain-prime
+
 ### Hexlet tests and linter status:
 [![Actions Status](https://github.com/s-gala/python-project-49/actions/workflows/hexlet-check.yml/badge.svg)](https://github.com/s-gala/python-project-49/actions)
 
 ### CodeClimate 
 [![Maintainability](https://api.codeclimate.com/v1/badges/487e17fe16141caa4b2a/maintainability)](https://codeclimate.com/github/s-gala/python-project-49/maintainability)
 
+### This project use:
+Python >= 3.10
+prompt >= 0.4.1
+
+### Install 
+
+git clone https://github.com/s-gala/python-project-49.git
+cd python-project-49
+make package-install
+
+### Removal
+cd pyton-project-49
+cd ../
+rm -rf python-project-49
+
 ### Asciinema even
-[![Demo](https://asciinema.org/a/d0DER5mtYI6eUx8QrBAQuZPD7)
+[![Demo]( https://asciinema.org/a/wRnu8Sf53kCCvUfgqQixs0EPh )
 
-### Asciinema even calc
-[![Demo](https://asciinema.org/a/I5Igo5X4xIsyGS50CBBa0Qcld)
+### Asciinema calc
+[![Demo]( https://asciinema.org/a/S9Bly86EkmrpnTJhsAJU8pQDl )
 
 ### Asciinema gcd
-[![Demo](https://asciinema.org/a/Sa6xEYjF5SZ9GlKZXa1UAEqUo)
+[![Demo]( https://asciinema.org/a/L5FDJeBgVySllsh5oELOwTtKa )
 
 ### Asciinema progression
-[![Demo](https://asciinema.org/a/bCwx5SdlyhaWnMn1TQZIDxtuW)
+[![Demo]( https://asciinema.org/a/geOtpvl2IneSE65iIyp3BSoGY )
 
 ### Asciinema prime
-[![Demo](https://asciinema.org/a/PyxW5Rn3Wu3LMM1EyiPQGu9m3)
+[![Demo](  https://asciinema.org/a/j2PgQoMiKCmVM1duYVp8pnN3i )
diff --git a/brain_games/cli.py b/brain_games/cli.py
@@ -2,5 +2,6 @@
 
 
 def welcome_user():
+    print("Welcome to the Brain Games!") 
     name = prompt.string('May I have your name? ')
-    print('Hello, ' + name + '!')
+    print(f'Hello, {name}!')
diff --git a/brain_games/games/__pycache__/for_all_games.cpython-312.pyc b/brain_games/games/__pycache__/for_all_games.cpython-312.pyc
diff --git a/brain_games/games/__pycache__/for_brain_calc.cpython-312.pyc b/brain_games/games/__pycache__/for_brain_calc.cpython-312.pyc
diff --git a/brain_games/games/__pycache__/for_brain_gcd.cpython-312.pyc b/brain_games/games/__pycache__/for_brain_gcd.cpython-312.pyc
diff --git a/brain_games/games/calc.py b/brain_games/games/calc.py
@@ -0,0 +1,17 @@
+import operator
+import random
+
+INSTRUCTION = "What is result of the expression?" 
+
+
+def question_answer_calc():
+    from brain_games.games import random_number
+    x = random_number.get_random_number(1, 100)
+    y = random_number.get_random_number(1, 100)
+    math_symbol = {'+': operator.add,
+                   '-': operator.sub,
+                   '*': operator.mul}
+    op = random.choice(list(math_symbol.keys()))
+    random_question = f'{x}{op}{y}'
+    right_answer = str(math_symbol.get(op)(x, y)) 
+    return random_question, right_answer
diff --git a/brain_games/games/engine.py b/brain_games/games/engine.py
@@ -9,7 +9,7 @@ def welcome_user(INSTRUCTION):
 
 
 def game_engine(random_question, right_answer, name):
-    print('Question: ' + str(random_question))
+    print(f"Question: {random_question}")
     answer = prompt.string('Your answer: ')
     if right_answer != answer:
         print(f"'{answer}' is wrong answer;(. ", end='')
diff --git a/brain_games/games/even.py b/brain_games/games/even.py
@@ -1,10 +1,9 @@
-from random import randint
-
 INSTRUCTION = 'Answer "yes" if the number is even, otherwise answer "no".'
 
 
 def question_answer_even():
-    random_question = randint(1, 100)
+    from brain_games.games import random_number
+    random_question = random_number.get_random_number(1, 100)
     right_answer = ''
     if random_question % 2 == 0:
         right_answer = 'yes'
diff --git a/brain_games/games/for_brain_calc.py b/brain_games/games/for_brain_calc.py
diff --git a/brain_games/games/gcd.py b/brain_games/games/gcd.py
@@ -1,12 +1,12 @@
 import math
-from random import randint
 
 INSTRUCTION = "Find the greatest common divisor of given numbers." 
 
 
 def question_answer_gcd():
-    x = randint(1, 100)
-    y = randint(1, 100)
-    random_question = str(x) + ' ' + str(y)
+    from brain_games.games import random_number
+    x = random_number.get_random_number(1, 100)
+    y = random_number.get_random_number(1, 100)
+    random_question = f'{x} {y}'
     right_answer = str(math.gcd(x, y))
     return random_question, right_answer
diff --git a/brain_games/games/prime.py b/brain_games/games/prime.py
@@ -1,10 +1,9 @@
-from random import randint
-
 INSTRUCTION = 'Answer "yes" if given number is prime. Otherwise answer "no".'
 
 
 def question_answer_prime():
-    random_question = randint(1, 1000)
+    from brain_games.games import random_number
+    random_question = random_number.get_random_number(1, 100)
     k = 0
     for i in range(2, random_question // 2 + 1):
         if (random_question % i == 0):
diff --git a/brain_games/games/progression.py b/brain_games/games/progression.py
@@ -1,14 +1,13 @@
-from random import randint
-
 INSTRUCTION = "What number is missing in the progression?"
 
 
 def question_answer_progression():
-    x = randint(6, 11)
-    begin = randint(1, 40)
-    step = randint(1, int((100 - begin) / x - 1))
+    from brain_games.games import random_number
+    x = random_number.get_random_number(5, 11)
+    begin = random_number.get_random_number(1, 40)
+    step = random_number.get_random_number(1, int((100 - begin) / x - 1))
     progression = (list(range(begin, 100, step)[:x]))
-    i = randint(0, len(progression) - 1)
+    i = random_number.get_random_number(0, len(progression) - 1)
     right_answer = str(progression[i])
     progression[i] = '..'
     random_question = ''
diff --git a/brain_games/games/random_number.py b/brain_games/games/random_number.py
@@ -0,0 +1,6 @@
+from random import randint
+
+
+def get_random_number(begin, end):
+    number = randint(begin, end)
+    return number
diff --git a/brain_games/scripts/__pycache__/brain_calc.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_calc.cpython-312.pyc
diff --git a/brain_games/scripts/__pycache__/brain_gcd.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_gcd.cpython-312.pyc
diff --git a/brain_games/scripts/__pycache__/brain_progression.cpython-312.pyc b/brain_games/scripts/__pycache__/brain_progression.cpython-312.pyc
diff --git a/brain_games/scripts/brain_calc.py b/brain_games/scripts/brain_calc.py
@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
 def main():
-    from brain_games.games import for_all_games, for_brain_calc
-    INSTRUCTION = for_brain_calc.INSTRUCTION
-    name = for_all_games.welcome_user(INSTRUCTION)
+    from brain_games.games import calc, engine
+    INSTRUCTION = calc.INSTRUCTION
+    name = engine.welcome_user(INSTRUCTION)
     swapped = True
     i = 1
     while swapped:            
         if i < 4:
-            question, answer = for_brain_calc.question_answer_calc()
-            swapped = for_all_games.game_engine(question, answer, name)
+            question, answer = calc.question_answer_calc()
+            swapped = engine.game_engine(question, answer, name)
             i += 1
         else:
             print(f"Congratulations, {name}!")
diff --git a/brain_games/scripts/brain_even.py b/brain_games/scripts/brain_even.py
@@ -2,15 +2,15 @@
 
 
 def main():
-    from brain_games.games import for_all_games, for_brain_even
-    INSTRUCTION = for_brain_even.INSTRUCTION
-    name = for_all_games.welcome_user(INSTRUCTION)
+    from brain_games.games import engine, even
+    INSTRUCTION = even.INSTRUCTION
+    name = engine.welcome_user(INSTRUCTION)
     swapped = True
     i = 1
     while swapped:            
         if i < 4:
-            question, answer = for_brain_even.question_answer_even()
-            swapped = for_all_games.game_engine(question, answer, name)
+            question, answer = even.question_answer_even()
+            swapped = engine.game_engine(question, answer, name)
             i += 1
         else:
             print(f"Congratulations, {name}!")
diff --git a/brain_games/scripts/brain_gcd.py b/brain_games/scripts/brain_gcd.py
@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
 def main():
-    from brain_games.games import for_all_games, for_brain_gcd
-    INSTRUCTION = for_brain_gcd.INSTRUCTION
-    name = for_all_games.welcome_user(INSTRUCTION)
+    from brain_games.games import engine, gcd
+    INSTRUCTION = gcd.INSTRUCTION
+    name = engine.welcome_user(INSTRUCTION)
     swapped = True
     i = 1
     while swapped:            
         if i < 4:
-            question, answer = for_brain_gcd.question_answer_gcd()
-            swapped = for_all_games.game_engine(question, answer, name)
+            question, answer = gcd.question_answer_gcd()
+            swapped = engine.game_engine(question, answer, name)
             i += 1
         else:
             print(f"Congratulations, {name}!")
diff --git a/brain_games/scripts/brain_prime.py b/brain_games/scripts/brain_prime.py
@@ -1,15 +1,15 @@
 #!/usr/bin/env python3
 
 def main():
-    from brain_games.games import for_all_games, for_brain_prime
-    INSTRUCTION = for_brain_prime.INSTRUCTION
-    name = for_all_games.welcome_user(INSTRUCTION)
+    from brain_games.games import engine, prime
+    INSTRUCTION = prime.INSTRUCTION
+    name = engine.welcome_user(INSTRUCTION)
     swapped = True
     i = 1
     while swapped:            
         if i < 4:
-            question, answer = for_brain_prime.question_answer_prime()
-            swapped = for_all_games.game_engine(question, answer, name)
+            question, answer = prime.question_answer_prime()
+            swapped = engine.game_engine(question, answer, name)
             i += 1
         else:
             print(f"Congratulations, {name}!")
diff --git a/brain_games/scripts/brain_progression.py b/brain_games/scripts/brain_progression.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 
 def main():
-    from brain_games.games import for_all_games, for_brain_progression
-    INSTRUCTION = for_brain_progression.INSTRUCTION
-    name = for_all_games.welcome_user(INSTRUCTION)
+    from brain_games.games import engine, progression
+    INSTRUCTION = progression.INSTRUCTION
+    name = engine.welcome_user(INSTRUCTION)
     swapped = True
     i = 1
     while swapped:            
         if i < 4:
-            question, answer = for_brain_progression.\
+            question, answer = progression.\
                 question_answer_progression()
-            swapped = for_all_games.game_engine(question, answer, name)
+            swapped = engine.game_engine(question, answer, name)
             i += 1
         else:
             print(f"Congratulations, {name}!")
diff --git a/hello.py b/hello.py
