Fixing some typos.

Author: krulis-martin

CMakeLists.txt

@@ -156,8 +156,8 @@ set(SOURCE_FILES
 	${TASKS_DIR}/internal/mkdir_task.cpp
 	${TASKS_DIR}/internal/rm_task.h
 	${TASKS_DIR}/internal/rm_task.cpp
-	${TASKS_DIR}/internal/archivate_task.h
-	${TASKS_DIR}/internal/archivate_task.cpp
+	${TASKS_DIR}/internal/archive_task.h
+	${TASKS_DIR}/internal/archive_task.cpp
 	${TASKS_DIR}/internal/extract_task.h
 	${TASKS_DIR}/internal/extract_task.cpp
 	${TASKS_DIR}/internal/fetch_task.h

recodex-worker.spec

@@ -1,8 +1,8 @@
 %define name recodex-worker
 %define short_name worker
 %define version 1.9.1
-%define unmangled_version 885c6bb4b3fa8e21400636f1bee1aefed19956e9
-%define release 1
+%define unmangled_version f267aa9d46aa908c56632af351d51f140de7e01c
+%define release 2
 
 %define spdlog_name spdlog
 %define spdlog_version 0.13.0

src/config/task_results.h

@@ -23,7 +23,7 @@ enum class task_status { OK, FAILED, SKIPPED };
 
 /**
  * Sandbox results.
- * @note Not all items must be returned from sandbox, so some defaults may aply.
+ * @note Not all items must be returned from sandbox, so some defaults may apply.
  */
 struct sandbox_results {
 	/**
@@ -42,7 +42,7 @@ struct sandbox_results {
 	 */
 	float wall_time = 0;
 	/**
-	 * Flag if program exited normaly or was killed.
+	 * Flag if program exited normally or was killed.
 	 * Default: false
 	 */
 	bool killed = false;
@@ -139,7 +139,7 @@ struct task_results {
 	std::unique_ptr<sandbox_results> sandbox_status = nullptr;
 
 	/**
-	 * Constructor with default values initiazation.
+	 * Constructor with default values initialization.
 	 */
 	task_results() = default;
 	/**

src/job/job.h

@@ -26,7 +26,7 @@ namespace fs = std::filesystem;
  * Job is built from configuration in which all information should be provided.
  * Job building results in task tree and task queue in which task should be evaluated.
  * @note During construction job_metadata structure is given. This structure is editable and
- * there is posibility it can be changed by whoever constructed a job class.
+ * there is possibility it can be changed by whoever constructed a job class.
  * In actual ReCodEx worker this situation can never happen. But be aware of this and keep it in mind in other coding.
  * Also do not change job_metadata or task_metadata structure between construction of tasks and its execution.
  * If you do it, you should watch your back, devil will be always very close!
@@ -41,7 +41,7 @@ class job
 	 * @param job_meta
 	 * @param worker_conf
 	 * @param working_directory Directory for temporary saving of files by tasks. Example
-	 *							use case is storing isolate's meta log file.
+	 *							use case is storing sandbox's meta log file.
 	 * @param source_path path to source codes of submission
 	 * @param result_path path to directory containing all results
 	 * @param factory used in creation of task objects
@@ -120,7 +120,7 @@ class job
 	 */
 	void prepare_job_vars();
 	/**
-	 * Replace occurences of job config variables and return the resulting string
+	 * Replace occurrences of job config variables and return the resulting string
 	 * @param src scanned string for variables
 	 * @return new string with all variables replaced with values
 	 */

src/sandbox/isolate_sandbox.cpp

@@ -296,7 +296,7 @@ void isolate_sandbox::isolate_run(const std::string &binary, const std::vector<s
 			waitpid(childpid, &status, 0);
 			// Kill control process. If it already exits, nothing will be done
 			kill(controlpid, SIGKILL);
-			// Remove zombie from controll process.
+			// Remove zombie from control process.
 			waitpid(controlpid, NULL, 0);
 
 			// isolate was killed

src/tasks/internal/archivate_task.cpp src/tasks/internal/archive_task.cppsrc/tasks/internal/archivate_task.cpp renamed to src/tasks/internal/archive_task.cpp

@@ -1,8 +1,8 @@
-#include "archivate_task.h"
+#include "archive_task.h"
 #include "archives/archivator.h"
 
 
-archivate_task::archivate_task(std::size_t id, std::shared_ptr<task_metadata> task_meta) : task_base(id, task_meta)
+archive_task::archive_task(std::size_t id, std::shared_ptr<task_metadata> task_meta) : task_base(id, task_meta)
 {
 	if (task_meta_->cmd_args.size() != 2) {
 		throw task_exception(
@@ -11,7 +11,7 @@ archivate_task::archivate_task(std::size_t id, std::shared_ptr<task_metadata> ta
 }
 
 
-std::shared_ptr<task_results> archivate_task::run()
+std::shared_ptr<task_results> archive_task::run()
 {
 	std::shared_ptr<task_results> result(new task_results());
 

src/tasks/internal/archivate_task.h src/tasks/internal/archive_task.hsrc/tasks/internal/archivate_task.h renamed to src/tasks/internal/archive_task.h

@@ -1,33 +1,33 @@
-#ifndef RECODEX_WORKER_INTERNAL_ARCHIVATE_TASK_H
-#define RECODEX_WORKER_INTERNAL_ARCHIVATE_TASK_H
+#ifndef RECODEX_WORKER_INTERNAL_ARCHIVE_TASK_H
+#define RECODEX_WORKER_INTERNAL_ARCHIVE_TASK_H
 
 #include "tasks/task_base.h"
 
 
 /**
- * Create archive using @ref archivator.
+ * Create archive using @ref archivist.
  */
-class archivate_task : public task_base
+class archive_task : public task_base
 {
 public:
 	/**
 	 * Constructor with initialization.
-	 * @param id Unique identificator of load order of tasks.
+	 * @param id Unique identifier of load order of tasks.
 	 * @param task_meta Variable containing further info about task. It's required that
 	 * @a cmd_args entry has just 2 arguments - directory to be archived and name of the archive.
-	 * For more info about archivation see @ref archivator class.
+	 * For more info about activation see @ref archivist class.
 	 * @throws task_exception on invalid number of arguments.
 	 */
-	archivate_task(std::size_t id, std::shared_ptr<task_metadata> task_meta);
+	archive_task(std::size_t id, std::shared_ptr<task_metadata> task_meta);
 	/**
 	 * Destructor.
 	 */
-	~archivate_task() override = default;
+	~archive_task() override = default;
 	/**
 	 * Run the action.
 	 * @return Evaluation results to be pushed back to frontend.
 	 */
 	std::shared_ptr<task_results> run() override;
 };
 
-#endif // RECODEX_WORKER_INTERNAL_ARCHIVATE_TASK_H
+#endif // RECODEX_WORKER_INTERNAL_ARCHIVE_TASK_H

src/tasks/task_factory.cpp

@@ -21,8 +21,8 @@ std::shared_ptr<task_base> task_factory::create_internal_task(std::size_t id, st
 		task = std::make_shared<rename_task>(id, task_meta);
 	} else if (task_meta->binary == "rm") {
 		task = std::make_shared<rm_task>(id, task_meta);
-	} else if (task_meta->binary == "archivate") {
-		task = std::make_shared<archivate_task>(id, task_meta);
+	} else if (task_meta->binary == "archive") {
+		task = std::make_shared<archive_task>(id, task_meta);
 	} else if (task_meta->binary == "extract") {
 		task = std::make_shared<extract_task>(id, task_meta);
 	} else if (task_meta->binary == "fetch") {

src/tasks/task_factory.h

@@ -5,7 +5,7 @@
 #include "task_factory_interface.h"
 #include "external_task.h"
 #include "root_task.h"
-#include "internal/archivate_task.h"
+#include "internal/archive_task.h"
 #include "internal/cp_task.h"
 #include "internal/dump_dir_task.h"
 #include "internal/truncate_task.h"

tests/CMakeLists.txt

@@ -117,7 +117,7 @@ add_test_suite(tasks
 	${TASKS_DIR}/internal/mkdir_task.cpp
 	${TASKS_DIR}/internal/rename_task.cpp
 	${TASKS_DIR}/internal/rm_task.cpp
-	${TASKS_DIR}/internal/archivate_task.cpp
+	${TASKS_DIR}/internal/archive_task.cpp
 	${TASKS_DIR}/internal/extract_task.cpp
 	${TASKS_DIR}/internal/fetch_task.cpp
 	${TASKS_DIR}/internal/truncate_task.cpp