walkero
/
speedtest-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Remove -cli from stuff.

This commit is contained in:
Nathan Lilienthal 2015-12-25 23:11:50 -05:00
parent 7b09d8759f
commit bdece4ac2f
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
README.rst
View File

@ -17,10 +17,10 @@ speedtest.net
Versions Versions
-------- --------
speedtest-cli works with Python 2.4-3.4 `speedtest` works with Python 2.4-3.4
.. image:: https://img.shields.io/pypi/pyversions/speedtest-cli.svg .. image:: https://img.shields.io/pypi/pyversions/speedtest.svg
:target: https://pypi.python.org/pypi/speedtest-cli/ :target: https://pypi.python.org/pypi/speedtest/
:alt: Versions :alt: Versions
Installation Installation
@ -58,23 +58,23 @@ Just download (Like the way it used to be)
:: ::
wget -O speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest_cli.py wget -O speedtest https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
chmod +x speedtest-cli chmod +x speedtest
or or
:: ::
curl -Lo speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest_cli.py curl -Lo speedtest https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
chmod +x speedtest-cli chmod +x speedtest
Usage Usage
----- -----
:: ::
$ speedtest-cli -h $ speedtest -h
usage: speedtest-cli [-h] [--bytes] [--share] [--simple] [--list] usage: speedtest [-h] [--bytes] [--share] [--simple] [--list]
[--server SERVER] [--mini MINI] [--source SOURCE] [--server SERVER] [--mini MINI] [--source SOURCE]
[--timeout TIMEOUT] [--secure] [--version] [--timeout TIMEOUT] [--secure] [--version]

9
setup.py
View File

@ -56,8 +56,8 @@ except:
setup( setup(
name='speedtest-cli', name='speedtest',
version=find_version('speedtest_cli.py'), version=find_version('speedtest.py'),
description=('Command line interface for testing internet bandwidth using ' description=('Command line interface for testing internet bandwidth using '
'speedtest.net'), 'speedtest.net'),
long_description=long_description, long_description=long_description,
@ -66,11 +66,10 @@ setup(
author_email='matt@sivel.net', author_email='matt@sivel.net',
url='https://github.com/sivel/speedtest-cli', url='https://github.com/sivel/speedtest-cli',
license='Apache License, Version 2.0', license='Apache License, Version 2.0',
py_modules=['speedtest_cli'], py_modules=['speedtest'],
entry_points={ entry_points={
'console_scripts': [ 'console_scripts': [
'speedtest=speedtest_cli:main', 'speedtest=speedtest:main'
'speedtest-cli=speedtest_cli:main'
] ]
}, },
classifiers=[ classifiers=[

14
speedtest-cli.1 → speedtest.1
View File

@ -1,8 +1,8 @@
.TH "speedtest-cli" 1 "2014-04-23" "speedtest-cli" .TH "speedtest" 1 "2014-04-23" "speedtest"
.SH NAME .SH NAME
speedtest\-cli \- Test your bandwidth througput using speedtest.net speedtest \- Test your bandwidth througput using speedtest.net
.SH SYNOPSIS .SH SYNOPSIS
.B speedtest\-cli .B speedtest
[OPTION]... [OPTION]...
.SH DESCRIPTION .SH DESCRIPTION
Speedtest.net is a web service for testing your broadband connection by downloading a file Speedtest.net is a web service for testing your broadband connection by downloading a file
@ -12,7 +12,7 @@ from the command line.
Speedtest mini is a version of the Speedtest.net server that you can host locally. Speedtest mini is a version of the Speedtest.net server that you can host locally.
.SH OPTIONS .SH OPTIONS
Usage: speedtest\-cli [OPTION...] Usage: speedtest [OPTION...]
.B Help Options .B Help Options
@ -67,17 +67,17 @@ Show the version number and exit
\fBAutomatically find closest server and start testing\fR \fBAutomatically find closest server and start testing\fR
.RS .RS
speedtest\-cli speedtest
.RE .RE
\fBSpecify testing against server 1491\fR \fBSpecify testing against server 1491\fR
.RS .RS
speedtest-cli \-\-server 1491 speedtest \-\-server 1491
.RE .RE
\fBTesting against Speedtest Mini\fR \fBTesting against Speedtest Mini\fR
.RS .RS
speedtest-cli \-\-mini 172.18.66.1 speedtest \-\-mini 172.18.66.1
.RE .RE
.SH REPORTING BUGS .SH REPORTING BUGS

4
speedtest_cli.py → speedtest.py
View File

@ -197,7 +197,7 @@ def build_user_agent():
'(%s; U; %s; en-us)' % (platform.system(), platform.architecture()[0]), '(%s; U; %s; en-us)' % (platform.system(), platform.architecture()[0]),
'Python/%s' % platform.python_version(), 'Python/%s' % platform.python_version(),
'(KHTML, like Gecko)', '(KHTML, like Gecko)',
'speedtest-cli/%s' % __version__ 'speedtest/%s' % __version__
) )
user_agent = ' '.join(ua_tuple) user_agent = ' '.join(ua_tuple)
return user_agent return user_agent
@ -560,7 +560,7 @@ def speedtest():
'speedtest.net.\n' 'speedtest.net.\n'
'------------------------------------------------------------' '------------------------------------------------------------'
'--------------\n' '--------------\n'
'https://github.com/sivel/speedtest-cli') 'https://github.com/sivel/speedtest')
parser = ArgParser(description=description) parser = ArgParser(description=description)
# Give optparse.OptionParser an `add_argument` method for # Give optparse.OptionParser an `add_argument` method for

10
tox.ini
View File

@ -4,18 +4,18 @@ skipsdist=true
[testenv] [testenv]
commands = commands =
{envpython} -V {envpython} -V
{envpython} -m compileall speedtest_cli.py {envpython} -m compileall speedtest.py
{envpython} speedtest_cli.py {envpython} speedtest.py
[testenv:flake8] [testenv:flake8]
basepython=python basepython=python
deps=flake8 deps=flake8
commands = commands =
{envpython} -V {envpython} -V
flake8 speedtest_cli.py flake8 speedtest.py
[testenv:pypy] [testenv:pypy]
commands = commands =
pypy -V pypy -V
pypy -m compileall speedtest_cli.py pypy -m compileall speedtest.py
pypy speedtest_cli.py pypy speedtest.py