install_dependencies_(extra_)index_url should affect all PIP operations

src/main/python/pybuilder/pluginloader.py

@@ -83,7 +83,9 @@ def load_plugin(self, project, name, version=None, plugin_module_name=None):
         display_name = "%s%s" % (name, " version %s" % version if version else "")
         self.logger.info("Downloading missing plugin {0}".format(display_name))
         try:
-            _install_external_plugin(name, version, self.logger, plugin_module_name)
+            _install_external_plugin(name, version, self.logger, plugin_module_name,
+                                     project.get_property("install_dependencies_index_url"),
+                                     project.get_property("install_dependencies_extra_index_url"))
             self.logger.info("Installed plugin {0}.".format(display_name))
         except MissingPluginException as e:
             self.logger.error("Could not install plugin {0}: {1}.".format(display_name, e))
@@ -106,7 +108,7 @@ def load_plugin(self, project, name, version=None, plugin_module_name=None):
         raise last_problem
 
 
-def _install_external_plugin(name, version, logger, plugin_module_name):
+def _install_external_plugin(name, version, logger, plugin_module_name, index_url=None, extra_index_url=None):
     if not name.startswith(PYPI_PLUGIN_PROTOCOL) and not name.startswith(VCS_PLUGIN_PROTOCOL):
         message = "Only plugins starting with '{0}' are currently supported"
         raise MissingPluginException(name, message.format((PYPI_PLUGIN_PROTOCOL, VCS_PLUGIN_PROTOCOL)))
@@ -125,6 +127,8 @@ def _install_external_plugin(name, version, logger, plugin_module_name):
     with tempfile.NamedTemporaryFile(delete=True) as log_file:
         log_file_name = log_file.name
         result = pip_install(pip_package,
+                             index_url=index_url,
+                             extra_index_url=extra_index_url,
                              upgrade=upgrade,
                              force_reinstall=force_reinstall,
                              logger=logger,

src/main/python/pybuilder/plugins/core_plugin.py

@@ -60,12 +60,16 @@ def prepare(project, logger):
     plugin_dependency_versions = get_package_version(project.plugin_dependencies, logger)
     for plugin_dependency in project.plugin_dependencies:
         logger.debug("Processing plugin dependency %s" % plugin_dependency)
-        if plugin_dependency.name.lower() not in plugin_dependency_versions or not version_satisfies_spec(
-                plugin_dependency.version, plugin_dependency_versions[plugin_dependency.name.lower()]):
+        if plugin_dependency.name.lower() not in plugin_dependency_versions or not \
+            version_satisfies_spec(plugin_dependency.version,
+                                   plugin_dependency_versions[plugin_dependency.name.lower()]):
             logger.info("Installing plugin dependency %s" % plugin_dependency)
             log_file = project.expand_path("$dir_reports", "dependency_%s_install.log" % plugin_dependency)
-            pip_install(as_pip_install_target(plugin_dependency), verbose=project.get_property("verbose"),
-                        logger=logger, force_reinstall=plugin_dependency.url is not None, outfile_name=log_file,
+            pip_install(as_pip_install_target(plugin_dependency),
+                        index_url=project.get_property("install_dependencies_index_url"),
+                        extra_index_url=project.get_property("install_dependencies_extra_index_url"),
+                        verbose=project.get_property("verbose"), logger=logger,
+                        force_reinstall=plugin_dependency.url is not None, outfile_name=log_file,
                         error_file_name=log_file)
 
 

src/main/python/pybuilder/plugins/python/distutils_plugin.py

@@ -201,9 +201,10 @@ def install_distribution(project, logger):
     _prepare_reports_dir(project)
     outfile_name = project.expand_path("$dir_reports", "distutils",
                                        "pip_install_%s" % datetime.utcnow().strftime("%Y%m%d%H%M%S"))
-    pip_install(project.expand_path("$dir_dist"), force_reinstall=True, logger=logger,
-                verbose=project.get_property("verbose"), cwd=".", outfile_name=outfile_name,
-                error_file_name=outfile_name)
+    pip_install(project.expand_path("$dir_dist"), index_url=project.get_property("install_dependencies_index_url"),
+                extra_index_url=project.get_property("install_dependencies_extra_index_url"),
+                force_reinstall=True, logger=logger, verbose=project.get_property("verbose"), cwd=".",
+                outfile_name=outfile_name, error_file_name=outfile_name)
 
 
 @task("upload", description="Upload a project to PyPi.")

src/unittest/python/pluginloader_tests.py

@@ -132,9 +132,12 @@ class DownloadingPluginLoaderTest(unittest.TestCase):
     @patch("pybuilder.pluginloader._install_external_plugin")
     def test_should_download_module_from_pypi(self, install, _):
         logger = Mock()
-        DownloadingPluginLoader(logger).load_plugin(Mock(), "pypi:external_plugin")
+        project = Mock()
+        project.get_property.side_effect = lambda x: "index_url" if x == "install_dependencies_index_url" \
+            else "extra_index_url" if x == "install_dependencies_extra_index_url" else None
+        DownloadingPluginLoader(logger).load_plugin(project, "pypi:external_plugin")
 
-        install.assert_called_with("pypi:external_plugin", None, logger, None)
+        install.assert_called_with("pypi:external_plugin", None, logger, None, "index_url", "extra_index_url")
 
     @patch("pybuilder.pluginloader.ThirdPartyPluginLoader.load_plugin")
     @patch("pybuilder.pluginloader._install_external_plugin")

src/unittest/python/plugins/python/distutils_plugin_tests.py

@@ -698,6 +698,19 @@ def test_install(self, execute_command, *args):
                                            cwd=".", env=ANY,
                                            outfile_name=ANY, error_file_name=ANY, shell=False)
 
+    @patch("pybuilder.plugins.python.distutils_plugin.os.mkdir")
+    @patch("pybuilder.pip_utils.open", create=True)
+    @patch("pybuilder.pip_utils.execute_command")
+    def test_install_with_index_url(self, execute_command, *args):
+        self.project.set_property("install_dependencies_index_url", "index_url")
+        self.project.set_property("install_dependencies_extra_index_url", "extra_index_url")
+
+        install_distribution(self.project, MagicMock(Logger))
+        execute_command.assert_called_with(
+            PIP_EXEC_STANZA + ["install", "--index-url", "index_url", "--extra-index-url", "extra_index_url",
+                               "--force-reinstall", '/whatever dist'], cwd=".", env=ANY, outfile_name=ANY,
+            error_file_name=ANY, shell=False)
+
     @patch("pybuilder.plugins.python.distutils_plugin.os.mkdir")
     @patch("pybuilder.plugins.python.distutils_plugin.open", create=True)
     @patch("pybuilder.plugins.python.distutils_plugin._run_process_and_wait")