v11.1.0

update changes
Merge pull request #117 from wakatime/feature/api-key-vault-cmd
2023-08-10 21:13:02 +03:00 · 2022-11-12 12:34:41 -06:00 · 2022-11-12 12:34:07 -06:00 · 2022-11-12 12:32:59 -06:00 · 2022-11-12 12:32:43 -06:00 · 2022-11-11 21:57:09 -03:00
26 changed files with 2464 additions and 3417 deletions
--- a/17
+++ b/17
@ -0,0 +1,17 @@
 WakaTime is written and maintained by Alan Hamlett and
 various contributors:
 Development Lead
 ----------------
 - Alan Hamlett <alan.hamlett@gmail.com>
 Patches and Suggestions
 -----------------------
 - Jimmy Selgen Nielsen <jimmy.selgen@gmail.com>
 - Patrik Kernstock <info@pkern.at>
 - Krishna Glick <krishnaglick@gmail.com>
 - Carlos Henrique Gandarez <gandarez@gmail.com>
--- a/Default.sublime-commands
+++ b/Default.sublime-commands
@ -0,0 +1,6 @@
 [
 	{
 		"caption": "WakaTime: Open Dashboard",
 		"command": "wakatime_dashboard"
 	}
 ]
--- a/HISTORY.rst
+++ b/HISTORY.rst
--- a/packages/wakatime/LICENSE
+++ b/packages/wakatime/LICENSE
@ -1,5 +1,6 @@
-Copyright (c) 2013 Alan Hamlett https://wakati.me
+BSD 3-Clause License
-All rights reserved.
+
 Copyright (c) 2014 Alan Hamlett.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@ -12,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
  in the documentation and/or other materials provided
  with the distribution.
-* Neither the names of Wakatime or Wakati.Me, nor the names of its
+* Neither the names of WakaTime, nor the names of its
  contributors may be used to endorse or promote products derived
  from this software without specific prior written permission.
--- a/Main.sublime-menu
+++ b/Main.sublime-menu
@ -6,24 +6,37 @@
        "children":
        [
            {
-                "caption": "WakaTime",
+                "caption": "Package Settings",
-                "mnemonic": "W",
+                "mnemonic": "P",
-                "id": "wakatime-settings",
+                "id": "package-settings",
                "children":
                [
                    {
-                        "command": "open_file", "args":
+                        "caption": "WakaTime",
-                        {
+                        "mnemonic": "W",
-                            "file": "${packages}/WakaTime/WakaTime.sublime-settings"
+                        "id": "wakatime-settings",
-                        },
+                        "children":
-                        "caption": "Settings – Default"
+                        [
-                    },
+                            {
-                    {
+                                "command": "open_file", "args":
-                        "command": "open_file", "args":
+                                {
-                        {
+                                    "file": "${packages}/WakaTime/WakaTime.sublime-settings"
-                            "file": "${packages}/User/WakaTime.sublime-settings"
+                                },
-                        },
+                                "caption": "Settings – Default"
-                        "caption": "Settings – User"
+                            },
                            {
                                "command": "open_file", "args":
                                {
                                    "file": "${packages}/User/WakaTime.sublime-settings"
                                },
                                "caption": "Settings – User"
                            },
                            {
                                "command": "wakatime_dashboard",
                                "args": {},
                                "caption": "WakaTime Dashboard"
                            }
                        ]
                    }
                ]
            }
--- a/README.md
+++ b/README.md
@ -1,37 +1,52 @@
-sublime-wakatime
+# sublime-wakatime
 ================
-automatic time tracking for Sublime Text 2 & 3
+[![Coding time tracker](https://wakatime.com/badge/github/wakatime/sublime-wakatime.svg)](https://wakatime.com/badge/github/wakatime/sublime-wakatime)
-Installation
+[WakaTime][wakatime] is an open source Sublime Text plugin for metrics, insights, and time tracking automatically generated from your programming activity.
 ------------
-Heads Up! WakaTime depends on [Python](http://www.python.org/getit/) being installed to work correctly.
+## Installation
-1. Get an api key from: https://wakati.me
+1. Install [Package Control](https://packagecontrol.io/installation).
-2. Using [Sublime Package Control](http://wbond.net/sublime_packages/package_control):
+2. In Sublime, press `ctrl+shift+p`(Windows, Linux) or `cmd+shift+p`(OS X).
-  a) Press `ctrl+shift+p`(Windows, Linux) or `cmd+shift+p`(OS X).
+3. Type `install`, then press `enter` with `Package Control: Install Package` selected.
-  b) Type `install`, then press `enter` with `Package Control: Install Package` selected.
+4. Type `wakatime`, then press `enter` with the `WakaTime` plugin selected.
-  c) Type `wakatime`, then press `enter` with the `WakaTime` plugin selected.
+5. Enter your [api key](https://wakatime.com/settings#apikey), then press `enter`.
-3. You will see a prompt at the bottom asking for your [api key](https://www.wakati.me/#apikey). Enter your api key, then press `enter`.
+6. Use Sublime and your coding activity will be displayed on your [WakaTime dashboard](https://wakatime.com).
-4. Use Sublime and your time will automatically be tracked for you.
+## Screen Shots
-5. Visit https://wakati.me to see your logged time.
+![Project Overview](https://wakatime.com/static/img/ScreenShots/Screen-Shot-2016-03-21.png)
-6. Consider installing [BIND9](https://help.ubuntu.com/community/BIND9ServerHowto#Caching_Server_configuration) to cache your repeated DNS requests: `sudo apt-get install bind9`
+## Unresponsive Plugin Warning
-Screen Shots
+In Sublime Text 2, if you get a warning message:
 ------------
-![Project Overview](https://www.wakati.me/static/img/ScreenShots/Screenshot%20from%202013-06-26%2001:12:59.png)
+    A plugin (WakaTime) may be making Sublime Text unresponsive by taking too long (0.017332s) in its on_modified callback.
-![Files in a Project](https://www.wakati.me/static/img/ScreenShots/Screenshot%20from%202013-06-26%2001:13:13.png)
+To fix this, go to `Preferences → Settings - User` then add the following setting:
-![Changing Date Range](https://www.wakati.me/static/img/ScreenShots/Screenshot%20from%202013-06-26%2001:13:53.png)
+`"detect_slow_plugins": false`
 ## Troubleshooting
 First, turn on debug mode in your `WakaTime.sublime-settings` file.
 ![sublime user settings](https://wakatime.com/static/img/ScreenShots/sublime-wakatime-settings-menu.png?v=3)
 Add the line: `"debug": true`
 Then, open your Sublime Console with `View → Show Console` ( CTRL + \` ) to see the plugin executing the wakatime cli process when sending a heartbeat.
 Also, tail your `$HOME/.wakatime.log` file to debug wakatime cli problems.
 The [How to Debug Plugins][how to debug] guide shows how to check when coding activity was last received from your editor using the [User Agents API][user agents api].
 For more general troubleshooting info, see the [wakatime-cli Troubleshooting Section][wakatime-cli-help].
 [wakatime]: https://wakatime.com/sublime-text
 [wakatime-cli-help]: https://github.com/wakatime/wakatime#troubleshooting
 [how to debug]: https://wakatime.com/faq#debug-plugins
 [user agents api]: https://wakatime.com/developers#user_agents
--- a/WakaTime.py
+++ b/WakaTime.py
--- a/WakaTime.sublime-settings
+++ b/WakaTime.sublime-settings
@ -1,11 +1,40 @@
-{
+// WakaTime Default Settings
-    // Prompt after being away.
+// Use this as a reference when editing your local User settings.
-    // If true, will prompt user after 10 minutes of inactivity.
+// This settings file will be overwritten when upgrading.
    // If false, only logs actual activity inside Sublime.
    // Defaults to false.
    "prompt_after_away": false,
-    // Your api key from https://www.wakati.me/#apikey
+{
    // Your api key from https://wakatime.com/api-key
    // Set this in your User specific WakaTime.sublime-settings file.
-    "api_key": ""
+    "api_key": "",
    // Debug mode. Set to true for verbose logging. Defaults to false.
    "debug": false,
    // Proxy with format https://user:pass@host:port or socks5://user:pass@host:port or domain\\user:pass.
    "proxy": "",
    // Ignore files; Files (including absolute paths) that match one of these
    // POSIX regular expressions will not be logged.
    "ignore": ["^/tmp/", "^/etc/", "^/var/(?!www/).*", "COMMIT_EDITMSG$", "PULLREQ_EDITMSG$", "MERGE_MSG$", "TAG_EDITMSG$"],
    // Include files; Files (including absolute paths) that match one of these
    // POSIX regular expressions will bypass your ignore setting.
    "include": [".*"],
    // Status bar for surfacing errors and displaying today's coding time. Set
    // to false to hide. Defaults to true.
    "status_bar_enabled": true,
    // Show today's coding activity in WakaTime status bar item.
    // Defaults to true.
    "status_bar_coding_activity": true,
    // Obfuscate file paths when sending to API. Your dashboard will no longer display coding activity per file.
    "hidefilenames": false,
    // Python binary location. Uses python from your PATH by default.
    "python_binary": "",
    // Use standalone compiled Python wakatime-cli (Will not work on ARM Macs)
    "standalone": false
 }
--- a/packages.json
+++ b/packages.json
@ -1,20 +0,0 @@
 {
    "schema_version": "1.2",
    "packages": [
        {
            "name": "WakaTime",
            "description": "Automatic time tracking for Sublime Text 2 & 3",
            "author": "wakati.me",
            "homepage": "https://github.com/wakatime/sublime-wakatime",
            "last_modified": "2013-08-08 09:42",
            "platforms": {
                "*": [
                    {
                        "version": "0.4.0",
                        "url": "https://codeload.github.com/wakatime/sublime-wakatime/zip/0.4.0"
                    }
                ]
            }
        }
    ]
 }
--- a/packages/wakatime/.gitignore
+++ b/packages/wakatime/.gitignore
@ -1,35 +0,0 @@
 *.py[cod]
 # C extensions
 *.so
 # Packages
 *.egg
 *.egg-info
 dist
 build
 eggs
 parts
 bin
 var
 sdist
 develop-eggs
 .installed.cfg
 lib
 lib64
 # Installer logs
 pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
 nosetests.xml
 # Translations
 *.mo
 # Mr Developer
 .mr.developer.cfg
 .project
 .pydevproject
--- a/packages/wakatime/HISTORY.rst
+++ b/packages/wakatime/HISTORY.rst
@ -1,22 +0,0 @@
 History
 -------
 0.3.0 (2013-08-08)
 ++++++++++++++++++
 - Allow importing directly from Python plugins
 0.1.1 (2013-07-07)
 ++++++++++++++++++
 - Refactored
 - Simplified action events schema
 0.0.1 (2013-07-05)
 ++++++++++++++++++
 - Birth
--- a/packages/wakatime/MANIFEST.in
+++ b/packages/wakatime/MANIFEST.in
@ -1,2 +0,0 @@
 include README.rst LICENSE HISTORY.rst
 recursive-include wakatime *.py
--- a/packages/wakatime/README.rst
+++ b/packages/wakatime/README.rst
@ -1,12 +0,0 @@
 Wakati.Me
 =========
 Wakati.Me is a time tracking api for text editors. This is the command line
 action event appender for the Wakati.Me api. You shouldn't need to directly
 use this outside of a text editor plugin.
 Installation
 ------------
 https://www.wakati.me/help/plugins/installing-plugins
--- a/packages/wakatime/setup.py
+++ b/packages/wakatime/setup.py
@ -1,39 +0,0 @@
 from setuptools import setup
 from wakatime.__init__ import __version__ as VERSION
 packages = [
    'wakatime',
 ]
 setup(
    name='wakatime',
    version=VERSION,
    license='BSD 3 Clause',
    description=' '.join([
        'Action event appender for Wakati.Me, a time',
        'tracking api for text editors.',
    ]),
    long_description=open('README.rst').read(),
    author='Alan Hamlett',
    author_email='alan.hamlett@gmail.com',
    url='https://github.com/wakatime/wakatime',
    packages=packages,
    package_dir={'wakatime': 'wakatime'},
    include_package_data=True,
    zip_safe=False,
    platforms='any',
    entry_points={
        'console_scripts': ['wakatime = wakatime.__init__:main'],
    },
    classifiers=(
        'Development Status :: 3 - Alpha',
        'Environment :: Console',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: BSD License',
        'Natural Language :: English',
        'Programming Language :: Python',
        'Topic :: Text Editors',
    ),
 )
--- a/packages/wakatime/wakatime-cli.py
+++ b/packages/wakatime/wakatime-cli.py
@ -1,21 +0,0 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
    wakatime-cli
    ~~~~~~~~~~~~
    Action event appender for Wakati.Me, auto time tracking for text editors.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
 import os
 import sys
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import wakatime
 if __name__ == '__main__':
    sys.exit(wakatime.main(sys.argv))
--- a/packages/wakatime/wakatime/init.py
+++ b/packages/wakatime/wakatime/init.py
@ -1,201 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime
    ~~~~~~~~
    Action event appender for Wakati.Me, auto time tracking for text editors.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 from __future__ import print_function
 __title__ = 'wakatime'
 __version__ = '0.3.0'
 __author__ = 'Alan Hamlett'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2013 Alan Hamlett'
 import base64
 import json
 import logging
 import os
 import platform
 import re
 import sys
 import time
 import traceback
 try:
    from urllib2 import HTTPError, Request, urlopen
 except ImportError:
    from urllib.error import HTTPError
    from urllib.request import Request, urlopen
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from .log import setup_logging
 from .project import find_project
 try:
    import argparse
 except ImportError:
    from .packages import argparse
 log = logging.getLogger(__name__)
 class FileAction(argparse.Action):
    def __call__(self, parser, namespace, values, option_string=None):
        values = os.path.realpath(values)
        setattr(namespace, self.dest, values)
 def parseArguments(argv):
    try:
        sys.argv
    except AttributeError:
        sys.argv = argv
    parser = argparse.ArgumentParser(
            description='Wakati.Me event api appender')
    parser.add_argument('--file', dest='targetFile', metavar='file',
            action=FileAction, required=True,
            help='absolute path to file for current action')
    parser.add_argument('--time', dest='timestamp', metavar='time',
            type=float,
            help='optional floating-point unix epoch timestamp; '+
                'uses current time by default')
    parser.add_argument('--endtime', dest='endtime',
            help='optional end timestamp turning this action into '+
                'a duration; if a non-duration action occurs within a '+
                'duration, the duration is ignored')
    parser.add_argument('--write', dest='isWrite',
            action='store_true',
            help='note action was triggered from writing to a file')
    parser.add_argument('--plugin', dest='plugin',
            help='optional text editor plugin name and version '+
                'for User-Agent header')
    parser.add_argument('--key', dest='key',
            help='your wakati.me api key; uses api_key from '+
                '~/.wakatime.conf by default')
    parser.add_argument('--logfile', dest='logfile',
            help='defaults to ~/.wakatime.log')
    parser.add_argument('--config', dest='config',
            help='defaults to ~/.wakatime.conf')
    parser.add_argument('--verbose', dest='verbose', action='store_true',
            help='turns on debug messages in log file')
    parser.add_argument('--version', action='version', version=__version__)
    args = parser.parse_args(args=argv[1:])
    if not args.timestamp:
        args.timestamp = time.time()
    if not args.key:
        default_key = get_api_key(args.config)
        if default_key:
            args.key = default_key
        else:
            parser.error('Missing api key')
    return args
 def get_api_key(configFile):
    if not configFile:
        configFile = os.path.join(os.path.expanduser('~'), '.wakatime.conf')
    api_key = None
    try:
        cf = open(configFile)
        for line in cf:
            line = line.split('=', 1)
            if line[0] == 'api_key':
                api_key = line[1].strip()
        cf.close()
    except IOError:
        print('Error: Could not read from config file.')
    return api_key
 def get_user_agent(plugin):
    ver = sys.version_info
    python_version = '%d.%d.%d.%s.%d' % (ver[0], ver[1], ver[2], ver[3], ver[4])
    user_agent = 'wakatime/%s (%s) Python%s' % (__version__,
        platform.platform(), python_version)
    if plugin:
        user_agent = user_agent+' '+plugin
    return user_agent
 def send_action(project=None, tags=None, key=None, targetFile=None,
        timestamp=None, endtime=None, isWrite=None, plugin=None, **kwargs):
    url = 'https://www.wakati.me/api/v1/actions'
    log.debug('Sending action to api at %s' % url)
    data = {
        'time': timestamp,
        'file': targetFile,
    }
    if endtime:
        data['endtime'] = endtime
    if isWrite:
        data['is_write'] = isWrite
    if project:
        data['project'] = project
    if tags:
        data['tags'] = list(set(tags))
    log.debug(data)
    request = Request(url=url, data=str.encode(json.dumps(data)))
    user_agent = get_user_agent(plugin)
    request.add_header('User-Agent', user_agent)
    request.add_header('Content-Type', 'application/json')
    auth = 'Basic %s' % bytes.decode(base64.b64encode(str.encode(key)))
    request.add_header('Authorization', auth)
    response = None
    try:
        response = urlopen(request)
    except HTTPError as exc:
        data = {
            'response_code': exc.getcode(),
            'response_content': exc.read(),
            sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
        }
        if log.isEnabledFor(logging.DEBUG):
            data['traceback'] = traceback.format_exc()
        log.error(data)
    except:
        data = {
            sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
        }
        if log.isEnabledFor(logging.DEBUG):
            data['traceback'] = traceback.format_exc()
        log.error(data)
    else:
        if response.getcode() >= 200 and response.getcode() < 300:
            log.debug({
                'response_code': response.getcode(),
                'response_content': response.read(),
            })
            return True
        log.error({
            'response_code': response.getcode(),
            'response_content': response.read(),
        })
    return False
 def main(argv=None):
    if not argv:
        argv = sys.argv
    args = parseArguments(argv)
    setup_logging(args, __version__)
    if os.path.isfile(args.targetFile):
        tags = []
        name = None
        project = find_project(args.targetFile)
        if project:
            tags = project.tags()
            name = project.name()
        if send_action(project=name, tags=tags, **vars(args)):
            return 0
        return 102
    else:
        log.debug('File does not exist; ignoring this action.')
    return 101
--- a/packages/wakatime/wakatime/log.py
+++ b/packages/wakatime/wakatime/log.py
@ -1,88 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.log
    ~~~~~~~~~~~~
    Provides the configured logger for writing JSON to the log file.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import json
 import logging
 import os
 try:
    from collections import OrderedDict
 except ImportError:
    from .packages.ordereddict import OrderedDict
 class CustomEncoder(json.JSONEncoder):
    def default(self, obj):
        if isinstance(obj, bytes):
            obj = bytes.decode(obj)
            return json.dumps(obj)
        return super(CustomEncoder, self).default(obj)
 class JsonFormatter(logging.Formatter):
    def setup(self, timestamp, endtime, isWrite, targetFile, version, plugin):
        self.timestamp = timestamp
        self.endtime = endtime
        self.isWrite = isWrite
        self.targetFile = targetFile
        self.version = version
        self.plugin = plugin
    def format(self, record):
        data = OrderedDict([
            ('now', self.formatTime(record, self.datefmt)),
            ('version', self.version),
            ('plugin', self.plugin),
            ('time', self.timestamp),
            ('endtime', self.endtime),
            ('isWrite', self.isWrite),
            ('file', self.targetFile),
            ('level', record.levelname),
            ('message', record.msg),
        ])
        if not self.endtime:
            del data['endtime']
        if not self.plugin:
            del data['plugin']
        if not self.isWrite:
            del data['isWrite']
        return CustomEncoder().encode(data)
    def formatException(self, exc_info):
        return exec_info[2].format_exc()
 def setup_logging(args, version):
    logger = logging.getLogger()
    if len(logger.handlers) > 0:
        return logger
    logfile = args.logfile
    if not logfile:
        logfile = '~/.wakatime.log'
    handler = logging.FileHandler(os.path.expanduser(logfile))
    formatter = JsonFormatter(datefmt='%a %b %d %H:%M:%S %Z %Y')
    formatter.setup(
        timestamp=args.timestamp,
        endtime=args.endtime,
        isWrite=args.isWrite,
        targetFile=args.targetFile,
        version=version,
        plugin=args.plugin,
    )
    handler.setFormatter(formatter)
    logger.addHandler(handler)
    level = logging.INFO
    if args.verbose:
        level = logging.DEBUG
    logger.setLevel(level)
    return logger
--- a/packages/wakatime/wakatime/packages/init.py
+++ b/packages/wakatime/wakatime/packages/init.py
--- a/packages/wakatime/wakatime/packages/argparse.py
+++ b/packages/wakatime/wakatime/packages/argparse.py
--- a/packages/wakatime/wakatime/packages/ordereddict.py
+++ b/packages/wakatime/wakatime/packages/ordereddict.py
@ -1,127 +0,0 @@
 # Copyright (c) 2009 Raymond Hettinger
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
 # (the "Software"), to deal in the Software without restriction,
 # including without limitation the rights to use, copy, modify, merge,
 # publish, distribute, sublicense, and/or sell copies of the Software,
 # and to permit persons to whom the Software is furnished to do so,
 # subject to the following conditions:
 #
 #     The above copyright notice and this permission notice shall be
 #     included in all copies or substantial portions of the Software.
 #
 #     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 #     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 #     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 #     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 #     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 #     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 #     OTHER DEALINGS IN THE SOFTWARE.
 from UserDict import DictMixin
 class OrderedDict(dict, DictMixin):
    def __init__(self, *args, **kwds):
        if len(args) > 1:
            raise TypeError('expected at most 1 arguments, got %d' % len(args))
        try:
            self.__end
        except AttributeError:
            self.clear()
        self.update(*args, **kwds)
    def clear(self):
        self.__end = end = []
        end += [None, end, end]         # sentinel node for doubly linked list
        self.__map = {}                 # key --> [key, prev, next]
        dict.clear(self)
    def __setitem__(self, key, value):
        if key not in self:
            end = self.__end
            curr = end[1]
            curr[2] = end[1] = self.__map[key] = [key, curr, end]
        dict.__setitem__(self, key, value)
    def __delitem__(self, key):
        dict.__delitem__(self, key)
        key, prev, next = self.__map.pop(key)
        prev[2] = next
        next[1] = prev
    def __iter__(self):
        end = self.__end
        curr = end[2]
        while curr is not end:
            yield curr[0]
            curr = curr[2]
    def __reversed__(self):
        end = self.__end
        curr = end[1]
        while curr is not end:
            yield curr[0]
            curr = curr[1]
    def popitem(self, last=True):
        if not self:
            raise KeyError('dictionary is empty')
        if last:
            key = reversed(self).next()
        else:
            key = iter(self).next()
        value = self.pop(key)
        return key, value
    def __reduce__(self):
        items = [[k, self[k]] for k in self]
        tmp = self.__map, self.__end
        del self.__map, self.__end
        inst_dict = vars(self).copy()
        self.__map, self.__end = tmp
        if inst_dict:
            return (self.__class__, (items,), inst_dict)
        return self.__class__, (items,)
    def keys(self):
        return list(self)
    setdefault = DictMixin.setdefault
    update = DictMixin.update
    pop = DictMixin.pop
    values = DictMixin.values
    items = DictMixin.items
    iterkeys = DictMixin.iterkeys
    itervalues = DictMixin.itervalues
    iteritems = DictMixin.iteritems
    def __repr__(self):
        if not self:
            return '%s()' % (self.__class__.__name__,)
        return '%s(%r)' % (self.__class__.__name__, self.items())
    def copy(self):
        return self.__class__(self)
    @classmethod
    def fromkeys(cls, iterable, value=None):
        d = cls()
        for key in iterable:
            d[key] = value
        return d
    def __eq__(self, other):
        if isinstance(other, OrderedDict):
            if len(self) != len(other):
                return False
            for p, q in  zip(self.items(), other.items()):
                if p != q:
                    return False
            return True
        return dict.__eq__(self, other)
    def __ne__(self, other):
        return not self == other
--- a/packages/wakatime/wakatime/project.py
+++ b/packages/wakatime/wakatime/project.py
@ -1,34 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.project
    ~~~~~~~~~~~~~~~~
    Returns a project for the given file.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import logging
 import os
 from .projects.git import Git
 from .projects.mercurial import Mercurial
 from .projects.subversion import Subversion
 log = logging.getLogger(__name__)
 PLUGINS = [
    Git,
    Mercurial,
    Subversion,
 ]
 def find_project(path):
    for plugin in PLUGINS:
        project = plugin(path)
        if project.process():
            return project
    return None
--- a/packages/wakatime/wakatime/projects/init.py
+++ b/packages/wakatime/wakatime/projects/init.py
--- a/packages/wakatime/wakatime/projects/base.py
+++ b/packages/wakatime/wakatime/projects/base.py
@ -1,54 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.projects.base
    ~~~~~~~~~~~~~~~~~~~~~~
    Base project for use when no other project can be found.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import logging
 import os
 log = logging.getLogger(__name__)
 class BaseProject(object):
    """ Parent project class only
    used when no valid project can
    be found for the current path.
    """
    def __init__(self, path):
        self.path = path
    def type(self):
        """ Returns None if this is the base class.
        Returns the type of project if this is a
        valid project.
        """
        type = self.__class__.__name__.lower()
        if type == 'baseproject':
            type = None
        return type
    def process(self):
        """ Processes self.path into a project and
        returns True if project is valid, otherwise
        returns False.
        """
        return False
    def name(self):
        """ Returns the project's name.
        """
        return None
    def tags(self):
        """ Returns an array of tag strings for the
        path and/or project.
        """
        return []
--- a/packages/wakatime/wakatime/projects/git.py
+++ b/packages/wakatime/wakatime/projects/git.py
@ -1,119 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.projects.git
    ~~~~~~~~~~~~~~~~~~~~~
    Information about the git project for a given file.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import logging
 import os
 from subprocess import Popen, PIPE
 from .base import BaseProject
 try:
    from collections import OrderedDict
 except ImportError:
    from ..packages.ordereddict import OrderedDict
 log = logging.getLogger(__name__)
 class Git(BaseProject):
    def process(self):
        self.config = self._find_config(self.path)
        if self.config:
            return True
        return False
    def name(self):
        base = self._project_base()
        if base:
            return os.path.basename(base)
        return None
    def tags(self):
        tags = []
        if self.config:
            proj_name = self.name()
            if proj_name:
                tags.append(proj_name)
            sections = self._parse_config()
            for section in sections:
                if section.split(' ', 1)[0] == 'remote' and 'url' in sections[section]:
                    remote = sections[section]['url'].rsplit(':', 1)[-1].rsplit('/', 1)[-1].split('.git', 1)[0]
                    if remote:
                        tags.append(remote)
            branch = self._current_branch()
            if branch is not None:
                tags.append(branch)
        return tags
    def _project_base(self):
        if self.config:
            return os.path.dirname(os.path.dirname(self.config))
        return None
    def _current_branch(self):
        stdout = None
        try:
            stdout, stderr = Popen([
                    'git', 'branch', '--no-color'
                ], stdout=PIPE, stderr=PIPE, cwd=self._project_base()
            ).communicate()
        except OSError:
            pass
        if stdout:
            for line in stdout.splitlines():
                if isinstance(line, bytes):
                    line = bytes.decode(line)
                line = line.split(' ', 1)
                if line[0] == '*':
                    return line[1]
        return None
    def _find_config(self, path):
        path = os.path.realpath(path)
        if os.path.isfile(path):
            path = os.path.split(path)[0]
        if os.path.isfile(os.path.join(path, '.git', 'config')):
            return os.path.join(path, '.git', 'config')
        split_path = os.path.split(path)
        if split_path[1] == '':
            return None
        return self._find_config(split_path[0])
    def _parse_config(self):
        sections = {}
        try:
            f = open(self.config, 'r')
        except IOError as e:
            log.exception("Exception:")
        else:
            with f:
                section = None
                for line in f.readlines():
                    line = line.lstrip()
                    if len(line) > 0 and line[0] == '[':
                        section = line[1:].split(']', 1)[0]
                        temp = section.split(' ', 1)
                        section = temp[0].lower()
                        if len(temp) > 1:
                            section = ' '.join([section, temp[1]])
                        sections[section] = {}
                    else:
                        try:
                            (setting, value) = line.split('=', 1)
                        except ValueError:
                            setting = line.split('#', 1)[0].split(';', 1)[0]
                            value = 'true'
                        setting = setting.strip().lower()
                        value = value.split('#', 1)[0].split(';', 1)[0].strip()
                        sections[section][setting] = value
                f.close()
        return sections
--- a/packages/wakatime/wakatime/projects/mercurial.py
+++ b/packages/wakatime/wakatime/projects/mercurial.py
@ -1,30 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.projects.mercurial
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
    Information about the mercurial project for a given file.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import logging
 import os
 from .base import BaseProject
 log = logging.getLogger(__name__)
 class Mercurial(BaseProject):
    def process(self):
        return False
    def name(self):
        return None
    def tags(self):
        return []
--- a/packages/wakatime/wakatime/projects/subversion.py
+++ b/packages/wakatime/wakatime/projects/subversion.py
@ -1,79 +0,0 @@
 # -*- coding: utf-8 -*-
 """
    wakatime.projects.subversion
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    Information about the svn project for a given file.
    :copyright: (c) 2013 Alan Hamlett.
    :license: BSD, see LICENSE for more details.
 """
 import logging
 import os
 from subprocess import Popen, PIPE
 from .base import BaseProject
 try:
    from collections import OrderedDict
 except ImportError:
    from ..packages.ordereddict import OrderedDict
 log = logging.getLogger(__name__)
 class Subversion(BaseProject):
    def process(self):
        return self._find_project_base(self.path)
    def name(self):
        return self.info['Repository Root'].split('/')[-1]
    def tags(self):
        tags = []
        if self.base:
            tags.append(os.path.basename(self.base))
        return tags
    def _get_info(self, path):
        info = OrderedDict()
        stdout = None
        try:
            stdout, stderr = Popen([
                'svn', 'info', os.path.realpath(path)
            ], stdout=PIPE, stderr=PIPE).communicate()
        except OSError:
            pass
        else:
            if stdout:
                interesting = [
                    'Repository Root',
                    'Repository UUID',
                    'URL',
                ]
                for line in stdout.splitlines():
                    if isinstance(line, bytes):
                        line = bytes.decode(line)
                    line = line.split(': ', 1)
                    if line[0] in interesting:
                        info[line[0]] = line[1]
        return info
    def _find_project_base(self, path, found=False):
        path = os.path.realpath(path)
        if os.path.isfile(path):
            path = os.path.split(path)[0]
        info = self._get_info(path)
        if len(info) > 0:
            found = True
            self.base = path
            self.info = info
        elif found:
            return True
        split_path = os.path.split(path)
        if split_path[1] == '':
            return found
        return self._find_project_base(split_path[0], found)
		`@ -1,2 +0,0 @@`
			`include README.rst LICENSE HISTORY.rst`
			`recursive-include wakatime *.py`