ruby_yacht 0.5.0 → 0.6.0

data/spec/dsl/hook_spec.rb

@@ -1,22 +1,6 @@
 require 'spec_helper'
 
 describe RubyYacht::Hook do
-  describe "copied_file_name" do
-    context "with no copied_file_path" do
-      it "is an empty string" do
-        expect(subject.copied_file_name).to eq ""
-      end
-    end
-
-    context "with a a copied_file_path" do
-      before { subject.copied_file_path = "./foo/bar.rb" }
-
-      it "gets the filename from the path" do
-        expect(subject.copied_file_name).to eq "bar.rb"
-      end
-    end
-  end
-
   describe "dsl" do
     let(:dsl) { RubyYacht::Hook::DSL.new(:before, :startup) }
     let(:hook) { dsl.run(@config_block).create_object }
@@ -25,103 +9,340 @@ describe RubyYacht::Hook do
       RubyYacht.configuration.clear
 
       RubyYacht.configure do
-        server_type :test do
+        server_type :rails do
           container_type :app
           baseline_image 'ubuntu'
         end
+
+        server_type :mysql do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
+
+        server_type :nginx do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
       end
 
       @config_block = Proc.new do
-        server_type :test
-        command 'curl google.com'
+        container_type :app
+        app_server_type :rails
+        database_server_type :mysql
+        web_server_type :nginx
       end
     end
 
     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.server_type).to eq :test
-      expect(hook.command).to eq 'curl google.com'
+      expect(hook.app_server_type).to eq :rails
+      expect(hook.database_server_type).to eq :mysql
+      expect(hook.web_server_type).to eq :nginx
+      expect(hook.behaviors).to eq []
+    end
+    
+    context "with no container type" do
+      before do
+        @config_block = Proc.new do
+          app_server_type :rails
+          database_server_type :mysql
+          web_server_type :nginx
+        end
+      end
+      
+      it "defaults to all" do
+        expect { hook }.to raise_exception 'Missing required attribute container_type for RubyYacht::Hook::DSL'
+      end
     end
 
-    it "can create a hook for running a script" do
-      @config_block = Proc.new do
-        server_type :test
-        script_folder './foo'
-        run_script 'bar.rb'
+    context "with no app type" do
+      before do
+        @config_block = Proc.new do
+          container_type :app
+          database_server_type :mysql
+          web_server_type :nginx
+        end
+      end
+      
+      it "defaults to all" do
+        expect(hook.app_server_type).to eq :all
       end
-      expect(hook.event_time).to eq :before
-      expect(hook.event_type).to eq :startup
-      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
+    context "with an app type that is not defined" do
       before do
         @config_block = Proc.new do
-          server_type :test
+          container_type :app
+          app_server_type :invalid
+          database_server_type :mysql
+          web_server_type :nginx
         end
       end
       
       it "raises an exception" do
-        expect { hook }.to raise_exception 'Missing required attribute command for RubyYacht::Hook::DSL'
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid app server type `invalid`'
       end
     end
 
-    context "with a script name and no script path" do
+    context 'with an app type that is really a database type' do
       before do
         @config_block = Proc.new do
-          server_type :test
-          run_script 'bar.rb'
+          container_type :app
+          app_server_type :mysql
+          database_server_type :mysql
+          web_server_type :nginx
         end
       end
+      
+      it "raises an exception" do
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid app server type `mysql`'
+      end
+    end
 
-      it "creates a hook with with the script relative to the current folder" do
-        expect(hook.copied_file_path).to eq './bar.rb'
-        expect(hook.command).to eq '/var/docker/bar.rb'
+    context "with no database server type" do
+      before do
+        @config_block = Proc.new do
+          container_type :app
+          app_server_type :rails
+          web_server_type :nginx
+        end
+      end
+      
+      it "defaults to all" do
+        expect(hook.database_server_type).to eq :all
       end
     end
-    
-    context "with a custom command for copying a file" do
+
+    context 'with a database server type that is not defined' 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'
+          container_type :app
+          app_server_type :rails
+          database_server_type :invalid
+          web_server_type :nginx
         end
       end
+      
+      it "raises an exception" do
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid database server type `invalid`'
+      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'
+    context 'with a database server type that is really an app type' do
+      before do
+        @config_block = Proc.new do
+          container_type :app
+          app_server_type :rails
+          database_server_type :rails
+          web_server_type :nginx
+        end
+      end
+      
+      it "raises an exception" do
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid database server type `rails`'
       end
     end
 
-    context "with no app type" do
+    context "with no web server type" do
       before do
         @config_block = Proc.new do
-          script_folder './foo'
-          run_script 'bar.rb'
+          container_type :app
+          app_server_type :rails
+          database_server_type :mysql
+        end
+      end
+      
+      it "defaults to all" do
+        expect(hook.web_server_type).to eq :all
+      end
+    end
+
+    context 'with a web server type that is not defined' do
+      before do
+        @config_block = Proc.new do
+          container_type :app
+          app_server_type :rails
+          database_server_type :mysql
+          web_server_type :invalid
         end
       end
       
       it "raises an exception" do
-        expect { hook }.to raise_exception 'Missing required attribute server_type for RubyYacht::Hook::DSL'
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid web server type `invalid`'
       end
     end
 
-    context "with an invalid app type" do
+    context 'with a web server type that is really an app type' do
       before do
         @config_block = Proc.new do
-          server_type :invalid
-          command 'whoami'
+          container_type :app
+          app_server_type :rails
+          database_server_type :mysql
+          web_server_type :rails
         end
       end
       
       it "raises an exception" do
-        expect { hook }.to raise_exception 'Hook has invalid app type `invalid`'
+        expect { hook }.to raise_exception 'RubyYacht::Hook::DSL has invalid web server type `rails`'
+      end
+    end
+
+    describe 'behaviors' do
+      describe 'command' do
+        before do
+          @config_block = Proc.new do
+            container_type :app
+            app_server_type :rails
+            database_server_type :mysql
+            command 'curl google.com'
+          end
+        end
+
+        it 'adds a behavior for running the command' do
+          expect(hook.behaviors.count).to eq 1
+          expect(hook.behaviors[0].dockerfile_command).to eq 'RUN curl google.com'
+        end
+      end
+
+      describe "run_script" do
+        context 'with a script folder' do
+          before do
+            @config_block = Proc.new do
+              container_type :app
+              app_server_type :rails
+              database_server_type :mysql
+              script_folder './foo'
+              run_script :ruby, 'bar.rb'
+            end
+          end
+
+          it 'adds behaviors for copying the file, making it executable, and running it' do
+            expect(hook.behaviors.count).to eq 2
+            expect(hook.behaviors[0].dockerfile_command).to eq 'COPY bar.rb /var/docker/'
+            expect(hook.behaviors[0].file_path).to eq './foo/bar.rb'
+            expect(hook.behaviors[1].dockerfile_command).to eq 'RUN ruby /var/docker/bar.rb'
+          end
+        end
+
+        context "with no script folder" do
+          before do
+            @config_block = Proc.new do
+              container_type :app
+              app_server_type :rails
+              database_server_type :mysql
+              run_script :bash, 'bar.bash'
+            end
+          end
+
+          it "copies the file from the working directory" do
+            expect(hook.behaviors.count).to eq 2
+            expect(hook.behaviors[0].file_path).to eq './bar.bash'
+            expect(hook.behaviors[1].dockerfile_command).to eq 'RUN bash /var/docker/bar.bash'
+          end
+        end
+      end
+
+      describe 'copy_file' do
+        before do
+          @config_block = Proc.new do
+            container_type :app
+            app_server_type :rails
+            database_server_type :mysql
+            script_folder './foo'
+            copy_file 'test.txt'
+          end
+        end
+
+        it "adds a behavior for copying the file" do
+          expect(hook.behaviors.count).to eq 1
+          expect(hook.behaviors[0].dockerfile_command).to eq 'COPY test.txt /var/docker/'
+          expect(hook.behaviors[0].file_path).to eq './foo/test.txt'
+        end
+      end
+
+      describe 'set_environment_variable' do
+        context 'with a literal value' do
+          before do
+            @config_block = Proc.new do
+              container_type :app
+              app_server_type :rails
+              database_server_type :mysql
+              set_environment_variable 'RAILS_ENV', 'development'
+            end
+          end
+
+          it 'adds a behavior for setting the environment variable' do
+            expect(hook.behaviors.count).to eq 1
+            expect(hook.behaviors[0].dockerfile_command).to eq 'ENV RAILS_ENV development'
+          end
+        end
+
+        context 'with a proc value' do
+          before do
+            @config_block = Proc.new do
+              container_type :app
+              app_server_type :rails
+              database_server_type :mysql
+              set_environment_variable('RAILS_ENV') { 'production' }
+            end
+          end
+
+          it 'adds a behavior for setting the environment variable' do
+            expect(hook.behaviors.count).to eq 1
+            expect(hook.behaviors[0].dockerfile_command).to eq 'ENV RAILS_ENV production'
+          end
+        end
+      end
+    end
+  end
+
+  describe "behaviors" do
+    describe 'default behavior' do
+      let(:behavior) { RubyYacht::Hook::Behavior.new }
+      it 'has no commands' do
+        expect(behavior.dockerfile_command).to eq ''
+        expect(behavior.shell_command).to eq ''
+      end
+    end
+
+    describe "command behavior" do
+      let(:behavior) { RubyYacht::Hook::CommandBehavior.new('curl google.com') }
+
+      it "runs the command as its docker command" do
+        expect(behavior.dockerfile_command).to eq "RUN curl google.com"
+      end
+
+      it "runs the command as its shell command" do
+        expect(behavior.shell_command).to eq "curl google.com"
+      end
+    end
+
+    describe "copy file behavior" do
+      let(:behavior) { RubyYacht::Hook::CopyFileBehavior.new('./files/script.rb') }
+
+      it "makes the full path accessible through the file_path" do
+        expect(behavior.file_path).to eq './files/script.rb'
+      end
+
+      it "copies the file as its docker command" do
+        expect(behavior.dockerfile_command).to eq "COPY script.rb /var/docker/"
+      end
+
+      it "has no shell command" do
+        expect(behavior.shell_command).to eq ""
+      end
+    end
+
+    describe "environment variable behavior" do
+      let(:behavior) { RubyYacht::Hook::EnvironmentVariableBehavior.new('SECRET_KEY_BASE', Proc.new { 'abc'}) }
+
+      it 'sets the environment variable as its docker command' do
+        expect(behavior.dockerfile_command).to eq 'ENV SECRET_KEY_BASE abc'
+      end
+
+      it 'sets the environment variable as its shell command' do
+        expect(behavior.shell_command).to eq 'export SECRET_KEY_BASE="abc"'
       end
     end
   end

data/spec/dsl/project_spec.rb

@@ -15,27 +15,31 @@ describe RubyYacht::Project do
           container_type :database
           baseline_image 'ubuntu'
         end
+        server_type :apache do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
       end
     end
     
     it "can create a project with all the fields" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
         repository "github.com"
 
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
@@ -43,41 +47,47 @@ describe RubyYacht::Project do
           server '8.10.1.1'
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         primary_app :app1
       end
 
       expect(project.name).to eq :test_project
       expect(project.system_prefix).to eq :a
-      expect(project.domain).to eq "a.test.com"
       expect(project.repository).to eq "github.com"
       expect(project.primary_app).to eq :app1
 
       expect(project.apps.map(&:name)).to eq [:app1, :app2]
       expect(project.databases.map(&:name)).to eq [:project1]
+      expect(project.web_servers.map(&:name)).to eq [:web]
 
       expect(project.dns_server.servers).to eq ['8.10.1.1']
     end
 
     it "requires the system prefix" do
       @builder = Proc.new do
-        domain "a.test.com"
-        repository "github.com"
-
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         dns_server do
           server '8.10.1.1'
         end
@@ -88,26 +98,30 @@ describe RubyYacht::Project do
       expect { project }.to raise_exception "Missing required attribute system_prefix for RubyYacht::Project::DSL"
     end
 
-    it "requires the domain" do
+    it "requires the repository" do
       @builder = Proc.new do
         system_prefix :a
-        repository "github.com"
 
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         dns_server do
           server '8.10.1.1'
         end
@@ -115,29 +129,26 @@ describe RubyYacht::Project do
         primary_app :app1
       end
 
-      expect { project }.to raise_exception "Missing required attribute domain for RubyYacht::Project::DSL"
+      expect { project }.to raise_exception "Missing required attribute repository for RubyYacht::Project::DSL"
     end
 
-    it "requires the repository" do
+    it "does not require any apps" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
-
-        app :app1, :generic do
-          repository_name 'brownleej/test1'
-        end
-
-        app :app2, :generic do
-          repository_name 'brownleej/test2'
-        end
+        repository "github.com"
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         dns_server do
           server '8.10.1.1'
         end
@@ -145,19 +156,27 @@ describe RubyYacht::Project do
         primary_app :app1
       end
 
-      expect { project }.to raise_exception "Missing required attribute repository for RubyYacht::Project::DSL"
+      expect(project.apps.count).to eq 0
     end
-
-    it "does not require any apps" do
+    
+    it "does not require any web servers" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
         repository "github.com"
 
-        database :project1, :sqlite do
+        app :generic, :app1 do
+          repository_name 'brownleej/test1'
+        end
+
+        app :generic, :app2 do
+          repository_name 'brownleej/test2'
+        end
+
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
@@ -168,23 +187,26 @@ describe RubyYacht::Project do
         primary_app :app1
       end
 
-      expect(project.apps.count).to eq 0
+      expect(project.web_servers.count).to eq 0
     end
 
     it "does not require the database config" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
         repository "github.com"
 
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         dns_server do
           server '8.10.1.1'
         end
@@ -198,24 +220,28 @@ describe RubyYacht::Project do
     it "does not require the DNS server config" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
         repository "github.com"
 
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         primary_app :app1
       end
 
@@ -225,24 +251,28 @@ describe RubyYacht::Project do
     it "does not require the primary_app field" do
       @builder = Proc.new do
         system_prefix :a
-        domain "a.test.com"
         repository "github.com"
 
-        app :app1, :generic do
+        app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
 
-        app :app2, :generic do
+        app :generic, :app2 do
           repository_name 'brownleej/test2'
         end
 
-        database :project1, :sqlite do
+        database :sqlite, :project1 do
           host "localhost"
           username "test"
           password "test"
+          port 1234
           container_label :sqlite
         end
 
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
         dns_server do
           server '8.10.1.1'
         end