change re.sub from rpartition

Signed-off-by: rpotter12 <rohitpotter12@gmail.com>

Author: rpotter12

src/packagedcode/rubygems.py

@@ -667,23 +667,22 @@ def build_packages_from_gemspec(location):
         declared_license=declared_license
     )
 
-    dependencies = gemspec_data.get('dependencies')
+    dependencies = gemspec_data.get('dependencies', {}) or {}
     package_dependencies = []
-    if dependencies:
-        for name, version in dependencies.items():
-            package_dependencies.append(
-                models.DependentPackage(
-                    purl=PackageURL(
-                        type='gem',
-                        name=name
-                    ).to_string(),
-                    requirement=', '.join(version),
-                    scope='dependencies',
-                    is_runtime=True,
-                    is_optional=False,
-                    is_resolved=False,
-                )
+    for name, version in dependencies.items():
+        package_dependencies.append(
+            models.DependentPackage(
+                purl=PackageURL(
+                    type='gem',
+                    name=name
+                ).to_string(),
+                requirement=', '.join(version),
+                scope='dependencies',
+                is_runtime=True,
+                is_optional=False,
+                is_resolved=False,
             )
+        )
     package.dependencies = package_dependencies
 
     return package

src/packagedcode/spec.py

@@ -61,21 +61,21 @@ def parse_spec(self, location):
 
         for line in lines:
             if '.name' in line:
-                name = re.sub(r'/*.*name.*?=', '', line)
-                spec_data['name'] = get_stripped_data(name)
+                name = line.rpartition('=')
+                spec_data['name'] = get_stripped_data(name[2])
             elif '.version' in line and '.version.' not in line:
-                version = re.sub(r'/*.*version.*?=', '', line)
-                spec_data['version'] = get_stripped_data(version)
+                version = line.rpartition('=')
+                spec_data['version'] = get_stripped_data(version[2])
             elif '.license' in line:
-                license_type = re.sub(r'/*.*license.*?=', '', line)
-                spec_data['license'] = get_stripped_data(license_type)
+                license_type = line.rpartition('=')
+                spec_data['license'] = get_stripped_data(license_type[2])
             elif '.source' in line and '.source_files' not in line:
                 source = re.sub(r'/*.*source.*?>', '', line)
                 stripped_source = re.sub(r',.*', '', source)
                 spec_data['source'] = get_stripped_data(stripped_source)
             elif '.email' in line:
-                emails = re.sub(r'/*.*email.*?=', '', line)
-                stripped_emails = get_stripped_data(emails)
+                emails = line.rpartition('=')
+                stripped_emails = get_stripped_data(emails[2])
                 stripped_emails = stripped_emails.strip()
                 stripped_emails = stripped_emails.split(',')
                 spec_data['email'] = stripped_emails
@@ -87,17 +87,19 @@ def parse_spec(self, location):
                 stripped_authors = stripped_authors.split(',')
                 spec_data['author'] = stripped_authors
             elif '.summary' in line:
-                summary = re.sub(r'/*.*summary.*?=', '', line)
-                spec_data['summary'] = get_stripped_data(summary)
+                summary = line.rpartition('=')
+                spec_data['summary'] = get_stripped_data(summary[2])
             elif '.description' in line:
                 if location.endswith('.gemspec'):
-                    desc = re.sub(r'/*.*description.*?=', '', line)
-                    spec_data['description'] = get_stripped_data(desc)
+                    # FIXME: description can be in single or multi-lines
+                    # There are many different ways to write description.
+                    desc = line.rpartition('=')
+                    spec_data['description'] = get_stripped_data(desc[2])
                 else:
-                    spec_data['description'] = get_description(location)
+                    spec_data['description'] = get_description(line)
             elif '.homepage' in line:
-                homepage_url = re.sub(r'/*.*homepage.*?=', '', line)
-                spec_data['homepage_url'] = get_stripped_data(homepage_url)
+                homepage_url = line.rpartition('=')
+                spec_data['homepage_url'] = get_stripped_data(homepage_url[2])
 
         parser = GemfileParser(location)
         deps = parser.parse()
@@ -113,7 +115,7 @@ def parse_spec(self, location):
 
 def get_stripped_data(line):
     """
-    Return data after removing unnecessary special character and space.
+    Return line after removing unnecessary special character and space.
     """
     if '#' in line:
         line = line[:line.index('#')]

tests/packagedcode/data/rubygems/gemspec/cocoapods.gemspec

@@ -73,12 +73,6 @@ def test_rubygems_cat_gemspec(self):
         packages = rubygems.RubyGem.recognize(test_file)
         self.check_packages(packages, expected_loc, regen=False)
 
-    def test_rubygems_cocoapods_gemspec(self):
-        test_file = self.get_test_loc('rubygems/gemspec/cocoapods.gemspec')
-        expected_loc = self.get_test_loc('rubygems/gemspec/cocoapods.gemspec.expected.json')
-        packages = rubygems.RubyGem.recognize(test_file)
-        self.check_packages(packages, expected_loc, regen=False)
-
     def test_rubygems_github_gemspec(self):
         test_file = self.get_test_loc('rubygems/gemspec/github.gemspec')
         expected_loc = self.get_test_loc('rubygems/gemspec/github.gemspec.expected.json')