dependabot-python 0.88.3 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c6bfe4dfe45325a0e54158029cae720c4983440ecc4c0452d1ba26cc7956c9
-  data.tar.gz: b177beebec6660a82dea21f61e4061c8bfec37b66de5b21349ac0fe075e4161a
+  metadata.gz: aa60d766aec46770ac774666f48efea217f4daa043ccffe85b6a8d605a0fe246
+  data.tar.gz: 570b1d8a175ddd4cd2e6134fa1da220de5d25e042e99faa68239ac0feee36c80
 SHA512:
-  metadata.gz: 402d90028ad333fada415084d491b2b50900d13171be0498d97e9d8add7e507f1868d4653dfc10e7e02f920472a3138c61754ddf8dfdbe7b6186c1cdadb7a1b2
-  data.tar.gz: e68f3a6bc15f89fdc12b5c2c1e936d2be84a5977260dc6625932dddeb5eb5c9b542827e8bf8ca6074b7f93da322dde19a1b576e2b47611e5298acecde0d4497e
+  metadata.gz: 724f1c44dc595398075215dd168a6c15e02b14e728f92a33e04230f4926acb73273293161f4caaa6ec8f787acbeccae19afb06d9c893181aef4c10bb1501440e
+  data.tar.gz: 10e903c17661bed06ede2dc184f789cb3cd2af5c41a6c5098aee9316cef53b46fb1975718040206eb87759187061caf9fc3a78613f2ae3bd2859c317665405ec

data/lib/dependabot/python/file_updater/pip_compile_file_updater.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "open3"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_fetcher"
 require "dependabot/python/file_updater"
@@ -117,20 +118,24 @@ module Dependabot
           ).updated_dependency_files
         end
 
+        # rubocop:disable Metrics/MethodLength
         def run_command(command)
           command = command.dup
-          raw_response = nil
-          IO.popen(command, err: %i(child out)) do |process|
-            raw_response = process.read
-          end
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if
           # pip-compile returns a non-zero status
-          return if $CHILD_STATUS.success?
+          return if process.success?
 
           raise SharedHelpers::HelperSubprocessFailed.new(
-            raw_response,
-            command
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
           )
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
@@ -149,6 +154,7 @@ module Dependabot
         ensure
           FileUtils.remove_entry(".python-version", true)
         end
+        # rubocop:enable Metrics/MethodLength
 
         def error_suggests_bad_python_version?(message)
           return true if message.include?("not find a version that satisfies")

data/lib/dependabot/python/file_updater/pipfile_file_updater.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "toml-rb"
-
+require "open3"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_updater"
 require "dependabot/shared_helpers"
@@ -237,15 +237,23 @@ module Dependabot
           )
         end
 
-        def run_pipenv_command(cmd)
-          raw_response = nil
-          IO.popen(cmd, err: %i(child out)) { |p| raw_response = p.read }
+        def run_pipenv_command(command)
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if Pipenv
           # returns a non-zero status
-          return if $CHILD_STATUS.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(raw_response, cmd)
+          return if process.success?
+
+          raise SharedHelpers::HelperSubprocessFailed.new(
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
+          )
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
           msg = error.message
@@ -256,9 +264,9 @@ module Dependabot
             end
 
           raise relevant_error unless error_suggests_bad_python_version?(msg)
-          raise relevant_error if cmd.include?("--two")
+          raise relevant_error if command.include?("--two")
 
-          cmd = cmd.gsub("pipenv ", "pipenv --two ")
+          command = command.gsub("pipenv ", "pipenv --two ")
           retry
         end
 

data/lib/dependabot/python/file_updater/poetry_file_updater.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "toml-rb"
-
+require "open3"
 require "dependabot/shared_helpers"
 require "dependabot/python/version"
 require "dependabot/python/requirement"
@@ -164,15 +164,23 @@ module Dependabot
           end
         end
 
-        def run_poetry_command(cmd)
-          raw_response = nil
-          IO.popen(cmd, err: %i(child out)) { |p| raw_response = p.read }
+        def run_poetry_command(command)
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if Pipenv
           # returns a non-zero status
-          return if $CHILD_STATUS.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(raw_response, cmd)
+          return if process.success?
+
+          raise SharedHelpers::HelperSubprocessFailed.new(
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
+          )
         end
 
         def write_temporary_dependency_files(pyproject_content)

data/lib/dependabot/python/update_checker/pip_compile_version_resolver.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "open3"
 require "dependabot/python/requirement_parser"
 require "dependabot/python/file_fetcher"
 require "dependabot/python/file_parser"
@@ -133,20 +134,24 @@ module Dependabot
           end
         end
 
+        # rubocop:disable Metrics/MethodLength
         def run_command(command)
           command = command.dup
-          raw_response = nil
-          IO.popen(command, err: %i(child out)) do |process|
-            raw_response = process.read
-          end
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if
           # pip-compile returns a non-zero status
-          return if $CHILD_STATUS.success?
+          return if process.success?
 
           raise SharedHelpers::HelperSubprocessFailed.new(
-            raw_response,
-            command
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
           )
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
@@ -165,6 +170,7 @@ module Dependabot
         ensure
           FileUtils.remove_entry(".python-version", true)
         end
+        # rubocop:enable Metrics/MethodLength
 
         def error_suggests_bad_python_version?(message)
           return true if message.include?("not find a version that satisfies")

data/lib/dependabot/python/update_checker/pipfile_version_resolver.rb

@@ -2,7 +2,7 @@
 
 require "excon"
 require "toml-rb"
-
+require "open3"
 require "dependabot/errors"
 require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
@@ -452,17 +452,26 @@ module Dependabot
           end
         end
 
-        def run_pipenv_command(cmd)
+        # rubocop:disable Metrics/MethodLength
+        def run_pipenv_command(command)
           set_up_python_environment
 
-          raw_response = nil
-          IO.popen(cmd, err: %i(child out)) { |p| raw_response = p.read }
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if Pipenv
           # returns a non-zero status
-          return if $CHILD_STATUS.success?
-
-          raise SharedHelpers::HelperSubprocessFailed.new(raw_response, cmd)
+          return if process.success?
+
+          raise SharedHelpers::HelperSubprocessFailed.new(
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
+          )
         rescue SharedHelpers::HelperSubprocessFailed => error
           original_error ||= error
           msg = error.message
@@ -477,11 +486,12 @@ module Dependabot
 
           @using_python_two = true
           add_python_two_requirement_to_pipfile
-          cmd = cmd.gsub("pipenv ", "pipenv --two ")
+          command = command.gsub("pipenv ", "pipenv --two ")
           retry
         ensure
           @using_python_two = nil
         end
+        # rubocop:enable Metrics/MethodLength
 
         def may_be_using_wrong_python_version?(error_message)
           return false if python_requirement_specified?

data/lib/dependabot/python/update_checker/poetry_version_resolver.rb

@@ -2,7 +2,7 @@
 
 require "excon"
 require "toml-rb"
-
+require "open3"
 require "dependabot/errors"
 require "dependabot/shared_helpers"
 require "dependabot/python/file_parser"
@@ -251,18 +251,21 @@ module Dependabot
         end
 
         def run_poetry_command(command)
-          raw_response = nil
-          IO.popen(command, err: %i(child out)) do |process|
-            raw_response = process.read
-          end
+          start = Time.now
+          stdout, process = Open3.capture2e(command)
+          time_taken = start - Time.now
 
           # Raise an error with the output from the shell session if Pipenv
           # returns a non-zero status
-          return if $CHILD_STATUS.success?
+          return if process.success?
 
           raise SharedHelpers::HelperSubprocessFailed.new(
-            raw_response,
-            command
+            message: stdout,
+            error_context: {
+              command: command,
+              time_taken: time_taken,
+              process_exit_value: process.to_s
+            }
           )
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-python
 version: !ruby/object:Gem::Version
-  version: 0.88.3
+  version: 0.89.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-01-11 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.88.3
+        version: 0.89.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.88.3
+        version: 0.89.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement