Merge branch 'devel'

.travis.yml

@@ -5,7 +5,7 @@ python:
 - 3.3
 - 3.4
 install:
-- pip install virtualenv tox docutils coveralls
+- pip install virtualenv tox coveralls
 script:
 - python setup.py test
 - python setup.py check -r

README.rst

@@ -6,8 +6,8 @@ Rancidcmd is a utility tool for network operators.
 This module is wrapper of RANCID login commands.(like cloing, jlogin ...)
 So if you use this moudle, then you have to install RANCID in some way.
 Why did I make this module? As everybody knows RANCID is popular as auto login solutions.
-Of course I want to use RANCID and I thought want to use without password of ".cloginrc".
-Rancidcmd can use RANCID login command like a clogin with empty ".clgoinrc".
+Of course I want to use RANCID. And I wanted to do using without password of ".cloginrc".
+This Rancidcmd can use RANCID login command like a clogin with empty ".clgoinrc".
 
 .. image:: https://secure.travis-ci.org/mtoshi/rancidcmd.svg?branch=master
    :target: http://travis-ci.org/mtoshi/rancidcmd
@@ -25,7 +25,7 @@ Requirements
 
 Installation
 =============
-#. Please install the Rancid in advance.
+#. Please install the RANCID in advance.
 
     For CentOS ::
 
@@ -39,7 +39,7 @@ Installation
 
         $ port install rancid
 
-#. After Rancid, please install Rancidcmd ::
+#. After RANCID, please install Rancidcmd ::
 
          $ pip install rancidcmd
           
@@ -49,6 +49,8 @@ Installation
          $ cd rancidcmd
          $ sudo python setup.py install
 
+* Care of "~/.cloginrc" existence is not necessary.
+    If executed user doesn't have "~/.cloginrc", then Rancidcmd makes empty "~/.cloginrc".
 
 Using example
 ==============

docs/source/conf.py

@@ -65,9 +65,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.4'
+version = '0.1.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.4'
+release = '0.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.cfg

@@ -3,7 +3,3 @@ build-base = _build
 
 [sdist]
 formats = gztar
-
-[check]
-strict = 1
-restructuredtext = 1

setup.py

@@ -56,16 +56,16 @@ def run_tests(self):
 with open(os.path.join(here, 'README.rst')) as f:
     README = f.read()
 
-requires = ['Sphinx']
+requires = []
 with open('requirements.txt', 'w') as _file:
     _file.write('\n'.join(requires))
 
 EXCLUDE_FROM_PACKAGES = []
 
 setup(
     name="rancidcmd",
-    version="0.1.4",
-    description='Rancid Command Wrapper Tool',
+    version="0.1.5",
+    description='Rancid Command Wrapper.',
     long_description=README,
     author='Toshikatsu Murakoshi',
     author_email='mtoshi.g@gmail.com',

tox.ini

@@ -12,7 +12,6 @@ explain = true
 
 [testenv]
 deps=
-    -rrequirements.txt
     pytest
     pytest-cov
     pytest-flakes
@@ -29,6 +28,8 @@ commands =
     pylint pytmpl --rcfile={toxinidir}/.pylintrc
 
 [testenv:docs]
+deps=
+    Sphinx
 changedir = docs
 commands =
     sphinx-build -b html -c source source build/html