ruby_yacht 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe86d0666f935e2212841266623b3f2fc4b0fdc
-  data.tar.gz: 5f5c2ed02c41aaf4f9b98dd3fc79e8110a43d2cc
+  metadata.gz: 60a4d2f558965415e5cd128391116e187b05c165
+  data.tar.gz: fa574d48c920037379ecf355ce1e07a31a5795ff
 SHA512:
-  metadata.gz: f4ad7a074ec77f4e8cfd1716ea69de349d0180125da4f7964420a1890c157c444a61eb7b06682e5dd672008fd55fdf01c4d037744286af4dd423be57cdccaa12
-  data.tar.gz: efc077fdd18c3485ce9f6ff25ad066c55dea2315324087aaa589a1ee6eb003b6bf0feb82c252ff9d4f96a91d335a0eb4a22d9a68cb341605edd3cc3d507d36f0
+  metadata.gz: 3a534420ae3d0eb73b31ae1f60c930d64bd217cca3717a04e50ac526d291952d024ebb3b604dd97cb5418fda3bc7fd2078220668dc01ca8651919db02d61ea15
+  data.tar.gz: 03bba6e531b6b21bb96250593f06bad135d796bf88bfe21358e92ade3ca194470b2b463a22d00ac5270e53890e9624febffba66d7638842654dac9a12fcce5a0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_yacht (0.1.1)
+    ruby_yacht (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -3,6 +3,7 @@ Rails apps.
 
 [![Code Climate](https://codeclimate.com/github/brownleej/ruby-yacht/badges/gpa.svg)](https://codeclimate.com/github/brownleej/ruby-yacht)
 [![Test Coverage](https://codeclimate.com/github/brownleej/ruby-yacht/badges/coverage.svg)](https://codeclimate.com/github/brownleej/ruby-yacht/coverage)
+[![Build Status](https://travis-ci.org/brownleej/ruby-yacht.svg?branch=master)](https://travis-ci.org/brownleej/ruby-yacht)
 
 # Prerequisites
 

data/doc/TODO.md

@@ -4,17 +4,15 @@ for open tickets.
 # General
 
 * Do more testing with remote databases and non-development environments
-* Consider whether deploy containers are worth including
 * Consider whether using the same web server for multiple projects is the best
   approach
 * Look into issues with running shell command that has its own command-line
   flags.
+* Add formal documentation on configuration DSL.
 
 # Plugins
 
-* Move more of the hooks to using the include_event helper
 * Add documentation on plugin API
-* Supporting shared databases between apps of different types
 
 # More Command Line Options
 
@@ -24,9 +22,6 @@ for open tickets.
 
 # More customization
 
-* Add customizations for installation
-* Add customization for post-checkout hooks
-* Using one of the apps for the bare domain
 * Defining custom commands
 * Allowing customization points at different levels, like adding hooks to
   individual apps

data/doc/configuration_sample.rb

@@ -49,6 +49,10 @@ RubyYacht.configure do
       # This app's repository is at github.com/brownleej/saturn
       repository_name 'brownleej/saturn'
     end
+
+    # This indicates that apollo.docker.local should serve requests to the mars
+    # app.
+    primary_app :mars
   end
 
   # This is a second project that runs a different set of apps, with different
@@ -79,6 +83,9 @@ RubyYacht.configure do
     rails_app :saturn do
       repository_name 'brownleej/saturn'
     end
+
+    # Because this project has no primary app, jupiter.docker.local will serve
+    # an ad-hoc landing page with links to the individual apps.
   end
 end
 

data/lib/ruby_yacht/dsl/app.rb

@@ -67,8 +67,6 @@ module RubyYacht
       add_attribute :port, 8080
 
       creates_object App
-
-
       
       # This method checks that all of the required attributes have been set on
       # the object.

data/lib/ruby_yacht/dsl/dsl.rb

@@ -208,27 +208,44 @@ module RubyYacht
 
         if self.class.created_type
           dsl_type = self.class.created_type.name.split('::').last.downcase
-          copied_attributes = self.class.copied_attributes
-
           RubyYacht.configuration.app_types.each do |app_type|
             next if @app_type && app_type.name != @app_type
-            attributes = app_type.send("#{dsl_type}_attributes") || [] rescue []
-            attributes.each do |attribute|
-              if attribute.has_key?(:required)
-                required = attribute[:required]
-              else
-                required = true
-              end
-              name = "#{app_type.name}_#{attribute[:name]}"
-              self.singleton_class.add_attribute name, attribute[:default], required
-              self.singleton_class.copied_attributes << name
-              self.class.created_type.instance_eval do
-                attr_accessor name
+            method_name = "#{dsl_type}_attributes"
+            if app_type.respond_to?("#{dsl_type}_attributes")
+              attributes = app_type.send(method_name)
+              attributes.each do |attribute|
+                attribute = attribute.merge(name: "#{app_type.name}_#{attribute[:name]}")
+                load_custom_attribute(attribute)
               end
             end
           end
         end
       end
+
+      private
+
+      # This method defines the fields for a custom attribute on the DSL.
+      #
+      # ### Parameters
+      #
+      # * **attribute: Hash**   The settings on the attribute. The `name`
+      #                         setting must already include the app type's
+      #                         prefix.
+      def load_custom_attribute(attribute)
+        if attribute.has_key?(:required)
+          required = attribute[:required]
+        else
+          required = true
+        end
+        name = attribute[:name]
+        self.singleton_class.add_attribute name, attribute[:default], required
+        self.singleton_class.copied_attributes << name
+        self.class.created_type.instance_eval do
+          attr_accessor name
+        end
+      end
+
+      public
       
       # This method runs a block with DSL methods.
       #

data/lib/ruby_yacht/dsl/project.rb

@@ -27,10 +27,6 @@ module RubyYacht
     # keeping it entirely inside the container.
     attr_accessor :check_out_locally
     
-    # Whether we should create a special container with all the apps for running
-    # deploys.
-    attr_accessor :create_deploy_container
-    
     # The configuration for the database. This is a RubyYacht::Database.
     attr_accessor :database
     
@@ -39,6 +35,15 @@ module RubyYacht
     
     # The configuration for the DNS for the apps. This is a RubyYacht::DnsServer.
     attr_accessor :dns_server
+
+    # The name of the primary app for the project.
+    #
+    # This app will respond to requests to the bare domain with no app
+    # subdomain. It will also respond under its normal subdomain.
+    #
+    # If this is not provided, this will create a special index page for the
+    # bare domain, with links to each app.
+    attr_accessor :primary_app
     
     # This class provides a DSL for configuring a project.
     #
@@ -78,6 +83,12 @@ module RubyYacht
       # You can call `repository 'github.com'` to set the project's `repository`
       # to `github.com`
       add_attribute :repository
+
+      #
+      # :method: primary_app
+      # You can call `primary_app :app1` to tell the project to use `app1` as
+      # the app under the bare domain.
+      add_attribute :primary_app, nil, false
       
       ##
       # :method: check_out_locally
@@ -86,13 +97,6 @@ module RubyYacht
       # `check_out_locally` flag to `true`. The default is false.
       add_boolean :check_out_locally
       
-      ##
-      # :method: create_deploy_container
-      #
-      # You can call `create_deploy_container` to set the project's
-      # `create_deploy_container` flag to `true`. The default is false.
-      add_boolean :create_deploy_container
-      
       ##
       # :method: app
       #

data/lib/ruby_yacht/images/app/Dockerfile.erb

@@ -6,33 +6,21 @@ ENV DATABASE_PASSWORD <%= @project.database.password %>
 ENV DATABASE_USERNAME <%= @project.database.username %>
 ENV APP_PORT <%= @app.port %>
 ENV REPOSITORY_HOST <%= @project.repository %>
+ENV REPOSITORY_NAME <%= @app.repository_name %>
 ENV SYSTEM_PREFIX <%= @project.system_prefix %>
-<% app_type = RubyYacht.configuration.find_app_type(@app.app_type) %>
-<% app_type.environment_variables.select { |variable| variable[:image] == :app }.each do |variable| %>
-ENV <%= variable[:name] %> <%= instance_eval(&variable[:block]) %>
-<% end %>
+<%= include_environment_variables :app %>
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-ENV REPOSITORY_NAME <%= @app.repository_name %>
 COPY checkout.bash /var/docker/checkout.bash
-RUN bash /var/docker/checkout.bash
-
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
-<% RubyYacht.configuration.fetch_hooks(app_type: @app.app_type).select { |hook| hook.script_name != '' }.each do |hook| %>
-<% next unless [:startup, :build_checkout].include?(hook.event_type) %>
-COPY <%= hook.script_name %> /var/docker/<%= hook.script_name %>
-<% end %>
+<%= copy_hooks [:startup, :build_checkout] %>
 
 RUN chmod u+x /var/docker/*
 
-WORKDIR /var/code
-
-<% RubyYacht.configuration.fetch_hooks(app_type: @app.app_type, event_time: :after, event_type: :build_checkout).each do |hook| %>
-RUN <%= hook.command %>
-<% end %>
+<%= include_event(:build_checkout) { "RUN /var/docker/checkout.bash\nWORKDIR /var/code"} %>
 
 EXPOSE <%= @app.port %>
 

data/lib/ruby_yacht/images/app/before_startup.bash.erb

@@ -3,6 +3,4 @@
 cd /var/code;
 /var/docker/checkout.bash;
 
-<% RubyYacht.configuration.fetch_hooks(app_type: @app.app_type, event_time: :before, event_type: :startup).each do |hook| %>
-<%= hook.command %>;
-<% end %>
+<%= include_event :startup, :before, in_bash: true %>

data/lib/ruby_yacht/images/app/startup.bash.erb

@@ -1,5 +1,3 @@
 #! /bin/bash
 /var/docker/before_startup.bash;
-<% RubyYacht.configuration.fetch_hooks(app_type: @app.app_type, event_time: :during, event_type: :startup).each do |hook| %>
-<%= hook.command %>;
-<% end %>
+<%= include_event :startup, [:during, :after], in_bash: true %>

data/lib/ruby_yacht/images/app-dependencies/Dockerfile.erb

@@ -6,34 +6,28 @@
 
 FROM <%= @app_type.baseline_image %>
 
+<%= include_environment_variables :app_dependencies %>
+
 RUN mkdir -p /root/.ssh
 COPY id_rsa /root/.ssh
 RUN ssh-keyscan <%= @project.repository %> >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
+RUN touch /var/docker/.keep
 
-<% library_scripts = RubyYacht.configuration.fetch_hooks(app_type: @app_type.name, event_time: :during, event_type: :install_libraries).select { |hook| hook.script_name != '' } %>
-<% library_scripts.each do |hook |%>
-COPY <%= hook.script_name %> /var/docker/<%= hook.script_name %>
-<% end %>
+<%= copy_hooks [:install_libraries] %>
 
-<% if library_scripts.any? %>
 RUN chmod u+x /var/docker/*
-<% end %>
 
 <% @project.apps.each do |app| %>
 <% next unless app.app_type == @app_type.name %>
 
 RUN git clone git@<%= @project.repository %>:<%= app.repository_name %> /var/code/<%= app.name %>
 WORKDIR /var/code/<%= app.name %>
-<% RubyYacht.configuration.fetch_hooks(app_type: @app_type.name, event_time: :during, event_type: :install_libraries).each do |hook |%>
-RUN <%= hook.command %>
-<% end %>
+<%= include_event :install_libraries %>
 <% end %>
 
-<% if library_scripts.any? %>
 RUN rm /var/docker/*
-<% end %>
 
 WORKDIR /
 

data/lib/ruby_yacht/images/database/Dockerfile.erb

@@ -7,13 +7,14 @@ RUN apt-get install -y mysql-server
 ENV DATABASE_USERNAME <%= @project.database.username %>
 ENV DATABASE_PASSWORD <%= @project.database.password %>
 ENV DATABASE_NAME <%= @project.database.name %>
+<% with_each_app_type do %>
+<%= include_environment_variables :database %>
+<% end %>
 
 COPY setup.bash /var/docker/setup.bash
 COPY checkout.bash /var/docker/checkout.bash
-<% @project.apps.map(&:app_type).uniq.each do |app_type| %>
-<% RubyYacht.configuration.fetch_hooks(app_type: app_type, event_type: :load_database_seeds).each do |hook| %>
-COPY <%= hook.script_name %> /var/docker/<%= hook.script_name %>
-<% end %>
+<% with_each_app_type do %>
+<%= copy_hooks [:load_database_seeds] %>
 <% end %>
 
 RUN chmod u+x /var/docker/*
@@ -21,10 +22,10 @@ RUN chmod u+x /var/docker/*
 RUN /var/docker/setup.bash <%= database.name %> <%= database.username %> <%= database.password %>
 
 <% @project.apps.each do |app| %>
+<% @app_type = RubyYacht.configuration.find_app_type(app.app_type) %>
 
 RUN /var/docker/checkout.bash <%= @project.repository %> <%= app.name %> <%= app.repository_name %>
 WORKDIR /var/code/<%= app.name %>
-<% @app_type = RubyYacht.configuration.find_app_type(app.app_type) %>
 <%= include_event :load_database_seeds %>
 <% end %>
 

data/lib/ruby_yacht/images/web/Dockerfile.erb

@@ -13,11 +13,13 @@ COPY index_config.erb /var/docker/index_config.erb
 COPY app_config.erb /var/docker/app_config.erb
 
 <% @projects.each do |project| %>
-
+<% if project.primary_app == nil %>
 <% app_list = project.apps.map(&:name).join(',') %>
+
 RUN ruby /var/docker/add_project.rb <%= project.system_prefix %> <%= project.domain %> <%= app_list %>
+<% end %>
 <% project.apps.each do |app| %>
-RUN ruby /var/docker/add_app.rb <%= project.system_prefix %> <%= project.domain %> <%= app.name %> <%= app.port %>
+RUN ruby /var/docker/add_app.rb <%= project.system_prefix %> <%= project.domain %> <%= app.name %> <%= app.port %> <%= app.name == project.primary_app %>
 <% end %>
 <% end %>
 

data/lib/ruby_yacht/images/web/add_app.rb

@@ -6,6 +6,7 @@ require 'erb'
 @app = ARGV.shift
 @port = ARGV.shift
 @container_name = "#{@project}-#{@app}"
+@is_primary_app = ARGV.shift == 'true'
 
 File.open(File.join("/etc/nginx/conf.d/#{@container_name}.conf"), 'w') do |file|
   file.write(ERB.new(File.read('/var/docker/app_config.erb')).result(binding))

data/lib/ruby_yacht/images/web/app_config.erb

@@ -9,3 +9,16 @@ server {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
   }
 }
+<% if @is_primary_app %>
+server {
+  listen       80;
+  server_name  <%= @domain %>;
+
+  location / {
+    proxy_pass http://<%= @container_name %>:<%= @port %>;
+    proxy_redirect off;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+}
+<% end %>

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

@@ -9,15 +9,20 @@ system "service mysql start"
 
 config_path = "./config/database.yml"
 
+username = ENV['DATABASE_USERNAME']
+password = ENV['DATABASE_PASSWORD']
+database = ENV['DATABASE_NAME']
+
+
 database_config = {
   'development' => {
     'adapter' => 'mysql2',
     'encoding' => 'utf8',
     'reconnect' => true,
-    'username' => ENV['DATABASE_USERNAME'],
-    'password' => ENV['DATABASE_PASSWORD'],
+    'username' => username,
+    'password' => password,
     'host' => 'localhost',
-    'database' => ENV['DATABASE_NAME']
+    'database' => database
   }
 }
 
@@ -26,8 +31,10 @@ File.open(config_path, "w") do |file|
 end
 
 system "bundle install"
-tables = `mysql -uroot -e "SHOW TABLES" #{ENV['DATABASE_NAME']}`
+tables = `mysql -uroot -e "SHOW TABLES" #{database}`
 if tables == ''
+  test_database_command = "CREATE DATABASE #{database}_test; GRANT ALL ON #{database}_test.* TO '#{username}'@'%';"
+  system "mysql -uroot -e \"#{test_database_command}\""
   system "bundle exec rake db:reset"
 else
   system "bundle exec rake db:migrate; bundle exec rake db:seed"

data/lib/ruby_yacht/runner/build_images.rb

@@ -41,10 +41,6 @@ module RubyYacht::Runner
           build_image 'app', "#{@project.system_prefix}-#{app.name}"
         end
         @app = nil
-        
-        if @project.create_deploy_container
-          build_image 'deploy'
-        end
       end
       
       @projects = projects
@@ -78,28 +74,10 @@ module RubyYacht::Runner
         FileUtils.cp(path, File.join('tmp', File.basename(path)))
       end
 
-      templates = 
-        case folder_name
-        when 'app' then ['Dockerfile', 'before_startup.bash', 'startup.bash']
-        else ['Dockerfile']
-        end
+      set_image_settings(folder_name)
 
-      hook_events =
-        case folder_name
-        when 'app' then [:startup, :build_checkout]
-        when 'app-dependencies' then [:install_libraries]
-        when 'database' then [:load_database_seeds]
-        else []
-        end
-        
-      app_types =
-        case folder_name
-        when 'database' then @project.apps.map(&:app_type).uniq
-        else [@app_type.name]
-        end
-      
-      hook_events.each do |event|
-        app_types.each do |app_type|
+      @hook_events.each do |event|
+        @app_types.each do |app_type|
           RubyYacht.configuration.fetch_hooks(app_type: app_type, event_type: event).each do |hook|
             next unless hook.script_path
             FileUtils.cp hook.script_path, "tmp"
@@ -107,7 +85,7 @@ module RubyYacht::Runner
         end
       end
 
-      templates.each do |template_name|
+      @templates.each do |template_name|
         File.open(File.join('tmp', template_name), 'w') do |file|
           template_contents = File.read(File.join('tmp', template_name + '.erb'))
           file_contents = ERB.new(template_contents, nil, '<>').result(binding)
@@ -122,6 +100,38 @@ module RubyYacht::Runner
       
       FileUtils.rm(Dir[File.join("tmp", "*")])
     end
+
+    # This method establishes settings for building an image.
+    #
+    # This will set the `@templates`, `@hook_events`, and `@app_types` instance
+    # variables.
+    #
+    # ### Parameters
+    #
+    # * **folder_name: String**   The name of the folder containing the image
+    #                             files.
+    def set_image_settings(folder_name)
+      @templates = 
+        case folder_name
+        when 'app' then ['Dockerfile', 'before_startup.bash', 'startup.bash']
+        else ['Dockerfile']
+        end
+
+      @hook_events =
+        case folder_name
+        when 'app' then [:startup, :build_checkout]
+        when 'app-dependencies' then [:install_libraries]
+        when 'database' then [:load_database_seeds]
+        else []
+        end
+        
+      @app_types =
+        case folder_name
+        when 'database' then @project.apps.map(&:app_type).uniq
+        else [@app_type.name]
+        end
+    end
+
     
     # This method includes the hooks for an event in a Dockerfile.
     #
@@ -130,20 +140,93 @@ module RubyYacht::Runner
     #
     # ### Parameters
     #
-    # * **event_type: Symbol**     The event whose hooks we are running.
+    # * **event_type: Symbol**      The event whose hooks we are running.
+    # * **times: [Symbol]**         The event times whose hooks we want to
+    #                               include. You can also pass a symbol to this
+    #                               method, which will cause it to include only
+    #                               that event time.
+    # * **options: [Hash]**         Additional flags for customizing the output.
+    #                               At this time, the only option is `in_bash`,
+    #                               which indicates whether the commands are
+    #                               running in bash rather than a Dockerfile.
+    # * **block**                   This also takes a block, which should yield
+    #                               fixed contents for the "during" section of
+    #                               the event.
     #
     # ### Returns
     #
     # A String with the contents of the Dockerfile for running the hooks.
-    def include_event(event_type)
+    def include_event(event_type, times = [:before, :during, :after], options = {})
       result = ""
-      [:before, :during, :after].each do |time|
-        before_hooks = RubyYacht.configuration.fetch_hooks(app_type: @app_type.name, event_type: event_type, event_time: time).each do |hook|
-          result += "RUN #{hook.command}\n"
+      if times.is_a?(Symbol)
+        times = [times]
+      end
+      times.each do |time|
+        if time == :during && block_given?
+          result += yield
+          result += "\n"
+          next
+        end
+        RubyYacht.configuration.fetch_hooks(app_type: @app_type.name, event_type: event_type, event_time: time).each do |hook|
+          if options[:in_bash]
+            result += "#{hook.command};\n"
+          else
+            result += "RUN #{hook.command}\n"
+          end
         end
       end
       
       result
     end
+
+    # This method includes the app environment variables for the current app
+    # type.
+    #
+    # ### Parameters
+    #
+    # * **image_type: Symbol**    The image type that we're building. This can
+    #                             be `app_dependencies`, `app`, or `database`.
+    #
+    # ### Returns
+    #
+    # A String with the contents of the Dockerfile for adding the environment
+    # variables.
+    def include_environment_variables(image_type)
+      result = ""
+      @app_type.environment_variables.select { |variable| variable[:image] == image_type }.each do |variable|
+        result += "ENV #{variable[:name]} #{instance_eval(&variable[:block])}\n"
+      end
+      result
+    end
+
+    # This method includes commands for copying script files for the hooks for
+    # the current app type.
+    #
+    # ### Parameters
+    #
+    # * **event_types: [Symbol]**     The events whose hooks we should include.
+    #
+    # ### Returns
+    #
+    # A String with the contents of the Dockerfile for copying the script.
+    def copy_hooks(event_types)
+      result = ""
+      RubyYacht.configuration.fetch_hooks(app_type: @app_type.name).each do |hook|
+        next if hook.script_name == ''
+        next unless event_types.include?(hook.event_type)
+        result += "COPY #{hook.script_name} /var/docker/#{hook.script_name}\n"
+      end
+      result
+    end
+
+    # This method goes through all the app types for the apps in the project,
+    # sets each one as the `@app_type` instance variable, and then yields to the
+    # block passed to the method.
+    def with_each_app_type
+      @project.apps.map(&:app_type).uniq.each do |app_type|
+        @app_type = RubyYacht.configuration.find_app_type(app_type)
+        yield
+      end
+    end
   end
 end

data/lib/ruby_yacht/runner/run_containers.rb

@@ -26,10 +26,6 @@ module RubyYacht::Runner
         project.apps.each do |app|
           run_container app.name
         end
-        
-        if @project.create_deploy_container
-          run_container :deploy
-        end
       end
       
       @project = projects.first
@@ -59,11 +55,7 @@ module RubyYacht::Runner
     #                                 the system prefix.
     def volume_flags(container_name)
       if @project.check_out_locally && ![:database, :web].include?(container_name)
-        if container_name == :deploy
-          return ["-v $PWD/../code:/var/code"]
-        else
-          return ["-v $PWD/../code/#{container_name}:/var/code"]
-        end
+        return ["-v $PWD/../#{container_name}:/var/code"]
       else
         return []
       end
@@ -84,7 +76,6 @@ module RubyYacht::Runner
       flags = ["-d"]
       flags += dns_server_flags
       flags += volume_flags(name)
-      flags << "-it" if name == :deploy
       flags << "-p 80:80" if name == :web
       flags << "--net=#{@network}"
       flags << "--net-alias=#{container_name}"

data/ruby_yacht.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
   spec.name         = 'ruby_yacht'
-  spec.version      = '0.2.0'
-  spec.date         = '2016-04-17'
+  spec.version      = '0.3.0'
+  spec.date         = '2016-04-19'
   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/dsl/app_type_spec.rb

@@ -50,7 +50,7 @@ describe RubyYacht::AppType do
       block = project_configuration_block
       RubyYacht.configure do
         project :test do
-          instance_eval &block
+          instance_eval(&block)
           app_type_test_foo 'test value'
 
           app_type_test_app :test do
@@ -68,7 +68,7 @@ describe RubyYacht::AppType do
       block = project_configuration_block
       RubyYacht.configure do
         project :test do
-          instance_eval &block
+          instance_eval(&block)
           app_type_test_foo 'test value'
         end
       end
@@ -82,7 +82,7 @@ describe RubyYacht::AppType do
       block = project_configuration_block
       RubyYacht.configure do
         project :test do
-          instance_eval &block
+          instance_eval(&block)
           app_type_test_foo 'test value'
 
           app :test1, :app_type_test do
@@ -102,7 +102,7 @@ describe RubyYacht::AppType do
       block = project_configuration_block
       RubyYacht.configure do
         project :test do
-          instance_eval &block
+          instance_eval(&block)
           app_type_test_foo 'test value'
 
           app :test1, :generic do
@@ -128,7 +128,7 @@ describe RubyYacht::AppType do
         expect(lambda do
           RubyYacht.configure do
             project :test do
-              instance_eval &block
+              instance_eval(&block)
             end
           end
         end).to raise_exception "Missing required attribute app_type_test_foo for RubyYacht::Project::DSL"

data/spec/dsl/project_spec.rb

@@ -35,12 +35,15 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         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.database.name).to eq 'project1'
@@ -70,6 +73,8 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         end
+
+        primary_app :app1
       end
 
       expect { project }.to raise_exception "Missing required attribute system_prefix for RubyYacht::Project::DSL"
@@ -98,6 +103,8 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         end
+
+        primary_app :app1
       end
 
       expect { project }.to raise_exception "Missing required attribute domain for RubyYacht::Project::DSL"
@@ -126,6 +133,8 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         end
+
+        primary_app :app1
       end
 
       expect { project }.to raise_exception "Missing required attribute repository for RubyYacht::Project::DSL"
@@ -147,6 +156,8 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         end
+
+        primary_app :app1
       end
 
       expect(project.apps.count).to eq 0
@@ -169,6 +180,8 @@ describe RubyYacht::Project do
         dns_server do
           server '8.10.1.1'
         end
+
+        primary_app :app1
       end
 
       expect { project }.to raise_exception "Missing required attribute database for RubyYacht::Project::DSL"
@@ -194,9 +207,40 @@ describe RubyYacht::Project do
           username "test"
           password "test"
         end
+
+        primary_app :app1
       end
 
       expect(project.dns_server).to be_nil
     end
+    
+    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
+          repository_name 'brownleej/test1'
+        end
+
+        app :app2, :generic do
+          repository_name 'brownleej/test2'
+        end
+
+        database do
+          host "localhost"
+          name "project1"
+          username "test"
+          password "test"
+        end
+
+        dns_server do
+          server '8.10.1.1'
+        end
+      end
+
+      expect(project.primary_app).to be_nil
+    end
   end
 end

data/spec/fixtures/app-dependencies-dockerfile-generic

@@ -11,10 +11,15 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
+RUN touch /var/docker/.keep
+
+RUN chmod u+x /var/docker/*
 
 RUN git clone git@github.com:brownleej/mars /var/code/mars
 WORKDIR /var/code/mars
 
+RUN rm /var/docker/*
+
 WORKDIR /
 
 RUN apt-get update && apt-get upgrade -y

data/spec/fixtures/app-dependencies-dockerfile-generic-with-library-install

@@ -11,6 +11,7 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
+RUN touch /var/docker/.keep
 
 COPY hook2.rb /var/docker/hook2.rb
 

data/spec/fixtures/app-dependencies-dockerfile-rails

@@ -11,6 +11,7 @@ COPY id_rsa /root/.ssh
 RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
 
 RUN mkdir -p /var/docker/
+RUN touch /var/docker/.keep
 
 COPY install_gems.rb /var/docker/install_gems.rb
 

data/spec/fixtures/mars-dockerfile

@@ -6,20 +6,19 @@ ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-ENV REPOSITORY_NAME brownleej/mars
 COPY checkout.bash /var/docker/checkout.bash
-RUN bash /var/docker/checkout.bash
-
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
 
 RUN chmod u+x /var/docker/*
 
+RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
 EXPOSE 8080

data/spec/fixtures/mars-dockerfile-rails

@@ -6,6 +6,7 @@ ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
 ENV RAILS_ENV development
 ENV SECRET_KEY_BASE abc
@@ -13,10 +14,7 @@ ENV SECRET_KEY_BASE abc
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-ENV REPOSITORY_NAME brownleej/mars
 COPY checkout.bash /var/docker/checkout.bash
-RUN bash /var/docker/checkout.bash
-
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
 COPY update_rails_config.rb /var/docker/update_rails_config.rb
@@ -24,8 +22,8 @@ COPY prepare_rails_for_launch.rb /var/docker/prepare_rails_for_launch.rb
 
 RUN chmod u+x /var/docker/*
 
+RUN /var/docker/checkout.bash
 WORKDIR /var/code
-
 RUN bundle install && bundle clean --force
 
 EXPOSE 8080

data/spec/fixtures/mars-dockerfile-with-after-checkout-hooks

@@ -6,23 +6,21 @@ ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-ENV REPOSITORY_NAME brownleej/mars
 COPY checkout.bash /var/docker/checkout.bash
-RUN bash /var/docker/checkout.bash
-
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
 COPY hook1.rb /var/docker/hook1.rb
 
 RUN chmod u+x /var/docker/*
 
+RUN /var/docker/checkout.bash
 WORKDIR /var/code
-
 RUN /var/docker/hook1.rb
 
 EXPOSE 8080

data/spec/fixtures/mars-dockerfile-with-before-startup-hooks

@@ -6,15 +6,13 @@ ENV DATABASE_PASSWORD test
 ENV DATABASE_USERNAME apollo
 ENV APP_PORT 8080
 ENV REPOSITORY_HOST github.com
+ENV REPOSITORY_NAME brownleej/mars
 ENV SYSTEM_PREFIX apollo
 
 RUN rm -r /var/code
 RUN mkdir -p /var/code
 
-ENV REPOSITORY_NAME brownleej/mars
 COPY checkout.bash /var/docker/checkout.bash
-RUN bash /var/docker/checkout.bash
-
 COPY before_startup.bash /var/docker/before_startup.bash
 COPY startup.bash /var/docker/startup.bash
 COPY hook1.rb /var/docker/hook1.rb
@@ -22,6 +20,7 @@ COPY hook2.rb /var/docker/hook2.rb
 
 RUN chmod u+x /var/docker/*
 
+RUN /var/docker/checkout.bash
 WORKDIR /var/code
 
 EXPOSE 8080

data/spec/fixtures/multi-project-web-dockerfile

@@ -13,12 +13,12 @@ COPY index_config.erb /var/docker/index_config.erb
 COPY app_config.erb /var/docker/app_config.erb
 
 RUN ruby /var/docker/add_project.rb apollo apollo.test.com mars,saturn
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080 false
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
 
 RUN ruby /var/docker/add_project.rb jupiter jupiter.test.com venus,saturn
-RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com venus 8080
-RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com saturn 8080
+RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com venus 8080 false
+RUN ruby /var/docker/add_app.rb jupiter jupiter.test.com saturn 8080 false
 
 RUN rm -r /var/docker
 RUN apt-get remove -y ruby

data/spec/fixtures/web-dockerfile

@@ -13,8 +13,8 @@ COPY index_config.erb /var/docker/index_config.erb
 COPY app_config.erb /var/docker/app_config.erb
 
 RUN ruby /var/docker/add_project.rb apollo apollo.test.com mars,saturn
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080
-RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080 false
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
 
 RUN rm -r /var/docker
 RUN apt-get remove -y ruby

data/spec/fixtures/web-dockerfile-with-primary-app

@@ -0,0 +1,20 @@
+FROM nginx
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y ruby
+
+RUN mkdir -p /var/docker
+
+COPY add_project.rb /var/docker/add_project.rb
+COPY add_app.rb /var/docker/add_app.rb
+COPY index.html.erb /var/docker/index.html.erb
+COPY index_config.erb /var/docker/index_config.erb
+COPY app_config.erb /var/docker/app_config.erb
+
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com mars 8080 true
+RUN ruby /var/docker/add_app.rb apollo apollo.test.com saturn 8080 false
+
+RUN rm -r /var/docker
+RUN apt-get remove -y ruby
+RUN apt-get autoremove -y

data/spec/plugins/rails_spec.rb

@@ -170,7 +170,7 @@ describe RubyYacht::Plugins::Rails do
     it "generates the dockerfiles for the web server" do
       docker.expect "build -t apollo-web tmp" do
         files = Dir[File.join("tmp", "*")].sort
-        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb', 'tmp/setup.rb']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile'))
         expect(dockerfile).to eq expected

data/spec/runner/build_images_spec.rb

@@ -63,7 +63,7 @@ describe RubyYacht::Runner::BuildImages do
     it "generates the dockerfiles for the web server" do
       docker.expect "build -t apollo-web tmp" do
         files = Dir[File.join("tmp", "*")].sort
-        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb', 'tmp/setup.rb']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
         expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile'))
         expect(dockerfile).to eq expected
@@ -158,18 +158,18 @@ describe RubyYacht::Runner::BuildImages do
         end
       end
     end
-    
-    context "with a deploy container" do
+
+    context "with an app set up as the primary app" do
       before do
-        RubyYacht.configuration.projects.first.create_deploy_container = true
+        RubyYacht.configuration.projects[0].primary_app = :mars
       end
-      
-      it "creates the deploy container" do
-        docker.expect("build -t apollo-deploy tmp") do
+
+      it "includes that app in the setup in the web server dockerfile" do
+        docker.expect "build -t apollo-web tmp" do
           files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
-          expected = File.read(File.join('spec', 'fixtures', 'deploy-dockerfile'))
+          expected = File.read(File.join('spec', 'fixtures', 'web-dockerfile-with-primary-app'))
           expect(dockerfile).to eq expected
         end
         subject.run
@@ -198,7 +198,7 @@ describe RubyYacht::Runner::BuildImages do
       it "generates one dockerfile for the web server with both projects" do
         docker.expect "build -t apollo-web tmp" do
           files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb', 'tmp/setup.rb']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/add_app.rb', 'tmp/add_project.rb', 'tmp/app_config.erb', 'tmp/index.html.erb', 'tmp/index_config.erb']
           dockerfile = File.read(File.join('tmp', 'Dockerfile'))
           expected = File.read(File.join('spec', 'fixtures', 'multi-project-web-dockerfile'))
           expect(dockerfile).to eq expected

data/spec/runner/run_containers_spec.rb

@@ -32,21 +32,6 @@ describe RubyYacht::Runner::RunContainers do
       expect(subject.run).to be_truthy
     end
     
-    context "with a deploy container" do
-      before do
-        RubyYacht.configuration.projects.first.create_deploy_container = true
-      end
-      
-      it "runs the deploy container" do
-        docker.expect 'run -d -it --net=apollo --net-alias=apollo-deploy --name=apollo-deploy apollo-deploy'
-        subject.run
-      end
-    
-      it "returns true" do
-        expect(subject.run).to be_truthy
-      end
-    end
-    
     context "with a local database" do
       before do
         RubyYacht.configuration.projects.first.database.host = 'localhost'
@@ -106,28 +91,14 @@ describe RubyYacht::Runner::RunContainers do
       end
       
       it "maps the code volume to a local directory" do
-        docker.expect 'run -d -v $PWD/../code/mars:/var/code --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
-        docker.expect 'run -d -v $PWD/../code/saturn:/var/code --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
+        docker.expect 'run -d -v $PWD/../mars:/var/code --net=apollo --net-alias=apollo-mars --name=apollo-mars apollo-mars'
+        docker.expect 'run -d -v $PWD/../saturn:/var/code --net=apollo --net-alias=apollo-saturn --name=apollo-saturn apollo-saturn'
         subject.run
       end
     
       it "returns true" do
         expect(subject.run).to be_truthy
       end
-      
-      context "when creating a deploy container" do
-        before do
-          RubyYacht.configuration.projects.first.create_deploy_container = true
-        end
-        it "maps the code volume to a local directory" do
-          docker.expect 'run -d -v $PWD/../code:/var/code -it --net=apollo --net-alias=apollo-deploy --name=apollo-deploy apollo-deploy'
-          subject.run
-        end
-    
-      it "returns true" do
-        expect(subject.run).to be_truthy
-      end
-      end
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_yacht
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Brownlee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -89,14 +89,12 @@ files:
 - 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/deploy/Dockerfile.erb
 - lib/ruby_yacht/images/web/Dockerfile.erb
 - lib/ruby_yacht/images/web/add_app.rb
 - lib/ruby_yacht/images/web/add_project.rb
 - lib/ruby_yacht/images/web/app_config.erb
 - lib/ruby_yacht/images/web/index.html.erb
 - lib/ruby_yacht/images/web/index_config.erb
-- lib/ruby_yacht/images/web/setup.rb
 - lib/ruby_yacht/plugins.rb
 - lib/ruby_yacht/plugins/rails.rb
 - lib/ruby_yacht/plugins/rails/scripts/install_gems.rb
@@ -146,6 +144,7 @@ files:
 - spec/fixtures/mars-startup-rails
 - spec/fixtures/multi-project-web-dockerfile
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-with-primary-app
 - spec/plugins/rails_spec.rb
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb
@@ -216,6 +215,7 @@ test_files:
 - spec/fixtures/mars-startup-rails
 - spec/fixtures/multi-project-web-dockerfile
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-with-primary-app
 - spec/plugins/rails_spec.rb
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb

data/lib/ruby_yacht/images/deploy/Dockerfile.erb

@@ -1,2 +0,0 @@
-FROM <%= @project.system_prefix %>-app-dependencies
-CMD bash

data/lib/ruby_yacht/images/web/setup.rb

@@ -1,22 +0,0 @@
-#! /usr/local/bin/ruby
-require 'erb'
-require 'fileutils'
-
-@project = ARGV.shift
-@domain = ARGV.shift
-@app_names = ARGV.shift.split(',')
-@app_ports = ARGV.shift.split(',')
-
-File.open(File.join("/usr/share/nginx/html/#{@project}.html"), 'w') do |file|
-  file.write(ERB.new(File.read('/var/docker/index.html.erb')).result(binding))
-end
-
-File.open(File.join("/etc/nginx/conf.d/#{@project}.conf"), 'w') do |file|
-  file.write(ERB.new(File.read('/var/docker/index_config.erb')).result(binding))
-  @app_names.each_with_index do |app, port|
-    @app = app
-    @app_port = port
-    @container_name = @project + '-' + @app
-    file.write(ERB.new(File.read('/var/docker/app_config.erb')).result(binding))
-  end
-end