ruby_yacht 0.5.0 → 0.6.0

data/spec/integration/update_hosts_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe RubyYacht::Runner::UpdateHosts, :integration do
+  include IntegrationHelpers
+  
+  before :all do
+    configure_project
+  end
+
+  before do
+    run_command 'update_hosts'
+  end
+
+  after do
+    restore_hosts_file
+  end
+
+  it "puts the domains for the apps in the hosts file" do
+    results = File.read('/etc/hosts').split("\n")
+    expect(results).to include '127.0.0.1    apollo.johnbrownlee.com'
+    expect(results).to include '127.0.0.1    mars.apollo.johnbrownlee.com'
+    expect(results).to include '127.0.0.1    saturn.apollo.johnbrownlee.com'
+  end
+
+  it "puts an old copy in the backup" do
+    timestamp = Time.now.utc.strftime('%Y%m%d%H')
+    file = Dir["/etc/hosts.#{timestamp}*.backup"].last
+    expect(file).not_to be_nil
+    results = File.read(file).split("\n")
+    expect(results.count).to be > 0
+    expect(results).not_to include 'apollo.johnbrownlee.com'
+    expect(results).not_to include 'mars.apollo.johnbrownlee.com'
+    expect(results).not_to include 'saturn.apollo.johnbrownlee.com'
+  end
+end

data/spec/plugins/mysql_spec.rb

@@ -10,6 +10,23 @@ describe RubyYacht::Plugins::MySQL do
     expect(RubyYacht.configuration.server_types.map(&:name)).to include :mysql
   end
 
+  it "sets a default for port of 3306" do
+    RubyYacht.configure do
+      project :apollo do
+        system_prefix :apollo
+        repository "github.com"
+        
+        mysql_database :apollo do
+          host "localhost"
+          username "apollo"
+          password "test"
+        end
+      end
+    end
+
+    expect(RubyYacht.configuration.projects.first.databases.first.port).to eq 3306
+  end
+
   describe "building images" do
     subject { RubyYacht::Runner::BuildImages.new }
     include DockerCommandSpec
@@ -28,13 +45,13 @@ describe RubyYacht::Plugins::MySQL do
       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"
+            port 3306
           end
 
           generic_app :mars do

data/spec/plugins/nginx_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe RubyYacht::Plugins::Nginx do
+  before do
+    RubyYacht.configuration.clear
+    RubyYacht::Plugins::Nginx.load
+  end
+
+  it 'creates a server type called nginx' do
+    server_type = RubyYacht.configuration.server_types.first
+    expect(server_type.name).to eq :nginx
+    expect(server_type.container_type).to eq :web
+  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
+          repository "github.com"
+          
+          generic_app :mars
+          generic_app :saturn
+
+          nginx_web_server do
+            domain 'apollo.test.com'
+          end 
+        end
+      end
+    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-mars tmp"
+      docker.expect "build -t apollo-saturn tmp"
+      docker.expect "build -t apollo-web tmp"
+      subject.run
+    end
+    
+    it "generates the dockerfiles for the web server" 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-nginx'))
+        expect(dockerfile).to eq expected
+      end
+      subject.run
+    end
+  end
+end

data/spec/plugins/rails_spec.rb

@@ -4,6 +4,18 @@ describe RubyYacht::Plugins::Rails do
   before do
     RubyYacht.configuration.clear
     described_class.load
+
+    @project = RubyYacht::Project.new
+    RubyYacht.configuration.projects << @project
+
+    @app = RubyYacht::App.new
+    @app.server_type = :rails
+    @app.database_name = :test_db
+    @project.apps = [@app]
+
+    @database = RubyYacht::Database.new
+    @database.name = :test_db
+    @project.databases = [@database]
   end
   
   def configure_project(options = {})
@@ -13,7 +25,6 @@ describe RubyYacht::Plugins::Rails do
     RubyYacht.configure do
       project :test_project do
         system_prefix :test_project
-        domain 'test.com'
         repository 'github.com'
         rails_secret_key_base(options[:secret_key_base]) if options[:secret_key_base]
         rails_environment(options[:environment]) if options[:environment]
@@ -53,89 +64,6 @@ describe RubyYacht::Plugins::Rails do
     expect(project.rails_excluded_gem_groups).to eq []
   end
 
-  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_secret_key_base = '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 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].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 --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].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].server_type).to eq :rails
-    expect(hooks[1].command).to eq '/var/docker/prepare_rails_for_launch.rb'
-    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].server_type).to eq :rails
-  end
-
   describe "building images" do
     subject { RubyYacht::Runner::BuildImages.new }
     include DockerCommandSpec
@@ -149,12 +77,15 @@ describe RubyYacht::Plugins::Rails do
           container_type :database
           baseline_image 'ubuntu'
         end
+        server_type :nginx do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
       end
 
       RubyYacht.configure do
         project :apollo do
           system_prefix :apollo
-          domain "apollo.test.com"
           repository "github.com"
           rails_secret_key_base 'abc'
           
@@ -162,6 +93,7 @@ describe RubyYacht::Plugins::Rails do
             host "db.test.com"
             username "apollo"
             password "test"
+            port 1234
           end
           
           rails_app :mars do
@@ -173,6 +105,10 @@ describe RubyYacht::Plugins::Rails do
             repository_name 'brownleej/saturn'
             database_name :apollo
           end
+
+          nginx_web_server do
+            domain 'apollo.test.com'
+          end 
         end
       end
     end
@@ -190,7 +126,7 @@ describe RubyYacht::Plugins::Rails do
     it "generates the dockerfile for the app dependencies" do
       docker.expect("build -t apollo-rails-app-dependencies tmp") do
         files = Dir[File.join("tmp", "*")].sort
-        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/install_gems.rb']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/id_rsa', 'tmp/install_gems.rb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'app-dependencies-dockerfile-rails'))
         expect(dockerfile).to eq expected
@@ -201,7 +137,7 @@ describe RubyYacht::Plugins::Rails do
     it "generates the dockerfiles for the apps" 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/prepare_rails_for_launch.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb', 'tmp/update_rails_config.rb']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/before_startup.bash', 'tmp/before_startup.bash.erb', 'tmp/build_new_app.rb', 'tmp/checkout.bash', 'tmp/prepare_rails_for_launch.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb', 'tmp/update_rails_config.rb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-rails'))
         expect(dockerfile).to eq expected
@@ -230,7 +166,7 @@ describe RubyYacht::Plugins::Rails do
     it "generates the dockerfiles for the web server" 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']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile'))
         expect(dockerfile).to eq expected
@@ -246,7 +182,7 @@ describe RubyYacht::Plugins::Rails do
       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/install_gems.rb', 'tmp/load_seeds.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/load_seeds.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
           expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails'))
           expect(dockerfile).to eq expected
@@ -254,5 +190,41 @@ describe RubyYacht::Plugins::Rails do
         subject.run
       end
     end
+    
+    context "with no repository" do
+      before do
+        RubyYacht.configuration.projects.first.apps.first.repository_name = nil
+        RubyYacht.configuration.projects.first.databases.first.host = 'localhost'
+      end
+      
+      it "generates the dockerfiles for the app server" 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/build_new_app.rb', 'tmp/checkout.bash', 'tmp/prepare_rails_for_launch.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb', 'tmp/update_rails_config.rb']
+          file = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-rails-with-no-repository'))
+          expect(file).to eq expected
+        end
+        subject.run
+      end
+      
+      it "generates the startup script for the app server" do
+        docker.expect "build -t apollo-mars tmp" do
+          file = File.read(File.join('tmp', 'startup.bash'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-startup-rails-with-no-repository'))
+          expect(file).to eq expected
+        end
+        subject.run
+      end
+
+      it "generates a dockerfile for the database server" do
+        docker.expect "build -t apollo-database tmp" do
+          file = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails-with-no-repository'))
+          expect(file).to eq expected
+        end
+        subject.run
+      end
+    end
   end
 end

data/spec/runner/build_images_spec.rb

@@ -16,14 +16,14 @@ describe RubyYacht::Runner::BuildImages do
       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"
+      docker.expect "build -t apollo-nginx tmp"
       subject.run
     end
     
     it "generates the dockerfile for the app dependencies" do
       docker.expect("build -t apollo-generic-app-dependencies tmp") do
         files = Dir[File.join("tmp", "*")].sort
-        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/id_rsa']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'app-dependencies-dockerfile-generic'))
         expect(dockerfile).to eq expected
@@ -61,9 +61,9 @@ describe RubyYacht::Runner::BuildImages do
     end
     
     it "generates the dockerfiles for the web server" do
-      docker.expect "build -t apollo-web tmp" do
+      docker.expect "build -t apollo-nginx 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']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile'))
         expect(dockerfile).to eq expected
@@ -90,6 +90,7 @@ describe RubyYacht::Runner::BuildImages do
         database.container_label = 'mysql'
         database.username = 'apollo'
         database.password = 'test'
+        database.port = 1234
         database.host = 'localhost'
         RubyYacht.configuration.projects.first.databases << database
         RubyYacht.configuration.projects.first.apps.first.database_name = 'apollo'
@@ -127,8 +128,8 @@ describe RubyYacht::Runner::BuildImages do
         before do
         script_folder = self.script_folder
           RubyYacht.configure do
-            add_hooks folder: script_folder, server_type: :generic do
-              during(:load_database_seeds) { run_script 'hook1.rb' }
+            add_hooks script_folder: script_folder, container_type: :database do
+              during(:load_database_seeds) { run_script :ruby, 'hook1.rb' }
             end
           end
         end
@@ -161,6 +162,7 @@ describe RubyYacht::Runner::BuildImages do
         database.username = 'apollo'
         database.password = 'test'
         database.host = 'db1.test.com'
+        database.port = 3306
         RubyYacht.configuration.projects.first.databases << database
         RubyYacht.configuration.projects.first.apps.first.database_name = 'apollo'
       end
@@ -183,43 +185,10 @@ describe RubyYacht::Runner::BuildImages do
         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"
+        docker.expect "build -t apollo-nginx tmp"
         subject.run
       end
     end
-    
-    context "with an id_rsa key" do
-      let(:id_file_path) { File.join(ENV['HOME'], '.ssh', 'id_rsa') }
-      let(:missing_id_file) { !File.exist?(id_file_path) }
-      before do
-        if missing_id_file
-          FileUtils.mkdir_p(File.dirname(id_file_path))
-          File.open(id_file_path, 'w') do |file|
-            file.write('test')
-          end
-        end
-      end
-      
-      it "copies the id_rsa key to the app-dependencies container" do
-        docker.expect "build -t apollo-generic-app-dependencies tmp" do
-          files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/id_rsa']
-          expect(File.read('tmp/id_rsa')).to eq File.read(id_file_path)
-        end
-        
-        subject.run
-      end
-    
-      it "returns true" do
-        expect(subject.run).to be_truthy
-      end
-      
-      after do
-        if missing_id_file
-          FileUtils.rm(id_file_path)
-        end
-      end
-    end
 
     context "with an app set up as the primary app" do
       before do
@@ -227,9 +196,9 @@ describe RubyYacht::Runner::BuildImages do
       end
 
       it "includes that app as the primary in the web server dockerfile" do
-        docker.expect "build -t apollo-web tmp" do
+        docker.expect "build -t apollo-nginx 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']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
           expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile-with-primary-app'))
           expect(dockerfile).to eq expected
@@ -250,14 +219,14 @@ describe RubyYacht::Runner::BuildImages do
         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"
+        docker.expect "build -t apollo-nginx 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
+        docker.expect "build -t apollo-nginx 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']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.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
@@ -278,19 +247,31 @@ describe RubyYacht::Runner::BuildImages do
         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-nginx tmp"
         docker.expect "build -t jupiter-debian-app-dependencies tmp"
         docker.expect "build -t jupiter-venus tmp"
         docker.expect "build -t jupiter-saturn tmp"
-        docker.expect "build -t apollo-web tmp"
+        docker.expect "build -t jupiter-web tmp"
         subject.run
       end
     
-      it "generates one dockerfile for the web server with both projects" do
-        docker.expect "build -t apollo-web tmp" do
+      it "generates a normal dockerfile for the first project's web server" do
+        docker.expect "build -t apollo-nginx 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']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
-          expected = File.read(File.join('spec', 'fixtures', 'multi-project-web-dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+    
+      it "generates a dockerfile for the second project's web server" do
+        docker.expect "build -t jupiter-web tmp" do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile-jupiter'))
           expect(dockerfile).to eq expected
         end
         subject.run
@@ -306,9 +287,9 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, server_type: :generic do
-            before(:startup) { run_script 'hook1.rb' }
-            before(:startup) { run_script 'hook2.rb' }
+          add_hooks script_folder: script_folder, container_type: :app do
+            before(:startup) { run_script :ruby, 'hook1.rb' }
+            before(:startup) { run_script :ruby, 'hook2.rb' }
           end
         end
       end
@@ -346,8 +327,8 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, server_type: :generic do
-            after(:build_checkout) { run_script 'hook1.rb' }
+          add_hooks script_folder: script_folder, container_type: :app do
+            after(:build_checkout) { run_script :ruby, 'hook1.rb' }
           end
         end
       end
@@ -384,8 +365,8 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, server_type: :generic do
-            during(:install_libraries) { run_script 'hook2.rb' }
+          add_hooks script_folder: script_folder, container_type: :app do
+            during(:install_libraries) { run_script :ruby, 'hook2.rb' }
           end
         end
       end
@@ -422,7 +403,7 @@ describe RubyYacht::Runner::BuildImages do
       before do
         script_folder = self.script_folder
         RubyYacht.configure do
-          add_hooks folder: script_folder, server_type: :generic do
+          add_hooks script_folder: script_folder, container_type: :app do
             before :startup do
               copy_file "hook1.rb"
               command "cp /var/docker/hook1.rb /var/code/scripts/hook1.rb"
@@ -457,5 +438,77 @@ describe RubyYacht::Runner::BuildImages do
         subject.run
       end
     end
+    
+    context "with an app with no repository" do
+      before do
+        RubyYacht.configuration.projects[0].apps[0].repository_name = nil
+        RubyYacht.configure do
+          during :build_new_app do
+            container_type :app
+            command 'touch /var/code/app.bash'
+          end
+        end
+      end
+      
+      it "builds a dependencies dockerfile that does not include that app" do
+        docker.expect("build -t apollo-generic-app-dependencies tmp") do
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'app-dependencies-dockerfile-with-no-repository'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+      
+      it "builds a dockerfile for that app that does not check it out" do
+        docker.expect("build -t apollo-mars tmp") do
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-dockerfile-with-no-repository'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+      
+      it "builds a before-startup script for the app that does not check out the app" do
+        docker.expect("build -t apollo-mars tmp") do
+          file = File.read(File.join('tmp', 'before_startup.bash'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-before-startup-with-no-repository'))
+          expect(file).to eq expected
+        end
+        subject.run
+      end
+      
+      it "builds a startup script for the app that creates the app before starting it" do
+        docker.expect("build -t apollo-mars tmp") do
+          file = File.read(File.join('tmp', 'startup.bash'))
+          expected = File.read(File.join('spec', 'fixtures', 'mars-startup-with-no-repository'))
+          expect(file).to eq expected
+        end
+        subject.run
+      end
+    end
+  end
+
+  describe 'helper methods' do
+    describe 'set_image_settings' do
+      context 'with an app folder' do
+        it 'sets the templates, hook events, and hook servers' do
+          app = RubyYacht::App.new
+          subject.instance_eval { @app = app }
+          subject.set_image_settings('app')
+          expect(subject.instance_eval { @templates }).to eq ['Dockerfile', 'before_startup.bash', 'startup.bash']
+          expect(subject.instance_eval { @hook_events }).to eq [:startup, :build_checkout, :build_new_app]
+          expect(subject.instance_eval { @hook_servers }).to eq [app]
+        end
+      end
+
+      context 'with an invalid folder' do
+        it 'sets the templates, hook events, and hook servers' do
+          subject.set_image_settings('invalid')
+          expect(subject.instance_eval { @templates }).to eq ['Dockerfile']
+          expect(subject.instance_eval { @hook_events }).to eq []
+          expect(subject.instance_eval { @hook_servers }).to eq []
+        end
+      end
+    end
   end
 end