ruby_yacht 0.3.0 → 0.4.0

data/spec/runner/shell_spec.rb

@@ -32,7 +32,7 @@ describe RubyYacht::Runner::Shell do
     describe "parse_positional_arguments" do
       it "takes the app from the command line" do
         subject.parse_positional_arguments(["venus", "rails", "c"])
-        expect(subject.app).to eq "venus"
+        expect(subject.app_name).to eq "venus"
       end
       
       it "takes the command from the command line" do
@@ -49,7 +49,7 @@ describe RubyYacht::Runner::Shell do
   
   describe "run behavior" do
     before do
-      subject.app = 'saturn'
+      subject.app_name = 'saturn'
       subject.command = 'rails c'
       RubyYacht.configure_second_test_project
       allow(subject).to receive :exec
@@ -72,7 +72,7 @@ describe RubyYacht::Runner::Shell do
     
     context "with no app" do
       before do
-        subject.app = nil
+        subject.app_name = nil
       end
       
       it "logs an error" do

data/spec/runner/update_hosts_spec.rb

@@ -159,5 +159,31 @@ describe RubyYacht::Runner::UpdateHosts do
         EOS
       end
     end
+
+    context "with an app with the same name as the project" do
+      before do
+        RubyYacht.configuration.projects.first.apps.first.name = :apollo
+      end
+
+      it "adds the entries to the hosts file in the tmp folder" do
+        subject.run
+        expect(File.exist?(File.join('tmp', 'hosts'))).to be_truthy
+        
+        contents = File.read(File.join('tmp', 'hosts'))
+        expect(contents).to eq <<-EOS.gsub(/^ +/, '').strip
+        # Local information
+        127.0.0.1 localhost
+        
+        # Database server
+        
+        40.1.30.10 db1.test.com
+        
+        # apollo docker containers
+        192.168.1.27    apollo.test.com
+        192.168.1.27    saturn.apollo.test.com
+        EOS
+        
+      end
+    end
   end
 end

data/spec/support/test_project.rb

@@ -1,31 +1,34 @@
 module RubyYacht
-  def self.configure_test_project
-    RubyYacht.configuration.clear
+  def self.configure_server_types
     RubyYacht.configure do
-      app_type(:generic) { baseline_image 'ubuntu' }
-      app_type(:debian) { baseline_image 'debian' }
+      server_type :generic do
+        container_type :app
+        baseline_image 'ubuntu'
+      end
+
+      server_type :debian do
+        container_type :app
+        baseline_image 'debian'
+      end
     end
 
     RubyYacht.configure do
       during :startup do
-        app_type :generic
+        server_type :generic
         command '/var/docker/start_app.bash'
       end
     end
-
+  end
+  
+  def self.configure_test_project
+    RubyYacht.configuration.clear
+    self.configure_server_types
     RubyYacht.configure do
       project :apollo do
         system_prefix :apollo
         domain "apollo.test.com"
         repository "github.com"
         
-        database do
-          host "db.test.com"
-          name "apollo"
-          username "apollo"
-          password "test"
-        end
-        
         generic_app :mars do
           repository_name 'brownleej/mars'
         end
@@ -44,13 +47,6 @@ module RubyYacht
         domain "jupiter.test.com"
         repository "github.com"
         
-        database do
-          host "db.test.com"
-          name "jupiter"
-          username "jupiter"
-          password "test"
-        end
-        
         debian_app :venus do
           repository_name 'brownleej/venus'
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_yacht
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - John Brownlee
@@ -74,13 +74,13 @@ files:
 - lib/ruby_yacht.rb
 - lib/ruby_yacht/dsl.rb
 - lib/ruby_yacht/dsl/app.rb
-- lib/ruby_yacht/dsl/app_type.rb
 - lib/ruby_yacht/dsl/configuration.rb
 - lib/ruby_yacht/dsl/database.rb
 - lib/ruby_yacht/dsl/dns_server.rb
 - lib/ruby_yacht/dsl/dsl.rb
 - lib/ruby_yacht/dsl/hook.rb
 - lib/ruby_yacht/dsl/project.rb
+- lib/ruby_yacht/dsl/server_type.rb
 - lib/ruby_yacht/images/app-dependencies/Dockerfile.erb
 - lib/ruby_yacht/images/app/Dockerfile.erb
 - lib/ruby_yacht/images/app/before_startup.bash.erb
@@ -88,7 +88,6 @@ files:
 - lib/ruby_yacht/images/app/startup.bash.erb
 - lib/ruby_yacht/images/database/Dockerfile.erb
 - lib/ruby_yacht/images/database/checkout.bash
-- lib/ruby_yacht/images/database/setup.bash
 - lib/ruby_yacht/images/web/Dockerfile.erb
 - lib/ruby_yacht/images/web/add_app.rb
 - lib/ruby_yacht/images/web/add_project.rb
@@ -96,6 +95,8 @@ files:
 - lib/ruby_yacht/images/web/index.html.erb
 - lib/ruby_yacht/images/web/index_config.erb
 - lib/ruby_yacht/plugins.rb
+- lib/ruby_yacht/plugins/mysql.rb
+- lib/ruby_yacht/plugins/mysql/scripts/setup.bash
 - lib/ruby_yacht/plugins/rails.rb
 - lib/ruby_yacht/plugins/rails/scripts/install_gems.rb
 - lib/ruby_yacht/plugins/rails/scripts/load_seeds.rb
@@ -117,17 +118,18 @@ files:
 - spec/docker/Dockerfile
 - spec/docker/build.bash
 - spec/dsl/app_spec.rb
-- spec/dsl/app_type_spec.rb
 - spec/dsl/configuration_spec.rb
 - spec/dsl/database_spec.rb
 - spec/dsl/dns_server_spec.rb
 - spec/dsl/dsl_spec.rb
 - spec/dsl/hook_spec.rb
 - spec/dsl/project_spec.rb
+- spec/dsl/server_type_spec.rb
 - spec/fixtures/app-dependencies-dockerfile-generic
 - spec/fixtures/app-dependencies-dockerfile-generic-with-library-install
 - spec/fixtures/app-dependencies-dockerfile-rails
 - spec/fixtures/database-dockerfile
+- spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
 - spec/fixtures/database-dockerfile-with-seed-hooks
 - spec/fixtures/deploy-dockerfile
@@ -136,15 +138,21 @@ files:
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
+- spec/fixtures/mars-before-startup-with-custom-file-copy
 - spec/fixtures/mars-dockerfile
 - spec/fixtures/mars-dockerfile-rails
 - spec/fixtures/mars-dockerfile-with-after-checkout-hooks
 - spec/fixtures/mars-dockerfile-with-before-startup-hooks
+- spec/fixtures/mars-dockerfile-with-custom-file-copy
+- spec/fixtures/mars-dockerfile-with-local-database
+- spec/fixtures/mars-dockerfile-with-remote-database
 - spec/fixtures/mars-startup
 - spec/fixtures/mars-startup-rails
 - spec/fixtures/multi-project-web-dockerfile
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-with-eponymous-app
 - spec/fixtures/web-dockerfile-with-primary-app
+- spec/plugins/mysql_spec.rb
 - spec/plugins/rails_spec.rb
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb
@@ -188,17 +196,18 @@ test_files:
 - spec/docker/Dockerfile
 - spec/docker/build.bash
 - spec/dsl/app_spec.rb
-- spec/dsl/app_type_spec.rb
 - spec/dsl/configuration_spec.rb
 - spec/dsl/database_spec.rb
 - spec/dsl/dns_server_spec.rb
 - spec/dsl/dsl_spec.rb
 - spec/dsl/hook_spec.rb
 - spec/dsl/project_spec.rb
+- spec/dsl/server_type_spec.rb
 - spec/fixtures/app-dependencies-dockerfile-generic
 - spec/fixtures/app-dependencies-dockerfile-generic-with-library-install
 - spec/fixtures/app-dependencies-dockerfile-rails
 - spec/fixtures/database-dockerfile
+- spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
 - spec/fixtures/database-dockerfile-with-seed-hooks
 - spec/fixtures/deploy-dockerfile
@@ -207,15 +216,21 @@ test_files:
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
+- spec/fixtures/mars-before-startup-with-custom-file-copy
 - spec/fixtures/mars-dockerfile
 - spec/fixtures/mars-dockerfile-rails
 - spec/fixtures/mars-dockerfile-with-after-checkout-hooks
 - spec/fixtures/mars-dockerfile-with-before-startup-hooks
+- spec/fixtures/mars-dockerfile-with-custom-file-copy
+- spec/fixtures/mars-dockerfile-with-local-database
+- spec/fixtures/mars-dockerfile-with-remote-database
 - spec/fixtures/mars-startup
 - spec/fixtures/mars-startup-rails
 - spec/fixtures/multi-project-web-dockerfile
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-with-eponymous-app
 - spec/fixtures/web-dockerfile-with-primary-app
+- spec/plugins/mysql_spec.rb
 - spec/plugins/rails_spec.rb
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb

data/lib/ruby_yacht/images/database/setup.bash

@@ -1,15 +0,0 @@
-#! /bin/bash
-
-DATABASE_NAME=$1
-DATABASE_USER=$2
-DATABASE_PASSWORD=$3
-
-service mysql start;
-COMMAND="CREATE USER '$DATABASE_USER'@'localhost' IDENTIFIED BY '$DATABASE_PASSWORD';";
-COMMAND="$COMMAND CREATE USER '$DATABASE_USER'@'%' IDENTIFIED BY '$DATABASE_PASSWORD';";
-
-COMMAND="$COMMAND GRANT ALL ON $DATABASE_NAME.* to '$DATABASE_USER'@'localhost';";
-COMMAND="$COMMAND GRANT ALL ON $DATABASE_NAME.* to '$DATABASE_USER'@'%';";
-COMMAND="$COMMAND CREATE DATABASE $DATABASE_NAME;";
-
-mysql -uroot -e "$COMMAND";