Skip to content

Commit 02ec4df

Browse files
committed
simple commit
1 parent 2726272 commit 02ec4df

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

src/fetchcode/package.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,7 @@ def get_rubygems_data_from_purl(purl):
310310
purl = PackageURL.from_string(purl)
311311
name = purl.name
312312
api_url = f"https://rubygems.org/api/v1/gems/{name}.json"
313-
releases_url = f"https://rubygems.org/api/v1/versions/{name}.json"
314313
response = get_response(api_url)
315-
releases = get_response(releases_url)
316-
print(response)
317-
# print(releases)
318314
declared_license = response.get("licenses") or None
319315
version = response.get("version")
320316
version_purl = PackageURL(
@@ -335,6 +331,9 @@ def get_rubygems_data_from_purl(purl):
335331
release_date=release_date,
336332
**version_purl.to_dict()
337333
)
334+
335+
releases_url = f"https://rubygems.org/api/v1/versions/{name}.json"
336+
releases = get_response(releases_url)
338337
for release in releases:
339338
version = release.get("number")
340339
release_date = release.get("created_at")

tests/test_package.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
# specific language governing permissions and limitations under the License.
1616

1717
import json
18-
import pytest
1918
from unittest import mock
2019

20+
import pytest
21+
2122
from fetchcode.package import info
2223

2324

@@ -93,21 +94,19 @@ def test_bitbucket_packages(mock_get):
9394
# @mock.patch("fetchcode.package.get_response")
9495
@mock.patch("fetchcode.package.get_response")
9596
def test_rubygems_packages(mock_get):
96-
# print(mock_get)
97-
side_effect = [file_data("./data/rubygems_mock_data.json"), file_data("./data/rubygems_mock_data2.json")]
98-
# side_effect2 = [file_data("./data/rubygems_mock_data2.json")]
97+
side_effect = [
98+
file_data("data/rubygems_mock_data.json"),
99+
file_data("data/rubygems_mock_data_versions.json")
100+
]
99101
purl = "pkg:rubygems/rubocop"
100-
expected_data = file_data("./data/rubygems.json")
102+
expected_data = file_data("data/rubygems.json")
101103
mock_get.side_effect = side_effect
102-
# mock_get2.side_effect = side_effect
103104
packages = list(info(purl))
104-
# print(packages)
105-
# print(packages, expected_data)
106105
match_data(packages, expected_data)
107106

108107

109108
@mock.patch("fetchcode.package.get_response")
110-
def test_tuby_package_with_invalid_url(mock_get):
109+
def test_ruby_package_with_invalid_url(mock_get):
111110
with pytest.raises(Exception) as e_info:
112111
purl = "pkg:ruby/file"
113112
packages = list(info(purl))

0 commit comments

Comments
 (0)