mirrors
/
forgejo
mirror of https://codeberg.org/forgejo/forgejo.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

make the linter happy.

This commit is contained in:
Haoyuan (Bill) Xing 2024-05-18 21:24:43 -04:00
parent c8a92a3bc7
commit 60184e0451
No known key found for this signature in database
GPG Key ID: 59E2C2AAF8DCC4F0
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
routers/api/packages/rubygems/rubygems.go
View File

@ -100,14 +100,14 @@ func enumeratePackages(ctx *context.Context, filename string, pvs []*packages_mo
// Serves info file for rubygems.org compatible /info/{gem} file.
// See also https://guides.rubygems.org/rubygems-org-compact-index-api/.
func ServePackageInfo(ctx *context.Context) {
package_name := ctx.Params("package")
packageName := ctx.Params("package")
versions, err := packages_model.GetVersionsByPackageName(
ctx, ctx.Package.Owner.ID, packages_model.TypeRubyGems, package_name)
ctx, ctx.Package.Owner.ID, packages_model.TypeRubyGems, packageName)
if err != nil {
apiError(ctx, http.StatusInternalServerError, err)
}
if len(versions) == 0 {
apiError(ctx, http.StatusNotFound, fmt.Sprintf("Could not find package %s", package_name))
apiError(ctx, http.StatusNotFound, fmt.Sprintf("Could not find package %s", packageName))
}
result, err := buildInfoFileForPackage(ctx, versions)
@ -383,19 +383,19 @@ func buildRequirementStringFromVersion(ctx *context.Context, version *packages_m
return "", err
}
metadata := pd.Metadata.(*rubygems_module.Metadata)
dep_requirements := new(strings.Builder)
dependencyRequirements := new(strings.Builder)
for i, dep := range metadata.RuntimeDependencies {
if i != 0 {
dep_requirements.WriteString(",")
dependencyRequirements.WriteString(",")
}
dep_requirements.WriteString(dep.Name)
dep_requirements.WriteString(":")
dependencyRequirements.WriteString(dep.Name)
dependencyRequirements.WriteString(":")
reqs := dep.Version
writeRequirements(reqs, dep_requirements)
writeRequirements(reqs, dependencyRequirements)
}
full_name := getFullFilename(pd.Package.Name, version.Version, metadata.Platform)
file, err := packages_model.GetFileForVersionByName(ctx, version.ID, full_name, "")
fullname := getFullFilename(pd.Package.Name, version.Version, metadata.Platform)
file, err := packages_model.GetFileForVersionByName(ctx, version.ID, fullname, "")
if err != nil {
return "", err
}
@ -403,17 +403,17 @@ func buildRequirementStringFromVersion(ctx *context.Context, version *packages_m
if err != nil {
return "", err
}
additional_requirments := new(strings.Builder)
fmt.Fprintf(additional_requirments, "checksum:%s", blob.HashSHA256)
additionalRequirements := new(strings.Builder)
fmt.Fprintf(additionalRequirements, "checksum:%s", blob.HashSHA256)
if len(metadata.RequiredRubyVersion) != 0 {
additional_requirments.WriteString(",ruby:")
writeRequirements(metadata.RequiredRubyVersion, additional_requirments)
additionalRequirements.WriteString(",ruby:")
writeRequirements(metadata.RequiredRubyVersion, additionalRequirements)
}
if len(metadata.RequiredRubygemsVersion) != 0 {
additional_requirments.WriteString(",rubygems:")
writeRequirements(metadata.RequiredRubygemsVersion, additional_requirments)
additionalRequirements.WriteString(",rubygems:")
writeRequirements(metadata.RequiredRubygemsVersion, additionalRequirements)
}
return fmt.Sprintf("%s %s|%s", version.Version, dep_requirements, additional_requirments), nil
return fmt.Sprintf("%s %s|%s", version.Version, dependencyRequirements, additionalRequirements), nil
}
func buildInfoFileForPackage(ctx *context.Context, versions []*packages_model.PackageVersion) (*string, error) {
@ -429,16 +429,15 @@ func buildInfoFileForPackage(ctx *context.Context, versions []*packages_model.Pa
return &result, nil
}
func getFullFilename(gem_name, version, platform string) string {
return strings.ToLower(getFullName(gem_name, version, platform)) + ".gem"
func getFullFilename(gemName, version, platform string) string {
return strings.ToLower(getFullName(gemName, version, platform)) + ".gem"
}
func getFullName(gem_name, version, platform string) string {
func getFullName(gemName, version, platform string) string {
if platform == "" || platform == "ruby" {
return fmt.Sprintf("%s-%s", gem_name, version)
} else {
return fmt.Sprintf("%s-%s-%s", gem_name, version, platform)
return fmt.Sprintf("%s-%s", gemName, version)
}
return fmt.Sprintf("%s-%s-%s", gemName, version, platform)
}
func getVersionsByFilename(ctx *context.Context, filename string) ([]*packages_model.PackageVersion, error) {

14
tests/integration/api_packages_rubygems_test.go
View File

@ -225,16 +225,16 @@ gAAAAP//MS06Gw==`)
t.Run("Versions", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
versions_req := NewRequest(t, "GET", fmt.Sprintf("%s/versions", root)).
versionsReq := NewRequest(t, "GET", fmt.Sprintf("%s/versions", root)).
AddBasicAuth(user.Name)
versions_resp := MakeRequest(t, versions_req, http.StatusOK)
info_req := NewRequest(t, "GET", fmt.Sprintf("%s/info/%s", root, packageName)).
versionsResp := MakeRequest(t, versionsReq, http.StatusOK)
infoReq := NewRequest(t, "GET", fmt.Sprintf("%s/info/%s", root, packageName)).
AddBasicAuth(user.Name)
info_resp := MakeRequest(t, info_req, http.StatusOK)
infoResp := MakeRequest(t, infoReq, http.StatusOK)
expected := fmt.Sprintf("%s\n%s %s %x\n",
sep, packageName, packageVersion, md5.Sum(info_resp.Body.Bytes()))
assert.Equal(t, expected, string(versions_resp.Body.String()))
sep, packageName, packageVersion, md5.Sum(infoResp.Body.Bytes()))
assert.Equal(t, expected, versionsResp.Body.String())
})
t.Run("Delete", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
@ -268,6 +268,6 @@ gAAAAP//MS06Gw==`)
req := NewRequest(t, "GET", fmt.Sprintf("%s/versions", root)).
AddBasicAuth(user.Name)
resp := MakeRequest(t, req, http.StatusOK)
assert.Equal(t, sep+"\n", string(resp.Body.Bytes()))
assert.Equal(t, sep+"\n", resp.Body.String())
})
}