ruby_yacht 0.6.1 → 0.7.0

data/spec/integration/run.rb

@@ -1,10 +1,22 @@
 require 'ruby_yacht'
 
+RubyYacht.configure do
+  add_local_config File.join(File.dirname(__FILE__), '..', 'fixtures', 'local_config.yml')
+end
+
 RubyYacht.configure do
   project :apollo do
     system_prefix :apollo
     repository 'github.com'
+    if ENV['HTTPS_REPOSITORY'] == '1'
+      repository_protocol :https
+    end
+    
     rails_secret_key_base 'c330d739b502b4c43f4a850c592798243c5e92b1828b4e1e69de764fbdf8e733e0165241c67a76f34a9a46b10d27960fa288149ac662ea6bd9408fdb766aea39'
+
+    if ENV['USE_LOCAL_CONFIG'] == '1'
+      copy_local_config :rails_environment
+    end
     
     if ENV['CHECK_OUT_LOCALLY'] == '1'
       check_out_locally
@@ -16,6 +28,10 @@ RubyYacht.configure do
         password 'testpass'
         host 'localhost'
         
+        if ENV['USE_LOCAL_CONFIG'] == '1'
+          copy_local_config :username, :password, :host, from: 'database'
+        end
+        
         if ENV['USE_NONSTANDARD_MYSQL_PORT'] == '1'
           port 3333
         end
@@ -51,12 +67,12 @@ RubyYacht.configure do
       end
     end
 
-    if ENV['USE_PRODUCTION_ENVIRONMENT']
+    if ENV['USE_PRODUCTION_ENVIRONMENT'] == '1'
       rails_environment 'production'
       rails_excluded_gem_groups %w(development test)
     end
 
-    if ENV['CREATE_PRIMARY_APP']
+    if ENV['CREATE_PRIMARY_APP'] == '1'
       primary_app :mars
     end
   end

data/spec/plugins/rails_spec.rb

@@ -16,6 +16,8 @@ describe RubyYacht::Plugins::Rails do
     @database = RubyYacht::Database.new
     @database.name = :test_db
     @project.databases = [@database]
+
+    @project.web_servers = []
   end
   
   def configure_project(options = {})
@@ -68,21 +70,7 @@ describe RubyYacht::Plugins::Rails do
     subject { RubyYacht::Runner::BuildImages.new }
     include DockerCommandSpec
 
-    before do
-      RubyYacht.configuration.clear
-      described_class.load
-
-      RubyYacht.configure do
-        server_type :sqlite do
-          container_type :database
-          baseline_image 'ubuntu'
-        end
-        server_type :nginx do
-          container_type :web
-          baseline_image 'ubuntu'
-        end
-      end
-
+    def configure_project
       RubyYacht.configure do
         project :apollo do
           system_prefix :apollo
@@ -112,6 +100,24 @@ describe RubyYacht::Plugins::Rails do
         end
       end
     end
+
+    before do
+      RubyYacht.configuration.clear
+      described_class.load
+
+      RubyYacht.configure do
+        server_type :sqlite do
+          container_type :database
+          baseline_image 'ubuntu'
+        end
+        server_type :nginx do
+          container_type :web
+          baseline_image 'ubuntu'
+        end
+      end
+
+      configure_project
+    end
     
     it "builds all the images for the project" do
       docker.fail_unexpected_commands!
@@ -182,7 +188,7 @@ describe RubyYacht::Plugins::Rails do
       it "generates the dockerfiles for the database server" do
         docker.expect "build -t apollo-database tmp" do
           files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/load_seeds.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/startup.bash', 'tmp/startup.bash.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
           expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails'))
           expect(dockerfile).to eq expected
@@ -191,6 +197,57 @@ describe RubyYacht::Plugins::Rails do
       end
     end
     
+    context "with a production app" do
+      before do
+        RubyYacht.configuration.projects.first.rails_environment = 'production'
+      end
+      
+      it "generates the dockerfiles for the app server" do
+        docker.expect("build -t apollo-rails-app-dependencies tmp") do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/id_rsa', 'tmp/install_gems.rb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'app-dependencies-dockerfile-rails-production'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+    end
+    
+    context "with a local MySQL database" do
+      before do
+        RubyYacht.configuration.clear
+        RubyYacht::Plugins::MySQL.load
+        described_class.load
+
+        RubyYacht.configure do
+          server_type :sqlite do
+            container_type :database
+            baseline_image 'ubuntu'
+          end
+          server_type :nginx do
+            container_type :web
+            baseline_image 'ubuntu'
+          end
+        end
+
+        configure_project
+        RubyYacht.configuration.projects.first.databases.first.host = 'localhost'
+        RubyYacht.configuration.projects.first.databases.first.server_type = :mysql
+      end
+      
+      it "generates the dockerfiles for the database server" do
+        docker.expect "build -t apollo-database tmp" do
+          files = Dir[File.join("tmp", "*")].sort
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/load_seeds.rb', 'tmp/setup.bash', 'tmp/startup.bash', 'tmp/startup.bash.erb']
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'database-dockerfile-rails-mysql'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+    end
+    
     context "with no repository" do
       before do
         RubyYacht.configuration.projects.first.apps.first.repository_name = nil

data/spec/runner/build_images_spec.rb

@@ -248,6 +248,7 @@ describe RubyYacht::Runner::BuildImages do
         docker.expect "build -t apollo-mars tmp"
         docker.expect "build -t apollo-saturn tmp"
         docker.expect "build -t apollo-nginx tmp"
+        docker.expect "network create jupiter 2> /dev/null"
         docker.expect "build -t jupiter-debian-app-dependencies tmp"
         docker.expect "build -t jupiter-venus tmp"
         docker.expect "build -t jupiter-saturn tmp"
@@ -439,6 +440,21 @@ describe RubyYacht::Runner::BuildImages do
       end
     end
     
+    context "with an HTTPS repository" do
+      before do
+        RubyYacht.configuration.projects[0].repository_protocol = :https
+      end
+      
+      it "builds a dependencies dockerfile that does checks the repository out over HTTPS" do
+        docker.expect("build -t apollo-generic-app-dependencies tmp") do
+          dockerfile = File.read(File.join('tmp', 'Dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'app-dependencies-dockerfile-with-https-repository'))
+          expect(dockerfile).to eq expected
+        end
+        subject.run
+      end
+    end
+    
     context "with an app with no repository" do
       before do
         RubyYacht.configuration.projects[0].apps[0].repository_name = nil
@@ -496,7 +512,7 @@ describe RubyYacht::Runner::BuildImages do
           subject.instance_eval { @app = app }
           subject.set_image_settings('app')
           expect(subject.instance_eval { @templates }).to eq ['Dockerfile', 'before_startup.bash', 'startup.bash']
-          expect(subject.instance_eval { @hook_events }).to eq [:startup, :build_checkout, :build_new_app]
+          expect(subject.instance_eval { @hook_events }).to eq [:startup, :build_checkout, :build_new_app, :cleanup]
           expect(subject.instance_eval { @hook_servers }).to eq [app]
         end
       end

data/spec/runner/run_containers_spec.rb

@@ -62,9 +62,9 @@ describe RubyYacht::Runner::RunContainers do
         docker.expect 'run -d --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
         docker.expect 'run -d --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
         docker.expect 'run -d -p 80:80 --net=apollo --net-alias=apollo-nginx --name=apollo-nginx apollo-nginx'
-        docker.expect 'run -d --net=apollo --net-alias=jupiter-venus --name=jupiter-venus jupiter-venus'
-        docker.expect 'run -d --net=apollo --net-alias=jupiter-saturn --name=jupiter-saturn jupiter-saturn'
-        docker.expect 'run -d -p 80:80 --net=apollo --net-alias=jupiter-web --name=jupiter-web jupiter-web'
+        docker.expect 'run -d --net=jupiter --net-alias=jupiter-venus --name=jupiter-venus jupiter-venus'
+        docker.expect 'run -d --net=jupiter --net-alias=jupiter-saturn --name=jupiter-saturn jupiter-saturn'
+        docker.expect 'run -d -p 80:80 --net=jupiter --net-alias=jupiter-web --name=jupiter-web jupiter-web'
         subject.run
       end
     

data/spec/support/integration_helpers.rb

@@ -1,7 +1,10 @@
 module IntegrationHelpers
-  def configure_project
-    IntegrationHelpers.clear_docker_containers
-    system "docker network rm apollo 1> /dev/null 2> /dev/null"
+  def containers
+    `docker ps | grep "apollo\\|jupiter"`.split("\n").collect { |line| line.split(/\s+/).last }.sort
+  end
+
+  def images
+    `docker images | grep "apollo\\|jupiter"`.split("\n").collect { |line| line.split(/\s+/).first }.sort
   end
 
   def run_command(command, environment: {}, capture_output: false)
@@ -11,6 +14,8 @@ module IntegrationHelpers
     end
     if capture_output
       `#{full_command}`
+    elsif ENV['VERBOSE_DOCKER'] == '1'
+      system full_command
     else
       system "#{full_command} 1> log/integration_stdout.txt 2> log/integration_stderr.txt"
     end
@@ -45,6 +50,11 @@ module IntegrationHelpers
       end
     end
   end
+  
+  def start_database
+    system "docker run -d --net=apollo --net-alias=apollo-database --name=apollo-database apollo-database > /dev/null"
+    wait_on_command_result 'docker run --rm --net=apollo apollo-mars mysql -uapollo -ptestpass -hapollo-database', does_not_contain: 'ERROR'
+  end
 
   def restore_hosts_file
     backup_path = Dir["/etc/hosts*.backup"].last
@@ -71,6 +81,10 @@ module IntegrationHelpers
   end
   
   def self.clear_checkout_folders
-    `docker run --rm -v $PWD/..:/var/code ruby:2.3 bash -c 'rm -r /var/code/mars; rm -r /var/code/saturn'`
+    %w(mars saturn).each do |app|
+      if Dir.exist?("../#{app}")
+        FileUtils.rm_rf("../#{app}")
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_yacht
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - John Brownlee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -171,15 +171,19 @@ files:
 - spec/fixtures/app-dependencies-dockerfile-generic
 - spec/fixtures/app-dependencies-dockerfile-generic-with-library-install
 - spec/fixtures/app-dependencies-dockerfile-rails
+- spec/fixtures/app-dependencies-dockerfile-rails-production
+- spec/fixtures/app-dependencies-dockerfile-with-https-repository
 - spec/fixtures/app-dependencies-dockerfile-with-no-repository
 - spec/fixtures/database-dockerfile
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
+- spec/fixtures/database-dockerfile-rails-mysql
 - spec/fixtures/database-dockerfile-rails-with-no-repository
 - spec/fixtures/database-dockerfile-with-seed-hooks
 - spec/fixtures/database-startup-mysql
 - spec/fixtures/hooks/hook1.rb
 - spec/fixtures/hooks/hook2.rb
+- spec/fixtures/local_config.yml
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
@@ -203,16 +207,17 @@ files:
 - spec/fixtures/web-dockerfile-nginx
 - spec/fixtures/web-dockerfile-with-eponymous-app
 - spec/fixtures/web-dockerfile-with-primary-app
-- spec/integration/build_images_spec.rb
-- spec/integration/build_spec.rb
-- spec/integration/checkout_spec.rb
-- spec/integration/create_new_project_spec.rb
-- spec/integration/implode_spec.rb
+- spec/integration/01_normal_config_spec.rb
+- spec/integration/02_creating_new_project_spec.rb
+- spec/integration/03_no_repository_spec.rb
+- spec/integration/04_no_database_spec.rb
+- spec/integration/05_https_repository_spec.rb
+- spec/integration/06_production_environment_spec.rb
+- spec/integration/07_local_checkout_spec.rb
+- spec/integration/08_multiple_projects_spec.rb
+- spec/integration/09_titular_app_spec.rb
+- spec/integration/10_misc_scenarios_spec.rb
 - spec/integration/run.rb
-- spec/integration/run_containers_spec.rb
-- spec/integration/services_spec.rb
-- spec/integration/shell_spec.rb
-- spec/integration/update_hosts_spec.rb
 - spec/plugins/mysql_spec.rb
 - spec/plugins/nginx_spec.rb
 - spec/plugins/rails_spec.rb
@@ -274,15 +279,19 @@ test_files:
 - spec/fixtures/app-dependencies-dockerfile-generic
 - spec/fixtures/app-dependencies-dockerfile-generic-with-library-install
 - spec/fixtures/app-dependencies-dockerfile-rails
+- spec/fixtures/app-dependencies-dockerfile-rails-production
+- spec/fixtures/app-dependencies-dockerfile-with-https-repository
 - spec/fixtures/app-dependencies-dockerfile-with-no-repository
 - spec/fixtures/database-dockerfile
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
+- spec/fixtures/database-dockerfile-rails-mysql
 - spec/fixtures/database-dockerfile-rails-with-no-repository
 - spec/fixtures/database-dockerfile-with-seed-hooks
 - spec/fixtures/database-startup-mysql
 - spec/fixtures/hooks/hook1.rb
 - spec/fixtures/hooks/hook2.rb
+- spec/fixtures/local_config.yml
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
@@ -306,16 +315,17 @@ test_files:
 - spec/fixtures/web-dockerfile-nginx
 - spec/fixtures/web-dockerfile-with-eponymous-app
 - spec/fixtures/web-dockerfile-with-primary-app
-- spec/integration/build_images_spec.rb
-- spec/integration/build_spec.rb
-- spec/integration/checkout_spec.rb
-- spec/integration/create_new_project_spec.rb
-- spec/integration/implode_spec.rb
+- spec/integration/01_normal_config_spec.rb
+- spec/integration/02_creating_new_project_spec.rb
+- spec/integration/03_no_repository_spec.rb
+- spec/integration/04_no_database_spec.rb
+- spec/integration/05_https_repository_spec.rb
+- spec/integration/06_production_environment_spec.rb
+- spec/integration/07_local_checkout_spec.rb
+- spec/integration/08_multiple_projects_spec.rb
+- spec/integration/09_titular_app_spec.rb
+- spec/integration/10_misc_scenarios_spec.rb
 - spec/integration/run.rb
-- spec/integration/run_containers_spec.rb
-- spec/integration/services_spec.rb
-- spec/integration/shell_spec.rb
-- spec/integration/update_hosts_spec.rb
 - spec/plugins/mysql_spec.rb
 - spec/plugins/nginx_spec.rb
 - spec/plugins/rails_spec.rb

data/spec/integration/build_images_spec.rb

@@ -1,210 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe RubyYacht::Runner::BuildImages, :integration do
-  include IntegrationHelpers
-  
-  def start_database
-    system "docker run -d --net=apollo --net-alias=apollo-database --name=apollo-database apollo-database > /dev/null"
-    wait_on_command_result 'docker run --rm --net=apollo apollo-mars mysql -uapollo -ptestpass -hapollo-database', does_not_contain: 'ERROR'
-  end
-
-  let(:images) { `docker images | grep "apollo\\|jupiter"`.split("\n").collect { |line| line.split(/\s+/).first }.sort }
-  
-  before :all do
-    configure_project
-    system 'docker network create apollo 1> /dev/null 2> /dev/null'
-  end
-  
-  context "with the standard config" do
-    before :all do
-      run_command 'build_images'
-    end
-    
-    after do
-      IntegrationHelpers.clear_docker_containers
-    end
-    
-    it "creates images for the app, dependencies, database, and web server" do
-      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
-    end 
-    
-    it "populates the tables in the database image" do
-      start_database
-      
-      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "use apollo; show tables"'
-      results = results.split("\n").collect { |line| line.delete('|').strip }.sort
-      results.shift
-      expect(results).to eq %w(clients posts schema_migrations users)
-    end
-    
-    it "populates the seed data in the database image" do
-      start_database
-      
-      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "select count(*) FROM apollo.users"'
-      results = results.split("\n").collect { |line| line.delete('|').strip }
-      results.shift
-      expect(results).to eq ['1']
-      
-      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database -e "select name FROM apollo.clients"'
-      results = results.split("\n").collect { |line| line.delete('|').strip }
-      results.shift
-      expect(results).to eq ['Test Client']
-    end
-
-    it "creates a test database" do
-      start_database
-
-      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database apollo_test 2>&1'
-      expect(results).not_to include 'ERROR'
-    end
-    
-    it "installs the gems on the app dependency image" do
-      results = run_command_in_docker 'rails-app-dependencies', 'gem list'
-      expect(results).to include 'mysql2'
-      expect(results).to include 'sass-rails'
-      expect(results).to include 'byebug'
-      expect(results).to include 'factory_girl'
-    end
-    
-    it "leaves all the apps checked out on the app dependency image" do
-      results = run_command_in_docker 'rails-app-dependencies', 'ls /var/code'
-      folders = results.split("\n")
-      expect(folders).to include 'mars'
-      expect(folders).to include 'saturn'
-    end
-    
-    it "installs the gems on the app images" do
-      results = run_command_in_docker :mars, 'gem list'
-      expect(results).to include 'mysql2'
-      expect(results).not_to include 'sass-rails'
-      expect(results).to include 'byebug'
-      expect(results).to include 'factory_girl'
-
-      results = run_command_in_docker :saturn, 'gem list'
-      expect(results).to include 'mysql2'
-      expect(results).to include 'sass-rails'
-      expect(results).not_to include 'byebug'
-      expect(results).not_to include 'factory_girl'
-    end
-
-    it 'installs mysql on the app images' do
-      results = run_command_in_docker :mars, 'which mysql'
-      expect(results).to eq "/usr/bin/mysql\n"
-    end
-    
-    it "checks out just the single app on the app image" do
-      results = run_command_in_docker :mars, 'ls /var/code'
-      folders = results.split("\n")
-      expect(folders).to include 'app'
-      expect(folders).to include 'db'
-    end
-    
-    it "installs the scripts in the /var/docker folder in the app image" do
-      results = run_command_in_docker :mars, 'ls /var/docker'
-      files = results.split("\n")
-      expect(files).to include 'checkout.bash'
-      expect(files).to include 'before_startup.bash'
-      expect(files).to include 'startup.bash'
-      expect(files).to include 'update_rails_config.rb'
-      expect(files).to include 'prepare_rails_for_launch.rb'
-    end
-  end
-  
-  context 'with no database server' do
-    before :all do
-      system "docker rmi apollo-database 1> /dev/null 2> /dev/null"
-      run_command 'build_images', environment: { SKIP_DATABASE: 1 }
-    end
-    
-    it "does not build a database image" do
-      expect(images).to eq ['apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
-    end
-
-    it 'does not install mysql on the app servers' do
-      results = run_command_in_docker :mars, 'which mysql'
-      expect(results).to eq ''
-    end
-  end
-
-  context 'with a production environment' do
-    before :all do
-      run_command 'build_images', environment: { USE_PRODUCTION_ENVIRONMENT: 1 }
-    end
-
-    after :all do
-      IntegrationHelpers.clear_docker_containers
-    end
-    
-    it "does not install the non-production gems" do
-      results = run_command_in_docker 'rails-app-dependencies', 'gem list'
-      expect(results).to include 'mysql2'
-      expect(results).not_to include 'byebug'
-      expect(results).not_to include 'factory_girl'
-
-      results = run_command_in_docker :mars, 'gem list'
-      expect(results).to include 'mysql2'
-      expect(results).not_to include 'byebug'
-      expect(results).not_to include 'factory_girl'
-    end
-
-    it "does not create a test database" do
-      start_database
-      results = run_command_in_docker :mars, 'mysql -uapollo -ptestpass -hapollo-database apollo_test 2>&1'
-      expect(results).to include 'ERROR'
-    end
-  end
-
-  context "with an app with the same name as the project" do
-    before :all do
-      system "docker rmi apollo-mars 1> /dev/null 2> /dev/null"
-      run_command 'build_images', environment: { CREATE_TITULAR_APP: 1 }
-    end
-    
-    after :all do
-      system "docker rmi apollo 1> /dev/null"
-    end
-    
-    it "creates an image with the same name as the project" do
-      expect(images).to eq ['apollo', 'apollo-database', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
-    end 
-    
-    it "checks out the app onto the image" do
-      results = `docker run --rm apollo ls /var/code/app/models`
-      expect(results).to include 'user.rb'
-      expect(results).to include 'post.rb'
-    end 
-  end
-  
-  context "with a second project" do
-    before :all do
-      run_command 'build_images', environment: { CREATE_SECOND_PROJECT: 1 }
-    end
-
-    after :all do
-      IntegrationHelpers.image_names.select { |name| name =~ /jupiter/ }.each do |name|
-        `docker rmi #{name} 1> /dev/null`
-      end
-    end
-    
-    it "creates images for the app, dependencies, database, and web server" do
-      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web', 'jupiter-database', 'jupiter-rails-app-dependencies', 'jupiter-saturn', 'jupiter-web']
-    end
-  end
-
-  context 'with no repository name' do
-    before :all do
-      run_command 'build_images', environment: { NO_REPOSITORY: 1 }
-    end
-
-    
-    it 'creates images for the app, dependencies, database, and web server' do
-      expect(images).to eq ['apollo-database', 'apollo-mars', 'apollo-rails-app-dependencies', 'apollo-saturn', 'apollo-web']
-    end
-
-    it 'creates a fresh app in the app image' do
-      results = run_command_in_docker :mars, 'ls /var/code'
-      expect(results).to include 'app'
-      expect(results).to include 'Gemfile'
-    end
-  end
-end