mod magic number, del relation build.gradle.kts, mod Makefile

alexeichuprikov · alexeichuprikov · commit db1a58f193b2 · 2025-10-15T14:36:39.000+03:00
diff --git a/app/Makefile b/app/Makefile
@@ -1,2 +1,13 @@
+.PHONY: build install clean run-dist
+
+build:
+	./gradlew build
+
+install:
+	./gradlew installDist
+
+clean:
+	./gradlew clean
+
 run-dist:
-	./build/install/app/bin/app
+	./build/install/app/bin/app
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,7 +1,5 @@
 plugins {
     id("application")
-    id("se.patrikerdes.use-latest-versions") version "0.2.19"
-    id("com.github.ben-manes.versions") version "0.41.0"
     id("checkstyle")
 }
 
@@ -21,15 +19,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
     implementation("org.apache.commons:commons-lang3:3.14.0")
 }
 
-tasks.test {
-    useJUnitPlatform()
-}
-
 tasks.getByName("run", JavaExec::class) {
     standardInput = System.`in`
 }
diff --git a/app/src/main/java/hexlet/code/App.java b/app/src/main/java/hexlet/code/App.java
@@ -1,6 +1,10 @@
 package hexlet.code;
 
-import hexlet.code.games.*;
+import hexlet.code.games.Calc;
+import hexlet.code.games.Even;
+import hexlet.code.games.Gcd;
+import hexlet.code.games.Prime;
+import hexlet.code.games.Progression;
 
 import java.util.Scanner;
 
@@ -46,4 +50,4 @@ public static void main(String[] args) {
         scanner.close();
     }
 
-}
+}
diff --git a/app/src/main/java/hexlet/code/Engine.java b/app/src/main/java/hexlet/code/Engine.java
@@ -2,12 +2,45 @@
 
 public class Engine {
 
-    public static int rounds = 3;
-    public static String questionText = "Question: ";
-    public static String answerText = "Your answer: ";
-    public static String correctAnswer = "Correct!";
-    public static String wrongAnswer = "'%s' is wrong answer ;(. Correct answer was '%s'.";
-    public static String retry = "Let's try again, %s!";
-    public static String congratulations = "Congratulations, %s!";
+    private static final int ROUNDS = 3;
+    //границы случайных чисел не были обозначены сделал от 1 до 100. требуется уточнение у аналитика
+    private static final int MAX_NUMBER = 100;
+    private static final String QUESTION_TEXT = "Question: ";
+    private static final String ANSWER_TEXT = "Your answer: ";
+    private static final String CORRECT_ANSWER = "Correct!";
+    private static final String WRONG_ANSWER = "'%s' is wrong answer ;(. Correct answer was '%s'.";
+    private static final String RETRY = "Let's try again, %s!";
+    private static final String CONGRATULATIONS = "Congratulations, %s!";
 
+    public static int getRounds() {
+        return ROUNDS;
+    }
+
+    public static int getMaxNumber() {
+        return MAX_NUMBER;
+    }
+
+    public static String getQuestionText() {
+        return QUESTION_TEXT;
+    }
+
+    public static String getAnswerText() {
+        return ANSWER_TEXT;
+    }
+
+    public static String getCorrectAnswer() {
+        return CORRECT_ANSWER;
+    }
+
+    public static String getWrongAnswer() {
+        return WRONG_ANSWER;
+    }
+
+    public static String getRetry() {
+        return RETRY;
+    }
+
+    public static String getCongratulations() {
+        return CONGRATULATIONS;
+    }
 }
diff --git a/app/src/main/java/hexlet/code/games/Calc.java b/app/src/main/java/hexlet/code/games/Calc.java
@@ -11,10 +11,10 @@ public static void play() {
         System.out.println("What is the result of the expression?");
         Scanner scanner = new Scanner(System.in);
 
-        for (int i = 1; i <= Engine.rounds; i++) {
-            int firstValue = (int) (Math.random() * 100) + 1;
-            int secondValue = (int) (Math.random() * 100) + 1;
-            char signs[] = {'+', '-', '*'};
+        for (int i = 1; i <= Engine.getRounds(); i++) {
+            int firstValue = (int) (Math.random() * Engine.getMaxNumber()) + 1;
+            int secondValue = (int) (Math.random() * Engine.getMaxNumber()) + 1;
+            char[] signs = {'+', '-', '*'};
             char randomSign = signs[(int) (Math.random() * signs.length)];
             int rightAnswer = 0;
 
@@ -33,18 +33,18 @@ public static void play() {
                     break;
             }
 
-            System.out.println(Engine.questionText + firstValue + " " + randomSign + " " + secondValue);
-            System.out.print(Engine.answerText);
+            System.out.println(Engine.getQuestionText() + firstValue + " " + randomSign + " " + secondValue);
+            System.out.print(Engine.getAnswerText());
             int answer = scanner.nextInt();
 
             if (answer == rightAnswer) {
-                System.out.println(Engine.correctAnswer);
+                System.out.println(Engine.getCorrectAnswer());
             } else {
-                System.out.printf(Engine.wrongAnswer, answer, rightAnswer);
-                System.out.printf(Engine.retry, userName);
+                System.out.printf(Engine.getWrongAnswer(), answer, rightAnswer);
+                System.out.printf(Engine.getRetry(), userName);
                 return;
             }
         }
-        System.out.printf(Engine.congratulations, userName);
+        System.out.printf(Engine.getCongratulations(), userName);
     }
 }
diff --git a/app/src/main/java/hexlet/code/games/Even.java b/app/src/main/java/hexlet/code/games/Even.java
@@ -11,25 +11,25 @@ public static void play() {
         System.out.println("Answer 'yes' if the number is even, otherwise answer 'no'.");
         Scanner scanner = new Scanner(System.in);
 
-        for (int i = 1; i <= Engine.rounds; i++) {
-            int random = (int) (Math.random() * 1000) + 1; //границы случайных чисел не были обозначены сделал от 1 до 1000. требуется уточнение у аналитика :)
-            System.out.println(Engine.questionText + random);
-            System.out.print(Engine.answerText);
+        for (int i = 1; i <= Engine.getRounds(); i++) {
+            int random = (int) (Math.random() * Engine.getMaxNumber()) + 1;
+            System.out.println(Engine.getQuestionText() + random);
+            System.out.print(Engine.getAnswerText());
             String answer = scanner.nextLine();
 
             boolean isEven = random % 2 == 0;
             String rightAnswer = isEven ? "yes" : "no";
 
 
             if (answer.equals(rightAnswer)) {
-                System.out.println(Engine.correctAnswer);
+                System.out.println(Engine.getCorrectAnswer());
             } else {
-                System.out.printf(Engine.wrongAnswer, answer, rightAnswer);
-                System.out.printf(Engine.retry, userName);
+                System.out.printf(Engine.getWrongAnswer(), answer, rightAnswer);
+                System.out.printf(Engine.getRetry(), userName);
                 return;
             }
         }
-        System.out.printf(Engine.congratulations, userName);
+        System.out.printf(Engine.getCongratulations(), userName);
 
     }
 }
diff --git a/app/src/main/java/hexlet/code/games/Gcd.java b/app/src/main/java/hexlet/code/games/Gcd.java
@@ -11,9 +11,9 @@ public static void play() {
         System.out.println("Find the greatest common divisor of given numbers.");
         Scanner scanner = new Scanner(System.in);
 
-        for (int i = 1; i <= Engine.rounds; i++) {
-            int firstValue = (int) (Math.random() * 100) + 1;
-            int secondValue = (int) (Math.random() * 100) + 1;
+        for (int i = 1; i <= Engine.getRounds(); i++) {
+            int firstValue = (int) (Math.random() * Engine.getMaxNumber()) + 1;
+            int secondValue = (int) (Math.random() * Engine.getMaxNumber()) + 1;
             int rightAnswer = 0;
 
             int tempFirstValue = firstValue;
@@ -25,18 +25,18 @@ public static void play() {
                 tempFirstValue = rightAnswer;
             }
 
-            System.out.println(Engine.answerText + firstValue + " " + secondValue);
-            System.out.print(Engine.answerText);
+            System.out.println(Engine.getQuestionText() + firstValue + " " + secondValue);
+            System.out.print(Engine.getAnswerText());
             int answer = scanner.nextInt();
 
             if (answer == rightAnswer) {
-                System.out.println(Engine.correctAnswer);
+                System.out.println(Engine.getCorrectAnswer());
             } else {
-                System.out.printf(Engine.wrongAnswer, answer, rightAnswer);
-                System.out.printf(Engine.retry, userName);
+                System.out.printf(Engine.getWrongAnswer(), answer, rightAnswer);
+                System.out.printf(Engine.getRetry(), userName);
                 return;
             }
         }
-        System.out.printf(Engine.congratulations, userName);
+        System.out.printf(Engine.getCongratulations(), userName);
     }
 }
diff --git a/app/src/main/java/hexlet/code/games/Prime.java b/app/src/main/java/hexlet/code/games/Prime.java
@@ -11,23 +11,23 @@ public static void play() {
         System.out.println("Answer 'yes' if given number is prime. Otherwise answer 'no'.");
         Scanner scanner = new Scanner(System.in);
 
-        for (int i = 1; i <= Engine.rounds; i++) {
-            int num = (int) (Math.random() * 100) + 1;
+        for (int i = 1; i <= Engine.getRounds(); i++) {
+            int num = (int) (Math.random() * Engine.getMaxNumber()) + 1;
             String rightAnswer = logicPrime(num);
 
-            System.out.println(Engine.answerText + num);
-            System.out.print(Engine.answerText);
+            System.out.println(Engine.getQuestionText() + num);
+            System.out.print(Engine.getAnswerText());
             String answer = scanner.next();
 
             if (answer.equals(rightAnswer)) {
-                System.out.println(Engine.correctAnswer);
+                System.out.println(Engine.getCorrectAnswer());
             } else {
-                System.out.printf(Engine.wrongAnswer, answer, rightAnswer);
-                System.out.printf(Engine.retry, userName);
+                System.out.printf(Engine.getWrongAnswer(), answer, rightAnswer);
+                System.out.printf(Engine.getRetry(), userName);
                 return;
             }
         }
-        System.out.printf(Engine.congratulations, userName);
+        System.out.printf(Engine.getCongratulations(), userName);
     }
 
 
diff --git a/app/src/main/java/hexlet/code/games/Progression.java b/app/src/main/java/hexlet/code/games/Progression.java
@@ -6,41 +6,43 @@
 import java.util.Scanner;
 
 public class Progression {
+    private static final int STEP_COUNT = 10;
+    private static final int VALUE_COUNT = 10;
+
     public static void play() {
         String userName = Cli.greet();
         System.out.println("What number is missing in the progression?");
         Scanner scanner = new Scanner(System.in);
 
 
-        for (int i = 1; i <= Engine.rounds; i++) {
-            int start = (int) (Math.random() * 20) + 1;
-            int step = (int) (Math.random() * 10) + 1;
-            int length = 10;
-            int[] sequence = addSequence(start, step, length);
+        for (int i = 1; i <= Engine.getRounds(); i++) {
+            int start = (int) (Math.random() * Engine.getMaxNumber()) + 1;
+            int step = (int) (Math.random() * STEP_COUNT) + 1;
+            int[] sequence = addSequence(start, step, VALUE_COUNT);
 
-            int hideIndex = (int) (Math.random() * length);
+            int hideIndex = (int) (Math.random() * VALUE_COUNT);
             int rightAnswer = sequence[hideIndex];
 
-            System.out.print(Engine.answerText);
-            for (int j = 0; j < length; j++) {
+            System.out.print(Engine.getQuestionText());
+            for (int j = 0; j < VALUE_COUNT; j++) {
                 if (j == hideIndex) {
                     System.out.print(".. ");
                 } else {
                     System.out.print(sequence[j] + " ");
                 }
             }
-            System.out.print(Engine.answerText);
+            System.out.print(Engine.getAnswerText());
             int answer = scanner.nextInt();
 
             if (answer == rightAnswer) {
-                System.out.println(Engine.correctAnswer);
+                System.out.println(Engine.getCorrectAnswer());
             } else {
-                System.out.printf(Engine.wrongAnswer, answer, rightAnswer);
-                System.out.printf(Engine.retry, userName);
+                System.out.printf(Engine.getWrongAnswer(), answer, rightAnswer);
+                System.out.printf(Engine.getRetry(), userName);
                 return;
             }
         }
-        System.out.printf(Engine.congratulations, userName);
+        System.out.printf(Engine.getCongratulations(), userName);
     }
 
     public static int[] addSequence(int start, int step, int length) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("application")`
`3`		`- id("se.patrikerdes.use-latest-versions") version "0.2.19"`
`4`		`- id("com.github.ben-manes.versions") version "0.41.0"`
`5`	`3`	`id("checkstyle")`
`6`	`4`	`}`
`7`	`5`
`@@ -21,15 +19,9 @@ repositories {`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`dependencies {`
`24`		`- testImplementation(platform("org.junit:junit-bom:5.10.0"))`
`25`		`- testImplementation("org.junit.jupiter:junit-jupiter")`
`26`	`22`	`implementation("org.apache.commons:commons-lang3:3.14.0")`
`27`	`23`	`}`
`28`	`24`
`29`		`-tasks.test {`
`30`		`- useJUnitPlatform()`
`31`		`-}`
`32`		`-`
`33`	`25`	`tasks.getByName("run", JavaExec::class) {`
`34`	`26`	standardInput = System.`in`
`35`	`27`	`}`