ruby_yacht 0.1.1 → 0.2.0

data/spec/dsl/project_spec.rb

@@ -4,19 +4,24 @@ describe RubyYacht::Project do
   describe "dsl" do
     let(:project) { RubyYacht::Project::DSL.new(:test_project).run(@builder).create_object }
 
+    before do
+      RubyYacht.configuration.clear
+      RubyYacht.configure do
+        app_type(:generic) { baseline_image 'ubuntu' }
+      end
+    end
+    
     it "can create a project with all the fields" do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
-        secret_key_base "a"
         repository "github.com"
-        rails_environment "production"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 
@@ -35,9 +40,7 @@ describe RubyYacht::Project do
       expect(project.name).to eq :test_project
       expect(project.system_prefix).to eq :a
       expect(project.domain).to eq "a.test.com"
-      expect(project.secret_key_base).to eq "a"
       expect(project.repository).to eq "github.com"
-      expect(project.rails_environment).to eq "production"
 
       expect(project.apps.map(&:name)).to eq [:app1, :app2]
       expect(project.database.name).to eq 'project1'
@@ -47,14 +50,13 @@ describe RubyYacht::Project do
     it "requires the system prefix" do
       @builder = Proc.new do
         domain "a.test.com"
-        secret_key_base "a"
         repository "github.com"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 
@@ -76,14 +78,13 @@ describe RubyYacht::Project do
     it "requires the domain" do
       @builder = Proc.new do
         system_prefix :a
-        secret_key_base "a"
         repository "github.com"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 
@@ -102,46 +103,16 @@ describe RubyYacht::Project do
       expect { project }.to raise_exception "Missing required attribute domain for RubyYacht::Project::DSL"
     end
 
-    it "requires the secret_key_base" do
-      @builder = Proc.new do
-        system_prefix :a
-        domain "a.test.com"
-        repository "github.com"
-
-        app(:app1) do
-          repository_name 'brownleej/test1'
-        end
-
-        app(:app2) do
-          repository_name 'brownleej/test2'
-        end
-
-        database do
-          host "localhost"
-          name "project1"
-          username "test"
-          password "test"
-        end
-
-        dns_server do
-          server '8.10.1.1'
-        end
-      end
-
-      expect { project }.to raise_exception "Missing required attribute secret_key_base for RubyYacht::Project::DSL"
-    end
-
     it "requires the repository" do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
-        secret_key_base "a"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 
@@ -159,43 +130,12 @@ describe RubyYacht::Project do
 
       expect { project }.to raise_exception "Missing required attribute repository for RubyYacht::Project::DSL"
     end
-    it "defaults the rails_environment to development" do
-      @builder = Proc.new do
-        system_prefix :a
-        domain "a.test.com"
-        secret_key_base "a"
-        repository "github.com"
-
-        app(:app1) do
-          repository_name 'brownleej/test1'
-        end
-
-        app(:app2) do
-          repository_name 'brownleej/test2'
-        end
-
-        database do
-          host "localhost"
-          name "project1"
-          username "test"
-          password "test"
-        end
-
-        dns_server do
-          server '8.10.1.1'
-        end
-      end
-
-      expect(project.rails_environment).to eq 'development'
-    end
 
     it "does not require any apps" do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
-        secret_key_base "a"
         repository "github.com"
-        rails_environment "production"
 
         database do
           host "localhost"
@@ -216,15 +156,13 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
-        secret_key_base "a"
         repository "github.com"
-        rails_environment "production"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 
@@ -240,15 +178,13 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
-        secret_key_base "a"
         repository "github.com"
-        rails_environment "production"
 
-        app(:app1) do
+        app :app1, :generic do
           repository_name 'brownleej/test1'
         end
 
-        app(:app2) do
+        app :app2, :generic do
           repository_name 'brownleej/test2'
         end
 

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

@@ -0,0 +1,21 @@
+# 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 git clone git@github.com:brownleej/mars /var/code/mars
+WORKDIR /var/code/mars
+
+WORKDIR /
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y mysql-client

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

@@ -0,0 +1,28 @@
+# 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/
+
+COPY hook2.rb /var/docker/hook2.rb
+
+RUN chmod u+x /var/docker/*
+
+RUN git clone git@github.com:brownleej/mars /var/code/mars
+WORKDIR /var/code/mars
+RUN /var/docker/hook2.rb
+
+RUN rm /var/docker/*
+
+WORKDIR /
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y mysql-client

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

@@ -0,0 +1,32 @@
+# 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 ruby:2.3
+
+RUN mkdir -p /root/.ssh
+COPY id_rsa /root/.ssh
+RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
+
+RUN mkdir -p /var/docker/
+
+COPY install_gems.rb /var/docker/install_gems.rb
+
+RUN chmod u+x /var/docker/*
+
+RUN git clone git@github.com:brownleej/mars /var/code/mars
+WORKDIR /var/code/mars
+RUN /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
+
+RUN rm /var/docker/*
+
+WORKDIR /
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y mysql-client

data/spec/fixtures/database-dockerfile

@@ -1,31 +1,32 @@
-FROM apollo-app-dependencies
-
-
+FROM apollo-debian-app-dependencies
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get install -y mysql-server
 
-COPY setup.rb /var/docker/setup.rb
-COPY setup_database.sql.erb /var/docker/setup_database.sql.erb
-COPY load_seeds.rb /var/docker/load_seeds.rb
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_NAME apollo
 
-RUN ruby /var/docker/setup.rb apollo apollo test development
+COPY setup.bash /var/docker/setup.bash
+COPY checkout.bash /var/docker/checkout.bash
 
+RUN chmod u+x /var/docker/*
 
+RUN /var/docker/setup.bash apollo apollo test
 
-  
-  
-RUN ruby /var/docker/load_seeds.rb mars apollo_development apollo test false
-  
+RUN /var/docker/checkout.bash github.com mars brownleej/mars
+WORKDIR /var/code/mars
 
-  
-  
-RUN ruby /var/docker/load_seeds.rb saturn apollo_development apollo test true
-  
+RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
+WORKDIR /var/code/saturn
 
 RUN rm -r /var/docker
 RUN rm -r /var/code
 
+ENV DATABASE_USERNAME ''
+ENV DATABASE_PASSWORD ''
+ENV DATABASE_NAME ''
+
 EXPOSE 3306
 
 CMD mysqld_safe --bind-address=0.0.0.0

data/spec/fixtures/database-dockerfile-rails

@@ -0,0 +1,35 @@
+FROM apollo-rails-app-dependencies
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get install -y mysql-server
+
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_NAME apollo
+
+COPY setup.bash /var/docker/setup.bash
+COPY checkout.bash /var/docker/checkout.bash
+COPY load_seeds.rb /var/docker/load_seeds.rb
+
+RUN chmod u+x /var/docker/*
+
+RUN /var/docker/setup.bash apollo apollo test
+
+RUN /var/docker/checkout.bash github.com mars brownleej/mars
+WORKDIR /var/code/mars
+RUN /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
+
+RUN rm -r /var/docker
+RUN rm -r /var/code
+
+ENV DATABASE_USERNAME ''
+ENV DATABASE_PASSWORD ''
+ENV DATABASE_NAME ''
+
+EXPOSE 3306
+
+CMD mysqld_safe --bind-address=0.0.0.0

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

@@ -0,0 +1,34 @@
+FROM apollo-debian-app-dependencies
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get install -y mysql-server
+
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_NAME apollo
+
+COPY setup.bash /var/docker/setup.bash
+COPY checkout.bash /var/docker/checkout.bash
+COPY hook1.rb /var/docker/hook1.rb
+
+RUN chmod u+x /var/docker/*
+
+RUN /var/docker/setup.bash apollo apollo test
+
+RUN /var/docker/checkout.bash github.com mars brownleej/mars
+WORKDIR /var/code/mars
+RUN /var/docker/hook1.rb
+
+RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
+WORKDIR /var/code/saturn
+
+RUN rm -r /var/docker
+RUN rm -r /var/code
+
+ENV DATABASE_USERNAME ''
+ENV DATABASE_PASSWORD ''
+ENV DATABASE_NAME ''
+
+EXPOSE 3306
+
+CMD mysqld_safe --bind-address=0.0.0.0

data/spec/fixtures/mars-before-startup

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

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

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

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

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

data/spec/fixtures/mars-dockerfile

@@ -1,32 +1,27 @@
-FROM apollo-app-dependencies
+FROM apollo-generic-app-dependencies
 
 ENV DATABASE_HOST db.test.com
 ENV DATABASE_NAME apollo
 ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
-ENV RAILS_ENV development
-ENV RAILS_PORT 8080
+ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
-ENV SECRET_KEY_BASE abc
 ENV SYSTEM_PREFIX apollo
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-COPY startup.rb /var/docker/startup.rb
-COPY checkout.rb /var/docker/checkout.rb
-COPY update_database_config.rb /var/docker/update_database_config.rb
-
-RUN chmod u+x /var/docker/*.rb
-
 ENV REPOSITORY_NAME brownleej/mars
+COPY checkout.bash /var/docker/checkout.bash
+RUN bash /var/docker/checkout.bash
 
-RUN /var/docker/checkout.rb
+COPY before_startup.bash /var/docker/before_startup.bash
+COPY startup.bash /var/docker/startup.bash
 
-WORKDIR /var/code
+RUN chmod u+x /var/docker/*
 
-RUN bundle install && bundle clean --force
+WORKDIR /var/code
 
 EXPOSE 8080
 
-CMD /var/docker/startup.rb
+CMD /var/docker/startup.bash

data/spec/fixtures/mars-dockerfile-rails

@@ -0,0 +1,33 @@
+FROM apollo-rails-app-dependencies
+
+ENV DATABASE_HOST db.test.com
+ENV DATABASE_NAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_USERNAME apollo
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV SYSTEM_PREFIX apollo
+ENV RAILS_ENV development
+ENV SECRET_KEY_BASE abc
+
+RUN rm -r /var/code
+RUN mkdir -p /var/code
+
+ENV REPOSITORY_NAME brownleej/mars
+COPY checkout.bash /var/docker/checkout.bash
+RUN 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
+
+RUN chmod u+x /var/docker/*
+
+WORKDIR /var/code
+
+RUN bundle install && bundle clean --force
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

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

@@ -0,0 +1,30 @@
+FROM apollo-generic-app-dependencies
+
+ENV DATABASE_HOST db.test.com
+ENV DATABASE_NAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_USERNAME apollo
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV SYSTEM_PREFIX apollo
+
+RUN rm -r /var/code
+RUN mkdir -p /var/code
+
+ENV REPOSITORY_NAME brownleej/mars
+COPY checkout.bash /var/docker/checkout.bash
+RUN 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/*
+
+WORKDIR /var/code
+
+RUN /var/docker/hook1.rb
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

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

@@ -0,0 +1,29 @@
+FROM apollo-generic-app-dependencies
+
+ENV DATABASE_HOST db.test.com
+ENV DATABASE_NAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_USERNAME apollo
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV SYSTEM_PREFIX apollo
+
+RUN rm -r /var/code
+RUN mkdir -p /var/code
+
+ENV REPOSITORY_NAME brownleej/mars
+COPY checkout.bash /var/docker/checkout.bash
+RUN 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
+
+RUN chmod u+x /var/docker/*
+
+WORKDIR /var/code
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

data/spec/fixtures/mars-startup

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

data/spec/fixtures/mars-startup-rails

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

data/spec/fixtures/multi-project-web-dockerfile

@@ -12,23 +12,13 @@ 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_project.rb apollo apollo.test.com mars,saturn
-  
 RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080
-  
 RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080
-  
 
-  
 RUN ruby /var/docker/add_project.rb jupiter jupiter.test.com venus,saturn
-  
 RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com venus 8080
-  
 RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com saturn 8080
-  
-
 
 RUN rm -r /var/docker
 RUN apt-get remove -y ruby

data/spec/fixtures/web-dockerfile

@@ -12,15 +12,9 @@ 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_project.rb apollo apollo.test.com mars,saturn
-  
 RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080
-  
 RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080
-  
-
 
 RUN rm -r /var/docker
 RUN apt-get remove -y ruby