From 4d8542fba6939b9133298cd533dc5f8c33ff57a6 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Sun, 21 Jul 2013 10:46:03 -0700 Subject: [PATCH] upgraded wakatime package to v0.1.4 --- plugin/packages/wakatime/wakatime/__init__.py | 14 +++++++++----- plugin/packages/wakatime/wakatime/project.py | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/plugin/packages/wakatime/wakatime/__init__.py b/plugin/packages/wakatime/wakatime/__init__.py index a27cd6f..e60b9a1 100644 --- a/plugin/packages/wakatime/wakatime/__init__.py +++ b/plugin/packages/wakatime/wakatime/__init__.py @@ -12,7 +12,7 @@ from __future__ import print_function __title__ = 'wakatime' -__version__ = '0.1.3' +__version__ = '0.1.4' __author__ = 'Alan Hamlett' __license__ = 'BSD' __copyright__ = 'Copyright 2013 Alan Hamlett' @@ -88,10 +88,10 @@ def parseArguments(argv): def get_api_key(configFile): if not configFile: - configFile = '~/.wakatime.conf' + configFile = os.path.join(os.path.expanduser('~'), '.wakatime.conf') api_key = None try: - cf = open(os.path.expanduser(configFile)) + cf = open(configFile) for line in cf: line = line.split('=', 1) if line[0] == 'api_key': @@ -170,9 +170,13 @@ def main(argv=None): args = parseArguments(argv) setup_logging(args, __version__) if os.path.isfile(args.targetFile): + tags = [] + name = None project = find_project(args.targetFile) - tags = project.tags() - if send_action(project=project.name(), tags=tags, **vars(args)): + if project: + tags = project.tags() + name = project.name() + if send_action(project=name, tags=tags, **vars(args)): return 0 return 102 else: diff --git a/plugin/packages/wakatime/wakatime/project.py b/plugin/packages/wakatime/wakatime/project.py index 4d33635..783f2cb 100644 --- a/plugin/packages/wakatime/wakatime/project.py +++ b/plugin/packages/wakatime/wakatime/project.py @@ -12,7 +12,6 @@ import logging import os -from .projects.base import BaseProject from .projects.git import Git from .projects.mercurial import Mercurial from .projects.subversion import Subversion @@ -32,4 +31,4 @@ def find_project(path): project = plugin(path) if project.process(): return project - return BaseProject(path) + return None