new --entitytype command line arg to replace --notfile
This commit is contained in:
Alan Hamlett
parent
48943519ae
commit
92948386fa
10 changed files with 77 additions and 67 deletions
|
|
@ -1,6 +1,6 @@
|
|||
usage: wakatime [-h] --file file [--key KEY] [--write] [--plugin PLUGIN]
|
||||
[--time time] [--lineno LINENO] [--cursorpos CURSORPOS]
|
||||
[--notfile] [--proxy PROXY] [--project PROJECT]
|
||||
[--entitytype ENTITY_TYPE] [--proxy PROXY] [--project PROJECT]
|
||||
[--alternate-project ALTERNATE_PROJECT] [--hostname HOSTNAME]
|
||||
[--disableoffline] [--hidefilenames] [--exclude EXCLUDE]
|
||||
[--include INCLUDE] [--logfile LOGFILE] [--apiurl API_URL]
|
||||
|
|
@ -22,9 +22,9 @@ optional arguments:
|
|||
--lineno LINENO optional line number; current line being edited
|
||||
--cursorpos CURSORPOS
|
||||
optional cursor position in the current file
|
||||
--notfile when set, will accept any value for the file. for
|
||||
example, a domain name or other item you want to log
|
||||
time towards.
|
||||
--entitytype ENTITY_TYPE
|
||||
entity type for this heartbeat. can be one of "file",
|
||||
"url", or "domain"; defaults to file.
|
||||
--proxy PROXY optional https proxy url; for example:
|
||||
https://user:pass@localhost:8080
|
||||
--project PROJECT optional project name
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
usage: wakatime [-h] --file file [--key KEY] [--write] [--plugin PLUGIN]
|
||||
[--time time] [--lineno LINENO] [--cursorpos CURSORPOS]
|
||||
[--notfile] [--proxy PROXY] [--project PROJECT]
|
||||
[--entitytype ENTITY_TYPE] [--proxy PROXY] [--project PROJECT]
|
||||
[--alternate-project ALTERNATE_PROJECT] [--hostname HOSTNAME]
|
||||
[--disableoffline] [--hidefilenames] [--exclude EXCLUDE]
|
||||
[--include INCLUDE] [--logfile LOGFILE] [--apiurl API_URL]
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from wakatime.base import main
|
||||
from wakatime.main import execute
|
||||
from wakatime.packages import requests
|
||||
|
||||
import os
|
||||
|
|
@ -38,7 +38,7 @@ class LanguagesTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', entity, '--config', config, '--time', now]
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -48,16 +48,19 @@ class LanguagesTestCase(utils.TestCase):
|
|||
self.patched['wakatime.session_cache.SessionCache.save'].assert_not_called()
|
||||
|
||||
heartbeat = {
|
||||
'language': 'Python',
|
||||
'language': u('Python'),
|
||||
'lines': 26,
|
||||
'entity': os.path.abspath(entity),
|
||||
'project': os.path.basename(os.path.abspath('.')),
|
||||
'dependencies': ['wakatime', 'os', 'mock', 'simplejson', 'django'],
|
||||
'project': u(os.path.basename(os.path.abspath('.'))),
|
||||
'dependencies': ANY,
|
||||
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
|
||||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": ["wakatime", "os", "mock", "simplejson", "django"], "lines": 26, "lineno": null, "language": "Python"}'
|
||||
stats = ANY
|
||||
expected_dependencies = ['wakatime', 'mock', 'django', 'simplejson', 'os']
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
for dep in expected_dependencies:
|
||||
self.assertIn(dep, self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'])
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
from wakatime.base import main
|
||||
from wakatime.main import execute
|
||||
from wakatime.packages import requests
|
||||
|
||||
import os
|
||||
|
|
@ -30,7 +30,7 @@ class BaseTestCase(utils.TestCase):
|
|||
def test_help_contents(self):
|
||||
args = ['--help']
|
||||
with self.assertRaises(SystemExit):
|
||||
main(args)
|
||||
execute(args)
|
||||
expected_stdout = open('tests/samples/output/test_help_contents').read()
|
||||
self.assertEquals(sys.stdout.getvalue(), expected_stdout)
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -45,7 +45,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', 'tests/samples/twolinefile.txt', '--key', '123', '--config', 'tests/samples/sample.cfg']
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 0)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -60,7 +60,7 @@ class BaseTestCase(utils.TestCase):
|
|||
def test_missing_config_file(self):
|
||||
args = ['--file', 'tests/samples/emptyfile.txt', '--config', 'foo']
|
||||
with self.assertRaises(SystemExit):
|
||||
main(args)
|
||||
execute(args)
|
||||
expected_stdout = u("Error: Could not read from config file foo\n")
|
||||
expected_stderr = open('tests/samples/output/test_missing_config_file').read()
|
||||
self.assertEquals(sys.stdout.getvalue(), expected_stdout)
|
||||
|
|
@ -74,7 +74,7 @@ class BaseTestCase(utils.TestCase):
|
|||
self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
|
||||
|
||||
args = ['--file', 'tests/samples/emptyfile.txt', '--config', 'tests/samples/sample.cfg']
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 0)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -88,7 +88,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
def test_bad_config_file(self):
|
||||
args = ['--file', 'tests/samples/emptyfile.txt', '--config', 'tests/samples/bad_config.cfg']
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 103)
|
||||
self.assertIn('ParsingError', sys.stdout.getvalue())
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -108,7 +108,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', entity, '--key', '123', '--config', config, '--time', now]
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -126,7 +126,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": [], "lines": 2, "lineno": null, "language": "Text only"}'
|
||||
stats = ANY
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
|
@ -142,7 +142,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', entity, '--key', '123', '--config', config, '--time', now]
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -160,7 +160,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": [], "lines": 2, "lineno": null, "language": "Text only"}'
|
||||
stats = ANY
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
|
@ -176,7 +176,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'--config', 'tests/samples/paranoid.cfg', '--time', now]
|
||||
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -194,7 +194,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": [], "lines": 2, "lineno": null, "language": "Text only"}'
|
||||
stats = ANY
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
|
@ -210,7 +210,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'--config', 'tests/samples/paranoid.cfg', '--time', now]
|
||||
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -233,7 +233,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', entity, '--alternate-project', 'xyz', '--config', config, '--time', now]
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -251,7 +251,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": [], "lines": 2, "lineno": null, "language": "Text only"}'
|
||||
stats = ANY
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
|
|
@ -267,7 +267,7 @@ class BaseTestCase(utils.TestCase):
|
|||
|
||||
args = ['--file', entity, '--project', 'xyz', '--config', config, '--time', now]
|
||||
|
||||
retval = main(args)
|
||||
retval = execute(args)
|
||||
self.assertEquals(retval, 102)
|
||||
self.assertEquals(sys.stdout.getvalue(), '')
|
||||
self.assertEquals(sys.stderr.getvalue(), '')
|
||||
|
|
@ -285,7 +285,7 @@ class BaseTestCase(utils.TestCase):
|
|||
'time': float(now),
|
||||
'type': 'file',
|
||||
}
|
||||
stats = '{"cursorpos": null, "dependencies": [], "lines": 2, "lineno": null, "language": "Text only"}'
|
||||
stats = ANY
|
||||
|
||||
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, stats, None)
|
||||
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
|
||||
Loading…
Add table
Add a link
Reference in a new issue