From 7d38d664896579893b6f1ea534d53d7a5642bf66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 13:39:08 +0200
Subject: [PATCH 01/19] PipUtil now uses --user argument with pip install if
 detected as necessary

---
 src/octoprint/util/pip.py                  | 208 +++++++++++++++------
 src/octoprint/util/piptestballoon/setup.py |  30 +++
 2 files changed, 180 insertions(+), 58 deletions(-)
 create mode 100644 src/octoprint/util/piptestballoon/setup.py

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index 8d0a008f..ccf8796c 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -9,6 +9,7 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms
 import sarge
 import sys
 import logging
+import re
 
 import pkg_resources
 
@@ -34,6 +35,8 @@ class PipCaller(CommandlineCaller):
 		self._version = None
 		self._version_string = None
 		self._use_sudo = False
+		self._use_user = False
+		self._install_dir = None
 
 		self.trigger_refresh()
 
@@ -41,6 +44,14 @@ class PipCaller(CommandlineCaller):
 		self.on_log_stdout = lambda *args, **kwargs: None
 		self.on_log_stderr = lambda *args, **kwargs: None
 
+	def _reset(self):
+		self._command = None
+		self._version = None
+		self._version_string = None
+		self._use_sudo = False
+		self._use_user = False
+		self._install_dir = None
+
 	def __le__(self, other):
 		return self.version is not None and self.version <= other
 
@@ -65,17 +76,26 @@ class PipCaller(CommandlineCaller):
 	def version_string(self):
 		return self._version_string
 
+	@property
+	def install_dir(self):
+		return self._install_dir
+
 	@property
 	def use_sudo(self):
 		return self._use_sudo
 
+	@property
+	def use_user(self):
+		return self._use_user
+
 	@property
 	def available(self):
 		return self._command is not None
 
 	def trigger_refresh(self):
+		self._reset()
 		try:
-			self._command, self._version, self._version_string, self._use_sudo = self._find_pip()
+			self._setup_pip()
 		except:
 			self._logger.exception("Error while discovering pip command")
 			self._command = None
@@ -97,13 +117,15 @@ class PipCaller(CommandlineCaller):
 			if self.version in self.__class__.no_use_wheel and not "--no-use-wheel" in arg_list:
 				self._logger.debug("Version {} needs --no-use-wheel to properly work.".format(self.version))
 				arg_list.append("--no-use-wheel")
+			if self.use_user:
+				arg_list.append("--user")
 
 		command = [self._command] + list(args)
 		if self._use_sudo:
 			command = ["sudo"] + command
 		return self.call(command)
 
-	def _find_pip(self):
+	def _setup_pip(self):
 		pip_command = self.configured
 
 		if pip_command is not None and pip_command.startswith("sudo "):
@@ -112,75 +134,145 @@ class PipCaller(CommandlineCaller):
 		else:
 			pip_sudo = False
 
-		pip_version = None
-		version_segment = None
+		if pip_command is None:
+			pip_command = self._autodetect_pip()
 
 		if pip_command is None:
-			import os
-			python_command = sys.executable
-			binary_dir = os.path.dirname(python_command)
+			return
 
-			pip_command = os.path.join(binary_dir, "pip")
-			if sys.platform == "win32":
-				# Windows is a bit special... first of all the file will be called pip.exe, not just pip, and secondly
-				# for a non-virtualenv install (e.g. global install) the pip binary will not be located in the
-				# same folder as python.exe, but in a subfolder Scripts, e.g.
-				#
-				# C:\Python2.7\
-				#  |- python.exe
-				#  `- Scripts
-				#      `- pip.exe
+		# Determine the pip version
 
-				# virtual env?
-				pip_command = os.path.join(binary_dir, "pip.exe")
+		self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command))
 
-				if not os.path.isfile(pip_command):
-					# nope, let's try the Scripts folder then
-					scripts_dir = os.path.join(binary_dir, "Scripts")
-					if os.path.isdir(scripts_dir):
-						pip_command = os.path.join(scripts_dir, "pip.exe")
+		pip_version, version_segment = self._get_pip_version(pip_command, pip_sudo)
+		if pip_version is None:
+			return
 
-			if not os.path.isfile(pip_command) or not os.access(pip_command, os.X_OK):
-				pip_command = None
+		if pip_version in self.__class__.broken:
+			self._logger.error("This version of pip is known to have errors that make it incompatible with how it needs to be used by OctoPrint. Please upgrade your pip version.")
+			return
 
-		if pip_command is not None:
-			self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command))
+		self._logger.info("Version of pip at {} is {}".format(pip_command, version_segment))
 
-			sarge_command = [pip_command, "--version"]
-			if pip_sudo:
-				sarge_command = ["sudo"] + sarge_command
+		# Now figure out if pip belongs to a virtual environment and if the
+		# default installation directory is writable.
+		#
+		# The idea is the following: If OctoPrint is installed globally,
+		# the site-packages folder is probably not writable by our user.
+		# However, the user site-packages folder as usable by providing the
+		# --user parameter during install is. This we may not use though if
+		# the provided pip belongs to a virtual env (since that hiccups hard).
+		#
+		# So we figure out the installation directory, check if it's writable
+		# and if not if pip belongs to a virtual environment. Only if the
+		# installation directory is NOT writable by us but we also don't run
+		# in a virtual environment may we proceed with the --user parameter.
+
+		ok, pip_user, pip_install_dir = self._check_pip_setup(pip_command)
+		if not ok:
+			self._logger.error("Pip install directory {} is not writable and is part of a virtual environment, can't use this constellation".format(pip_install_dir))
+			return
+
+		self._logger.info("pip at {} installs to {}, --user flag needed => {}".format(pip_command, pip_install_dir, "yes" if pip_user else "no"))
+
+		self._command = pip_command
+		self._version = pip_version
+		self._version_string = version_segment
+		self._use_sudo = pip_sudo
+		self._use_user = pip_user
+		self._install_dir = pip_install_dir
+
+	def _autodetect_pip(self):
+		import os
+		python_command = sys.executable
+		binary_dir = os.path.dirname(python_command)
+
+		pip_command = os.path.join(binary_dir, "pip")
+		if sys.platform == "win32":
+			# Windows is a bit special... first of all the file will be called pip.exe, not just pip, and secondly
+			# for a non-virtualenv install (e.g. global install) the pip binary will not be located in the
+			# same folder as python.exe, but in a subfolder Scripts, e.g.
+			#
+			# C:\Python2.7\
+			#  |- python.exe
+			#  `- Scripts
+			#      `- pip.exe
+
+			# virtual env?
+			pip_command = os.path.join(binary_dir, "pip.exe")
+
+			if not os.path.isfile(pip_command):
+				# nope, let's try the Scripts folder then
+				scripts_dir = os.path.join(binary_dir, "Scripts")
+				if os.path.isdir(scripts_dir):
+					pip_command = os.path.join(scripts_dir, "pip.exe")
+
+		if not os.path.isfile(pip_command) or not os.access(pip_command, os.X_OK):
+			pip_command = None
+
+		return pip_command
+
+	def _get_pip_version(self, pip_command, pip_sudo):
+		sarge_command = [pip_command, "--version"]
+		if pip_sudo:
+			sarge_command = ["sudo"] + sarge_command
+		p = sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
+
+		if p.returncode != 0:
+			self._logger.warn("Error while trying to run pip --version: {}".format(p.stderr.text))
+			return None, None
+
+		output = p.stdout.text
+		# output should look something like this:
+		#
+		#     pip <version> from <path> (<python version>)
+		#
+		# we'll just split on whitespace and then try to use the second entry
+
+		if not output.startswith("pip"):
+			self._logger.warn("pip command returned unparseable output, can't determine version: {}".format(output))
+
+		split_output = map(lambda x: x.strip(), output.split())
+		if len(split_output) < 2:
+			self._logger.warn("pip command returned unparseable output, can't determine version: {}".format(output))
+
+		version_segment = split_output[1]
+
+		try:
+			pip_version = pkg_resources.parse_version(version_segment)
+		except:
+			self._logger.exception("Error while trying to parse version string from pip command")
+			return None, None
+
+		return pip_version, version_segment
+
+	pip_install_dir_regex = re.compile("^\s*!!! PIP_INSTALL_DIR=(.*)\s*$", re.MULTILINE)
+	pip_virtual_env_regex = re.compile("^\s*!!! PIP_VIRTUAL_ENV=(True|False)\s*$", re.MULTILINE)
+	pip_writable_regex = re.compile("^\s*!!! PIP_WRITABLE=(True|False)\s*$", re.MULTILINE)
+
+	def _check_pip_setup(self, pip_command):
+		import os
+		testballoon = os.path.join(os.path.realpath(os.path.dirname(__file__)), "piptestballoon")
+
+		sarge_command = [pip_command, "install", testballoon, "--verbose"]
+		try:
 			p = sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
 
-			if p.returncode != 0:
-				self._logger.warn("Error while trying to run pip --version: {}".format(p.stderr.text))
-				pip_command = None
-
 			output = p.stdout.text
-			# output should look something like this:
-			#
-			#     pip <version> from <path> (<python version>)
-			#
-			# we'll just split on whitespace and then try to use the second entry
+			install_dir_match = self.__class__.pip_install_dir_regex.search(output)
+			virtual_env_match = self.__class__.pip_virtual_env_regex.search(output)
+			writable_match = self.__class__.pip_writable_regex.search(output)
 
-			if not output.startswith("pip"):
-				self._logger.warn("pip command returned unparseable output, can't determine version: {}".format(output))
+			if install_dir_match and virtual_env_match and writable_match:
+				install_dir = install_dir_match.group(1)
+				virtual_env = virtual_env_match.group(1) == "True"
+				writable = writable_match.group(1) == "True"
 
-			split_output = map(lambda x: x.strip(), output.split())
-			if len(split_output) < 2:
-				self._logger.warn("pip command returned unparseable output, can't determine version: {}".format(output))
-
-			version_segment = split_output[1]
-
-			try:
-				pip_version = pkg_resources.parse_version(version_segment)
-			except:
-				self._logger.exception("Error while trying to parse version string from pip command")
-				return None, None, None
+				return writable or not virtual_env, not writable and not virtual_env, install_dir
 			else:
-				self._logger.info("Found pip at {}, version is {}".format(pip_command, version_segment))
+				return False, False, None
 
-			if pip_version in self.__class__.broken:
-				self._logger.error("This version of pip is known to have errors that make it incompatible with how it needs to be used by OctoPrint. Please upgrade your pip version.")
-				return None, None, None, False
+		finally:
+			sarge_command = [pip_command, "uninstall", "-y", "OctoPrint-PipTestBalloon"]
+			sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
 
-		return pip_command, pip_version, version_segment, pip_sudo
diff --git a/src/octoprint/util/piptestballoon/setup.py b/src/octoprint/util/piptestballoon/setup.py
new file mode 100644
index 00000000..7e0036b7
--- /dev/null
+++ b/src/octoprint/util/piptestballoon/setup.py
@@ -0,0 +1,30 @@
+from setuptools import setup
+
+def run_checks():
+	from distutils.command.install import install as cmd_install
+	from distutils.dist import Distribution
+	import sys
+	import os
+
+	cmd = cmd_install(Distribution())
+	cmd.finalize_options()
+
+	install_dir = cmd.install_lib
+	virtual_env = hasattr(sys, "real_prefix")
+	writable = os.access(install_dir, os.W_OK)
+
+	print("!!! PIP_INSTALL_DIR={}".format(install_dir))
+	print("!!! PIP_VIRTUAL_ENV={}".format(virtual_env))
+	print("!!! PIP_WRITABLE={}".format(writable))
+	sys.stdout.flush()
+
+def parameters():
+	run_checks()
+
+	return dict(
+		name="OctoPrint-PipTestBalloon",
+		version="1.0",
+		description="Just a test balloon to check a couple of pip related settings"
+	)
+
+setup(**parameters())

From 000f8e9310f04ead9d79136ea48e491cdc2aa276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 13:47:35 +0200
Subject: [PATCH 02/19] Debug logging for testballoon install

---
 src/octoprint/util/pip.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index ccf8796c..9a860421 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -259,6 +259,8 @@ class PipCaller(CommandlineCaller):
 			p = sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
 
 			output = p.stdout.text
+			self._logger.debug("Got output from {}: {}".format(" ".join(sarge_command), output))
+
 			install_dir_match = self.__class__.pip_install_dir_regex.search(output)
 			virtual_env_match = self.__class__.pip_virtual_env_regex.search(output)
 			writable_match = self.__class__.pip_writable_regex.search(output)

From 5df576b73e320b41423e845e7ba8a63c1fc7b2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 13:53:48 +0200
Subject: [PATCH 03/19] Install testballoon using pip install . in testballoon
 folder

---
 src/octoprint/util/pip.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index 9a860421..aad082b2 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -254,9 +254,12 @@ class PipCaller(CommandlineCaller):
 		import os
 		testballoon = os.path.join(os.path.realpath(os.path.dirname(__file__)), "piptestballoon")
 
-		sarge_command = [pip_command, "install", testballoon, "--verbose"]
+		sarge_command = [pip_command, "install", ".", "--verbose"]
 		try:
-			p = sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
+			p = sarge.run(sarge_command,
+			              stdout=sarge.Capture(),
+			              stderr=sarge.Capture(),
+			              cwd=testballoon)
 
 			output = p.stdout.text
 			self._logger.debug("Got output from {}: {}".format(" ".join(sarge_command), output))

From cae73c1ee5ad323bcb8330280fd3314105d17082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 14:22:29 +0200
Subject: [PATCH 04/19] Cache for pip setup and version information

Can take a bit of time to collect that data since it needs some invocations of
pip, so we cache that data unless told otherwise.
---
 src/octoprint/util/pip.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index aad082b2..1303caf9 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -15,6 +15,7 @@ import pkg_resources
 
 from .commandline import CommandlineCaller
 
+_cache = dict(version=dict(), setup=dict())
 
 class UnknownPip(Exception):
 	pass
@@ -24,12 +25,13 @@ class PipCaller(CommandlineCaller):
 	no_use_wheel = pkg_resources.parse_requirements("pip==1.5.0")
 	broken = pkg_resources.parse_requirements("pip>=6.0.1,<=6.0.3")
 
-	def __init__(self, configured=None):
+	def __init__(self, configured=None, ignore_cache=False):
 		CommandlineCaller.__init__(self)
 		self._logger = logging.getLogger(__name__)
 
 		self.configured = configured
 		self.refresh = False
+		self.ignore_cache = ignore_cache
 
 		self._command = None
 		self._version = None
@@ -144,7 +146,7 @@ class PipCaller(CommandlineCaller):
 
 		self._logger.debug("Found pip at {}, going to figure out its version".format(pip_command))
 
-		pip_version, version_segment = self._get_pip_version(pip_command, pip_sudo)
+		pip_version, version_segment = self._get_pip_version(pip_command)
 		if pip_version is None:
 			return
 
@@ -212,10 +214,12 @@ class PipCaller(CommandlineCaller):
 
 		return pip_command
 
-	def _get_pip_version(self, pip_command, pip_sudo):
+	def _get_pip_version(self, pip_command):
+		if not self.ignore_cache and pip_command in _cache["version"]:
+			self._logger.debug("Using cached pip version information for {}".format(pip_command))
+			return _cache["version"][pip_command]
+
 		sarge_command = [pip_command, "--version"]
-		if pip_sudo:
-			sarge_command = ["sudo"] + sarge_command
 		p = sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
 
 		if p.returncode != 0:
@@ -244,13 +248,19 @@ class PipCaller(CommandlineCaller):
 			self._logger.exception("Error while trying to parse version string from pip command")
 			return None, None
 
-		return pip_version, version_segment
+		result = pip_version, version_segment
+		_cache["version"][pip_command] = result
+		return result
 
 	pip_install_dir_regex = re.compile("^\s*!!! PIP_INSTALL_DIR=(.*)\s*$", re.MULTILINE)
 	pip_virtual_env_regex = re.compile("^\s*!!! PIP_VIRTUAL_ENV=(True|False)\s*$", re.MULTILINE)
 	pip_writable_regex = re.compile("^\s*!!! PIP_WRITABLE=(True|False)\s*$", re.MULTILINE)
 
 	def _check_pip_setup(self, pip_command):
+		if not self.ignore_cache and pip_command in _cache["setup"]:
+			self._logger.debug("Using cached pip setup information for {}".format(pip_command))
+			return _cache["setup"][pip_command]
+
 		import os
 		testballoon = os.path.join(os.path.realpath(os.path.dirname(__file__)), "piptestballoon")
 
@@ -273,9 +283,9 @@ class PipCaller(CommandlineCaller):
 				virtual_env = virtual_env_match.group(1) == "True"
 				writable = writable_match.group(1) == "True"
 
-				return writable or not virtual_env, not writable and not virtual_env, install_dir
-			else:
-				return False, False, None
+				result = writable or not virtual_env, not writable and not virtual_env, install_dir
+				_cache["setup"][pip_command] = result
+				return result
 
 		finally:
 			sarge_command = [pip_command, "uninstall", "-y", "OctoPrint-PipTestBalloon"]

From 22509f02b5c0f6a3f4752637af68e862eb238686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 14:23:10 +0200
Subject: [PATCH 05/19] Make sure to include testballoon package in install

---
 MANIFEST.in | 1 +
 setup.py    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index abffeac2..15833310 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,7 @@ recursive-include src/octoprint/static *
 recursive-include src/octoprint/templates *
 recursive-include src/octoprint/plugins *
 recursive-include src/octoprint/translations *
+include src/octoprint/util/piptestballoon/setup.py
 include versioneer.py
 include src/octoprint/_version.py
 include AUTHORS.md
diff --git a/setup.py b/setup.py
index 3633a628..ec24b83f 100644
--- a/setup.py
+++ b/setup.py
@@ -149,7 +149,9 @@ def params():
 		"": "src",
 	}
 	package_data = {
-		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint', ['static', 'templates', 'plugins', 'translations'])
+		"octoprint": octoprint_setuptools.package_data_dirs('src/octoprint',
+		                                                    ['static', 'templates', 'plugins', 'translations'])
+		             + ['util/piptestballoon/setup.py']
 	}
 
 	include_package_data = True

From 62478fd98f964a9b0af967d80406cb0a654e0110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 29 Sep 2015 14:51:58 +0200
Subject: [PATCH 06/19] More pip data in plugin manager front end

---
 .../plugins/pluginmanager/__init__.py          |  6 ++++--
 .../pluginmanager/static/js/pluginmanager.js   | 13 +++++++++++++
 .../templates/pluginmanager_settings.jinja2    | 18 +++++++++++++++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 7b5679b7..d724f8e5 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -188,8 +188,8 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 
 		return jsonify(plugins=self._get_plugins(),
 		               repository=dict(
-			               available=self._repository_available,
-			               plugins=self._repository_plugins
+		                   available=self._repository_available,
+		                   plugins=self._repository_plugins
 		               ),
 		               os=self._get_os(),
 		               octoprint=self._get_octoprint_version_string(),
@@ -197,7 +197,9 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		                   available=self._pip_caller.available,
 		                   command=self._pip_caller.command,
 		                   version=self._pip_caller.version_string,
+		                   install_dir=self._pip_caller.install_dir,
 		                   use_sudo=self._pip_caller.use_sudo,
+		                   use_user=self._pip_caller.use_user,
 		                   additional_args=self._settings.get(["pip_args"])
 		               ))
 
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 75c8e2f3..0f61a927 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -82,9 +82,18 @@ $(function() {
         self.pipAvailable = ko.observable(false);
         self.pipCommand = ko.observable();
         self.pipVersion = ko.observable();
+        self.pipInstallDir = ko.observable();
+        self.pipUseUser = ko.observable();
         self.pipUseSudo = ko.observable();
         self.pipAdditionalArgs = ko.observable();
 
+        self.pipUseSudoString = ko.computed(function() {
+            return self.pipUseSudo() ? "yes" : "no";
+        });
+        self.pipUseUserString = ko.computed(function() {
+            return self.pipUseUser() ? "yes" : "no";
+        });
+
         self.working = ko.observable(false);
         self.workingTitle = ko.observable();
         self.workingDialog = undefined;
@@ -211,11 +220,15 @@ $(function() {
             if (data.available) {
                 self.pipCommand(data.command);
                 self.pipVersion(data.version);
+                self.pipInstallDir(data.install_dir);
+                self.pipUseUser(data.use_user);
                 self.pipUseSudo(data.use_sudo);
                 self.pipAdditionalArgs(data.additional_args);
             } else {
                 self.pipCommand(undefined);
                 self.pipVersion(undefined);
+                self.pipInstallDir(undefined);
+                self.pipUseUser(data.use_user);
                 self.pipUseSudo(undefined);
                 self.pipAdditionalArgs(undefined);
             }
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index d399b593..9c55fac0 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -71,9 +71,21 @@
 
 <button class="btn btn-block" data-bind="click: $root.showRepository">{{ _('Get More...') }}</button>
 
-<p class="muted" data-bind="visible: pipAvailable()">
-    <small>Using pip at "<span data-bind="text: pipCommand"></span>" (Version <span data-bind="text: pipVersion"></span><span data-bind="visible: pipAdditionalArgs">, additional arguments: <span data-bind="text: pipAdditionalArgs"></span></span>)</small>
-</p>
+<div class="muted" data-bind="visible: pipAvailable()">
+    <div>
+        <small>
+            <a href="#" class="muted" onclick="$(this).children('i.toggle-arrow').toggleClass('icon-caret-right icon-caret-down').parent().parent().parent().next().slideToggle('fast')">
+                <i class="toggle-arrow icon-caret-right"></i> Using pip at "<span data-bind="text: pipCommand"></span>", Version <span data-bind="text: pipVersion"></span>
+            </a>
+        </small>
+    </div>
+    <div class="hide">
+        <small>
+            Installation directory: <span data-bind="text: pipInstallDir"></span> ("--user" flag: <span data-bind="text: pipUseUserString"></span>, sudo: <span data-bind="text: pipUseSudoString"></span>)<br />
+            <span data-bind="visible: pipAdditionalArgs">Additional Arguments: <span data-bind="text: pipAdditionalArgs"></span></span>
+        </small>
+    </div>
+</div>
 
 <div id="settings_plugin_pluginmanager_workingdialog" class="modal hide fade">
     <div class="modal-header">

From 7c5fe46f4a24f92740b1afee58ca9c96d7ec1b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:27:24 +0200
Subject: [PATCH 07/19] More intelligence for PipUtil to determine when to use
 --user

Includes a force_user (and a force_sudo) parameter.
---
 src/octoprint/util/pip.py | 43 +++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index 7a132425..ded4a419 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -10,6 +10,7 @@ import sarge
 import sys
 import logging
 import re
+import site
 
 import pkg_resources
 
@@ -25,7 +26,8 @@ class PipCaller(CommandlineCaller):
 	no_use_wheel = pkg_resources.parse_requirements("pip==1.5.0")
 	broken = pkg_resources.parse_requirements("pip>=6.0.1,<=6.0.3")
 
-	def __init__(self, configured=None, ignore_cache=False):
+	def __init__(self, configured=None, ignore_cache=False, force_sudo=False,
+	             force_user=False):
 		CommandlineCaller.__init__(self)
 		self._logger = logging.getLogger(__name__)
 
@@ -33,11 +35,15 @@ class PipCaller(CommandlineCaller):
 		self.refresh = False
 		self.ignore_cache = ignore_cache
 
+		self.force_sudo = force_sudo
+		self.force_user = force_user
+
 		self._command = None
 		self._version = None
 		self._version_string = None
 		self._use_sudo = False
 		self._use_user = False
+		self._virtual_env = False
 		self._install_dir = None
 
 		self.trigger_refresh()
@@ -90,6 +96,10 @@ class PipCaller(CommandlineCaller):
 	def use_user(self):
 		return self._use_user
 
+	@property
+	def virtual_env(self):
+		return self._virtual_env
+
 	@property
 	def available(self):
 		return self._command is not None
@@ -112,19 +122,35 @@ class PipCaller(CommandlineCaller):
 			raise UnknownPip()
 
 		arg_list = list(args)
+
 		if "install" in arg_list:
+			# strip --process-dependency-links for versions that don't support it
 			if not self.version in self.__class__.process_dependency_links and "--process-dependency-links" in arg_list:
 				self._logger.debug("Found --process-dependency-links flag, version {} doesn't need that yet though, removing.".format(self.version))
 				arg_list.remove("--process-dependency-links")
+
+			# add --no-use-wheel for versions that otherwise break
 			if self.version in self.__class__.no_use_wheel and not "--no-use-wheel" in arg_list:
 				self._logger.debug("Version {} needs --no-use-wheel to properly work.".format(self.version))
 				arg_list.append("--no-use-wheel")
-			if self.use_user:
+
+			# remove --user if it's present and a virtual env is detected
+			if "--user" in arg_list:
+				if self._virtual_env or not site.ENABLE_USER_SITE:
+					self._logger.debug("Virtual environment detected, removing --user flag.")
+					arg_list.remove("--user")
+			# otherwise add it if necessary
+			elif (self.use_user or self.force_user) and site.ENABLE_USER_SITE:
+				self._logger.debug("pip needs --user flag for installations.")
 				arg_list.append("--user")
 
+		# add args to command
 		command = [self._command] + list(arg_list)
-		if self._use_sudo:
+
+		# add sudo if necessary
+		if self._use_sudo or self.force_sudo:
 			command = ["sudo"] + command
+
 		return self.call(command)
 
 	def _setup_pip(self):
@@ -170,18 +196,19 @@ class PipCaller(CommandlineCaller):
 		# installation directory is NOT writable by us but we also don't run
 		# in a virtual environment may we proceed with the --user parameter.
 
-		ok, pip_user, pip_install_dir = self._check_pip_setup(pip_command)
+		ok, pip_user, pip_virtual_env, pip_install_dir = self._check_pip_setup(pip_command)
 		if not ok:
 			self._logger.error("Pip install directory {} is not writable and is part of a virtual environment, can't use this constellation".format(pip_install_dir))
 			return
 
-		self._logger.info("pip at {} installs to {}, --user flag needed => {}".format(pip_command, pip_install_dir, "yes" if pip_user else "no"))
+		self._logger.info("pip at {} installs to {}, --user flag needed => {}, virtual env => {}".format(pip_command, pip_install_dir, "yes" if pip_user else "no", "yes" if pip_virtual_env else "no"))
 
 		self._command = pip_command
 		self._version = pip_version
 		self._version_string = version_segment
 		self._use_sudo = pip_sudo
 		self._use_user = pip_user
+		self._virtual_env = pip_virtual_env
 		self._install_dir = pip_install_dir
 
 	def _autodetect_pip(self):
@@ -283,7 +310,11 @@ class PipCaller(CommandlineCaller):
 				virtual_env = virtual_env_match.group(1) == "True"
 				writable = writable_match.group(1) == "True"
 
-				result = writable or not virtual_env, not writable and not virtual_env, install_dir
+				# ok, enable user flag, virtual env yes/no, installation dir
+				result = writable or not virtual_env, \
+				         not writable and not virtual_env and site.ENABLE_USER_SITE, \
+				         virtual_env, \
+				         install_dir
 				_cache["setup"][pip_command] = result
 				return result
 

From 10db8c9577e663bc05e4c26ba3f9b8568b8eb6af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:28:58 +0200
Subject: [PATCH 08/19] PluginManager now marks plugins as managable

Managable currently pretty much only means "uninstallable".

Plugins are managable if their installation location is writable
and - if they are installed from an entry point and OctoPrint is
running in a virtual environment - within the bounds of the virtual
environment (because otherwise pip will not allow to uninstall).
---
 src/octoprint/plugin/core.py | 37 ++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py
index 30577575..6f9d9c63 100644
--- a/src/octoprint/plugin/core.py
+++ b/src/octoprint/plugin/core.py
@@ -133,6 +133,7 @@ class PluginInfo(object):
 		self.enabled = True
 		self.bundled = False
 		self.loaded = False
+		self.managable = True
 
 		self._name = name
 		self._version = version
@@ -475,8 +476,25 @@ class PluginManager(object):
 
 		self.marked_plugins = defaultdict(list)
 
+		self._python_install_dir = None
+		self._python_virtual_env = False
+		self._detect_python_environment()
+
 		self.reload_plugins(startup=True, initialize_implementations=False)
 
+	def _detect_python_environment(self):
+		from distutils.command.install import install as cmd_install
+		from distutils.dist import Distribution
+		import sys
+
+		cmd = cmd_install(Distribution())
+		cmd.finalize_options()
+
+		self._python_install_dir = cmd.install_lib
+		self._python_prefix = sys.prefix
+		self._python_virtual_env = hasattr(sys, "real_prefix") \
+		                           or (hasattr(sys, "base_prefix") and sys.prefix != sys.base_prefix)
+
 	@property
 	def plugins(self):
 		plugins = dict(self.enabled_plugins)
@@ -503,12 +521,13 @@ class PluginManager(object):
 		result = dict()
 
 		for folder in folders:
-			readonly = False
+			flagged_readonly = False
 			if isinstance(folder, (list, tuple)):
 				if len(folder) == 2:
-					folder, readonly = folder
+					folder, flagged_readonly = folder
 				else:
 					continue
+			actual_readonly = not os.access(folder, os.W_OK)
 
 			if not os.path.exists(folder):
 				self.logger.warn("Plugin folder {folder} could not be found, skipping it".format(folder=folder))
@@ -531,8 +550,8 @@ class PluginManager(object):
 				plugin = self._import_plugin_from_module(key, folder=folder)
 				if plugin:
 					plugin.origin = FolderOrigin("folder", folder)
-					if readonly:
-						plugin.bundled = True
+					plugin.managable = not flagged_readonly and not actual_readonly
+					plugin.bundled = flagged_readonly
 
 					plugin.enabled = False
 
@@ -578,6 +597,16 @@ class PluginManager(object):
 				plugin = self._import_plugin_from_module(key, **kwargs)
 				if plugin:
 					plugin.origin = EntryPointOrigin("entry_point", group, module_name, package_name, version)
+
+					# plugin is manageable if its location is writable and OctoPrint
+					# is either not running from a virtual env or the plugin is
+					# installed in that virtual env - the virtual env's pip will not
+					# allow us to uninstall stuff that is installed outside
+					# of the virtual env, so this check is necessary
+					plugin.managable = os.access(plugin.location, os.W_OK) \
+					                   and (not self._python_virtual_env
+					                        or plugin.location.startswith(self._python_prefix))
+
 					plugin.enabled = False
 					result[key] = plugin
 

From fbfac4b569ab1e31750d225fc007717cb85334d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:30:39 +0200
Subject: [PATCH 09/19] PluginManager also scans user site packages

In case the user site packages are not yet part of the used
working set OR the sys path and ENABLE_USER_SITE is true, the
manager will now make sure that the folder is searched for plugins
as well upon plugin reload.

This is necessary since Python will not automatically include the
user site directory upon firing up the program in case there's
nothing installed to it/it doesn't exist. If a plugin is installed
during run time with --user that will lead to it not being found,
which is undesirable. Hence run time manipulation of sys.path and
the workingset becomes necessary.
---
 src/octoprint/plugin/core.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py
index 6f9d9c63..41a36883 100644
--- a/src/octoprint/plugin/core.py
+++ b/src/octoprint/plugin/core.py
@@ -562,9 +562,18 @@ class PluginManager(object):
 	def _find_plugins_from_entry_points(self, groups, existing, ignore_uninstalled=True):
 		result = dict()
 
-		# let's make sure we have a current working set
+		# let's make sure we have a current working set ...
 		working_set = pkg_resources.WorkingSet()
 
+		# ... including the user's site packages
+		import site
+		import sys
+		if site.ENABLE_USER_SITE:
+			if not site.USER_SITE in working_set.entries:
+				working_set.add_entry(site.USER_SITE)
+			if not site.USER_SITE in sys.path:
+				site.addsitedir(site.USER_SITE)
+
 		if not isinstance(groups, (list, tuple)):
 			groups = [groups]
 

From 28fc7d74f49d3f0ccd8d6095e2b0b4aabf11a99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:33:25 +0200
Subject: [PATCH 10/19] Made plugin marking in PluginManager more flexible

Now supports arbitrary markers for plugins. Also added a method
to check if a plugin was marked with a specified marker.
---
 src/octoprint/plugin/core.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py
index 41a36883..0dee798c 100644
--- a/src/octoprint/plugin/core.py
+++ b/src/octoprint/plugin/core.py
@@ -686,15 +686,24 @@ class PluginManager(object):
 				hooks=sum(map(lambda x: len(x), self.plugin_hooks.values()))
 			))
 
-	def mark_plugin(self, name, uninstalled=None):
+	def mark_plugin(self, name, **kwargs):
 		if not name in self.plugins:
-			self.logger.warn("Trying to mark an unknown plugin {name}".format(**locals()))
+			self.logger.debug("Trying to mark an unknown plugin {name}".format(**locals()))
 
-		if uninstalled is not None:
-			if uninstalled and not name in self.marked_plugins["uninstalled"]:
-				self.marked_plugins["uninstalled"].append(name)
-			elif not uninstalled and name in self.marked_plugins["uninstalled"]:
-				self.marked_plugins["uninstalled"].remove(name)
+		for key, value in kwargs.items():
+			if value is None:
+				continue
+
+			if value and not name in self.marked_plugins[key]:
+				self.marked_plugins[key].append(name)
+			elif not value and name in self.marked_plugins[key]:
+				self.marked_plugins[key].remove(name)
+
+	def is_plugin_marked(self, name, key):
+		if not name in self.plugins:
+			return False
+
+		return name in self.marked_plugins[key]
 
 	def load_plugin(self, name, plugin=None, startup=False, initialize_implementation=True):
 		if not name in self.plugins:

From 4a97864e0117d889966991f137bf578203ac1eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:36:00 +0200
Subject: [PATCH 11/19] PMGR: Added option to force use of --user flag

---
 src/octoprint/plugins/pluginmanager/__init__.py  |  5 ++++-
 .../pluginmanager/static/js/pluginmanager.js     |  5 ++++-
 .../templates/pluginmanager_settings.jinja2      | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index d724f8e5..125c6be3 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -52,7 +52,8 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		self._repository_cache_path = os.path.join(self.get_plugin_data_folder(), "plugins.json")
 		self._repository_cache_ttl = self._settings.get_int(["repository_ttl"]) * 60
 
-		self._pip_caller = PipCaller(configured=self._settings.get(["pip"]))
+		self._pip_caller = PipCaller(configured=self._settings.get(["pip"]),
+		                             force_user=self._settings.get_boolean(["pip_force_user"]))
 		self._pip_caller.on_log_call = self._log_call
 		self._pip_caller.on_log_stdout = self._log_stdout
 		self._pip_caller.on_log_stderr = self._log_stderr
@@ -84,6 +85,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 			repository_ttl=24*60,
 			pip=None,
 			pip_args=None,
+			pip_force_user=False,
 			dependency_links=False,
 			hidden=[]
 		)
@@ -94,6 +96,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		new_pip = self._settings.get(["pip"])
 
 		self._repository_cache_ttl = self._settings.get_int(["repository_ttl"]) * 60
+		self._pip_caller.force_user = self._settings.get_boolean(["pip_force_user"])
 		if old_pip != new_pip:
 			self._pip_caller.configured = new_pip
 			try:
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 0f61a927..5e3612a6 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -10,6 +10,7 @@ $(function() {
         self.config_repositoryTtl = ko.observable();
         self.config_pipCommand = ko.observable();
         self.config_pipAdditionalArgs = ko.observable();
+        self.config_pipForceUser = ko.observable();
 
         self.configurationDialog = $("#settings_plugin_pluginmanager_configurationdialog");
 
@@ -423,7 +424,8 @@ $(function() {
                         repository: repository,
                         repository_ttl: repositoryTtl,
                         pip: pipCommand,
-                        pip_args: pipArgs
+                        pip_args: pipArgs,
+                        pip_force_user: self.config_pipForceUser()
                     }
                 }
             };
@@ -439,6 +441,7 @@ $(function() {
             self.config_repositoryTtl(self.settingsViewModel.settings.plugins.pluginmanager.repository_ttl());
             self.config_pipCommand(self.settingsViewModel.settings.plugins.pluginmanager.pip());
             self.config_pipAdditionalArgs(self.settingsViewModel.settings.plugins.pluginmanager.pip_args());
+            self.config_pipForceUser(self.settingsViewModel.settings.plugins.pluginmanager.pip_force_user());
         };
 
         self.installed = function(data) {
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index 9c55fac0..b50b4f41 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -217,19 +217,31 @@
     </div>
     <div class="modal-body">
         <form class="form-horizontal">
+            <legend>{{ _('pip configuration') }}</legend>
+
             <div class="control-group" title="{{ _('pip command to use for managing plugins. You might have to configure this if auto detection fails.') }}">
-                <label class="control-label">{{ _('pip command') }}</label>
+                <label class="control-label">{{ _('Command') }}</label>
                 <div class="controls">
                     <input type="text" class="input-block-level" data-bind="value: config_pipCommand" placeholder="{{ _('Autodetect') }}">
                     <span class="help-inline">{{ _('<strong>Only</strong> set this if OctoPrint cannot autodetect the path to <code>pip</code> to use for managing plugins.') }}</span>
                 </div>
             </div>
             <div class="control-group" title="{{ _('Additional arguments for pip command. You should normally not have to change this.') }}">
-                <label class="control-label">{{ _('Additional pip arguments') }}</label>
+                <label class="control-label">{{ _('Additional arguments') }}</label>
                 <div class="controls">
                     <input type="text" class="input-block-level" data-bind="value: config_pipAdditionalArgs">
                 </div>
             </div>
+            <div class="control-group">
+                <div class="controls">
+                    <label class="checkbox">
+                        <input type="checkbox" data-bind="checked: config_pipForceUser"> {{ _('Force the user of the <code>--user</code> flag with <code>pip install</code>') }}
+                    </label>
+                </div>
+            </div>
+
+            <legend>{{ _('Plugin repository configuration') }}</legend>
+
             <div class="control-group" title="{{ _('URL of the Plugin Repository to use. You should normally not have to change this.') }}">
                 <label class="control-label">{{ _('Repository URL') }}</label>
                 <div class="controls">

From e64975c85c2d0d367c1b47e54ac8b4dd86320247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:36:45 +0200
Subject: [PATCH 12/19] PMGR: Debug output in frontend to indicate venv

---
 src/octoprint/plugins/pluginmanager/__init__.py           | 1 +
 .../plugins/pluginmanager/static/js/pluginmanager.js      | 8 +++++++-
 .../pluginmanager/templates/pluginmanager_settings.jinja2 | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 125c6be3..091f4a97 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -203,6 +203,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		                   install_dir=self._pip_caller.install_dir,
 		                   use_sudo=self._pip_caller.use_sudo,
 		                   use_user=self._pip_caller.use_user,
+		                   virtual_env=self._pip_caller.virtual_env,
 		                   additional_args=self._settings.get(["pip_args"])
 		               ))
 
diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 5e3612a6..3ab09119 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -86,6 +86,7 @@ $(function() {
         self.pipInstallDir = ko.observable();
         self.pipUseUser = ko.observable();
         self.pipUseSudo = ko.observable();
+        self.pipVirtualEnv = ko.observable();
         self.pipAdditionalArgs = ko.observable();
 
         self.pipUseSudoString = ko.computed(function() {
@@ -94,6 +95,9 @@ $(function() {
         self.pipUseUserString = ko.computed(function() {
             return self.pipUseUser() ? "yes" : "no";
         });
+        self.pipVirtualEnvString = ko.computed(function() {
+            return self.pipVirtualEnv() ? "yes" : "no";
+        });
 
         self.working = ko.observable(false);
         self.workingTitle = ko.observable();
@@ -224,13 +228,15 @@ $(function() {
                 self.pipInstallDir(data.install_dir);
                 self.pipUseUser(data.use_user);
                 self.pipUseSudo(data.use_sudo);
+                self.pipVirtualEnv(data.virtual_env);
                 self.pipAdditionalArgs(data.additional_args);
             } else {
                 self.pipCommand(undefined);
                 self.pipVersion(undefined);
                 self.pipInstallDir(undefined);
-                self.pipUseUser(data.use_user);
+                self.pipUseUser(undefined);
                 self.pipUseSudo(undefined);
+                self.pipVirtualEnv(undefined);
                 self.pipAdditionalArgs(undefined);
             }
         };
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index b50b4f41..014d75a4 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -82,6 +82,7 @@
     <div class="hide">
         <small>
             Installation directory: <span data-bind="text: pipInstallDir"></span> ("--user" flag: <span data-bind="text: pipUseUserString"></span>, sudo: <span data-bind="text: pipUseSudoString"></span>)<br />
+            Virtual environment: <span data-bind="text: pipVirtualEnvString"></span><br />
             <span data-bind="visible: pipAdditionalArgs">Additional Arguments: <span data-bind="text: pipAdditionalArgs"></span></span>
         </small>
     </div>

From ca587454df8a870001f269dd85190f141502f01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:37:27 +0200
Subject: [PATCH 13/19] PMGR: Fixed marking of plugins

Plugins can now (again) show if they are pending installation,
uninstallation and also if they are managable at all.
---
 .../plugins/pluginmanager/__init__.py         | 20 +++++++++++++------
 .../templates/pluginmanager_settings.jinja2   |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 091f4a97..48a7be6d 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -337,8 +337,11 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 			self._send_result_notification("install", result)
 			return jsonify(result)
 
-		self._plugin_manager.mark_plugin(new_plugin_key, uninstalled=False)
 		self._plugin_manager.reload_plugins()
+		is_reinstall = self._plugin_manager.is_plugin_marked(new_plugin_key, "uninstalled")
+		self._plugin_manager.mark_plugin(new_plugin_key,
+		                                 uninstalled=False,
+		                                 installed=not is_reinstall)
 
 		needs_restart = self._plugin_manager.is_restart_needing_plugin(new_plugin) or new_plugin_key in all_plugins_before or reinstall is not None
 		needs_refresh = new_plugin.implementation and isinstance(new_plugin.implementation, octoprint.plugin.ReloadNeedingPlugin)
@@ -351,10 +354,13 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 
 	def command_uninstall(self, plugin):
 		if plugin.key == "pluginmanager":
-			return make_response("Can't uninstall Plugin Manager", 400)
+			return make_response("Can't uninstall Plugin Manager", 403)
+
+		if not plugin.managable:
+			return make_response("Plugin is not managable and hence cannot be uninstalled", 403)
 
 		if plugin.bundled:
-			return make_response("Bundled plugins cannot be uninstalled", 400)
+			return make_response("Bundled plugins cannot be uninstalled", 403)
 
 		if plugin.origin is None:
 			self._logger.warn(u"Trying to uninstall plugin {plugin} but origin is unknown".format(**locals()))
@@ -398,7 +404,8 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		needs_restart = self._plugin_manager.is_restart_needing_plugin(plugin)
 		needs_refresh = plugin.implementation and isinstance(plugin.implementation, octoprint.plugin.ReloadNeedingPlugin)
 
-		self._plugin_manager.mark_plugin(plugin.key, uninstalled=True)
+		was_pending_install = self._plugin_manager.is_plugin_marked(plugin.key, "installed")
+		self._plugin_manager.mark_plugin(plugin.key, uninstalled=not was_pending_install, installed=False)
 
 		if not needs_restart:
 			try:
@@ -670,11 +677,12 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 			url=plugin.url,
 			license=plugin.license,
 			bundled=plugin.bundled,
+			managable=plugin.managable,
 			enabled=plugin.enabled,
 			pending_enable=(not plugin.enabled and plugin.key in self._pending_enable),
 			pending_disable=(plugin.enabled and plugin.key in self._pending_disable),
-			pending_install=(plugin.key in self._pending_install),
-			pending_uninstall=(plugin.key in self._pending_uninstall),
+			pending_install=(self._plugin_manager.is_plugin_marked(plugin.key, "installed")),
+			pending_uninstall=(self._plugin_manager.is_plugin_marked(plugin.key, "uninstalled")),
 			origin=plugin.origin.type
 		)
 
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index 014d75a4..72cbc7ca 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -42,7 +42,7 @@
     <tbody data-bind="foreach: plugins.paginatedItems">
     <tr>
         <td class="settings_plugin_plugin_manager_plugins_name">
-            <div data-bind="css: {muted: !enabled}"><span data-bind="text: name"></span> <span data-bind="visible: version">(<span data-bind="text: version"></span>)</span> <i title="{{ _('Bundled') }}" class="icon-th-large" data-bind="visible: bundled"></i> <i title="Restart needed" class="icon-refresh" data-bind="visible: pending_enable || pending_disable || pending_uninstall"></i> <i title="Uninstalled" class="icon-remove" data-bind="visible: pending_uninstall"></i></div>
+            <div data-bind="css: {muted: !enabled}"><span data-bind="text: name"></span> <span data-bind="visible: version">(<span data-bind="text: version"></span>)</span> <i title="{{ _('Bundled with OctoPrint') }}" class="icon-th-large" data-bind="visible: bundled"></i> <i class="icon-lock" title="{{ _('Cannot be uninstalled through OctoPrint') }}" data-bind="visible: !managable"></i> <i title="{{ _('Restart of OctoPrint needed for changes to take effect') }}" class="icon-refresh" data-bind="visible: pending_enable || pending_disable || pending_install || pending_uninstall"></i> <i title="{{ _('Pending install') }}" class="icon-plus" data-bind="visible: pending_install"></i> <i title="{{ _('Pending uninstall') }}" class="icon-minus" data-bind="visible: pending_uninstall"></i></div>
             <div><small class="muted" data-bind="text: description">&nbsp;</small></div>
             <div data-bind="css: {muted: !enabled}">
                 <small data-bind="visible: url"><i class="icon-home"></i> <a data-bind="attr: {href: url}">{{ _('Homepage') }}</a></small>

From 2eb80c550ff97f67bf66b66d2311b0ceb5566cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 13:44:58 +0200
Subject: [PATCH 14/19] PMGR: Disable plugin remove button if plugin is not
 managable

---
 src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 3ab09119..8767c9ea 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -115,6 +115,7 @@ $(function() {
         self.enableUninstall = function(data) {
             return self.enableManagement()
                 && (data.origin != "entry_point" || self.pipAvailable())
+                && data.managable
                 && !data.bundled
                 && data.key != 'pluginmanager'
                 && !data.pending_uninstall;

From fdcc6ac367e5fbcf6d66a0c6caa62b043f78fb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 14:25:06 +0200
Subject: [PATCH 15/19] PMGR: Only add --user flag if not running in a virtual
 env

---
 src/octoprint/util/pip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index ded4a419..1a590b1c 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -140,7 +140,7 @@ class PipCaller(CommandlineCaller):
 					self._logger.debug("Virtual environment detected, removing --user flag.")
 					arg_list.remove("--user")
 			# otherwise add it if necessary
-			elif (self.use_user or self.force_user) and site.ENABLE_USER_SITE:
+			elif not self._virtual_env and site.ENABLE_USER_SITE and (self.use_user or self.force_user):
 				self._logger.debug("pip needs --user flag for installations.")
 				arg_list.append("--user")
 

From 2926b5c8d56eca4448f6147210abd95a12cacf2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 14:30:10 +0200
Subject: [PATCH 16/19] PMGR: only mark as pending (un)installed if restart is
 needed

---
 src/octoprint/plugins/pluginmanager/__init__.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index 48a7be6d..069e8aff 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -338,13 +338,13 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 			return jsonify(result)
 
 		self._plugin_manager.reload_plugins()
+		needs_restart = self._plugin_manager.is_restart_needing_plugin(new_plugin) or new_plugin_key in all_plugins_before or reinstall is not None
+		needs_refresh = new_plugin.implementation and isinstance(new_plugin.implementation, octoprint.plugin.ReloadNeedingPlugin)
+
 		is_reinstall = self._plugin_manager.is_plugin_marked(new_plugin_key, "uninstalled")
 		self._plugin_manager.mark_plugin(new_plugin_key,
 		                                 uninstalled=False,
-		                                 installed=not is_reinstall)
-
-		needs_restart = self._plugin_manager.is_restart_needing_plugin(new_plugin) or new_plugin_key in all_plugins_before or reinstall is not None
-		needs_refresh = new_plugin.implementation and isinstance(new_plugin.implementation, octoprint.plugin.ReloadNeedingPlugin)
+		                                 installed=not is_reinstall and needs_restart)
 
 		self._plugin_manager.log_all_plugins()
 
@@ -405,7 +405,9 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 		needs_refresh = plugin.implementation and isinstance(plugin.implementation, octoprint.plugin.ReloadNeedingPlugin)
 
 		was_pending_install = self._plugin_manager.is_plugin_marked(plugin.key, "installed")
-		self._plugin_manager.mark_plugin(plugin.key, uninstalled=not was_pending_install, installed=False)
+		self._plugin_manager.mark_plugin(plugin.key,
+		                                 uninstalled=not was_pending_install and needs_restart,
+		                                 installed=False)
 
 		if not needs_restart:
 			try:

From 0a1816e52fd5053bed564511bf5b6e1d7b5ffd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 15:58:38 +0200
Subject: [PATCH 17/19] Better error reporting in PipUtil for errors during pip
 setup detection

---
 src/octoprint/util/pip.py | 43 +++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
index 1a590b1c..4b5b19b9 100644
--- a/src/octoprint/util/pip.py
+++ b/src/octoprint/util/pip.py
@@ -198,7 +198,7 @@ class PipCaller(CommandlineCaller):
 
 		ok, pip_user, pip_virtual_env, pip_install_dir = self._check_pip_setup(pip_command)
 		if not ok:
-			self._logger.error("Pip install directory {} is not writable and is part of a virtual environment, can't use this constellation".format(pip_install_dir))
+			self._logger.error("Cannot use pip at {}".format(pip_command))
 			return
 
 		self._logger.info("pip at {} installs to {}, --user flag needed => {}, virtual env => {}".format(pip_command, pip_install_dir, "yes" if pip_user else "no", "yes" if pip_virtual_env else "no"))
@@ -299,26 +299,29 @@ class PipCaller(CommandlineCaller):
 			              cwd=testballoon)
 
 			output = p.stdout.text
-			self._logger.debug("Got output from {}: {}".format(" ".join(sarge_command), output))
-
-			install_dir_match = self.__class__.pip_install_dir_regex.search(output)
-			virtual_env_match = self.__class__.pip_virtual_env_regex.search(output)
-			writable_match = self.__class__.pip_writable_regex.search(output)
-
-			if install_dir_match and virtual_env_match and writable_match:
-				install_dir = install_dir_match.group(1)
-				virtual_env = virtual_env_match.group(1) == "True"
-				writable = writable_match.group(1) == "True"
-
-				# ok, enable user flag, virtual env yes/no, installation dir
-				result = writable or not virtual_env, \
-				         not writable and not virtual_env and site.ENABLE_USER_SITE, \
-				         virtual_env, \
-				         install_dir
-				_cache["setup"][pip_command] = result
-				return result
-
+		except:
+			self._logger.exception("Error while trying to install testballoon to figure out pip setup")
+			return False, False, False, None
 		finally:
 			sarge_command = [pip_command, "uninstall", "-y", "OctoPrint-PipTestBalloon"]
 			sarge.run(sarge_command, stdout=sarge.Capture(), stderr=sarge.Capture())
 
+		install_dir_match = self.__class__.pip_install_dir_regex.search(output)
+		virtual_env_match = self.__class__.pip_virtual_env_regex.search(output)
+		writable_match = self.__class__.pip_writable_regex.search(output)
+
+		if install_dir_match and virtual_env_match and writable_match:
+			install_dir = install_dir_match.group(1)
+			virtual_env = virtual_env_match.group(1) == "True"
+			writable = writable_match.group(1) == "True"
+
+			# ok, enable user flag, virtual env yes/no, installation dir
+			result = writable or not virtual_env, \
+			         not writable and not virtual_env and site.ENABLE_USER_SITE, \
+			         virtual_env, \
+			         install_dir
+			_cache["setup"][pip_command] = result
+			return result
+		else:
+			self._logger.debug("Could not detect desired output from testballoon install, got this instead: {}".format(" ".join(sarge_command), output))
+			return False, False, False, None

From 982f24fe3125586e733134aad74bc3f861fc8d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 15:59:08 +0200
Subject: [PATCH 18/19] PMGR: Better wording of "pip unavailable" message

---
 .../pluginmanager/templates/pluginmanager_settings.jinja2    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index 72cbc7ca..ae137976 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -6,8 +6,9 @@
 
 {% macro pluginmanager_nopip() %}
 <div class="alert" data-bind="visible: !pipAvailable()">{% trans %}
-    The <code>pip</code> command could not be found.
-    Please configure it manually. No installation and uninstallation of plugin
+    The <code>pip</code> command could not be found or does not work correctly
+    for this installation of OctoPrint - please consult the log file for details
+    and if necessary configure it manually. No installation and uninstallation of plugin
     packages is possible while <code>pip</code> is unavailable.
 {% endtrans %}</div>
 {% endmacro %}

From 5cc8ec5cc39913a7ed11a5a156c91a3014ce6757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 30 Sep 2015 16:00:32 +0200
Subject: [PATCH 19/19] Better wording for plugin system startup & sorted
 plugin list of ALL plugins

---
 src/octoprint/plugin/core.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py
index 913289de..bcb28ce0 100644
--- a/src/octoprint/plugin/core.py
+++ b/src/octoprint/plugin/core.py
@@ -861,7 +861,7 @@ class PluginManager(object):
 			                                         additional_pre_inits=additional_pre_inits,
 			                                         additional_post_inits=additional_post_inits)
 
-		self.logger.info("Initialized {count} plugin(s)".format(count=len(self.plugin_implementations)))
+		self.logger.info("Initialized {count} plugin implementation(s)".format(count=len(self.plugin_implementations)))
 
 	def initialize_implementation_of_plugin(self, name, plugin, additional_injects=None, additional_inject_factories=None, additional_pre_inits=None, additional_post_inits=None):
 		if plugin.implementation is None:
@@ -955,15 +955,13 @@ class PluginManager(object):
 			self.logger.info("No plugins available")
 		else:
 			self.logger.info("{count} plugin(s) registered with the system:\n{plugins}".format(count=len(all_plugins), plugins="\n".join(
-				sorted(
-					map(lambda x: "| " + x.long_str(show_bundled=show_bundled,
-					                                bundled_strs=bundled_str,
-					                                show_location=show_location,
-					                                location_str=location_str,
-					                                show_enabled=show_enabled,
-					                                enabled_strs=enabled_str),
-					    self.enabled_plugins.values())
-				)
+				map(lambda x: "| " + x.long_str(show_bundled=show_bundled,
+				                                bundled_strs=bundled_str,
+				                                show_location=show_location,
+				                                location_str=location_str,
+				                                show_enabled=show_enabled,
+				                                enabled_strs=enabled_str),
+				    sorted(self.plugins.values(), key=lambda x: str(x).lower()))
 			)))
 
 	def get_plugin(self, identifier, require_enabled=True):