Merge pull request #35 from frigg/feature/login-option

Add login and tty option in run

Author: relekang

docker/manager.py

@@ -60,7 +60,7 @@ def __exit__(self, exc_type, exc_value, exc_traceback):
         if exc_value:
             raise exc_value
 
-    def run(self, command, working_directory='', stdin=''):
+    def run(self, command, working_directory='', stdin='', login=True, tty=True):
         """
         Runs the command with docker exec in the given working directory.
 
@@ -72,6 +72,10 @@ def run(self, command, working_directory='', stdin=''):
                                   paths will become absolute paths.
         :type working_directory: str
         :type stdin: str
+        :param login: Will add --login on the bash call.
+        :type login: boolean
+        :param tty: Will add -t on the bash call.
+        :type tty: boolean
         :return: A ProcessResult object containing information on the result of the command.
         :rtype: ProcessResult
         """
@@ -87,9 +91,11 @@ def run(self, command, working_directory='', stdin=''):
         ])
 
         result = execute(
-            'docker exec -i {container} bash -c \'{command}\''.format(
+            'docker exec -i{tty} {container} bash{login} -c \'{command}\''.format(
                 envs=env_string,
                 container=self.container_name,
+                login=' --login' if login else '',
+                tty=' -t' if tty else '',
                 command=command_string.format(
                     working_directory=working_directory,
                     command=command,

tests/test_manager.py

@@ -70,8 +70,11 @@ def test_quotation_mark_handling(self, mock_run):
         docker.run('echo "hi there"')
         docker.run("echo 'hi there'")
         expected = (
-            'docker exec -i {} bash -c \'cd ~/ &&  echo "hi there"\''.format(docker.container_name),
-            '')
+            'docker exec -i -t {} bash --login -c \'cd ~/ &&  echo "hi there"\''.format(
+                docker.container_name
+            ),
+            ''
+        )
 
         mock_run.assert_has_calls([mock.call(*expected), mock.call(*expected)])
 
@@ -81,8 +84,21 @@ def test_env_variables(self, mock_run):
         docker = Docker(env_variables={'CI': 1, 'FRIGG': 1})
         docker.run('ls')
         mock_run.assert_called_once_with(
-            'docker exec -i {} bash -c \'cd ~/ && CI=1 FRIGG=1 ls\''.format(docker.container_name),
-            '')
+            'docker exec -i -t {} bash --login -c \'cd ~/ && CI=1 FRIGG=1 ls\''.format(
+                docker.container_name
+            ),
+            ''
+        )
+
+    @mock.patch('docker.manager.execute')
+    @mock.patch('re.search', lambda *x: None)
+    def test_no_login(self, mock_run):
+        docker = Docker()
+        docker.run('ls', login=False)
+        mock_run.assert_called_once_with(
+            'docker exec -i -t {} bash -c \'cd ~/ &&  ls\''.format(docker.container_name),
+            ''
+        )
 
     @mock.patch('docker.manager.execute')
     def test_single_port_mappping(self, mock_run):