Add sanity check to OS X build script

Ship 0.4.1

.gitignore

@@ -3,5 +3,4 @@
 /build
 /dist
 /docs/_site
-/docs/.git-gh-pages
 fig.spec

.travis.yml

@@ -12,13 +12,13 @@ install:
 - sudo curl -L -o /usr/local/bin/orchard https://github.com/orchardup/go-orchard/releases/download/2.0.5/linux
 - sudo chmod +x /usr/local/bin/orchard
 before_script:
- - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && orchard hosts rm -f $TRAVIS_JOB_ID'
- - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && orchard hosts create $TRAVIS_JOB_ID || false'
+ - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts rm -f $TRAVIS_JOB_ID || true; fi'
+ - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts create $TRAVIS_JOB_ID; fi'
 script:
  - nosetests tests/unit
- - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && script/travis-integration || false'
+ - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then script/travis-integration; fi'
 after_script:
- - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && orchard hosts rm -f $TRAVIS_JOB_ID || false'
+ - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then orchard hosts rm -f $TRAVIS_JOB_ID; fi'
 deploy:
   provider: pypi
   user: orchard

CHANGES.md

@@ -1,6 +1,11 @@
 Change log
 ==========
 
+0.4.1 (2014-05-08)
+------------------
+
+ - Add support for Docker 0.11.0.
+
 0.4.0 (2014-04-29)
 ------------------
 

Dockerfile

@@ -5,6 +5,7 @@ RUN pip install -r requirements.txt
 ADD requirements-dev.txt /code/
 RUN pip install -r requirements-dev.txt
 ADD . /code/
+RUN python setup.py develop
 RUN useradd -d /home/user -m -s /bin/bash user
 RUN chown -R user /code/
 USER user

README.md

@@ -32,7 +32,7 @@ db:
 
 Then type `fig up`, and Fig will start and run your entire app:
 
-![example fig run](https://orchardup.com/static/images/fig-example-large.f96065fc9e22.gif)
+![example fig run](https://orchardup.com/static/images/fig-example-large.gif)
 
 There are commands to:
 

docs/index.md

@@ -30,7 +30,7 @@ db:
 
 Then type `fig up`, and Fig will start and run your entire app:
 
-![example fig run](https://orchardup.com/static/images/fig-example-large.f96065fc9e22.gif)
+![example fig run](https://orchardup.com/static/images/fig-example-large.gif)
 
 There are commands to:
 

docs/install.md

@@ -6,9 +6,9 @@ title: Installing Fig
 Installing Fig
 ==============
 
-First, install Docker version 0.10.0. If you're on OS X, you can use [docker-osx](https://github.com/noplay/docker-osx):
+First, install Docker version 0.11.0. If you're on OS X, you can use [docker-osx](https://github.com/noplay/docker-osx):
 
-    $ curl https://raw.github.com/noplay/docker-osx/0.10.0/docker-osx > /usr/local/bin/docker-osx
+    $ curl https://raw.githubusercontent.com/noplay/docker-osx/0.11.0/docker-osx > /usr/local/bin/docker-osx
     $ chmod +x /usr/local/bin/docker-osx
     $ docker-osx shell
 
@@ -16,12 +16,12 @@ Docker has guides for [Ubuntu](http://docs.docker.io/en/latest/installation/ubun
 
 Next, install Fig. On OS X:
 
-    $ curl -L https://github.com/orchardup/fig/releases/download/0.3.2/darwin > /usr/local/bin/fig
+    $ curl -L https://github.com/orchardup/fig/releases/download/0.4.0/darwin > /usr/local/bin/fig
     $ chmod +x /usr/local/bin/fig
 
 On 64-bit Linux:
 
-    $ curl -L https://github.com/orchardup/fig/releases/download/0.3.2/linux > /usr/local/bin/fig
+    $ curl -L https://github.com/orchardup/fig/releases/download/0.4.0/linux > /usr/local/bin/fig
     $ chmod +x /usr/local/bin/fig
 
 Fig is also available as a Python package if you're on another platform (or if you prefer that sort of thing):

fig/__init__.py

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

fig/cli/command.py

@@ -24,6 +24,7 @@ class Command(DocoptCommand):
 
     def __init__(self):
         self.yaml_path = os.environ.get('FIG_FILE', None)
+        self.explicit_project_name = None
 
     def dispatch(self, *args, **kwargs):
         try:
@@ -44,6 +45,8 @@ class Command(DocoptCommand):
     def perform_command(self, options, *args, **kwargs):
         if options['--file'] is not None:
             self.yaml_path = os.path.join(self.base_dir, options['--file'])
+        if options['--project-name'] is not None:
+            self.explicit_project_name = options['--project-name']
         return super(Command, self).perform_command(options, *args, **kwargs)
 
     @cached_property
@@ -70,6 +73,8 @@ class Command(DocoptCommand):
     @cached_property
     def project_name(self):
         project = os.path.basename(os.getcwd())
+        if self.explicit_project_name is not None:
+            project = self.explicit_project_name
         project = re.sub(r'[^a-zA-Z0-9]', '', project)
         if not project:
             project = 'default'

fig/cli/main.py

@@ -71,9 +71,10 @@ class TopLevelCommand(Command):
       fig -h|--help
 
     Options:
-      --verbose            Show more output
-      --version            Print version and exit
-      -f, --file FILE      Specify an alternate fig file (default: fig.yml)
+      --verbose                 Show more output
+      --version                 Print version and exit
+      -f, --file FILE           Specify an alternate fig file (default: fig.yml)
+      -p, --project-name NAME   Specify an alternate project name (default: directory name)
 
     Commands:
       build     Build or rebuild services
@@ -233,10 +234,11 @@ class TopLevelCommand(Command):
             with self._attach_to_container(container.id, raw=tty) as c:
                 service.start_container(container, ports=None, one_off=True)
                 c.run()
+            exit_code = container.wait()
             if options['--rm']:
-                container.wait()
                 log.info("Removing %s..." % container.name)
                 self.client.remove_container(container.id)
+            sys.exit(exit_code)
 
     def scale(self, options):
         """

fig/container.py

@@ -78,7 +78,7 @@ class Container(object):
     def human_readable_state(self):
         self.inspect_if_not_inspected()
         if self.dictionary['State']['Running']:
-            if self.dictionary['State']['Ghost']:
+            if self.dictionary['State'].get('Ghost'):
                 return 'Ghost'
             else:
                 return 'Up'

script/build-linux

@@ -1,5 +1,7 @@
 #!/bin/sh
+set -ex
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 docker build -t fig .
 docker run -v `pwd`/dist:/code/dist fig pyinstaller -F bin/fig
+docker run -v `pwd`/dist:/code/dist fig dist/fig --version

script/build-osx

@@ -5,3 +5,4 @@ virtualenv venv
 venv/bin/pip install pyinstaller==2.1
 venv/bin/pip install .
 venv/bin/pyinstaller -F bin/fig
+dist/fig --version

script/clean

@@ -1,3 +1,3 @@
 #!/bin/sh
 find . -type f -name '*.pyc' -delete
-
+rm -rf docs/_site build dist