ruby_yacht 0.5.0 → 0.6.0

data/spec/dsl/server_type_spec.rb

@@ -10,9 +10,7 @@ describe RubyYacht::ServerType do
 
       server_attribute name: :bar, required: false
 
-      environment_variable :app, 'SECRET_KEY' do
-        @server.secret_key
-      end
+      server_default database_name: 'foo_db'
     end
   end
 
@@ -36,12 +34,12 @@ describe RubyYacht::ServerType do
       Proc.new do
         system_prefix 'test-project'
         repository 'github.com'
-        domain 'test.com'
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
       end
@@ -95,7 +93,7 @@ describe RubyYacht::ServerType do
           instance_eval(&block)
           app_type_test_foo 'test value'
 
-          app :test1, :app_type_test do
+          app :app_type_test, :test1 do
             app_type_test_bar 'baz'
             repository_name 'brownleej/test'
           end
@@ -115,7 +113,7 @@ describe RubyYacht::ServerType do
           instance_eval(&block)
           app_type_test_foo 'test value'
 
-          app :test1, :generic do
+          app :generic, :test1 do
             begin
               app_type_test_bar 'baz'
             rescue
@@ -144,6 +142,53 @@ describe RubyYacht::ServerType do
         end).to raise_exception "Missing required attribute app_type_test_foo for RubyYacht::Project::DSL"
       end
     end
+
+    context "with a default value for an existing server attribute" do
+      before do
+        block = project_configuration_block
+        RubyYacht.configure do
+          server_type :app_type_test2 do
+            container_type :app
+            baseline_image 'ubuntu'
+          end
+        end
+
+        RubyYacht.configure do
+          project :test do
+            instance_eval(&block)
+            app_type_test_foo 'test value'
+
+            app_type_test_app :app1 do
+              repository_name 'brownleej/test'
+            end
+
+            app_type_test_app :app2 do
+              repository_name 'brownleej/test'
+              database_name 'testdb'
+            end
+
+            app_type_test2_app :app3 do
+              repository_name 'brownleej/test'
+            end
+          end
+        end
+      end
+
+      it "sets those default values" do
+        app = RubyYacht.configuration.projects.first.apps[0]
+        expect(app.database_name).to eq 'foo_db'
+      end
+
+      it "does not override explicit values" do
+        app = RubyYacht.configuration.projects.first.apps[1]
+        expect(app.database_name).to eq 'testdb'
+      end
+
+      it "does not set a default value on servers of other types" do
+        app = RubyYacht.configuration.projects.first.apps[2]
+        expect(app.database_name).to be_nil
+      end
+    end
   end
 
   describe "dsl" do
@@ -170,11 +215,6 @@ describe RubyYacht::ServerType do
       @server.define_singleton_method :secret_key do
         'abc1234'
       end
-
-      expect(server_type.environment_variables.count).to eq 1
-      expect(server_type.environment_variables[0][:name]).to eq 'SECRET_KEY'
-      expect(server_type.environment_variables[0][:image]).to eq :app
-      expect(instance_eval(&server_type.environment_variables[0][:block])).to eq 'abc1234'
     end
 
     context "with no baseline image" do

data/spec/dsl/web_server_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+describe RubyYacht::WebServer do
+  describe "DSL" do
+    let(:name) { :test_app }
+    let(:server) { RubyYacht::WebServer::DSL.new(:test, name).run(@builder).create_object }
+
+    before do
+      RubyYacht.configuration.clear
+      RubyYacht.configure do
+        server_type :test do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
+      end
+    end
+
+    it 'can create a web server with all attributes' do
+      @builder = Proc.new do
+        domain 'test.com'
+        port 8080
+      end
+
+      expect(server.name).to eq :test_app
+      expect(server.domain).to eq 'test.com'
+      expect(server.port).to eq 8080
+    end
+
+    it 'defaults the name to web' do
+      @builder = Proc.new do
+        domain 'test.com'
+        port 8080
+      end
+      server = RubyYacht::WebServer::DSL.new(:test).run(@builder).create_object
+
+      expect(server.name).to eq :web
+    end
+
+    it 'requires the domain' do
+      @builder = Proc.new do
+        port 8080
+      end
+
+      expect { server }.to raise_exception 'Missing required attribute domain for RubyYacht::WebServer::DSL'
+    end
+
+    it 'defaults the port to 80' do
+      @builder = Proc.new do
+        domain 'test.com'
+      end
+
+      expect(server.port).to eq 80
+    end
+
+    it 'requires a defined server type' do
+      @builder = Proc.new do
+        domain 'test.com'
+        port 8080
+        server_type :invalid
+      end
+      expect do
+        self.server
+      end.to raise_exception("RubyYacht::WebServer::DSL has invalid web server type `invalid`")
+    end
+
+    it 'requires a defined server type for web servers' do
+      RubyYacht.configure do
+        server_type :sqlite do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
+      end
+
+      @builder = Proc.new do
+        domain 'test.com'
+        port 8080
+        server_type :sqlite
+      end
+      expect do
+        self.server
+      end.to raise_exception("RubyYacht::WebServer::DSL has invalid web server type `sqlite`")
+    end
+
+    it 'allows creating a server with the default name in the project DSL' do
+      RubyYacht.configure do
+        project :project1 do
+          repository 'github.com'
+          system_prefix :project1
+
+          test_web_server do
+            domain 'project1.test.com'
+          end
+        end
+      end
+
+      server = RubyYacht.configuration.projects.first.web_servers.first
+      expect(server.name).to eq :web
+    end
+  end
+
+  describe 'project' do
+    before do
+      RubyYacht.configuration.clear
+      RubyYacht.configure do
+        server_type :test do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
+      end
+      RubyYacht.configure do
+        project :project1 do
+          repository 'github.com'
+          system_prefix :project1
+
+          test_web_server :server1 do
+            domain 'project1.test.com'
+          end
+
+          test_web_server :server2 do
+            domain 'project2.test.com'
+          end
+        end
+        
+        project :project2 do
+          repository 'github.com'
+          system_prefix :project2
+
+          test_web_server :app3 do
+            domain 'project3.test.com'
+          end
+        end
+      end
+    end
+
+    it 'finds the project that contains the server' do
+      server2 = RubyYacht.configuration.projects[0].web_servers[1]
+      expect(server2.project.name).to eq :project1
+
+      server3 = RubyYacht.configuration.projects[1].web_servers[0]
+      expect(server3.project.name).to eq :project2
+    end
+  end
+
+  describe 'container_name' do
+    before do
+      @project = RubyYacht::Project.new
+      @project.name = :test_project
+      @project.system_prefix = :tests
+
+      @server = RubyYacht::WebServer.new
+      @server.name = 'server1'
+      @project.web_servers = [@server]
+      RubyYacht.configuration.projects << @project
+    end
+
+    it "combines the project's prefix with the server's name" do
+      expect(@server.container_name).to eq 'tests-server1'
+    end
+  end
+end

data/spec/fixtures/apollo-new-project-config

@@ -0,0 +1,20 @@
+require 'ruby_yacht'
+
+RubyYacht.configure do
+  project :apollo do
+    system_prefix           :apollo
+    repository              'github.com'
+    rails_secret_key_base   'testkey'
+    check_out_locally
+
+    rails_app :apollo
+
+    primary_app :apollo
+
+    nginx_web_server do
+      domain 'apollo.test.com'
+    end
+  end
+end
+
+RubyYacht::Runner.run

data/spec/fixtures/app-dependencies-dockerfile-generic

@@ -11,16 +11,13 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
-RUN touch /var/docker/.keep
+RUN mkdir -p /var/code/
 
-RUN chmod u+x /var/docker/*
+RUN apt-get update && apt-get upgrade -y
 
 RUN git clone git@github.com:brownleej/mars /var/code/mars
 WORKDIR /var/code/mars
 
-RUN rm /var/docker/*
-
-WORKDIR /
+RUN rm -f /var/docker/*
 
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y mysql-client
+WORKDIR /

data/spec/fixtures/app-dependencies-dockerfile-generic-with-library-install

@@ -11,19 +11,15 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
-RUN touch /var/docker/.keep
+RUN mkdir -p /var/code/
 
-COPY hook2.rb /var/docker/hook2.rb
-
-RUN chmod u+x /var/docker/*
+RUN apt-get update && apt-get upgrade -y
 
 RUN git clone git@github.com:brownleej/mars /var/code/mars
 WORKDIR /var/code/mars
-RUN /var/docker/hook2.rb
+COPY hook2.rb /var/docker/
+RUN ruby /var/docker/hook2.rb
 
-RUN rm /var/docker/*
+RUN rm -f /var/docker/*
 
-WORKDIR /
-
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y mysql-client
+WORKDIR /

data/spec/fixtures/app-dependencies-dockerfile-rails

@@ -7,6 +7,7 @@
 FROM ruby:2.3
 
 ENV RAILS_ENV development
+ENV SECRET_KEY_BASE abc
 ENV EXCLUDED_GEM_GROUPS ""
 
 RUN mkdir -p /root/.ssh
@@ -14,23 +15,20 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
-RUN touch /var/docker/.keep
+RUN mkdir -p /var/code/
 
-COPY install_gems.rb /var/docker/install_gems.rb
-
-RUN chmod u+x /var/docker/*
+RUN apt-get update && apt-get upgrade -y
 
 RUN git clone git@github.com:brownleej/mars /var/code/mars
 WORKDIR /var/code/mars
-RUN /var/docker/install_gems.rb
+COPY install_gems.rb /var/docker/
+RUN ruby /var/docker/install_gems.rb
 
 RUN git clone git@github.com:brownleej/saturn /var/code/saturn
 WORKDIR /var/code/saturn
-RUN /var/docker/install_gems.rb
+COPY install_gems.rb /var/docker/
+RUN ruby /var/docker/install_gems.rb
 
-RUN rm /var/docker/*
+RUN rm -f /var/docker/*
 
-WORKDIR /
-
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y mysql-client
+WORKDIR /

data/spec/fixtures/app-dependencies-dockerfile-with-no-repository

@@ -0,0 +1,20 @@
+# This Dockerfile creates an image for installing all of the dependencies
+# for all of the apps.
+#
+# This is a slow process, so this should be kept as simple as possible so that
+# it can remain unchanged.
+
+FROM ubuntu
+
+RUN mkdir -p /root/.ssh
+COPY id_rsa /root/.ssh
+RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
+
+RUN mkdir -p /var/docker/
+RUN mkdir -p /var/code/
+
+RUN apt-get update && apt-get upgrade -y
+
+RUN rm -f /var/docker/*
+
+WORKDIR /

data/spec/fixtures/database-dockerfile

@@ -20,6 +20,6 @@ ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
 ENV DATABASE_NAME ''
 
-EXPOSE 3306
+EXPOSE 1234
 
 CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-mysql

@@ -4,17 +4,17 @@ ENV DATABASE_USERNAME apollo
 ENV DATABASE_PASSWORD test
 ENV DATABASE_NAME apollo
 ENV DATABASE_TYPE mysql
-ENV DEBIAN_FRONTEND noninteractive
 
 COPY checkout.bash /var/docker/checkout.bash
 COPY startup.bash /var/docker/startup.bash
-COPY setup.bash /var/docker/setup.bash
 
 RUN chmod u+x /var/docker/*
 
+ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get install -y mysql-server
 
-RUN /var/docker/setup.bash
+COPY setup.bash /var/docker/
+RUN bash /var/docker/setup.bash
 
 RUN /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars

data/spec/fixtures/database-dockerfile-rails

@@ -7,17 +7,18 @@ ENV DATABASE_TYPE sqlite
 
 COPY checkout.bash /var/docker/checkout.bash
 COPY startup.bash /var/docker/startup.bash
-COPY load_seeds.rb /var/docker/load_seeds.rb
 
 RUN chmod u+x /var/docker/*
 
 RUN /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars
-RUN /var/docker/load_seeds.rb
+COPY load_seeds.rb /var/docker/
+RUN ruby /var/docker/load_seeds.rb
 
 RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
 WORKDIR /var/code/saturn
-RUN /var/docker/load_seeds.rb
+COPY load_seeds.rb /var/docker/
+RUN ruby /var/docker/load_seeds.rb
 
 RUN rm -r /var/code
 WORKDIR /
@@ -26,6 +27,6 @@ ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
 ENV DATABASE_NAME ''
 
-EXPOSE 3306
+EXPOSE 1234
 
 CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-rails-with-no-repository

@@ -0,0 +1,27 @@
+FROM apollo-rails-app-dependencies
+
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_NAME apollo
+ENV DATABASE_TYPE sqlite
+
+COPY checkout.bash /var/docker/checkout.bash
+COPY startup.bash /var/docker/startup.bash
+
+RUN chmod u+x /var/docker/*
+
+RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
+WORKDIR /var/code/saturn
+COPY load_seeds.rb /var/docker/
+RUN ruby /var/docker/load_seeds.rb
+
+RUN rm -r /var/code
+WORKDIR /
+
+ENV DATABASE_USERNAME ''
+ENV DATABASE_PASSWORD ''
+ENV DATABASE_NAME ''
+
+EXPOSE 1234
+
+CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-with-seed-hooks

@@ -7,13 +7,13 @@ ENV DATABASE_TYPE sqlite
 
 COPY checkout.bash /var/docker/checkout.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 github.com mars brownleej/mars
 WORKDIR /var/code/mars
-RUN /var/docker/hook1.rb
+COPY hook1.rb /var/docker/
+RUN ruby /var/docker/hook1.rb
 
 RUN rm -r /var/code
 WORKDIR /
@@ -22,6 +22,6 @@ ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
 ENV DATABASE_NAME ''
 
-EXPOSE 3306
+EXPOSE 1234
 
 CMD /var/docker/startup.bash

data/spec/fixtures/database-startup-mysql

@@ -1,3 +1,4 @@
 #! /bin/bash
 
-mysqld_safe --bind-address=0.0.0.0;
+export MYSQL_PORT="3306"
+mysqld_safe --bind-address=0.0.0.0 --port=$MYSQL_PORT

data/spec/fixtures/mars-before-startup

@@ -1,4 +1,4 @@
 #! /bin/bash
 
-cd /var/code;
-/var/docker/checkout.bash;
+cd /var/code
+/var/docker/checkout.bash

data/spec/fixtures/mars-before-startup-rails

@@ -1,7 +1,8 @@
 #! /bin/bash
 
-cd /var/code;
-/var/docker/checkout.bash;
+cd /var/code
+/var/docker/checkout.bash
 
-/var/docker/update_rails_config.rb;
-/var/docker/prepare_rails_for_launch.rb;
+ruby /var/docker/update_rails_config.rb
+
+ruby /var/docker/prepare_rails_for_launch.rb

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

@@ -1,7 +1,8 @@
 #! /bin/bash
 
-cd /var/code;
-/var/docker/checkout.bash;
+cd /var/code
+/var/docker/checkout.bash
 
-/var/docker/hook1.rb;
-/var/docker/hook2.rb;
+ruby /var/docker/hook1.rb
+
+ruby /var/docker/hook2.rb

data/spec/fixtures/mars-before-startup-with-custom-file-copy

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-cd /var/code;
-/var/docker/checkout.bash;
+cd /var/code
+/var/docker/checkout.bash
 
-cp /var/docker/hook1.rb /var/code/scripts/hook1.rb;
+cp /var/docker/hook1.rb /var/code/scripts/hook1.rb

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

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+cd /var/code

data/spec/fixtures/mars-dockerfile

@@ -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
@@ -14,9 +14,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-rails

@@ -5,11 +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 SECRET_KEY_BASE abc
+ENV REPOSITORY_NAME brownleej/mars
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
@@ -17,13 +17,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 update_rails_config.rb /var/docker/update_rails_config.rb
-COPY prepare_rails_for_launch.rb /var/docker/prepare_rails_for_launch.rb
+COPY update_rails_config.rb /var/docker/
+COPY prepare_rails_for_launch.rb /var/docker/
 
 RUN chmod u+x /var/docker/*
 
-RUN /var/docker/checkout.bash
 WORKDIR /var/code
+
+RUN /var/docker/checkout.bash
 RUN bundle install --clean
 
 EXPOSE 8080

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

@@ -0,0 +1,32 @@
+FROM apollo-rails-app-dependencies
+
+ENV DATABASE_HOST apollo-database
+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 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
+COPY update_rails_config.rb /var/docker/
+COPY prepare_rails_for_launch.rb /var/docker/
+COPY build_new_app.rb /var/docker/
+
+RUN chmod u+x /var/docker/*
+
+WORKDIR /var/code
+
+COPY build_new_app.rb /var/docker/
+RUN ruby /var/docker/build_new_app.rb
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash