dependabot-python 0.93.2 → 0.93.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41977f3352b198233fba881550ad3054a0678a6a19bdc14e9979f6f4f660b3e2
-  data.tar.gz: 37b2a88ada82c94ab263b13a3087c5c14ad6c6427b6fc826fa77eadde9aa15c8
+  metadata.gz: 03e42ce4b4fbe1d2120e19d19c824fee64d48f780d66827fe5349c5e31fb0f88
+  data.tar.gz: 754a2bcab4e657fda82b538a778074553a859ac7b33237ae213cddf04d3378b6
 SHA512:
-  metadata.gz: c4cc7aadc2926e78321de001cd29f41076efc4b7957830bfb6795032a3384b17df72687443c944ab14cd5f196339854da917eb402f07ec306c011c0acb285d99
-  data.tar.gz: 598e37b1a88bb948cfbd799588001c2d69bf4237427baa1729fe19c24e5001052e2f312d62787e4b29ea78065d379f3c314d1eda453d4e6a5fb347d0ce2a8aa8
+  metadata.gz: 539a56d9ae30347f38994f9bb5e62d8395d79357040125733d8baf07c1c1785094a210e8c3fcb16a9bebd7d50fecf8e0c2ebffe35555fdc1c13fee1594a7b334
+  data.tar.gz: 991231daea34176c28c367cdd9121d7d6abac373df2f660d2c90ac479476e84267f0219a275bd0e90c1e966051f3e259b9a654ccf1864b99f4a74776209e8006

data/lib/dependabot/python/file_fetcher.rb

@@ -232,24 +232,9 @@ module Dependabot
         unfetchable_files = []
 
         path_setup_file_paths.each do |path|
-          path = Pathname.new(File.join(path, "setup.py")).cleanpath.to_path
-          next if path == "setup.py" && setup_file
-
-          begin
-            path_setup_files << fetch_file_from_host(path).
-                                tap { |f| f.support_file = true }
-          rescue Dependabot::DependencyFileNotFound
-            unfetchable_files << path
-          end
-
-          begin
-            cfg_path = path.gsub(/\.py$/, ".cfg")
-            path_setup_files << fetch_file_from_host(cfg_path).
-                                tap { |f| f.support_file = true }
-          rescue Dependabot::DependencyFileNotFound
-            # Ignore lack of a setup.cfg
-            nil
-          end
+          path_setup_files += fetch_path_setup_file(path)
+        rescue Dependabot::DependencyFileNotFound => error
+          unfetchable_files << error.file_path.gsub(%r{^/}, "")
         end
 
         if unfetchable_files.any?
@@ -259,6 +244,31 @@ module Dependabot
         path_setup_files
       end
 
+      def fetch_path_setup_file(path)
+        path_setup_files = []
+
+        unless path.end_with?(".tar.gz")
+          path = Pathname.new(File.join(path, "setup.py")).cleanpath.to_path
+        end
+        return [] if path == "setup.py" && setup_file
+
+        path_setup_files << fetch_file_from_host(path).
+                            tap { |f| f.support_file = true }
+
+        return path_setup_files unless path.end_with?(".py")
+
+        begin
+          cfg_path = path.gsub(/\.py$/, ".cfg")
+          path_setup_files << fetch_file_from_host(cfg_path).
+                              tap { |f| f.support_file = true }
+        rescue Dependabot::DependencyFileNotFound
+          # Ignore lack of a setup.cfg
+          nil
+        end
+
+        path_setup_files
+      end
+
       def requirements_file?(file)
         return true if file.name.match?(/requirements/x)
 
@@ -275,27 +285,39 @@ module Dependabot
       end
 
       def path_setup_file_paths
-        requirement_txt_path_setup_file_paths + pipfile_path_setup_file_paths
+        requirement_txt_path_setup_file_paths +
+          requirement_in_path_setup_file_paths +
+          pipfile_path_setup_file_paths
       end
 
       def requirement_txt_path_setup_file_paths
-        (requirements_txt_files + child_requirement_txt_files).map do |req_file|
-          uneditable_reqs =
-            req_file.content.
-            scan(/^['"]?(?<path>\..*?)(?=\[|#|'|"|$)/).
-            flatten.
-            map(&:strip).
-            reject { |p| p.include?("://") }
-
-          editable_reqs =
-            req_file.content.
-            scan(/^(?:-e)\s+['"]?(?<path>.*?)(?=\[|#|'|"|$)/).
-            flatten.
-            map(&:strip).
-            reject { |p| p.include?("://") }
-
-          uneditable_reqs + editable_reqs
-        end.flatten.uniq
+        (requirements_txt_files + child_requirement_txt_files).
+          map { |req_file| parse_path_setup_paths(req_file) }.
+          flatten.uniq
+      end
+
+      def requirement_in_path_setup_file_paths
+        requirements_in_files.
+          map { |req_file| parse_path_setup_paths(req_file) }.
+          flatten.uniq
+      end
+
+      def parse_path_setup_paths(req_file)
+        uneditable_reqs =
+          req_file.content.
+          scan(/^['"]?(?<path>\..*?)(?=\[|#|'|"|$)/).
+          flatten.
+          map(&:strip).
+          reject { |p| p.include?("://") }
+
+        editable_reqs =
+          req_file.content.
+          scan(/^(?:-e)\s+['"]?(?<path>.*?)(?=\[|#|'|"|$)/).
+          flatten.
+          map(&:strip).
+          reject { |p| p.include?("://") }
+
+        uneditable_reqs + editable_reqs
       end
 
       def pipfile_path_setup_file_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.93.2
+  version: 0.93.3
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.93.2
+        version: 0.93.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.93.2
+        version: 0.93.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement