ruby_yacht 0.6.1 → 0.7.0

data/lib/ruby_yacht/plugins/rails/scripts/update_rails_config.rb

@@ -17,11 +17,13 @@ common_config = {
   'port' => ENV['DATABASE_PORT']
 }
 
+rails_env = ENV['RAILS_ENV'] || 'development'
+
 database_config = {
-  ENV['RAILS_ENV'] => common_config
+  rails_env => common_config
 }
 
-if ENV['RAILS_ENV'] == 'development'
+if rails_env == 'development'
   database_config['test'] = common_config.dup
   database_config['test']['database'] += '_test'
 end
@@ -31,12 +33,12 @@ File.open('/var/code/config/database.yml', 'w') do |file|
 end
 
 secret_key_config = {
-  ENV['RAILS_ENV'] => {
+  rails_env => {
     'secret_key_base' => ENV['SECRET_KEY_BASE']
   }
 }
 
-if ENV['RAILS_ENV'] == 'development'
+if rails_env == 'development'
   secret_key_config['test'] = secret_key_config['development'].dup
 end
 

data/lib/ruby_yacht/plugins/rails.rb

@@ -5,6 +5,7 @@ module RubyYacht::Plugins
     def self.load
       load_server_type
       load_hooks
+      load_environment_variables
     end
 
     # This method loads the configuration for the Rails server type.
@@ -24,26 +25,16 @@ module RubyYacht::Plugins
     def self.load_hooks
       RubyYacht.configure do
         add_hooks(app_server_type: :rails, container_type: :app, script_folder: File.join(File.dirname(__FILE__), 'rails', 'scripts')) do
-          during :initialize_app_environment do
-            set_environment_variable 'RAILS_ENV' do
-              @project.rails_environment
-            end
-            set_environment_variable 'SECRET_KEY_BASE' do
-              @project.rails_secret_key_base
-            end
-            set_environment_variable 'EXCLUDED_GEM_GROUPS' do
-              groups = @project.rails_excluded_gem_groups.join(' ')
-              groups = '""' if groups == ''
-              groups
-            end
-          end
           during(:install_libraries) { run_script :ruby, 'install_gems.rb' }
           
           after(:build_checkout) { command 'bundle install --clean' }
           
-          during :load_database_seeds do
-            container_type :database
-            run_script :ruby, 'load_seeds.rb'
+          if RubyYacht.configuration.find_server_type(:mysql)
+            during :load_database_seeds do
+              container_type :database
+              database_server_type :mysql
+              run_script :ruby, 'load_seeds.rb'
+            end
           end
           
           during :build_new_app do
@@ -53,7 +44,29 @@ module RubyYacht::Plugins
           before(:startup) { run_script :ruby, 'update_rails_config.rb' }
           before(:startup) { run_script :ruby, 'prepare_rails_for_launch.rb' }
 
-          during(:startup) { command 'rails s -b 0.0.0.0 -p $APP_PORT -e $RAILS_ENV' }
+          during(:startup) { command 'rails s -b 0.0.0.0 -p $APP_PORT' }
+        end
+      end
+    end
+
+    # This method loads the hooks for setting environment variables for the
+    # Rails apps.
+    def self.load_environment_variables
+      RubyYacht.configure do
+        add_hooks app_server_type: :rails, container_type: :app do
+          during :initialize_app_environment do
+            set_environment_variable 'RAILS_ENV' do
+              @project.rails_environment == 'development' ? nil : @project.rails_environment
+            end
+            set_environment_variable 'SECRET_KEY_BASE' do
+              @project.rails_secret_key_base
+            end
+            set_environment_variable 'EXCLUDED_GEM_GROUPS' do
+              groups = @project.rails_excluded_gem_groups.join(' ')
+              groups = '""' if groups == ''
+              groups
+            end
+          end
         end
       end
     end

data/lib/ruby_yacht/plugins.rb

@@ -3,6 +3,6 @@ module RubyYacht
   module Plugins
   end
 end
-require 'ruby_yacht/plugins/rails'
 require 'ruby_yacht/plugins/mysql'
+require 'ruby_yacht/plugins/rails'
 require 'ruby_yacht/plugins/nginx'

data/lib/ruby_yacht/runner/build_images.rb

@@ -15,12 +15,10 @@ module RubyYacht::Runner
     def run
       FileUtils.mkdir_p 'tmp'
       
-      default_system_prefix = projects.first.system_prefix
-      docker "network create #{default_system_prefix} 2> /dev/null"
-      
       projects.each do |project|
         log "Building images for #{project.name}"
         
+        docker "network create #{project.system_prefix} 2> /dev/null"
         id_path = File.join(ENV['HOME'], '.ssh', 'id_rsa')
         tmp_id_path = File.join('tmp', 'id_rsa')
         FileUtils.cp(id_path, tmp_id_path) if File.exist?(id_path)
@@ -133,10 +131,10 @@ module RubyYacht::Runner
 
       @hook_events =
         case folder_name
-        when 'app' then [:startup, :build_checkout, :build_new_app]
-        when 'app-dependencies' then [:initialize_app_environment, :install_libraries]
-        when 'database' then [:create_databases, :install_libraries, :load_database_seeds]
-        when 'web' then [:install_libraries, :add_project_landing, :add_app_config]
+        when 'app' then [:startup, :build_checkout, :build_new_app, :cleanup]
+        when 'app-dependencies' then [:initialize_app_environment, :install_libraries, :cleanup]
+        when 'database' then [:create_databases, :install_libraries, :load_database_seeds, :cleanup]
+        when 'web' then [:install_libraries, :add_project_landing, :add_app_config, :cleanup]
         else []
         end
         

data/lib/ruby_yacht/runner/run_containers.rb

@@ -11,10 +11,9 @@ module RubyYacht::Runner
     
     # This method runs the logic of the command.
     def run
-      @network = projects.first.system_prefix
-      
       projects.each do |project|
         @project = project
+        @network = project.system_prefix
         
         project.databases.select(&:local?).each do |database|
           run_container database

data/ruby_yacht.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name         = 'ruby_yacht'
-  spec.version      = '0.6.1'
-  spec.date         = '2016-05-16'
+  spec.version      = '0.7.0'
+  spec.date         = '2016-05-20'
   spec.description  = "A DSL for building docker containers for a family of Rails apps"
   spec.summary      = "A DSL for building docker containers for a family of Rails apps"
   spec.authors      = ["John Brownlee"]

data/spec/docker/run.bash

@@ -31,6 +31,10 @@ else
   EXISTING_CONTAINER=""
 fi
 
+if [[ -n $VERBOSE_DOCKER && $VERBOSE_DOCKER -eq 1 ]]; then
+  EXTRA_FLAGS="$EXTRA_FLAGS -e VERBOSE_DOCKER=1"
+fi
+
 if [ -z "$EXISTING_CONTAINER" ]; then
   docker run -it $EXTRA_FLAGS --privileged --name=ruby-yacht-tests -v $PWD:/var/code/ruby-yacht ruby-yacht-tests /var/docker/startup.bash $*
   RESULT=$?

data/spec/dsl/configuration_spec.rb

@@ -339,6 +339,24 @@ describe RubyYacht::Configuration do
       expect(configuration.server_types[0].server_attributes.count).to eq 1
     end
 
+    it 'can add local config' do
+      configuration = RubyYacht::Configuration::DSL.new.run(Proc.new do
+        add_local_config File.join(File.dirname(__FILE__), '..', 'fixtures', 'local_config.yml')
+      end)
+
+      expect(configuration.local_config).to eq(
+        system_prefix: 'jupiter',
+        check_out_locally: true,
+        rails_environment: 'production',
+        database: {
+          host: 'localhost',
+          name: 'jupiter_testing',
+          username: 'jupiter',
+          password: 'jupiterpass'
+        }
+      )
+    end
+
     it "can add `during` hooks" do
       configuration = RubyYacht::Configuration::DSL.new.run(Proc.new do
         add_hooks container_type: :app, app_server_type: :configuration_test, script_folder: './scripts' do
@@ -408,6 +426,17 @@ describe RubyYacht::Configuration do
         expect(configuration.server_types[2].name).to eq :second_configuration_test
       end
 
+      it "adds to the local config" do
+        RubyYacht.configuration.local_config = {system_prefix: 'apollo', rails_secret_key_base: 'ABC1234'}
+        RubyYacht.configure do
+          add_local_config File.join(File.dirname(__FILE__), '..', 'fixtures', 'local_config.yml')
+        end
+        
+        configuration = RubyYacht.configuration
+        expect(configuration.local_config[:system_prefix]).to eq 'jupiter'
+        expect(configuration.local_config[:rails_secret_key_base]).to eq 'ABC1234'
+      end
+
       context "with a server type that is already registered" do
         before do
           type = RubyYacht::ServerType.new

data/spec/dsl/dsl_spec.rb

@@ -298,6 +298,62 @@ describe RubyYacht::DSL::Base do
     end
   end
 
+  describe 'copy_local_config' do
+    before do
+      DSLTestHelpers::DSL.add_attribute :name
+      DSLTestHelpers::DSL.add_attribute :height
+      DSLTestHelpers::DSL.add_attribute :gender
+      DSLTestHelpers::DSL.add_boolean :vegan
+
+      @dsl = DSLTestHelpers::DSL.new
+      RubyYacht.configuration.local_config = {name: 'John', height: 120, vegan: false, last_name: 'Smith'}
+    end
+
+    context 'with a valid attribute' do
+      it 'copies the value from the local config' do
+        @dsl.copy_local_config(:name)
+        expect(@dsl.instance_eval { @name }).to eq 'John'
+      end
+    end
+
+    context 'with a path to the dictionary' do
+      it 'copies the value from the local config' do
+        RubyYacht.configuration.local_config = {people: {john: {height: 150}}}
+        @dsl.copy_local_config :height, from: 'people.john'
+        expect(@dsl.instance_eval { @height }).to eq 150
+      end
+    end
+
+    context 'with a false boolean attribute' do
+      it 'leaves the value false' do
+        @dsl.copy_local_config :vegan
+        expect(@dsl.instance_eval { @vegan }).to be_falsey
+      end
+    end
+
+    context 'with a true boolean attribute' do
+      it 'sets the value to true' do
+        RubyYacht.configuration.local_config[:vegan] = true
+        @dsl.copy_local_config :vegan
+        expect(@dsl.instance_eval { @vegan }).to be_truthy
+      end
+    end
+
+    context 'with an attribute that is not defined on the DSL' do
+      it 'raises an exception' do
+        expect { @dsl.copy_local_config :last_name }.to raise_exception 'Undefined field in DSLTestHelpers::DSL: last_name'
+      end
+    end
+
+    context 'with an attribute with no value in the config file' do
+      it 'leaves the value nil' do
+        @dsl.copy_local_config :gender
+        expect(@dsl.instance_eval { @gender }).to be_nil
+      end
+    end
+  end
+
+
   describe "check_required_attributes" do
     before do
       DSLTestHelpers::DSL.add_attribute :name

data/spec/dsl/hook_spec.rb

@@ -335,14 +335,37 @@ describe RubyYacht::Hook do
     end
 
     describe "environment variable behavior" do
-      let(:behavior) { RubyYacht::Hook::EnvironmentVariableBehavior.new('SECRET_KEY_BASE', Proc.new { 'abc'}) }
+      context 'with a normal value' 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'
+        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
 
-      it 'sets the environment variable as its shell command' do
-        expect(behavior.shell_command).to eq 'export SECRET_KEY_BASE="abc"'
+      context 'with a blank value' do
+        let(:behavior) { RubyYacht::Hook::EnvironmentVariableBehavior.new('SECRET_KEY_BASE', Proc.new { '' }) }
+
+        it 'sets the environment variable as its docker command' do
+          expect(behavior.dockerfile_command).to eq 'ENV SECRET_KEY_BASE '
+        end
+
+        it 'sets the environment variable as its shell command' do
+          expect(behavior.shell_command).to eq 'export SECRET_KEY_BASE=""'
+        end
+      end
+
+      context 'with a nil value' do
+        let(:behavior) { RubyYacht::Hook::EnvironmentVariableBehavior.new('SECRET_KEY_BASE', Proc.new { nil }) }
+
+        it 'has a nil command' do
+          expect(behavior.dockerfile_command).to be_nil
+          expect(behavior.shell_command).to be_nil
+        end
       end
     end
   end

data/spec/dsl/project_spec.rb

@@ -26,6 +26,7 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'
@@ -57,6 +58,7 @@ describe RubyYacht::Project do
       expect(project.name).to eq :test_project
       expect(project.system_prefix).to eq :a
       expect(project.repository).to eq "github.com"
+      expect(project.repository_protocol).to eq :https
       expect(project.primary_app).to eq :app1
 
       expect(project.apps.map(&:name)).to eq [:app1, :app2]
@@ -68,6 +70,9 @@ describe RubyYacht::Project do
 
     it "requires the system prefix" do
       @builder = Proc.new do
+        repository 'github.com'
+        repository_protocol :https
+
         app :generic, :app1 do
           repository_name 'brownleej/test1'
         end
@@ -101,6 +106,7 @@ describe RubyYacht::Project do
     it "requires the repository" do
       @builder = Proc.new do
         system_prefix :a
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'
@@ -132,10 +138,46 @@ describe RubyYacht::Project do
       expect { project }.to raise_exception "Missing required attribute repository for RubyYacht::Project::DSL"
     end
 
+    it 'defaults the repository protocol to ssh' do
+      @builder = Proc.new do
+        system_prefix :a
+        repository 'github.com'
+
+        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
+
+        web_server :apache, :web do
+          domain 'test.com'
+        end
+
+        dns_server do
+          server '8.10.1.1'
+        end
+
+        primary_app :app1
+      end
+
+      expect(project.repository_protocol).to eq :ssh
+    end
+
     it "does not require any apps" do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         database :sqlite, :project1 do
           host "localhost"
@@ -163,6 +205,7 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'
@@ -194,6 +237,7 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'
@@ -221,6 +265,7 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'
@@ -252,6 +297,7 @@ describe RubyYacht::Project do
       @builder = Proc.new do
         system_prefix :a
         repository "github.com"
+        repository_protocol :https
 
         app :generic, :app1 do
           repository_name 'brownleej/test1'

data/spec/dsl/server_type_spec.rb

@@ -82,6 +82,7 @@ describe RubyYacht::ServerType do
       end
 
       project = RubyYacht.configuration.projects.last
+      expect(RubyYacht::Project::DSL.new(:test).singleton_class.all_attributes).to include :app_type_test_foo
       expect(project.app_type_test_environment).to eq 'staging'
       expect(project.app_type_test_foo).to eq 'test value'
     end
@@ -99,6 +100,8 @@ describe RubyYacht::ServerType do
           end
         end
       end
+      
+      expect(RubyYacht::App::DSL.new(:app_type_test, :test1).singleton_class.all_attributes).to include :app_type_test_bar
 
       project = RubyYacht.configuration.projects.last
       app = project.apps.last