From a7b1296fb5bd3ebb270731d1782bf05a97806e29 Mon Sep 17 00:00:00 2001
From: Kevin Stillhammer <kevin.stillhammer@gmail.com>
Date: Thu, 6 Feb 2025 17:51:03 +0100
Subject: [PATCH] Refactor internal function names (#76)

---
 dist/ruff-action/index.js | Bin 1450988 -> 1451071 bytes
 src/ruff-action.ts        |   8 +++++---
 src/utils/pyproject.ts    |  10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dist/ruff-action/index.js b/dist/ruff-action/index.js
index 4478d967f4931a4922ce6cdee1e4e23edb02f6e0..4f2d68c5e46df1c9ca842f56f6a04c80b1ba14b2 100644
GIT binary patch
delta 315
zcmaEJJYxTeh=vx%7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQEkcIV1%pxx
zOEZg7b5rw5irq4EQZ=V9oGK)`Jz%;}3zGo4<o3HWg_en$q6;h7Dx{~D1eK<xg{2l1
zXXfX*73JrmE1G=KO>g?YJ|T|j57rBnV$tB3ljD+FkeZj0nwOlJx;=G+&|GGM%BBl#
g5sJZZ=koF`LW~6UwzqE;0%Bnx7TMmuRWvmZ08USPLI3~&

delta 226
zcmdmgBI3>Qh=vx%7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQEkcIVIRh#S
zit@8klS{TcP8XWRgv5V6Q)rnef<JxXdLbn4<cn^4)Bp7eaZLZ<$j?4KVyTe+^f)Je
zw&@ldge(OL5{rscgHj7iGmBDlQ}ar;Puw6hml;ENy5AO|7=#tecWn`3#8A|JYpW0t
O3j?vp_FG#;Q}Y1C;8`jF

diff --git a/src/ruff-action.ts b/src/ruff-action.ts
index 7308c3a..15b2226 100644
--- a/src/ruff-action.ts
+++ b/src/ruff-action.ts
@@ -21,7 +21,7 @@ import {
   version,
   versionFile as versionFileInput,
 } from "./utils/inputs";
-import { getRuffVersionFromPyproject } from "./utils/pyproject";
+import { getRuffVersionFromRequirementsFile } from "./utils/pyproject";
 import * as fs from "node:fs";
 
 async function run(): Promise<void> {
@@ -93,7 +93,8 @@ async function determineVersion(): Promise<string> {
     return await resolveVersion(version, githubToken);
   }
   if (versionFileInput !== "") {
-    const versionFromPyproject = getRuffVersionFromPyproject(versionFileInput);
+    const versionFromPyproject =
+      getRuffVersionFromRequirementsFile(versionFileInput);
     if (versionFromPyproject === undefined) {
       core.warning(
         `Could not parse version from ${versionFileInput}. Using latest version.`,
@@ -106,7 +107,8 @@ async function determineVersion(): Promise<string> {
     core.info(`Could not find ${pyProjectPath}. Using latest version.`);
     return await resolveVersion("latest", githubToken);
   }
-  const versionFromPyproject = getRuffVersionFromPyproject(pyProjectPath);
+  const versionFromPyproject =
+    getRuffVersionFromRequirementsFile(pyProjectPath);
   if (versionFromPyproject === undefined) {
     core.warning(
       `Could not parse version from ${pyProjectPath}. Using latest version.`,
diff --git a/src/utils/pyproject.ts b/src/utils/pyproject.ts
index 055ffc9..fc98a82 100644
--- a/src/utils/pyproject.ts
+++ b/src/utils/pyproject.ts
@@ -2,7 +2,9 @@ import * as fs from "node:fs";
 import * as core from "@actions/core";
 import * as toml from "smol-toml";
 
-function parseRequirements(allDependencies: string[]): string | undefined {
+function getRuffVersionFromAllDependencies(
+  allDependencies: string[],
+): string | undefined {
   const ruffVersionDefinition = allDependencies.find((dep: string) =>
     dep.startsWith("ruff"),
   );
@@ -38,12 +40,12 @@ function parsePyproject(pyprojectContent: string): string | undefined {
   )
     .flat()
     .filter((item: string | object) => typeof item === "string");
-  return parseRequirements(
+  return getRuffVersionFromAllDependencies(
     dependencies.concat(optionalDependencies, devDependencies),
   );
 }
 
-export function getRuffVersionFromPyproject(
+export function getRuffVersionFromRequirementsFile(
   filePath: string,
 ): string | undefined {
   if (!fs.existsSync(filePath)) {
@@ -52,7 +54,7 @@ export function getRuffVersionFromPyproject(
   }
   const pyprojectContent = fs.readFileSync(filePath, "utf-8");
   if (filePath.endsWith(".txt")) {
-    return parseRequirements(pyprojectContent.split("\n"));
+    return getRuffVersionFromAllDependencies(pyprojectContent.split("\n"));
   }
   try {
     return parsePyproject(pyprojectContent);