Remove venv before building on OS X

Ship 0.3.1

.travis.yml

@@ -2,8 +2,6 @@ language: python
 python:
 - '2.6'
 - '2.7'
-- '3.2'
-- '3.3'
 env:
 - DOCKER_VERSION=0.8.0
 - DOCKER_VERSION=0.8.1

CHANGES.md

@@ -1,6 +1,13 @@
 Change log
 ==========
 
+0.3.1 (2014-03-04)
+------------------
+
+ - Added contribution instructions. (Thanks @kvz!)
+ - Fixed `fig rm` throwing an error.
+ - Fixed a bug in `fig ps` on Docker 0.8.1 when there is a container with no command.
+
 0.3.0 (2014-03-03)
 ------------------
 

README.md

@@ -60,3 +60,16 @@ Building OS X binaries
 
 Note that this only works on Mountain Lion, not Mavericks, due to a [bug in PyInstaller](http://www.pyinstaller.org/ticket/807).
 
+Contributing to Fig
+-------------------
+
+If you're looking contribute to [Fig](http://orchardup.github.io/fig/)
+but you're new to the project or maybe even to Python, here are the steps
+that should get you started.
+
+1. Fork [https://github.com/orchardup/fig](https://github.com/orchardup/fig) to your username. kvz in this example.
+1. Clone your forked repository locally `git clone git@github.com:kvz/fig.git`.
+1. Enter the local directory `cd fig`.
+1. Set up a development environment `python setup.py develop`. That will install the dependencies and set up a symlink from your `fig` executable to the checkout of the repo. So from any of your fig projects, `fig` now refers to your development project. Time to start hacking : )
+1. Works for you? Run the test suite via `./scripts/test` to verify it won't break other usecases.
+1. All good? Commit and push to GitHub, and submit a pull request.

fig/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import unicode_literals
 from .service import Service
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'

fig/cli/main.py

@@ -170,19 +170,23 @@ class TopLevelCommand(Command):
         """
         Remove stopped service containers.
 
-        Usage: rm [SERVICE...]
+        Usage: rm [options] [SERVICE...]
 
         Options:
-            -v    Remove volumes associated with containers
+            --force   Don't ask to confirm removal
+            -v        Remove volumes associated with containers
         """
         all_containers = self.project.containers(service_names=options['SERVICE'], stopped=True)
         stopped_containers = [c for c in all_containers if not c.is_running]
 
         if len(stopped_containers) > 0:
             print("Going to remove", list_containers(stopped_containers))
-            if yesno("Are you sure? [yN] ", default=False):
-                self.project.remove_stopped(service_names=options['SERVICE'],
-                                            remove_volumes=options['-v'])
+            if options.get('--force') \
+                    or yesno("Are you sure? [yN] ", default=False):
+                self.project.remove_stopped(
+                    service_names=options['SERVICE'],
+                    v=options.get('-v', False)
+                )
         else:
             print("No stopped containers")
 

fig/container.py

@@ -86,7 +86,10 @@ class Container(object):
     @property
     def human_readable_command(self):
         self.inspect_if_not_inspected()
-        return ' '.join(self.dictionary['Config']['Cmd'])
+        if self.dictionary['Config']['Cmd']:
+            return ' '.join(self.dictionary['Config']['Cmd'])
+        else:
+            return ''
 
     @property
     def environment(self):
@@ -112,8 +115,7 @@ class Container(object):
         return self.client.kill(self.id)
 
     def remove(self, **options):
-        v = options.get('remove_volumes', False)
-        return self.client.remove_container(self.id, v=v)
+        return self.client.remove_container(self.id, **options)
 
     def inspect_if_not_inspected(self):
         if not self.has_been_inspected:

script/build-osx

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -ex
+rm -r venv
 virtualenv venv
 venv/bin/pip install pyinstaller==2.1
 venv/bin/pip install .

tests/cli_test.py

@@ -32,7 +32,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertIn('fig_simple_1', mock_stdout.getvalue())
 
     @patch('sys.stdout', new_callable=StringIO)
-    def test_default_figfile(self, mock_stdout):
+    def test_ps_default_figfile(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/multiple-figfiles'
         self.command.dispatch(['up', '-d'], None)
         self.command.dispatch(['ps'], None)
@@ -43,7 +43,7 @@ class CLITestCase(DockerClientTestCase):
         self.assertNotIn('fig_yetanother_1', output)
 
     @patch('sys.stdout', new_callable=StringIO)
-    def test_alternate_figfile(self, mock_stdout):
+    def test_ps_alternate_figfile(self, mock_stdout):
         self.command.base_dir = 'tests/fixtures/multiple-figfiles'
         self.command.dispatch(['-f', 'fig2.yml', 'up', '-d'], None)
         self.command.dispatch(['-f', 'fig2.yml', 'ps'], None)
@@ -53,6 +53,14 @@ class CLITestCase(DockerClientTestCase):
         self.assertNotIn('fig_another_1', output)
         self.assertIn('fig_yetanother_1', output)
 
+    def test_rm(self):
+        service = self.command.project.get_service('simple')
+        service.create_container()
+        service.kill()
+        self.assertEqual(len(service.containers(stopped=True)), 1)
+        self.command.dispatch(['rm', '--force'], None)
+        self.assertEqual(len(service.containers(stopped=True)), 0)
+
     def test_scale(self):
         project = self.command.project
 
@@ -74,4 +82,3 @@ class CLITestCase(DockerClientTestCase):
         self.command.scale({'SERVICE=NUM': ['simple=0', 'another=0']})
         self.assertEqual(len(project.get_service('simple').containers()), 0)
         self.assertEqual(len(project.get_service('another').containers()), 0)
-