ruby_yacht 0.5.0 → 0.6.0

data/spec/dsl/configuration_spec.rb

@@ -10,7 +10,7 @@ describe RubyYacht::Configuration do
     describe "fetch_hooks" do
       before do
         RubyYacht.configure do
-          server_type :test do
+          server_type :django do
             container_type :app
             baseline_image 'ubuntu'
           end
@@ -18,31 +18,231 @@ describe RubyYacht::Configuration do
             container_type :app
             baseline_image 'ubuntu'
           end
+
+          server_type :postgres do
+            container_type :database
+            baseline_image 'ubuntu'
+          end
+          server_type :mongo do
+            container_type :database
+            baseline_image 'ubuntu'
+          end
+
+          server_type :nginx do
+            container_type :web
+            baseline_image 'ubuntu'
+          end
+
+          server_type :apache do
+            container_type :web
+            baseline_image 'ubuntu'
+          end
         end
 
         RubyYacht.configure do
-          add_hooks server_type: :test, folder: '.' do
-            before(:startup) { run_script 'a.rb' }
-            before(:install_libraries) { run_script 'a.rb' }
+          add_hooks container_type: :app, app_server_type: :django, database_server_type: :postgres, script_folder: '.' do
+            before :startup do
+              run_script :bash, 'app-a.bash'
+            end
+
+            before :install_libraries do
+              run_script :bash, 'app-b.bash'
+            end
+            
+            before :startup do
+              app_server_type :php
+              run_script :bash, 'app-c.bash'
+            end
+
+            before :startup do
+              database_server_type :mongo
+              run_script :bash, 'app-d.bash'
+            end
+
+            before :startup do
+              database_server_type :all
+              run_script :bash, 'app-e.bash'
+            end
+
+            before :startup do
+              app_server_type :all
+              run_script :bash, 'app-f.bash'
+            end
+          end
+
+          add_hooks container_type: :database, app_server_type: :django, database_server_type: :postgres, script_folder: '.' do
+            before :startup do
+              run_script :bash, 'database-a.bash'
+            end
+
+            before :install_libraries do
+              run_script :bash, 'database-b.bash'
+            end
             
             before :startup do
-              server_type :php
-              run_script 'c.rb'
+              database_server_type :mongo
+              run_script :bash, 'database-c.bash'
+            end
+
+            before :startup do
+              app_server_type :php
+              run_script :bash, 'database-d.bash'
             end
 
             before :startup do
-              server_type :test
-              run_script 'd.rb'
+              app_server_type :all
+              run_script :bash, 'database-e.bash'
+            end
+
+            before :startup do
+              database_server_type :all
+              run_script :bash, 'database-f.bash'
+            end
+          end
+
+          add_hooks container_type: :web, web_server_type: :nginx, script_folder: '.' do
+            before :startup do
+              run_script :bash, 'web-a.bash'
+            end
+
+            before :startup do
+              web_server_type :all
+              run_script :bash, 'web-b.bash'
+            end
+
+            before :startup do
+              web_server_type :apache
+              run_script :bash, 'web-c.bash'
+            end
+
+            before :install_libraries do
+              run_script :bash, 'web-d.bash'
+            end
+          end
+        end
+
+        RubyYacht.configure do
+          project :test_project do
+            repository 'github.com'
+            system_prefix :test_project
+
+            postgres_database :db1 do
+              host :localhost
+              username 'test'
+              password 'test'
+              port 5432
+            end
+
+            mongo_database :db2 do
+              host :localhost
+              username 'test'
+              password 'test'
+              port 27017
+            end
+
+            django_app :app1 do
+              database_name :db1
+              repository_name 'test/app1'
+            end
+
+            php_app :app2 do
+              database_name :db2
+              repository_name 'test/app2'
+            end
+
+            nginx_web_server do
+              domain 'test.com'
             end
           end
         end
       end
 
-      it "returns hooks with the matching attributes" do
-        hooks = RubyYacht.configuration.fetch_hooks(server_type: :test, event_type: :startup)
-        expect(hooks.count).to eq 2
-        expect(hooks[0].copied_file_path).to eq './a.rb'
-        expect(hooks[1].copied_file_path).to eq './d.rb'
+      let(:hooks) { RubyYacht.configuration.fetch_hooks(server, :startup) }
+      let(:filenames) { hooks.collect { |hook| File.basename(hook.behaviors.first.file_path) } }
+
+      context "with an app" do
+        let(:server) { RubyYacht.configuration.projects.first.apps.first }
+        it "finds hooks for that app" do
+          expect(filenames).to include 'app-a.bash'
+        end
+
+        it "finds hooks for all apps" do
+          expect(filenames).to include 'app-f.bash'
+        end
+
+        it "does not find hooks for other apps" do
+          expect(filenames).not_to include 'app-c.bash'
+        end
+
+        it "finds hooks for all databases for that app" do
+          expect(filenames).to include 'app-e.bash'
+        end
+
+        it "does not find hooks for other databases for that app" do
+          expect(filenames).not_to include 'app-d.bash'
+        end
+
+        it "does not find hooks for other events" do
+          expect(filenames).not_to include 'app-b.bash'
+        end
+
+        it "does not find hooks for database containers" do
+          expect(filenames).not_to include 'database-a.bash'
+        end
+      end
+
+      context "with a database" do
+        let(:server) { RubyYacht.configuration.projects.first.databases.first }
+
+        it "finds hooks for that databases" do
+          expect(filenames).to include 'database-a.bash'
+        end
+
+        it "finds hooks for all databases" do
+          expect(filenames).to include 'database-f.bash'
+        end
+
+        it "does not find hooks for other databases" do
+          expect(filenames).not_to include 'database-c.bash'
+        end
+
+        it "finds hooks for all apps for that database" do
+          expect(filenames).to include 'database-e.bash'
+        end
+
+        it "does not find hooks for other apps for that database" do
+          expect(filenames).not_to include 'database-d.bash'
+        end
+
+        it "does not find hooks for other events" do
+          expect(filenames).not_to include 'database-b.bash'
+        end
+      end
+
+      context 'with a web server' do
+        let(:server) { RubyYacht.configuration.projects.first.web_servers.first }
+
+        it "finds hooks for that type" do
+          expect(filenames).to include 'web-a.bash'
+        end
+
+        it "finds hooks for all types" do
+          expect(filenames).to include 'web-b.bash'
+        end
+
+        it "does not find hooks for other types" do
+          expect(filenames).not_to include 'web-c.bash'
+        end
+
+        it "does not find hooks for other events" do
+          expect(filenames).not_to include 'web-d.bash'
+        end
+      end
+
+      context "with an invalid type" do
+        it "is an empty array" do
+          expect(RubyYacht.configuration.fetch_hooks(:test, :startup)).to eq []
+        end
       end
     end
 
@@ -73,13 +273,11 @@ describe RubyYacht::Configuration do
       Proc.new do
         project :project1 do
           system_prefix :a
-          domain "a.test.com"
           repository "github.com"
         end
 
         project :project2 do
           system_prefix :b
-          domain "b.test.com"
           repository "github.com"
         end
       end
@@ -87,9 +285,9 @@ describe RubyYacht::Configuration do
 
     let(:hook_creation_block) do
       Proc.new do
-        add_hooks server_type: :configuration_test, folder: './scripts' do
+        add_hooks container_type: :app, app_server_type: :configuration_test, script_folder: './scripts' do
           before :startup do
-            run_script 'update_config.rb'
+            run_script :ruby, 'update_config.rb'
           end
         end
       end
@@ -111,6 +309,10 @@ describe RubyYacht::Configuration do
           container_type :app
           baseline_image 'ubuntu'
         end
+        server_type :configuration_test_db do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
       end
     end
 
@@ -126,10 +328,10 @@ describe RubyYacht::Configuration do
       expect(configuration.hooks.count).to eq 1
       expect(configuration.hooks[0].event_time).to eq :before
       expect(configuration.hooks[0].event_type).to eq :startup
-      expect(configuration.hooks[0].copied_file_path).to eq './scripts/update_config.rb'
+      expect(configuration.hooks[0].behaviors.first.file_path).to eq './scripts/update_config.rb'
     end
 
-    it "can server types" do
+    it "can add server types" do
       configuration = RubyYacht::Configuration::DSL.new.run(server_type_creation_block).create_object
       expect(configuration.server_types.count).to eq 1
       expect(configuration.server_types[0].name).to eq :second_configuration_test
@@ -139,30 +341,36 @@ describe RubyYacht::Configuration do
 
     it "can add `during` hooks" do
       configuration = RubyYacht::Configuration::DSL.new.run(Proc.new do
-        add_hooks server_type: :configuration_test, folder: './scripts' do
+        add_hooks container_type: :app, app_server_type: :configuration_test, script_folder: './scripts' do
           during :startup do
-            run_script 'start_app.rb'
+            run_script :ruby, 'start_app.rb'
           end
         end
       end).create_object
       expect(configuration.hooks.count).to eq 1
       expect(configuration.hooks[0].event_time).to eq :during
       expect(configuration.hooks[0].event_type).to eq :startup
-      expect(configuration.hooks[0].copied_file_path).to eq './scripts/start_app.rb'
+      expect(configuration.hooks[0].app_server_type).to eq :configuration_test
+      expect(configuration.hooks[0].database_server_type).to eq :all
+      expect(configuration.hooks[0].container_type).to eq :app
+      expect(configuration.hooks[0].behaviors.first.file_path).to eq './scripts/start_app.rb'
     end
 
     it "can add `after` hooks" do
       configuration = RubyYacht::Configuration::DSL.new.run(Proc.new do
-        add_hooks server_type: :configuration_test, folder: './scripts' do
+        add_hooks container_type: :database, database_server_type: :configuration_test_db, script_folder: './scripts' do
           after :startup do
-            run_script 'start_app.rb'
+            run_script :ruby, 'start_app.rb'
           end
         end
       end).create_object
       expect(configuration.hooks.count).to eq 1
       expect(configuration.hooks[0].event_time).to eq :after
       expect(configuration.hooks[0].event_type).to eq :startup
-      expect(configuration.hooks[0].copied_file_path).to eq './scripts/start_app.rb'
+      expect(configuration.hooks[0].app_server_type).to eq :all
+      expect(configuration.hooks[0].database_server_type).to eq :configuration_test_db
+      expect(configuration.hooks[0].container_type).to eq :database
+      expect(configuration.hooks[0].behaviors.first.file_path).to eq './scripts/start_app.rb'
     end
 
     describe "configure method" do
@@ -183,23 +391,21 @@ describe RubyYacht::Configuration do
         hook = RubyYacht::Hook.new
         hook.event_time = :after
         hook.event_type = :restart_application
-        hook.copied_file_path = './scripts/log_success.rb'
         RubyYacht.configuration.hooks << hook
         RubyYacht.configure(&hook_creation_block)
 
         configuration = RubyYacht.configuration
         expect(configuration.hooks.count).to eq 2
-        expect(configuration.hooks[0].copied_file_path).to eq './scripts/log_success.rb'
-        expect(configuration.hooks[1].copied_file_path).to eq './scripts/update_config.rb'
       end
 
       it "adds to the list of server types" do
         RubyYacht.configure(&server_type_creation_block)
 
         configuration = RubyYacht.configuration
-        expect(configuration.server_types.count).to eq 2
+        expect(configuration.server_types.count).to eq 3
         expect(configuration.server_types[0].name).to eq :configuration_test
-        expect(configuration.server_types[1].name).to eq :second_configuration_test
+        expect(configuration.server_types[1].name).to eq :configuration_test_db
+        expect(configuration.server_types[2].name).to eq :second_configuration_test
       end
 
       context "with a server type that is already registered" do

data/spec/dsl/database_spec.rb

@@ -12,13 +12,14 @@ describe RubyYacht::Database do
   end
 
   describe "dsl" do
-    let(:database) { RubyYacht::Database::DSL.new(:apps, :sqlite).run(@builder).create_object }
+    let(:database) { RubyYacht::Database::DSL.new(:sqlite, :apps).run(@builder).create_object }
 
     it "creates a database with all the fields" do
       @builder = Proc.new do
         host 'db1.test.com'
         username 'test-user'
         password 'test-pass'
+        port 1237
         container_label :database
       end
 
@@ -27,6 +28,7 @@ describe RubyYacht::Database do
       expect(database.server_type).to eq :sqlite
       expect(database.username).to eq 'test-user'
       expect(database.password).to eq 'test-pass'
+      expect(database.port).to eq 1237
       expect(database.container_label).to eq :database
     end
 
@@ -34,6 +36,7 @@ describe RubyYacht::Database do
       @builder = Proc.new do
         username 'test-user'
         password 'test-pass'
+        port 1237
         container_label :database
       end
 
@@ -44,6 +47,7 @@ describe RubyYacht::Database do
       @builder = Proc.new do
         host 'db1.test.com'
         password 'test-pass'
+        port 1237
         container_label :database
       end
 
@@ -54,6 +58,7 @@ describe RubyYacht::Database do
       @builder = Proc.new do
         host 'db1.test.com'
         username 'test-user'
+        port 1237
         container_label :database
       end
 
@@ -65,6 +70,7 @@ describe RubyYacht::Database do
         host 'db1.test.com'
         username 'test-user'
         password 'test-pass'
+        port 1237
       end
 
       expect(database.container_label).to eq :database
@@ -75,11 +81,12 @@ describe RubyYacht::Database do
         host 'db1.test.com'
         username 'test-user'
         password 'test-pass'
+        port 1237
         container_label :database
         server_type :invalid
       end
 
-      expect { database }.to raise_exception "Database has invalid server type `invalid`"
+      expect { database }.to raise_exception "RubyYacht::Database::DSL has invalid database server type `invalid`"
     end
 
     it "requires a defined server type for a database" do
@@ -94,11 +101,12 @@ describe RubyYacht::Database do
         host 'db1.test.com'
         username 'test-user'
         password 'test-pass'
+        port 1237
         container_label :database
         server_type :generic
       end
 
-      expect { database }.to raise_exception "Database has invalid server type `generic`"
+      expect { database }.to raise_exception "RubyYacht::Database::DSL has invalid database server type `generic`"
     end
   end
 
@@ -116,6 +124,94 @@ describe RubyYacht::Database do
     end
   end
 
+  describe 'project' do
+    before do
+      RubyYacht.configuration.clear
+      RubyYacht.configure do
+        server_type :test do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
+      end
+      RubyYacht.configure do
+        project :project1 do
+          repository 'github.com'
+          system_prefix :project1
+
+          test_database :db1 do
+            host :localhost
+            username :test
+            password :test
+            port 1237
+          end
+
+          test_database :db2 do
+            host :localhost
+            username :test
+            password :test
+            port 1237
+          end
+        end
+        
+        project :project2 do
+          repository 'github.com'
+          system_prefix :project2
+
+          test_database :db3 do
+            host :localhost
+            username :test
+            password :test
+            port 1237
+          end
+        end
+      end
+    end
+
+    it 'finds the project that contains the apps' do
+      db2 = RubyYacht.configuration.projects[0].databases[1]
+      db3 = RubyYacht.configuration.projects[1].databases[0]
+
+      expect(db2.project.name).to eq :project1
+      expect(db3.project.name).to eq :project2
+    end
+  end
+
+  describe 'apps' do
+    before do
+      @project = RubyYacht::Project.new
+      @project.name = :test_project
+      @project.system_prefix = :tests
+
+      @database = RubyYacht::Database.new
+      @database.name = :db1
+      @database.container_label = 'mysql'
+
+      @project.databases = [@database]
+      @project.apps = []
+
+      app = RubyYacht::App.new
+      app.name = :app1
+      app.database_name = :db1
+      @project.apps << app
+
+      app = RubyYacht::App.new
+      app.name = :app2
+      app.database_name = :db1
+      @project.apps << app
+
+      app = RubyYacht::App.new
+      app.name = :app3
+      app.database_name = :db2
+      @project.apps << app
+
+      RubyYacht.configuration.projects << @project
+    end
+
+    it 'is the apps from the project that have the same database name' do
+      expect(@database.apps.map(&:name)).to eq [:app1, :app2]
+    end
+  end
+
   describe "container_name" do
     before do
       @project = RubyYacht::Project.new
@@ -124,10 +220,13 @@ describe RubyYacht::Database do
 
       @database = RubyYacht::Database.new
       @database.container_label = 'mysql'
+
+      @project.databases = [@database]
+      RubyYacht.configuration.projects << @project
     end
 
     it "combines the project's prefix with the database's container label" do
-      expect(@database.container_name(@project)).to eq 'tests-mysql'
+      expect(@database.container_name).to eq 'tests-mysql'
     end
   end
 end

data/spec/dsl/dsl_spec.rb

@@ -32,6 +32,7 @@ module DSLTestHelpers
     include RubyYacht::DSL::Base
   end
 end
+
 describe RubyYacht::DSL::Base do
   let(:DSL) { DSLTestHelpers::DSL }
   let(:SecondDSL) { DSLTestHelpers::SecondDSL }
@@ -49,7 +50,7 @@ describe RubyYacht::DSL::Base do
 
   describe "add_generic_attribute" do
     it "adds the attribute to the list" do
-      DSLTestHelpers::DSL.add_generic_attribute :namify, :name do | value|
+      DSLTestHelpers::DSL.add_generic_attribute :namify, :name do |_|
       end
 
       expect(DSLTestHelpers::DSL.all_attributes).to eq [:name]
@@ -70,7 +71,7 @@ describe RubyYacht::DSL::Base do
     end
 
     it "can accept optional fields" do
-      DSLTestHelpers::DSL.add_generic_attribute :namify, :name, nil, false do | value|
+      DSLTestHelpers::DSL.add_generic_attribute :namify, :name, nil, false do |_|
       end
 
       expect(DSLTestHelpers::DSL.all_attributes).to eq [:name]
@@ -78,7 +79,7 @@ describe RubyYacht::DSL::Base do
     end
 
     it "can accept fields with default values" do
-      DSLTestHelpers::DSL.add_generic_attribute :namify, :name, 'hello' do | value|
+      DSLTestHelpers::DSL.add_generic_attribute :namify, :name, 'hello' do |_|
       end
 
       expect(DSLTestHelpers::DSL.all_attributes).to eq [:name]
@@ -185,6 +186,24 @@ describe RubyYacht::DSL::Base do
       DSLTestHelpers::DSL.add_object :thing, DSLTestHelpers::SecondDSL, required: false
       expect(DSLTestHelpers::DSL.required_attributes).to eq []
     end
+
+    context 'with no required attributes on the second DSL' do
+      before do
+        DSLTestHelpers::SecondDSL.clear
+        DSLTestHelpers::SecondDSL.add_attribute :name, 'Jim'
+        DSLTestHelpers::SecondDSL.creates_object DSLTestHelpers::ThingOne
+      end
+
+      it 'allows created objects with no block' do
+        dsl = run_dsl do
+          thing
+        end
+
+        thing = dsl.instance_eval { @thing }
+        expect(thing).to be_a DSLTestHelpers::ThingOne
+        expect(thing.name).to eq 'Jim'
+      end
+    end
   end
 
   describe "add_object_list" do
@@ -217,6 +236,30 @@ describe RubyYacht::DSL::Base do
       dsl = run_dsl {}
       expect(dsl.instance_eval { @things }).to eq []
     end
+
+    context 'with no required attributes on the second DSL' do
+      before do
+        DSLTestHelpers::SecondDSL.clear
+        DSLTestHelpers::SecondDSL.add_attribute :name, 'Jim'
+        DSLTestHelpers::SecondDSL.creates_object DSLTestHelpers::ThingOne
+      end
+
+      it 'allows created objects with no block' do
+        dsl = run_dsl do
+          thing do
+            name 'Charlie'
+          end
+          thing
+        end
+
+        things = dsl.instance_eval { @things }
+        expect(things.count).to eq 2
+        expect(things[0]).to be_a DSLTestHelpers::ThingOne
+        expect(things[0].name).to eq 'Charlie'
+        expect(things[1]).to be_a DSLTestHelpers::ThingOne
+        expect(things[1].name).to eq 'Jim'
+      end
+    end
   end
 
   describe "creates_object" do