merged with upstream

Author: LD250

README.md

@@ -7,24 +7,32 @@
 **Based on**
 [python-jenkins](https://github.com/openstack/python-jenkins)
 
-# Install:
+# Tested on
+Jenkins ver: 1.565, 
+Python ver: 2.7, 3.4, 3.5
+
+# Table of contents
+ * [Installation](#installation)
+ * [Commands overwiew](#commands-overwiew)
+ * [Usage example](#usage-example)
+ * [Tests](#tests)
+
+# Installation:
+
+## Using pip
+
+## Clone 
 ```bash
 git clone https://github.com/LD250/jenkins-cli-python.git
 cd jenkins-cli-python
 python setup.py install
 ```
 
-# Usage:
-
-```bash
-jenkins [-h] [--host jenkins-url] [--username username] [--password password]
-         {jobs,queue,building,start,info,setbranch,stop,console} ...
-```
+## Configuration file (.jencins-cli)
 
 Server URL, Username and password may be specified either by the command line arguments or in configuration file **(.jenkins-cli)**. Command line arguments has the highest priority, after that the **.jenkins-cli** file from current folder is taking into account. If there is no.jenkins-cli file in current folder, settings will be read from **.jenkins-cli** from the home folder
 
-
-# Available commands:
+# Commands overwiew:
 ```bash
   {jobs,queue,building,start,info,set_branch,stop,console}
     jobs                Show all jobs and their statuses
@@ -38,3 +46,21 @@ Server URL, Username and password may be specified either by the command line ar
     builds             	Show builds for job
     changes            	Show build's changes
 ```
+
+# Usage example:
+
+```bash
+jenkins [-h] [--host jenkins-url] [--username username] [--password password]
+         {jobs,queue,building,start,info,setbranch,stop,console} ...
+```
+
+# Tests
+
+To perfom flake8 checks and run tests similar to Travis
+
+```bash
+pip install -r requirements.txt
+tox 
+```
+
+

jenkins_cli/cli.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import os
-from time import time
+from time import time, sleep
 import datetime
 import jenkins
 import socket
@@ -185,7 +185,7 @@ def info(self, args):
                                     scm_name,
                                     branch_name))
 
-    def set_branch(self, args):
+    def setbranch(self, args):
         job_name = self._check_job(args.job_name)
         xml = self.jenkins.get_job_config(job_name)
         root = ElementTree.fromstring(xml.encode('utf-8'))
@@ -279,8 +279,6 @@ def changes(self, args):
                         print("%(num)s. %(msg_collor)s%(msg)s%(endcollor)s by %(author_collor)s%(author)s%(endcollor)s affected %(affected_files)s files %(is_merge)s" % params)
                 else:
                     print("%(job_name)s %(build_number)s has no changes" % {'job_name': job_name, 'build_number': build_number})
-            else:
-                raise CliException('Changesets not found for %s' % job_name)
 
     def console(self, args):
         job_name = self._check_job(args.job_name)
@@ -303,7 +301,7 @@ def console(self, args):
                     if new_line_num > last_line_num:
                         print("\n".join(console_out[last_line_num:]))
                         last_line_num = new_line_num
-                    time.sleep(3)
+                    sleep(3)
                     build_info = self.jenkins.get_build_info(job_name, build_number)
 
     def building(self, args):

requirements.txt

@@ -1,6 +1,4 @@
-pbr==1.3.0
 python-jenkins==0.4.12
-six==1.9.0
 tox==2.3.1
 pyfakefs==2.7.0
 mock==1.3.0