From ab9a7e05c8a528900f4669956ed580f1c98cc9a9 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 1 May 2015 12:54:45 +0100
Subject: [PATCH] Use "lib_dir" by default for LibraryManager

---
 platformio/commands/lib.py | 12 ++++++------
 platformio/libmanager.py   |  6 +++---
 platformio/maintenance.py  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py
index f90ce614..7bf31383 100644
--- a/platformio/commands/lib.py
+++ b/platformio/commands/lib.py
@@ -7,7 +7,7 @@ import click
 
 from platformio import app, exception
 from platformio.libmanager import LibraryManager
-from platformio.util import get_api_result, get_lib_dir
+from platformio.util import get_api_result
 
 LIBLIST_TPL = ("[{id:^14}] {name:<25} {compatibility:<30} "
                "\"{authornames}\": {description}")
@@ -100,7 +100,7 @@ def lib_search(query, **filters):
 @click.option("-v", "--version")
 @click.pass_context
 def lib_install(ctx, libid, version):
-    lm = LibraryManager(get_lib_dir())
+    lm = LibraryManager()
     for id_ in libid:
         click.echo(
             "Installing library [ %s ]:" % click.style(str(id_), fg="green"))
@@ -149,7 +149,7 @@ def lib_install_dependency(ctx, data):
 @cli.command("uninstall", short_help="Uninstall libraries")
 @click.argument("libid", type=click.INT, nargs=-1)
 def lib_uninstall(libid):
-    lm = LibraryManager(get_lib_dir())
+    lm = LibraryManager()
     for id_ in libid:
         info = lm.get_info(id_)
         if lm.uninstall(id_):
@@ -160,7 +160,7 @@ def lib_uninstall(libid):
 @cli.command("list", short_help="List installed libraries")
 @click.option("--json-output", is_flag=True)
 def lib_list(json_output):
-    lm = LibraryManager(get_lib_dir())
+    lm = LibraryManager()
     items = lm.get_installed().values()
 
     if json_output:
@@ -179,7 +179,7 @@ def lib_list(json_output):
 @cli.command("show", short_help="Show details about installed library")
 @click.argument("libid", type=click.INT)
 def lib_show(libid):
-    lm = LibraryManager(get_lib_dir())
+    lm = LibraryManager()
     info = lm.get_info(libid)
     click.secho(info['name'], fg="cyan")
     click.echo("-" * len(info['name']))
@@ -215,7 +215,7 @@ def lib_show(libid):
                 metavar="[LIBRARY_ID]")
 @click.pass_context
 def lib_update(ctx, libid):
-    lm = LibraryManager(get_lib_dir())
+    lm = LibraryManager()
     for id_, latest_version in (lm.get_latest_versions() or {}).items():
         if libid and int(id_) not in libid:
             continue
diff --git a/platformio/libmanager.py b/platformio/libmanager.py
index ae577d15..72d9665c 100644
--- a/platformio/libmanager.py
+++ b/platformio/libmanager.py
@@ -12,15 +12,15 @@ from platformio import telemetry
 from platformio.downloader import FileDownloader
 from platformio.exception import LibAlreadyInstalledError, LibNotInstalledError
 from platformio.unpacker import FileUnpacker
-from platformio.util import get_api_result
+from platformio.util import get_api_result, get_lib_dir
 
 
 class LibraryManager(object):
 
     CONFIG_NAME = ".library.json"
 
-    def __init__(self, lib_dir):
-        self.lib_dir = lib_dir
+    def __init__(self, lib_dir=None):
+        self.lib_dir = lib_dir or get_lib_dir()
 
     @staticmethod
     def download(url, dest_dir):
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index a44f454f..b67824b9 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -203,7 +203,7 @@ def check_internal_updates(ctx, what):
             if p.is_outdated():
                 outdated_items.append(platform)
     elif what == "libraries":
-        lm = LibraryManager(get_lib_dir())
+        lm = LibraryManager()
         outdated_items = lm.get_outdated()
 
     if not outdated_items: