ruby_yacht 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad849de99b81055226aa81f2958813df81795b9
-  data.tar.gz: a29a356d8cc8c63727f3b5ef90665b7d4f4394eb
+  metadata.gz: f958d7dd279688e4f761cfabde4f10696fea04f1
+  data.tar.gz: 921dfd094b9fdea99292b7daf03abb92c3f47415
 SHA512:
-  metadata.gz: 45665a1e24640f5d2d2d4a391ce3dc9e23c4ced4fc93f0fc96dae1d3979ad481e08c47cf6ba461e93c24ce742eeb4e1e0aa464367110c1d1401a76de72ac6311
-  data.tar.gz: ea27fca3dbb8afabe51d2b3d1a77b3d3c567259faa53aaf09d0f5959aa03a59a13d750cc32349f994e771ae0ad477bd8d36314a9eeb5a02f81900eaee806afe1
+  metadata.gz: 6dd1410db4ef7cda53b1d5029102176c49e259896cde6cc68f882d65a03f02404382a667aa6551eedc829540fa89be75c59845d50e401e680fdf703df31cbe2a
+  data.tar.gz: 529f3f2489158df1ec5e535955286fb4fbad23f310e67cb2ea86ed3fd783a98f442f490e8221eba69004e5f9d8123d6698d81a83d90c4be7914703289f8f4ebd

data/.rubocop.yml

@@ -224,12 +224,6 @@ Metrics/ClassLength:
   Enabled: true
   Max: 250
 
-Metrics/CyclomaticComplexity:
-  Description: >-
-                 A complexity metric that is strongly correlated to the number
-                 of test cases needed to validate a method.
-  Enabled: true
-
 Metrics/LineLength:
   Description: 'Limit lines to 80 characters.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#80-character-limits'

data/Gemfile.lock

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

data/doc/TODO.md

@@ -12,6 +12,7 @@ for open tickets.
 # Plugins
 
 * Better support for rails apps with no database
+* Configurable ports for database servers
 
 # More customization
 

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

@@ -10,7 +10,8 @@ ENV DATABASE_TYPE <%= @database.server_type %>
 <% end %>
 
 COPY checkout.bash /var/docker/checkout.bash
-<%= copy_hooks [:install_libraries, :create_databases] %>
+COPY startup.bash /var/docker/startup.bash
+<%= copy_hooks [:install_libraries, :create_databases, :startup] %>
 <% with_each_app_type do %>
 <%= copy_hooks [:load_database_seeds] %>
 <% end %>
@@ -21,6 +22,7 @@ RUN chmod u+x /var/docker/*
 
 <%= include_event :create_databases %>
 
+<% original_server_type = @server_type %>
 <% apps = @project.apps.select { |app| app.database_name == @database.name } %>
 <% apps.each do |app| %>
 <% @server_type = RubyYacht.configuration.find_server_type(app.server_type) %>
@@ -30,8 +32,10 @@ WORKDIR /var/code/<%= app.name %>
 <%= include_event :load_database_seeds %>
 <% end %>
 
-RUN rm -r /var/docker
+<% @server_type = original_server_type %>
+
 RUN rm -r /var/code
+WORKDIR /
 
 ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
@@ -39,4 +43,4 @@ ENV DATABASE_NAME ''
 
 EXPOSE 3306
 
-CMD mysqld_safe --bind-address=0.0.0.0
+CMD /var/docker/startup.bash

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

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+<%= include_event :startup, [:before, :during], in_bash: true %>

data/lib/ruby_yacht/plugins/mysql.rb

@@ -18,6 +18,7 @@ module RubyYacht::Plugins
         add_hooks(server_type: :mysql, folder: File.join(File.dirname(__FILE__), 'mysql', 'scripts')) do
           during(:install_libraries) { command 'apt-get install -y mysql-server' }
           during(:create_databases) { run_script 'setup.bash' }
+          during(:startup) { command 'mysqld_safe --bind-address=0.0.0.0' }
         end
       end
     end

data/lib/ruby_yacht/runner/build_images.rb

@@ -31,8 +31,8 @@ module RubyYacht::Runner
           build_image 'app-dependencies', "#{@project.system_prefix}-#{@server_type.name}-app-dependencies"
         end
         
+        @app_server_type = RubyYacht.configuration.find_server_type(project.apps.first.server_type)
         project.databases.select(&:local?).each do |database|
-          @app_server_type = @server_type
           @database = database
           @server_type = RubyYacht.configuration.find_server_type(@database.server_type)
           build_image 'database', @database.container_name(@project)
@@ -107,8 +107,8 @@ module RubyYacht::Runner
 
     # This method establishes settings for building an image.
     #
-    # This will set the `@templates`, `@hook_events`, and `@server_types` instance
-    # variables.
+    # This will set the `@templates`, `@hook_events`, and `@server_types`
+    # instance variables.
     #
     # ### Parameters
     #
@@ -118,6 +118,7 @@ module RubyYacht::Runner
       @templates = 
         case folder_name
         when 'app' then ['Dockerfile', 'before_startup.bash', 'startup.bash']
+        when 'database' then ['Dockerfile', 'startup.bash']
         else ['Dockerfile']
         end
 

data/ruby_yacht.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name         = 'ruby_yacht'
-  spec.version      = '0.4.2'
+  spec.version      = '0.4.3'
   spec.date         = '2016-04-27'
   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"

data/spec/fixtures/database-dockerfile

@@ -1,4 +1,4 @@
-FROM apollo-debian-app-dependencies
+FROM apollo-generic-app-dependencies
 
 ENV DATABASE_USERNAME apollo
 ENV DATABASE_PASSWORD test
@@ -6,14 +6,15 @@ ENV DATABASE_NAME apollo
 ENV DATABASE_TYPE sqlite
 
 COPY checkout.bash /var/docker/checkout.bash
+COPY startup.bash /var/docker/startup.bash
 
 RUN chmod u+x /var/docker/*
 
 RUN /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars
 
-RUN rm -r /var/docker
 RUN rm -r /var/code
+WORKDIR /
 
 ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
@@ -21,4 +22,4 @@ ENV DATABASE_NAME ''
 
 EXPOSE 3306
 
-CMD mysqld_safe --bind-address=0.0.0.0
+CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-mysql

@@ -7,6 +7,7 @@ ENV DATABASE_TYPE mysql
 ENV DEBIAN_FRONTEND noninteractive
 
 COPY checkout.bash /var/docker/checkout.bash
+COPY startup.bash /var/docker/startup.bash
 COPY setup.bash /var/docker/setup.bash
 
 RUN chmod u+x /var/docker/*
@@ -18,8 +19,8 @@ RUN /var/docker/setup.bash
 RUN /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars
 
-RUN rm -r /var/docker
 RUN rm -r /var/code
+WORKDIR /
 
 ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
@@ -27,4 +28,4 @@ ENV DATABASE_NAME ''
 
 EXPOSE 3306
 
-CMD mysqld_safe --bind-address=0.0.0.0
+CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-rails

@@ -6,6 +6,7 @@ ENV DATABASE_NAME apollo
 ENV DATABASE_TYPE sqlite
 
 COPY checkout.bash /var/docker/checkout.bash
+COPY startup.bash /var/docker/startup.bash
 COPY load_seeds.rb /var/docker/load_seeds.rb
 
 RUN chmod u+x /var/docker/*
@@ -18,8 +19,8 @@ RUN /var/docker/checkout.bash github.com saturn brownleej/saturn
 WORKDIR /var/code/saturn
 RUN /var/docker/load_seeds.rb
 
-RUN rm -r /var/docker
 RUN rm -r /var/code
+WORKDIR /
 
 ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
@@ -27,4 +28,4 @@ ENV DATABASE_NAME ''
 
 EXPOSE 3306
 
-CMD mysqld_safe --bind-address=0.0.0.0
+CMD /var/docker/startup.bash

data/spec/fixtures/database-dockerfile-with-seed-hooks

@@ -1,4 +1,4 @@
-FROM apollo-debian-app-dependencies
+FROM apollo-generic-app-dependencies
 
 ENV DATABASE_USERNAME apollo
 ENV DATABASE_PASSWORD test
@@ -6,6 +6,7 @@ ENV DATABASE_NAME apollo
 ENV DATABASE_TYPE sqlite
 
 COPY checkout.bash /var/docker/checkout.bash
+COPY startup.bash /var/docker/startup.bash
 COPY hook1.rb /var/docker/hook1.rb
 
 RUN chmod u+x /var/docker/*
@@ -14,8 +15,8 @@ RUN /var/docker/checkout.bash github.com mars brownleej/mars
 WORKDIR /var/code/mars
 RUN /var/docker/hook1.rb
 
-RUN rm -r /var/docker
 RUN rm -r /var/code
+WORKDIR /
 
 ENV DATABASE_USERNAME ''
 ENV DATABASE_PASSWORD ''
@@ -23,4 +24,4 @@ ENV DATABASE_NAME ''
 
 EXPOSE 3306
 
-CMD mysqld_safe --bind-address=0.0.0.0
+CMD /var/docker/startup.bash

data/spec/fixtures/database-startup-mysql

@@ -0,0 +1,3 @@
+#! /bin/bash
+
+mysqld_safe --bind-address=0.0.0.0;

data/spec/plugins/mysql_spec.rb

@@ -48,10 +48,11 @@ describe RubyYacht::Plugins::MySQL do
     it "copies the scripts to the docker folder" 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/setup.bash']
+        expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/setup.bash', 'tmp/startup.bash', 'tmp/startup.bash.erb']
       end
       subject.run
     end
+
     it "builds the dockerfile for a MySQL database" do
       docker.expect("build -t apollo-database tmp") do
         dockerfile = File.read(File.join('tmp', 'Dockerfile'))
@@ -60,5 +61,14 @@ describe RubyYacht::Plugins::MySQL do
       end
       subject.run
     end
+
+    it "builds the startup script for a MySQL database" do
+      docker.expect("build -t apollo-database tmp") do
+        startup_file = File.read(File.join('tmp', 'startup.bash'))
+        expected = File.read(File.join('spec', 'fixtures', 'database-startup-mysql'))
+        expect(startup_file).to eq expected
+      end
+      subject.run
+    end
   end
 end

data/spec/plugins/rails_spec.rb

@@ -246,7 +246,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/install_gems.rb', 'tmp/load_seeds.rb']
+          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/install_gems.rb', 'tmp/load_seeds.rb', '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

data/spec/runner/build_images_spec.rb

@@ -109,7 +109,7 @@ describe RubyYacht::Runner::BuildImages do
       it "builds the database" do
         docker.expect("build -t apollo-mysql tmp") do
           files = Dir[File.join("tmp", "*")].sort
-          expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash']
+          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'))
           expect(dockerfile).to eq expected
@@ -136,7 +136,7 @@ describe RubyYacht::Runner::BuildImages do
         it "copies the files for the hooks to the database" do
           docker.expect("build -t apollo-mysql tmp") do
             files = Dir[File.join("tmp", "*")].sort
-            expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/hook1.rb']
+            expect(files).to eq ['tmp/Dockerfile', 'tmp/Dockerfile.erb', 'tmp/checkout.bash', 'tmp/hook1.rb', 'tmp/startup.bash', 'tmp/startup.bash.erb']
           end
           subject.run
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_yacht
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - John Brownlee
@@ -88,6 +88,7 @@ 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/startup.bash.erb
 - lib/ruby_yacht/images/web/Dockerfile.erb
 - lib/ruby_yacht/images/web/add_app.rb
 - lib/ruby_yacht/images/web/add_project.rb
@@ -132,6 +133,7 @@ files:
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
 - spec/fixtures/database-dockerfile-with-seed-hooks
+- spec/fixtures/database-startup-mysql
 - spec/fixtures/deploy-dockerfile
 - spec/fixtures/hooks/hook1.rb
 - spec/fixtures/hooks/hook2.rb
@@ -210,6 +212,7 @@ test_files:
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
 - spec/fixtures/database-dockerfile-with-seed-hooks
+- spec/fixtures/database-startup-mysql
 - spec/fixtures/deploy-dockerfile
 - spec/fixtures/hooks/hook1.rb
 - spec/fixtures/hooks/hook2.rb