Merge pull request #165 from krzysztof-pawlik-gat/master

Python improvements
licensee · May 8, 2019 · 6a107a1 · 6a107a1
2 parents afba288 + 567c487
commit 6a107a1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/lib/licensed/sources/pip.rb b/lib/licensed/sources/pip.rb
@@ -6,7 +6,7 @@ module Licensed
   module Sources
     class Pip < Source
       VERSION_OPERATORS = %w(< > <= >= == !=).freeze
-      PACKAGE_REGEX = /^(\w+)(#{VERSION_OPERATORS.join("|")})?/
+      PACKAGE_REGEX = /^([\w-]+)(#{VERSION_OPERATORS.join("|")})?/
 
       def enabled?
         return unless virtual_env_pip && Licensed::Shell.tool_available?(virtual_env_pip)
@@ -16,7 +16,7 @@ def enabled?
       def enumerate_dependencies
         packages_from_requirements_txt.map do |package_name|
           package = package_info(package_name)
-          location = File.join(package["Location"], package["Name"] +  "-" + package["Version"] + ".dist-info")
+          location = File.join(package["Location"], package["Name"].gsub("-", "_") +  "-" + package["Version"] + ".dist-info")
           Dependency.new(
             name: package["Name"],
             version: package["Version"],
@@ -35,6 +35,7 @@ def enumerate_dependencies
       def packages_from_requirements_txt
         File.read(@config.pwd.join("requirements.txt"))
             .lines
+            .reject { |line| line.include?("://") }
             .map { |line| line.strip.match(PACKAGE_REGEX) { |match| match.captures.first } }
             .compact
       end

diff --git a/test/fixtures/pip/requirements.txt b/test/fixtures/pip/requirements.txt
@@ -8,4 +8,5 @@ Pillow>5.4.0
 Scrapy<1.6.0
 numpy!=1.16.1
 botocore == 1.12.91
-boto3>=1.0,<=2.0
+boto3>=1.0,<=2.0
+lazy-object-proxy==1.4.0
diff --git a/test/sources/pip_test.rb b/test/sources/pip_test.rb
@@ -114,6 +114,16 @@
           assert dep.record["summary"]
         end
       end
+
+      it "detects dependencies with hyphens in package name" do
+        Dir.chdir fixtures do
+          dep = source.dependencies.detect { |d| d.name == "lazy-object-proxy" }
+          assert dep
+          assert_equal "pip", dep.record["type"]
+          assert dep.record["homepage"]
+          assert dep.record["summary"]
+        end
+      end
     end
   end
 end