ruby_yacht 0.3.0 → 0.4.0

data/spec/fixtures/web-dockerfile-with-eponymous-app

@@ -0,0 +1,20 @@
+FROM nginx
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y ruby
+
+RUN mkdir -p /var/docker
+
+COPY add_project.rb /var/docker/add_project.rb
+COPY add_app.rb /var/docker/add_app.rb
+COPY index.html.erb /var/docker/index.html.erb
+COPY index_config.erb /var/docker/index_config.erb
+COPY app_config.erb /var/docker/app_config.erb
+
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com apollo 8080 true
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
+
+RUN rm -r /var/docker
+RUN apt-get remove -y ruby
+RUN apt-get autoremove -y

data/spec/plugins/mysql_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe RubyYacht::Plugins::MySQL do
+  before do
+    RubyYacht.configuration.clear
+    described_class.load
+  end
+  
+  it "adds MySQL to the app type list" do
+    expect(RubyYacht.configuration.server_types.map(&:name)).to include :mysql
+  end
+
+  describe "building images" do
+    subject { RubyYacht::Runner::BuildImages.new }
+    include DockerCommandSpec
+
+    before do
+      RubyYacht.configuration.clear
+      described_class.load
+
+      RubyYacht.configure do
+        server_type :generic do
+          container_type :app
+          baseline_image :ubuntu
+        end
+      end
+
+      RubyYacht.configure do
+        project :apollo do
+          system_prefix :apollo
+          domain "apollo.test.com"
+          repository "github.com"
+          
+          mysql_database :apollo do
+            host "localhost"
+            username "apollo"
+            password "test"
+          end
+
+          generic_app :mars do
+            repository_name 'brownleej/mars'
+            database_name :apollo
+          end
+        end
+      end
+    end
+
+    it "copies the scripts to the docker folder" do
+      docker.expect("build -t apollo-database tmp") do
+        files = Dir[File.join("tmp", "*")].sort
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/setup.bash']
+      end
+      subject.run
+    end
+    it "builds the dockerfile for a MySQL database" do
+      docker.expect("build -t apollo-database tmp") do
+        dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+        expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-mysql'))
+        expect(dockerfile).to eq expected
+      end
+      subject.run
+    end
+  end
+end

data/spec/plugins/rails_spec.rb

@@ -5,83 +5,135 @@ describe RubyYacht::Plugins::Rails do
     RubyYacht.configuration.clear
     described_class.load
   end
+  
+  def configure_project(options = {})
+    RubyYacht.configuration.clear
+    RubyYacht::Plugins::Rails.load
 
-  it "adds rails to the app type list" do
-    expect(RubyYacht.configuration.app_types.map(&:name)).to include :rails
-  end
-
-  it "adds attributes for the rails environment and secret key" do
     RubyYacht.configure do
       project :test_project do
         system_prefix :test_project
         domain 'test.com'
         repository 'github.com'
-        rails_secret_key_base 'abc'
-
-        database do
-          host 'localhost'
-          name 'test'
-          password 'test'
-          username 'test'
-        end
+        rails_secret_key_base(options[:secret_key_base]) if options[:secret_key_base]
+        rails_environment(options[:environment]) if options[:environment]
+        rails_excluded_gem_groups(options[:excluded_gem_groups]) if options[:excluded_gem_groups]
       end
     end
+  end
 
+  it "adds rails to the app type list" do
+    expect(RubyYacht.configuration.server_types.map(&:name)).to include :rails
+  end
+
+  it "adds an attribute for the rails environment" do
+    configure_project(secret_key_base: 'abc', environment: 'production')
+    project = RubyYacht.configuration.projects.last
+    expect(project.rails_environment).to eq 'production'
+    
+    configure_project(secret_key_base: 'abc')
     project = RubyYacht.configuration.projects.last
     expect(project.rails_environment).to eq 'development'
+  end
+
+  it "adds an attribute for the rails secret key" do
+    configure_project(secret_key_base: 'abc')
+    project = RubyYacht.configuration.projects.last
     expect(project.rails_secret_key_base).to eq 'abc'
   end
+  
+  it "adds an attribute for the rails excluded gem groups" do
+    configure_project(secret_key_base: 'abc', excluded_gem_groups: %w(development test))
+    project = RubyYacht.configuration.projects.last
+    expect(project.rails_excluded_gem_groups).to eq %w(development test)
+    
+    RubyYacht.configuration.clear
+    configure_project(secret_key_base: 'abc')
+    project = RubyYacht.configuration.projects.last
+    expect(project.rails_excluded_gem_groups).to eq []
+  end
 
-  it "sets environment variables for the RAILS_ENV and SECRET_KEY_BASE" do
+  it "sets an environment variables for the RAILS_ENV" do
+    @project = RubyYacht::Project.new
+    @project.rails_environment = 'staging'
+    variables = RubyYacht.configuration.find_server_type(:rails).environment_variables
+    variable = variables.find { |v| v[:name] == 'RAILS_ENV' }
+    
+    expect(variable).not_to be_nil
+    expect(variable[:image]).to eq :app_dependencies
+    expect(instance_eval(&variable[:block])).to eq 'staging'
+  end
+  
+  it "sets an environment variable for the SECRET_KEY_BASE" do
     @project = RubyYacht::Project.new
-    @project.rails_environment = 'development'
     @project.rails_secret_key_base = 'abc'
-    variables = RubyYacht.configuration.find_app_type(:rails).environment_variables
-
-    expect(variables.count).to eq 2
-    expect(variables[0][:name]).to eq 'RAILS_ENV'
-    expect(variables[0][:image]).to eq :app
-    expect(instance_eval(&variables[0][:block])).to eq 'development'
-    expect(variables[1][:name]).to eq 'SECRET_KEY_BASE'
-    expect(variables[1][:image]).to eq :app
-    expect(instance_eval(&variables[1][:block])).to eq 'abc'
+    variables = RubyYacht.configuration.find_server_type(:rails).environment_variables
+    variable = variables.find { |v| v[:name] == 'SECRET_KEY_BASE' }
+    
+    expect(variable).not_to be_nil
+    expect(variable[:image]).to eq :app
+    expect(instance_eval(&variable[:block])).to eq 'abc'
+  end
+  
+  it "sets an environment variable for the EXCLUDED_GEM_GROUPS" do
+    @project = RubyYacht::Project.new
+    @project.rails_excluded_gem_groups = %w(assets doc)
+    variables = RubyYacht.configuration.find_server_type(:rails).environment_variables
+    variable = variables.find { |v| v[:name] == 'EXCLUDED_GEM_GROUPS' }
+    
+    expect(variable).not_to be_nil
+    expect(variable[:image]).to eq :app_dependencies
+    expect(instance_eval(&variable[:block])).to eq 'assets doc'
+  end
+  
+  context "with no gem groups excluded" do
+    it "sets an empty string for the EXCLUDED_GEM_GROUPS environment variable" do
+      @project = RubyYacht::Project.new
+      @project.rails_excluded_gem_groups = []
+      variables = RubyYacht.configuration.find_server_type(:rails).environment_variables
+      variable = variables.find { |v| v[:name] == 'EXCLUDED_GEM_GROUPS' }
+      
+      expect(variable).not_to be_nil
+      expect(variable[:image]).to eq :app_dependencies
+      expect(instance_eval(&variable[:block])).to eq '""'
+    end
   end
 
-  it "creates a during-install-libraries hook for cleaning the gems" do
+  it "creates a during-install-libraries hook for installing the gems" do
     hooks = RubyYacht.configuration.fetch_hooks(event_time: :during, event_type: :install_libraries)
     expect(hooks.count).to eq 1
     expect(hooks[0].command).to eq '/var/docker/install_gems.rb'
-    expect(hooks[0].app_type).to eq :rails
+    expect(hooks[0].server_type).to eq :rails
   end
 
   it "creates an after-build-checkout hook for cleaning the gems" do
     hooks = RubyYacht.configuration.fetch_hooks(event_time: :after, event_type: :build_checkout)
     expect(hooks.count).to eq 1
-    expect(hooks[0].command).to eq 'bundle install && bundle clean --force'
-    expect(hooks[0].app_type).to eq :rails
+    expect(hooks[0].command).to eq 'bundle install --clean'
+    expect(hooks[0].server_type).to eq :rails
   end
 
   it "creates a during-load-seeds hook for loading the seeds" do
     hooks = RubyYacht.configuration.fetch_hooks(event_time: :during, event_type: :load_database_seeds)
     expect(hooks.count).to eq 1
     expect(hooks[0].command).to eq '/var/docker/load_seeds.rb'
-    expect(hooks[0].app_type).to eq :rails
+    expect(hooks[0].server_type).to eq :rails
   end
 
   it "creates before-startup hooks for updating the config and preparing the app for launch" do
     hooks = RubyYacht.configuration.fetch_hooks(event_time: :before, event_type: :startup)
     expect(hooks.count).to eq 2
     expect(hooks[0].command).to eq '/var/docker/update_rails_config.rb'
-    expect(hooks[0].app_type).to eq :rails
+    expect(hooks[0].server_type).to eq :rails
     expect(hooks[1].command).to eq '/var/docker/prepare_rails_for_launch.rb'
-    expect(hooks[1].app_type).to eq :rails
+    expect(hooks[1].server_type).to eq :rails
   end
 
   it "creates a during-startup hook for starting the server" do
     hooks = RubyYacht.configuration.fetch_hooks(event_time: :during, event_type: :startup)
     expect(hooks.count).to eq 1
     expect(hooks[0].command).to eq 'rails s -b 0.0.0.0 -p $APP_PORT -e $RAILS_ENV'
-    expect(hooks[0].app_type).to eq :rails
+    expect(hooks[0].server_type).to eq :rails
   end
 
   describe "building images" do
@@ -92,6 +144,13 @@ describe RubyYacht::Plugins::Rails do
       RubyYacht.configuration.clear
       described_class.load
 
+      RubyYacht.configure do
+        server_type :sqlite do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
+      end
+
       RubyYacht.configure do
         project :apollo do
           system_prefix :apollo
@@ -99,19 +158,20 @@ describe RubyYacht::Plugins::Rails do
           repository "github.com"
           rails_secret_key_base 'abc'
           
-          database do
+          sqlite_database :apollo do
             host "db.test.com"
-            name "apollo"
             username "apollo"
             password "test"
           end
           
           rails_app :mars do
             repository_name 'brownleej/mars'
+            database_name :apollo
           end
           
           rails_app :saturn do
             repository_name 'brownleej/saturn'
+            database_name :apollo
           end
         end
       end
@@ -180,18 +240,18 @@ describe RubyYacht::Plugins::Rails do
     
     context "with a local database" do
       before do
-        RubyYacht.configuration.projects[0].database.host = 'localhost'
+        RubyYacht.configuration.projects.first.databases.first.host = 'localhost'
       end
       
       it "generates the dockerfiles for the database server" do
-      docker.expect "build -t apollo-database tmp" do
-        files = Dir[File.join("tmp", "*")].sort
-        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/load_seeds.rb', 'tmp/setup.bash']
-        dockerfile = File.read(File.join('tmp', 'Dockerfile'))
-        expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails'))
-        expect(dockerfile).to eq expected
-      end
-      subject.run
+        docker.expect "build -t apollo-database tmp" do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/install_gems.rb', 'tmp/load_seeds.rb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
       end
     end
   end

data/spec/runner/build_images_spec.rb

@@ -77,13 +77,39 @@ describe RubyYacht::Runner::BuildImages do
     
     context "with a local database" do
       before do
-        RubyYacht.configuration.projects[0].database.host = 'localhost'
+        RubyYacht.configure do
+          server_type :sqlite do
+            container_type :database
+            baseline_image 'ubuntu'
+          end
+        end
+
+        database = RubyYacht::Database.new
+        database.name = 'apollo'
+        database.server_type = :sqlite
+        database.container_label = 'mysql'
+        database.username = 'apollo'
+        database.password = 'test'
+        database.host = 'localhost'
+        RubyYacht.configuration.projects.first.databases << database
+        RubyYacht.configuration.projects.first.apps.first.database_name = 'apollo'
+      end
+
+      it "builds an app dockerfile with the database config" do
+        docker.expect("build -t apollo-mars tmp") do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/before_startup.bash', 'tmp/before_startup.bash.erb', 'tmp/checkout.bash', 'tmp/startup.bash', 'tmp/startup.bash.erb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-with-local-database'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
       end
       
       it "builds the database" do
-        docker.expect("build -t apollo-database tmp") do
+        docker.expect("build -t apollo-mysql tmp") do
           files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash','tmp/setup.bash']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
           expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile'))
           expect(dockerfile).to eq expected
@@ -101,22 +127,22 @@ describe RubyYacht::Runner::BuildImages do
         before do
         script_folder = self.script_folder
           RubyYacht.configure do
-            add_hooks folder: script_folder, app_type: :generic do
+            add_hooks folder: script_folder, server_type: :generic do
               during(:load_database_seeds) { run_script 'hook1.rb' }
             end
           end
         end
         
         it "copies the files for the hooks to the database" do
-          docker.expect("build -t apollo-database tmp") do
+          docker.expect("build -t apollo-mysql tmp") do
             files = Dir[File.join("tmp", "*")].sort
-            expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/hook1.rb', 'tmp/setup.bash']
+            expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/hook1.rb']
           end
           subject.run
         end
         
         it "includes the scripts in the database dockerfile" do
-          docker.expect("build -t apollo-database tmp") do
+          docker.expect("build -t apollo-mysql tmp") do
             dockerfile = File.read(File.join('tmp', 'Dockerfile'))
             expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-with-seed-hooks'))
             expect(dockerfile).to eq expected
@@ -125,6 +151,42 @@ describe RubyYacht::Runner::BuildImages do
         end
       end
     end
+
+    context 'with a non-local database' do
+      before do
+        database = RubyYacht::Database.new
+        database.name = 'apollo'
+        database.server_type = 'mysql'
+        database.container_label = 'mysql'
+        database.username = 'apollo'
+        database.password = 'test'
+        database.host = 'db1.test.com'
+        RubyYacht.configuration.projects.first.databases << database
+        RubyYacht.configuration.projects.first.apps.first.database_name = 'apollo'
+      end
+
+      it "builds an app dockerfile with the database config" do
+        docker.expect("build -t apollo-mars tmp") do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/before_startup.bash', 'tmp/before_startup.bash.erb', 'tmp/checkout.bash', 'tmp/startup.bash', 'tmp/startup.bash.erb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-with-remote-database'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+      
+      it "does not build an image for the database" do
+        docker.fail_unexpected_commands!
+        docker.expect "network create apollo 2> /dev/null"
+        docker.expect "build -t apollo-generic-app-dependencies tmp"
+        docker.expect "build -t apollo-debian-app-dependencies tmp"
+        docker.expect "build -t apollo-mars tmp"
+        docker.expect "build -t apollo-saturn tmp"
+        docker.expect "build -t apollo-web tmp"
+        subject.run
+      end
+    end
     
     context "with an id_rsa key" do
       let(:id_file_path) { File.join(ENV['HOME'], '.ssh', 'id_rsa') }
@@ -164,7 +226,7 @@ describe RubyYacht::Runner::BuildImages do
         RubyYacht.configuration.projects[0].primary_app = :mars
       end
 
-      it "includes that app in the setup in the web server dockerfile" do
+      it "includes that app as the primary in the web server dockerfile" do
         docker.expect "build -t apollo-web tmp" do
           files = Dir[File.join("tmp", "*")].sort
           expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
@@ -175,6 +237,34 @@ describe RubyYacht::Runner::BuildImages do
         subject.run
       end
     end
+
+    context "with an app with the same name as the system" do
+      before do
+        RubyYacht.configuration.projects[0].apps[0].name = :apollo
+      end
+
+      it "builds all the images for the project" do
+        docker.fail_unexpected_commands!
+        docker.expect "network create apollo 2> /dev/null"
+        docker.expect "build -t apollo-generic-app-dependencies tmp"
+        docker.expect "build -t apollo-debian-app-dependencies tmp"
+        docker.expect "build -t apollo tmp"
+        docker.expect "build -t apollo-saturn tmp"
+        docker.expect "build -t apollo-web tmp"
+        subject.run
+      end
+
+      it "includes that app as the primary in the web server dockerfile" do
+        docker.expect "build -t apollo-web tmp" do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile-with-eponymous-app'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+    end
     
     context "with multiple projects" do
       before do
@@ -216,7 +306,7 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, app_type: :generic do
+          add_hooks folder: script_folder, server_type: :generic do
             before(:startup) { run_script 'hook1.rb' }
             before(:startup) { run_script 'hook2.rb' }
           end
@@ -256,7 +346,7 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, app_type: :generic do
+          add_hooks folder: script_folder, server_type: :generic do
             after(:build_checkout) { run_script 'hook1.rb' }
           end
         end
@@ -294,7 +384,7 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, app_type: :generic do
+          add_hooks folder: script_folder, server_type: :generic do
             during(:install_libraries) { run_script 'hook2.rb' }
           end
         end
@@ -326,5 +416,46 @@ describe RubyYacht::Runner::BuildImages do
         subject.run
       end
     end
+
+    context "with hooks for copying custom files" do
+      let(:script_folder) { File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'hooks') }
+      before do
+        script_folder = self.script_folder
+        RubyYacht.configure do
+          add_hooks folder: script_folder, server_type: :generic do
+            before :startup do
+              copy_file "hook1.rb"
+              command "cp /var/docker/hook1.rb /var/code/scripts/hook1.rb"
+            end
+          end
+        end
+      end
+
+      it "copies the scripts to the tmp directory" do
+        docker.expect("build -t apollo-mars tmp") do
+          files = Dir[File.join('tmp', '*')]
+          expect(files).to include 'tmp/hook1.rb'
+        end
+        subject.run
+      end
+
+      it "builds a before_startup script that copies the file" do
+        docker.expect("build -t apollo-mars tmp") do
+          dockerfile = File.read(File.join('tmp', 'before_startup.bash'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-before-startup-with-custom-file-copy'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+
+      it "builds a dockerfile that copies the file to the /var/docker directory" do
+        docker.expect("build -t apollo-mars tmp") do
+          startup = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-with-custom-file-copy'))
+          expect(startup).to eq expected
+        end
+        subject.run
+      end
+    end
   end
 end

data/spec/runner/checkout_spec.rb

@@ -30,7 +30,7 @@ describe RubyYacht::Runner::Checkout do
       
       it "takes the app and checkout from the command line" do
         subject.parse_positional_arguments(['venus', 'issue1234'])
-        expect(subject.app).to eq 'venus'
+        expect(subject.app_name).to eq 'venus'
         expect(subject.branch).to eq 'issue1234'
       end
     end
@@ -38,7 +38,7 @@ describe RubyYacht::Runner::Checkout do
   
   describe "run behavior" do
     before do
-      subject.app = 'saturn'
+      subject.app_name = 'saturn'
       subject.branch = 'issue1234'
     end
     
@@ -61,7 +61,7 @@ describe RubyYacht::Runner::Checkout do
       end
       
       it "runs the command in that project" do
-        subject.app = 'venus'
+        subject.app_name = 'venus'
         docker.fail_unexpected_commands!
         docker.expect "exec jupiter-venus bash -c 'cd /var/code; git fetch; git checkout .; git checkout issue1234; git pull'"
         docker.expect "exec jupiter-venus /var/docker/before_startup.bash"
@@ -91,7 +91,7 @@ describe RubyYacht::Runner::Checkout do
     
     context "with no app" do
       before do
-        subject.app = nil
+        subject.app_name = nil
       end
       
       it "logs an error" do

data/spec/runner/run_containers_spec.rb

@@ -34,11 +34,16 @@ describe RubyYacht::Runner::RunContainers do
     
     context "with a local database" do
       before do
-        RubyYacht.configuration.projects.first.database.host = 'localhost'
+        database = RubyYacht::Database.new
+        database.name = 'apollo'
+        database.server_type = 'mysql'
+        database.container_label = 'mysql'
+        database.host = 'localhost'
+        RubyYacht.configuration.projects.first.databases << database
       end
       
       it "runs the database container" do
-        docker.expect 'run -d --net=apollo --net-alias=apollo-database --name=apollo-database apollo-database'
+        docker.expect 'run -d --net=apollo --net-alias=apollo-mysql --name=apollo-mysql apollo-mysql'
         subject.run
       end
     
@@ -100,6 +105,20 @@ describe RubyYacht::Runner::RunContainers do
         expect(subject.run).to be_truthy
       end
     end
+
+    context "with an app with the same name as the project" do
+      before do
+        RubyYacht.configuration.projects.first.apps.first.name = :apollo
+      end
+    
+      it "runs the containers for all the apps" do
+        docker.fail_unexpected_commands!
+        docker.expect 'run -d --net=apollo --net-alias=apollo --name=apollo apollo'
+        docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
+        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-web --name=apollo-web apollo-web'
+        subject.run
+      end
+    end
   end
   
   describe "remove_container" do

data/spec/runner/runner_spec.rb

@@ -37,7 +37,7 @@ describe RubyYacht::Runner do
         
         it "calls the command" do
           expect(command.project_name).to eq :apollo
-          expect(command.app).to eq 'mars'
+          expect(command.app_name).to eq 'mars'
           expect(command.branch).to eq 'issue1234'
           expect(command).to have_received(:run)
         end

data/spec/runner/services_spec.rb

@@ -39,11 +39,16 @@ describe RubyYacht::Runner::Services do
     
     context "with a local database" do
       before do
-        RubyYacht.configuration.projects.first.database.host = 'localhost'
+        database = RubyYacht::Database.new
+        database.name = 'apollo'
+        database.server_type = 'mysql'
+        database.container_label = 'mysql'
+        database.host = 'localhost'
+        RubyYacht.configuration.projects.first.databases << database
       end
       
       it "stops the database" do
-        docker.expect 'stop apollo-database'
+        docker.expect 'stop apollo-mysql'
         subject.run
       end