ruby_yacht 0.5.0 → 0.6.0

data/spec/fixtures/mars-dockerfile-with-after-checkout-hooks

@@ -2,8 +2,8 @@ FROM apollo-generic-app-dependencies
 
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -11,13 +11,14 @@ RUN mkdir -p /var/code
 COPY checkout.bash /var/docker/checkout.bash
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
-COPY hook1.rb /var/docker/hook1.rb
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
-RUN /var/docker/hook1.rb
+
+RUN /var/docker/checkout.bash
+COPY hook1.rb /var/docker/
+RUN ruby /var/docker/hook1.rb
 
 EXPOSE 8080
 

data/spec/fixtures/mars-dockerfile-with-before-startup-hooks

@@ -2,8 +2,8 @@ FROM apollo-generic-app-dependencies
 
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -11,14 +11,15 @@ RUN mkdir -p /var/code
 COPY checkout.bash /var/docker/checkout.bash
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
-COPY hook1.rb /var/docker/hook1.rb
-COPY hook2.rb /var/docker/hook2.rb
+COPY hook1.rb /var/docker/
+COPY hook2.rb /var/docker/
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
+RUN /var/docker/checkout.bash
+
 EXPOSE 8080
 
 CMD /var/docker/startup.bash

data/spec/fixtures/mars-dockerfile-with-custom-file-copy

@@ -2,8 +2,8 @@ FROM apollo-generic-app-dependencies
 
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -11,13 +11,14 @@ RUN mkdir -p /var/code
 COPY checkout.bash /var/docker/checkout.bash
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
-COPY hook1.rb /var/docker/hook1.rb
+COPY hook1.rb /var/docker/
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
+RUN /var/docker/checkout.bash
+
 EXPOSE 8080
 
 CMD /var/docker/startup.bash

data/spec/fixtures/mars-dockerfile-with-local-database

@@ -5,10 +5,11 @@ ENV DATABASE_NAME apollo
 ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV DATABASE_TYPE sqlite
+ENV DATABASE_PORT 1234
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -19,9 +20,10 @@ COPY startup.bash /var/docker/startup.bash
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
+RUN /var/docker/checkout.bash
+
 EXPOSE 8080
 
 CMD /var/docker/startup.bash

data/spec/fixtures/mars-dockerfile-with-no-repository

@@ -0,0 +1,22 @@
+FROM apollo-generic-app-dependencies
+
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV SYSTEM_PREFIX apollo
+
+RUN rm -r /var/code
+RUN mkdir -p /var/code
+
+COPY checkout.bash /var/docker/checkout.bash
+COPY before_startup.bash /var/docker/before_startup.bash
+COPY startup.bash /var/docker/startup.bash
+
+RUN chmod u+x /var/docker/*
+
+WORKDIR /var/code
+
+RUN touch /var/code/app.bash
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

data/spec/fixtures/mars-dockerfile-with-remote-database

@@ -5,10 +5,11 @@ ENV DATABASE_NAME apollo
 ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV DATABASE_TYPE mysql
+ENV DATABASE_PORT 3306
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -19,9 +20,10 @@ COPY startup.bash /var/docker/startup.bash
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
+RUN /var/docker/checkout.bash
+
 EXPOSE 8080
 
 CMD /var/docker/startup.bash

data/spec/fixtures/mars-startup

@@ -1,3 +1,3 @@
 #! /bin/bash
-/var/docker/before_startup.bash;
-/var/docker/start_app.bash;
+/var/docker/before_startup.bash
+/var/docker/start_app.bash

data/spec/fixtures/mars-startup-rails

@@ -1,3 +1,3 @@
 #! /bin/bash
-/var/docker/before_startup.bash;
-rails s -b 0.0.0.0 -p $APP_PORT -e $RAILS_ENV;
+/var/docker/before_startup.bash
+rails s -b 0.0.0.0 -p $APP_PORT -e $RAILS_ENV

data/spec/fixtures/mars-startup-rails-with-no-repository

@@ -0,0 +1,5 @@
+#! /bin/bash
+
+ruby /var/docker/build_new_app.rb
+/var/docker/before_startup.bash
+rails s -b 0.0.0.0 -p $APP_PORT -e $RAILS_ENV

data/spec/fixtures/mars-startup-with-no-repository

@@ -0,0 +1,4 @@
+#! /bin/bash
+touch /var/code/app.bash
+/var/docker/before_startup.bash
+/var/docker/start_app.bash

data/spec/fixtures/web-dockerfile

@@ -2,20 +2,27 @@ 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
+ENV PROJECT apollo
+ENV DOMAIN apollo.test.com
 
-RUN ruby /var/docker/add_project.rb apollo apollo.test.com mars,saturn
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080 false
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
+ENV APP_LIST mars,saturn
+
+ENV APP_NAME mars
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
+
+ENV APP_NAME saturn
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
 
 RUN rm -r /var/docker
-RUN apt-get remove -y ruby
-RUN apt-get autoremove -y
+
+ENV PROJECT ""
+ENV DOMAIN ""
+ENV APP_LIST ""
+ENV APP_NAME ""
+ENV APP_PORT ""
+ENV APP_PRIMARY ""

data/spec/fixtures/web-dockerfile-jupiter

@@ -0,0 +1,28 @@
+FROM nginx
+
+RUN apt-get update
+RUN apt-get upgrade -y
+
+RUN mkdir -p /var/docker
+
+ENV PROJECT jupiter
+ENV DOMAIN jupiter.test.com
+
+ENV APP_LIST venus,saturn
+
+ENV APP_NAME venus
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
+
+ENV APP_NAME saturn
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
+
+RUN rm -r /var/docker
+
+ENV PROJECT ""
+ENV DOMAIN ""
+ENV APP_LIST ""
+ENV APP_NAME ""
+ENV APP_PORT ""
+ENV APP_PRIMARY ""

data/spec/fixtures/web-dockerfile-nginx

@@ -0,0 +1,38 @@
+FROM nginx
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y ruby
+COPY index.html.erb /var/docker/
+COPY index_config.erb /var/docker/
+COPY app_config.erb /var/docker/
+
+RUN mkdir -p /var/docker
+
+ENV PROJECT apollo
+ENV DOMAIN apollo.test.com
+
+ENV APP_LIST mars,saturn
+COPY add_project.rb /var/docker/
+RUN ruby /var/docker/add_project.rb
+
+ENV APP_NAME mars
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
+COPY add_app.rb /var/docker/
+RUN ruby /var/docker/add_app.rb
+
+ENV APP_NAME saturn
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
+COPY add_app.rb /var/docker/
+RUN ruby /var/docker/add_app.rb
+
+RUN rm -r /var/docker
+
+ENV PROJECT ""
+ENV DOMAIN ""
+ENV APP_LIST ""
+ENV APP_NAME ""
+ENV APP_PORT ""
+ENV APP_PRIMARY ""

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

@@ -2,19 +2,25 @@ 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
+ENV PROJECT apollo
+ENV DOMAIN apollo.test.com
 
-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
+ENV APP_NAME apollo
+ENV APP_PORT 8080
+ENV APP_PRIMARY true
+
+ENV APP_NAME saturn
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
 
 RUN rm -r /var/docker
-RUN apt-get remove -y ruby
-RUN apt-get autoremove -y
+
+ENV PROJECT ""
+ENV DOMAIN ""
+ENV APP_LIST ""
+ENV APP_NAME ""
+ENV APP_PORT ""
+ENV APP_PRIMARY ""

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

@@ -2,19 +2,25 @@ 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
+ENV PROJECT apollo
+ENV DOMAIN apollo.test.com
 
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080 true
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
+ENV APP_NAME mars
+ENV APP_PORT 8080
+ENV APP_PRIMARY true
+
+ENV APP_NAME saturn
+ENV APP_PORT 8080
+ENV APP_PRIMARY false
 
 RUN rm -r /var/docker
-RUN apt-get remove -y ruby
-RUN apt-get autoremove -y
+
+ENV PROJECT ""
+ENV DOMAIN ""
+ENV APP_LIST ""
+ENV APP_NAME ""
+ENV APP_PORT ""
+ENV APP_PRIMARY ""

data/spec/integration/build_images_spec.rb

@@ -0,0 +1,210 @@
+require 'spec_helper'
+
+RSpec.describe RubyYacht::Runner::BuildImages, :integration do
+  include IntegrationHelpers
+  
+  def start_database
+    system "docker run -d --net=apollo --net-alias=apollo-database --name=apollo-database apollo-database > /dev/null"
+    wait_on_command_result 'docker run --rm --net=apollo apollo-mars mysql -uapollo -ptestpass -hapollo-database', does_not_contain: 'ERROR'
+  end
+
+  let(:images) { `docker images | grep "apollo\\|jupiter"`.split("\n").collect { |line| line.split(/\s+/).first }.sort }
+  
+  before :all do
+    configure_project
+    system 'docker network create apollo 1> /dev/null 2> /dev/null'
+  end
+  
+  context "with the standard config" do
+    before :all do
+      run_command 'build_images'
+    end
+    
+    after do
+      IntegrationHelpers.clear_docker_containers
+    end
+    
+    it "creates images for the app, dependencies, database, and web server" do
+      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
+    end 
+    
+    it "populates the tables in the database image" do
+      start_database
+      
+      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "use apollo; show tables"'
+      results = results.split("\n").collect { |line| line.delete('|').strip }.sort
+      results.shift
+      expect(results).to eq %w(clients posts schema_migrations users)
+    end
+    
+    it "populates the seed data in the database image" do
+      start_database
+      
+      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "select count(*) FROM apollo.users"'
+      results = results.split("\n").collect { |line| line.delete('|').strip }
+      results.shift
+      expect(results).to eq ['1']
+      
+      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "select name FROM apollo.clients"'
+      results = results.split("\n").collect { |line| line.delete('|').strip }
+      results.shift
+      expect(results).to eq ['Test Client']
+    end
+
+    it "creates a test database" do
+      start_database
+
+      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database apollo_test 2>&1'
+      expect(results).not_to include 'ERROR'
+    end
+    
+    it "installs the gems on the app dependency image" do
+      results = run_command_in_docker 'rails-app-dependencies', 'gem list'
+      expect(results).to include 'mysql2'
+      expect(results).to include 'sass-rails'
+      expect(results).to include 'byebug'
+      expect(results).to include 'factory_girl'
+    end
+    
+    it "leaves all the apps checked out on the app dependency image" do
+      results = run_command_in_docker 'rails-app-dependencies', 'ls /var/code'
+      folders = results.split("\n")
+      expect(folders).to include 'mars'
+      expect(folders).to include 'saturn'
+    end
+    
+    it "installs the gems on the app images" do
+      results = run_command_in_docker :mars, 'gem list'
+      expect(results).to include 'mysql2'
+      expect(results).not_to include 'sass-rails'
+      expect(results).to include 'byebug'
+      expect(results).to include 'factory_girl'
+
+      results = run_command_in_docker :saturn, 'gem list'
+      expect(results).to include 'mysql2'
+      expect(results).to include 'sass-rails'
+      expect(results).not_to include 'byebug'
+      expect(results).not_to include 'factory_girl'
+    end
+
+    it 'installs mysql on the app images' do
+      results = run_command_in_docker :mars, 'which mysql'
+      expect(results).to eq "/usr/bin/mysql\n"
+    end
+    
+    it "checks out just the single app on the app image" do
+      results = run_command_in_docker :mars, 'ls /var/code'
+      folders = results.split("\n")
+      expect(folders).to include 'app'
+      expect(folders).to include 'db'
+    end
+    
+    it "installs the scripts in the /var/docker folder in the app image" do
+      results = run_command_in_docker :mars, 'ls /var/docker'
+      files = results.split("\n")
+      expect(files).to include 'checkout.bash'
+      expect(files).to include 'before_startup.bash'
+      expect(files).to include 'startup.bash'
+      expect(files).to include 'update_rails_config.rb'
+      expect(files).to include 'prepare_rails_for_launch.rb'
+    end
+  end
+  
+  context 'with no database server' do
+    before :all do
+      system "docker rmi apollo-database 1> /dev/null 2> /dev/null"
+      run_command 'build_images', environment: { SKIP_DATABASE: 1 }
+    end
+    
+    it "does not build a database image" do
+      expect(images).to eq ['apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
+    end
+
+    it 'does not install mysql on the app servers' do
+      results = run_command_in_docker :mars, 'which mysql'
+      expect(results).to eq ''
+    end
+  end
+
+  context 'with a production environment' do
+    before :all do
+      run_command 'build_images', environment: { USE_PRODUCTION_ENVIRONMENT: 1 }
+    end
+
+    after :all do
+      IntegrationHelpers.clear_docker_containers
+    end
+    
+    it "does not install the non-production gems" do
+      results = run_command_in_docker 'rails-app-dependencies', 'gem list'
+      expect(results).to include 'mysql2'
+      expect(results).not_to include 'byebug'
+      expect(results).not_to include 'factory_girl'
+
+      results = run_command_in_docker :mars, 'gem list'
+      expect(results).to include 'mysql2'
+      expect(results).not_to include 'byebug'
+      expect(results).not_to include 'factory_girl'
+    end
+
+    it "does not create a test database" do
+      start_database
+      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database apollo_test 2>&1'
+      expect(results).to include 'ERROR'
+    end
+  end
+
+  context "with an app with the same name as the project" do
+    before :all do
+      system "docker rmi apollo-mars 1> /dev/null 2> /dev/null"
+      run_command 'build_images', environment: { CREATE_TITULAR_APP: 1 }
+    end
+    
+    after :all do
+      system "docker rmi apollo 1> /dev/null"
+    end
+    
+    it "creates an image with the same name as the project" do
+      expect(images).to eq ['apollo', 'apollo-database', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
+    end 
+    
+    it "checks out the app onto the image" do
+      results = `docker run --rm apollo ls /var/code/app/models`
+      expect(results).to include 'user.rb'
+      expect(results).to include 'post.rb'
+    end 
+  end
+  
+  context "with a second project" do
+    before :all do
+      run_command 'build_images', environment: { CREATE_SECOND_PROJECT: 1 }
+    end
+
+    after :all do
+      IntegrationHelpers.image_names.select { |name| name =~ /jupiter/ }.each do |name|
+        `docker rmi #{name} 1> /dev/null`
+      end
+    end
+    
+    it "creates images for the app, dependencies, database, and web server" do
+      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web', 'jupiter-database', 'jupiter-rails-app-dependencies', 'jupiter-saturn', 'jupiter-web']
+    end
+  end
+
+  context 'with no repository name' do
+    before :all do
+      run_command 'build_images', environment: { NO_REPOSITORY: 1 }
+    end
+
+    
+    it 'creates images for the app, dependencies, database, and web server' do
+      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
+    end
+
+    it 'creates a fresh app in the app image' do
+      results = run_command_in_docker :mars, 'ls /var/code'
+      expect(results).to include 'app'
+      expect(results).to include 'Gemfile'
+    end
+  end
+end

data/spec/integration/build_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe RubyYacht::Runner::Build, :integration do
+  include IntegrationHelpers
+
+  before :all do
+    configure_project
+  end
+
+  before do
+    run_command 'build'
+    wait_on_command_success 'curl apollo.johnbrownlee.com'
+  end
+
+  after :all do
+    restore_hosts_file
+  end
+
+  it "allows accessing the containers through their hostnames" do
+    results = `curl apollo.johnbrownlee.com 2>&1`
+    expect(results).to include '<a href="http://mars.apollo.johnbrownlee.com/">'
+  end
+end