ruby_yacht 0.3.0 → 0.4.0

data/spec/dsl/hook_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe RubyYacht::Hook do
-  describe "script_name" do
-    context "with no script path" do
+  describe "copied_file_name" do
+    context "with no copied_file_path" do
       it "is an empty string" do
-        expect(subject.script_name).to eq ""
+        expect(subject.copied_file_name).to eq ""
       end
     end
 
-    context "with a script path" do
-      before { subject.script_path = "./foo/bar.rb" }
+    context "with a a copied_file_path" do
+      before { subject.copied_file_path = "./foo/bar.rb" }
 
-      it "gets the filename from the script path" do
-        expect(subject.script_name).to eq "bar.rb"
+      it "gets the filename from the path" do
+        expect(subject.copied_file_name).to eq "bar.rb"
       end
     end
   end
@@ -25,13 +25,14 @@ describe RubyYacht::Hook do
       RubyYacht.configuration.clear
 
       RubyYacht.configure do
-        app_type :test do
+        server_type :test do
+          container_type :app
           baseline_image 'ubuntu'
         end
       end
 
       @config_block = Proc.new do
-        app_type :test
+        server_type :test
         command 'curl google.com'
       end
     end
@@ -39,27 +40,27 @@ describe RubyYacht::Hook do
     it "can create a hook for running a command" do
       expect(hook.event_time).to eq :before
       expect(hook.event_type).to eq :startup
-      expect(hook.app_type).to eq :test
+      expect(hook.server_type).to eq :test
       expect(hook.command).to eq 'curl google.com'
     end
 
-    it "can create a hook for running a command" do
+    it "can create a hook for running a script" do
       @config_block = Proc.new do
-        app_type :test
+        server_type :test
         script_folder './foo'
         run_script 'bar.rb'
       end
       expect(hook.event_time).to eq :before
       expect(hook.event_type).to eq :startup
-      expect(hook.app_type).to eq :test
-      expect(hook.script_path).to eq './foo/bar.rb'
+      expect(hook.server_type).to eq :test
+      expect(hook.copied_file_path).to eq './foo/bar.rb'
       expect(hook.command).to eq '/var/docker/bar.rb'
     end
 
     context "with no command" do
       before do
         @config_block = Proc.new do
-          app_type :test
+          server_type :test
         end
       end
       
@@ -71,16 +72,32 @@ describe RubyYacht::Hook do
     context "with a script name and no script path" do
       before do
         @config_block = Proc.new do
-          app_type :test
+          server_type :test
           run_script 'bar.rb'
         end
       end
 
       it "creates a hook with with the script relative to the current folder" do
-        expect(hook.script_path).to eq './bar.rb'
+        expect(hook.copied_file_path).to eq './bar.rb'
         expect(hook.command).to eq '/var/docker/bar.rb'
       end
     end
+    
+    context "with a custom command for copying a file" do
+      before do
+        @config_block = Proc.new do
+          server_type :test
+          script_folder './foo'
+          copy_file 'test.txt'
+          command 'scp /var/docker/test.txt test.com:test.txt'
+        end
+      end
+
+      it "uses that file as the copied_file_path" do
+        expect(hook.copied_file_path).to eq './foo/test.txt'
+        expect(hook.command).to eq 'scp /var/docker/test.txt test.com:test.txt'
+      end
+    end
 
     context "with no app type" do
       before do
@@ -91,14 +108,14 @@ describe RubyYacht::Hook do
       end
       
       it "raises an exception" do
-        expect { hook }.to raise_exception 'Missing required attribute app_type for RubyYacht::Hook::DSL'
+        expect { hook }.to raise_exception 'Missing required attribute server_type for RubyYacht::Hook::DSL'
       end
     end
 
     context "with an invalid app type" do
       before do
         @config_block = Proc.new do
-          app_type :invalid
+          server_type :invalid
           command 'whoami'
         end
       end

data/spec/dsl/project_spec.rb

@@ -7,7 +7,14 @@ describe RubyYacht::Project do
     before do
       RubyYacht.configuration.clear
       RubyYacht.configure do
-        app_type(:generic) { baseline_image 'ubuntu' }
+        server_type :generic do
+          container_type :app
+          baseline_image 'ubuntu'
+        end
+        server_type :sqlite do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
       end
     end
     
@@ -25,11 +32,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do
@@ -46,7 +53,8 @@ describe RubyYacht::Project do
       expect(project.primary_app).to eq :app1
 
       expect(project.apps.map(&:name)).to eq [:app1, :app2]
-      expect(project.database.name).to eq 'project1'
+      expect(project.databases.map(&:name)).to eq [:project1]
+
       expect(project.dns_server.servers).to eq ['8.10.1.1']
     end
 
@@ -63,11 +71,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do
@@ -93,11 +101,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do
@@ -123,11 +131,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do
@@ -146,11 +154,11 @@ describe RubyYacht::Project do
         domain "a.test.com"
         repository "github.com"
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do
@@ -163,7 +171,7 @@ describe RubyYacht::Project do
       expect(project.apps.count).to eq 0
     end
 
-    it "requires the database config" do
+    it "does not require the database config" do
       @builder = Proc.new do
         system_prefix :a
         domain "a.test.com"
@@ -184,7 +192,7 @@ describe RubyYacht::Project do
         primary_app :app1
       end
 
-      expect { project }.to raise_exception "Missing required attribute database for RubyYacht::Project::DSL"
+      expect(project.databases.count).to eq 0
     end
 
     it "does not require the DNS server config" do
@@ -201,11 +209,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         primary_app :app1
@@ -228,11 +236,11 @@ describe RubyYacht::Project do
           repository_name 'brownleej/test2'
         end
 
-        database do
+        database :project1, :sqlite do
           host "localhost"
-          name "project1"
           username "test"
           password "test"
+          container_label :sqlite
         end
 
         dns_server do

data/spec/dsl/{app_type_spec.rb → server_type_spec.rb}

@@ -1,16 +1,17 @@
 require 'spec_helper'
 
-describe RubyYacht::AppType do
+describe RubyYacht::ServerType do
   let(:full_config_block) do
     Proc.new do
+      container_type :app
       baseline_image 'ubuntu'
       project_attribute name: :environment, default: 'staging'
       project_attribute name: :foo
 
-      app_attribute name: :bar, required: false
+      server_attribute name: :bar, required: false
 
       environment_variable :app, 'SECRET_KEY' do
-        @app.secret_key
+        @server.secret_key
       end
     end
   end
@@ -18,7 +19,15 @@ describe RubyYacht::AppType do
   before do
     RubyYacht.configuration.clear
     RubyYacht.configure do
-      app_type(:generic) { baseline_image 'ubuntu' }
+      server_type :generic  do
+        container_type :app
+        baseline_image 'ubuntu'
+      end
+      
+      server_type :sqlite do
+        container_type :database
+        baseline_image 'ubuntu'
+      end
     end
   end
   
@@ -28,11 +37,12 @@ describe RubyYacht::AppType do
         system_prefix 'test-project'
         repository 'github.com'
         domain 'test.com'
-        database do
-          host 'localhost'
-          name 'test'
-          username 'test'
-          password 'test'
+
+        database :project1, :sqlite do
+          host "localhost"
+          username "test"
+          password "test"
+          container_label :sqlite
         end
       end
     end
@@ -40,7 +50,7 @@ describe RubyYacht::AppType do
     before do
       block = full_config_block
       RubyYacht.configure do
-        app_type :app_type_test do
+        server_type :app_type_test do
           instance_eval(&block)
         end
       end
@@ -61,7 +71,7 @@ describe RubyYacht::AppType do
 
       app = RubyYacht.configuration.projects.last.apps.first
       expect(app.name).to eq :test
-      expect(app.app_type).to eq :app_type_test
+      expect(app.server_type).to eq :app_type_test
     end
 
     it "creates attributes for the project attributes on the Project DSL" do
@@ -137,39 +147,53 @@ describe RubyYacht::AppType do
   end
 
   describe "dsl" do
-    let(:dsl) { RubyYacht::AppType::DSL.new(:app_type_test) }
-    let(:app_type) { dsl.run(@config_block).create_object }
+    let(:dsl) { RubyYacht::ServerType::DSL.new(:app_type_test) }
+    let(:server_type) { dsl.run(@config_block).create_object }
 
     before do
       @config_block = full_config_block
     end
 
     it "sets the information on the app type" do
-      expect(app_type.name).to eq :app_type_test
-      expect(app_type.baseline_image).to eq 'ubuntu'
+      expect(server_type.name).to eq :app_type_test
+      expect(server_type.container_type).to eq :app
+      expect(server_type.baseline_image).to eq 'ubuntu'
       
-      expect(app_type.project_attributes.count).to eq 2
-      expect(app_type.project_attributes[0]).to eq(name: :environment, default: 'staging')
-      expect(app_type.project_attributes[1]).to eq(name: :foo)
+      expect(server_type.project_attributes.count).to eq 2
+      expect(server_type.project_attributes[0]).to eq(name: :environment, default: 'staging')
+      expect(server_type.project_attributes[1]).to eq(name: :foo)
       
-      expect(app_type.app_attributes.count).to eq 1
-      expect(app_type.app_attributes[0]).to eq(name: :bar, required: false)
+      expect(server_type.server_attributes.count).to eq 1
+      expect(server_type.server_attributes[0]).to eq(name: :bar, required: false)
 
-      @app = Object.new
-      @app.define_singleton_method :secret_key do
+      @server = Object.new
+      @server.define_singleton_method :secret_key do
         'abc1234'
       end
 
-      expect(app_type.environment_variables.count).to eq 1
-      expect(app_type.environment_variables[0][:name]).to eq 'SECRET_KEY'
-      expect(app_type.environment_variables[0][:image]).to eq :app
-      expect(instance_eval(&app_type.environment_variables[0][:block])).to eq 'abc1234'
+      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
       it "raises an exception" do
-        @config_block = Proc.new {}
-        expect { app_type }.to raise_exception "Missing required attribute baseline_image for RubyYacht::AppType::DSL"
+        @config_block = Proc.new do
+          container_type :app
+        end
+
+        expect { server_type }.to raise_exception "Missing required attribute baseline_image for RubyYacht::ServerType::DSL"
+      end
+    end
+
+    context "with no container type" do
+      it "raises an exception" do
+        @config_block = Proc.new do
+          baseline_image 'ubuntu'
+        end
+        
+        expect { server_type }.to raise_exception "Missing required attribute container_type for RubyYacht::ServerType::DSL"
       end
     end
   end

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

@@ -6,6 +6,9 @@
 
 FROM ruby:2.3
 
+ENV RAILS_ENV development
+ENV EXCLUDED_GEM_GROUPS ""
+
 RUN mkdir -p /root/.ssh
 COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts

data/spec/fixtures/database-dockerfile

@@ -1,25 +1,18 @@
 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
+ENV DATABASE_TYPE sqlite
 
 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 /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars
 
-RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
-WORKDIR /var/code/saturn
-
 RUN rm -r /var/docker
 RUN rm -r /var/code
 

data/spec/fixtures/database-dockerfile-mysql

@@ -0,0 +1,30 @@
+FROM apollo-generic-app-dependencies
+
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_NAME apollo
+ENV DATABASE_TYPE mysql
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get install -y mysql-server
+
+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
+
+RUN /var/docker/checkout.bash github.com mars brownleej/mars
+WORKDIR /var/code/mars
+
+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

@@ -1,11 +1,9 @@
 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
+ENV DATABASE_TYPE sqlite
 
 COPY setup.bash /var/docker/setup.bash
 COPY checkout.bash /var/docker/checkout.bash
@@ -13,8 +11,6 @@ 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

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

@@ -1,11 +1,9 @@
 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
+ENV DATABASE_TYPE sqlite
 
 COPY setup.bash /var/docker/setup.bash
 COPY checkout.bash /var/docker/checkout.bash
@@ -13,15 +11,10 @@ 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
 

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

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

data/spec/fixtures/mars-dockerfile

@@ -1,9 +1,5 @@
 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 REPOSITORY_NAME brownleej/mars

data/spec/fixtures/mars-dockerfile-rails

@@ -4,11 +4,11 @@ ENV DATABASE_HOST db.test.com
 ENV DATABASE_NAME apollo
 ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
+ENV DATABASE_TYPE sqlite
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
 ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
-ENV RAILS_ENV development
 ENV SECRET_KEY_BASE abc
 
 RUN rm -r /var/code
@@ -24,7 +24,7 @@ RUN chmod u+x /var/docker/*
 
 RUN /var/docker/checkout.bash
 WORKDIR /var/code
-RUN bundle install && bundle clean --force
+RUN bundle install --clean
 
 EXPOSE 8080
 

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

@@ -1,9 +1,5 @@
 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 REPOSITORY_NAME brownleej/mars

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

@@ -1,9 +1,5 @@
 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 REPOSITORY_NAME brownleej/mars

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

@@ -0,0 +1,23 @@
+FROM apollo-generic-app-dependencies
+
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
+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 hook1.rb /var/docker/hook1.rb
+
+RUN chmod u+x /var/docker/*
+
+RUN /var/docker/checkout.bash
+WORKDIR /var/code
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

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

@@ -0,0 +1,27 @@
+FROM apollo-generic-app-dependencies
+
+ENV DATABASE_HOST apollo-mysql
+ENV DATABASE_NAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_TYPE sqlite
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
+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/*
+
+RUN /var/docker/checkout.bash
+WORKDIR /var/code
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash

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

@@ -0,0 +1,27 @@
+FROM apollo-generic-app-dependencies
+
+ENV DATABASE_HOST db1.test.com
+ENV DATABASE_NAME apollo
+ENV DATABASE_PASSWORD test
+ENV DATABASE_USERNAME apollo
+ENV DATABASE_TYPE mysql
+ENV APP_PORT 8080
+ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
+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/*
+
+RUN /var/docker/checkout.bash
+WORKDIR /var/code
+
+EXPOSE 8080
+
+CMD /var/docker/startup.bash