ruby_yacht 0.5.0 → 0.6.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_yacht
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - John Brownlee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,9 +52,38 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A DSL for building docker containers for a family of Rails apps
 email: apps@mail.johnbrownlee.com
-executables: []
+executables:
+- ruby_yacht
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,6 +98,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- bin/ruby_yacht
 - doc/TODO.md
 - doc/configuration.md
 - doc/configuration_sample.rb
@@ -84,6 +114,7 @@ files:
 - lib/ruby_yacht/dsl/hook.rb
 - lib/ruby_yacht/dsl/project.rb
 - lib/ruby_yacht/dsl/server_type.rb
+- lib/ruby_yacht/dsl/web_server.rb
 - lib/ruby_yacht/images/app-dependencies/Dockerfile.erb
 - lib/ruby_yacht/images/app/Dockerfile.erb
 - lib/ruby_yacht/images/app/before_startup.bash.erb
@@ -93,15 +124,17 @@ files:
 - 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
-- 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/plugins.rb
 - lib/ruby_yacht/plugins/mysql.rb
 - lib/ruby_yacht/plugins/mysql/scripts/setup.bash
+- lib/ruby_yacht/plugins/nginx.rb
+- lib/ruby_yacht/plugins/nginx/scripts/add_app.rb
+- lib/ruby_yacht/plugins/nginx/scripts/add_project.rb
+- lib/ruby_yacht/plugins/nginx/scripts/app_config.erb
+- lib/ruby_yacht/plugins/nginx/scripts/index.html.erb
+- lib/ruby_yacht/plugins/nginx/scripts/index_config.erb
 - lib/ruby_yacht/plugins/rails.rb
+- lib/ruby_yacht/plugins/rails/scripts/build_new_app.rb
 - lib/ruby_yacht/plugins/rails/scripts/install_gems.rb
 - lib/ruby_yacht/plugins/rails/scripts/load_seeds.rb
 - lib/ruby_yacht/plugins/rails/scripts/prepare_rails_for_launch.rb
@@ -111,6 +144,7 @@ files:
 - lib/ruby_yacht/runner/build_images.rb
 - lib/ruby_yacht/runner/checkout.rb
 - lib/ruby_yacht/runner/command.rb
+- lib/ruby_yacht/runner/create_new_project.rb
 - lib/ruby_yacht/runner/help.rb
 - lib/ruby_yacht/runner/implode.rb
 - lib/ruby_yacht/runner/run_containers.rb
@@ -118,9 +152,12 @@ files:
 - lib/ruby_yacht/runner/services.rb
 - lib/ruby_yacht/runner/shell.rb
 - lib/ruby_yacht/runner/update_hosts.rb
+- log/.gitkeep
 - ruby_yacht.gemspec
 - spec/docker/Dockerfile
-- spec/docker/build.bash
+- spec/docker/install_gems.bash
+- spec/docker/run.bash
+- spec/docker/startup.bash
 - spec/dsl/app_spec.rb
 - spec/dsl/configuration_spec.rb
 - spec/dsl/database_spec.rb
@@ -129,40 +166,61 @@ files:
 - spec/dsl/hook_spec.rb
 - spec/dsl/project_spec.rb
 - spec/dsl/server_type_spec.rb
+- spec/dsl/web_server_spec.rb
+- spec/fixtures/apollo-new-project-config
 - 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-with-no-repository
 - spec/fixtures/database-dockerfile
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
+- spec/fixtures/database-dockerfile-rails-with-no-repository
 - 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
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
 - spec/fixtures/mars-before-startup-with-custom-file-copy
+- spec/fixtures/mars-before-startup-with-no-repository
 - spec/fixtures/mars-dockerfile
 - spec/fixtures/mars-dockerfile-rails
+- spec/fixtures/mars-dockerfile-rails-with-no-repository
 - spec/fixtures/mars-dockerfile-with-after-checkout-hooks
 - spec/fixtures/mars-dockerfile-with-before-startup-hooks
 - spec/fixtures/mars-dockerfile-with-custom-file-copy
 - spec/fixtures/mars-dockerfile-with-local-database
+- spec/fixtures/mars-dockerfile-with-no-repository
 - spec/fixtures/mars-dockerfile-with-remote-database
 - spec/fixtures/mars-startup
 - spec/fixtures/mars-startup-rails
-- spec/fixtures/multi-project-web-dockerfile
+- spec/fixtures/mars-startup-rails-with-no-repository
+- spec/fixtures/mars-startup-with-no-repository
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-jupiter
+- 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/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
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb
 - spec/runner/checkout_spec.rb
 - spec/runner/command_spec.rb
+- spec/runner/create_new_project_spec.rb
 - spec/runner/help_spec.rb
 - spec/runner/implode_spec.rb
 - spec/runner/run_containers_spec.rb
@@ -172,6 +230,7 @@ files:
 - spec/runner/update_hosts_spec.rb
 - spec/spec_helper.rb
 - spec/support/docker_stubbing.rb
+- spec/support/integration_helpers.rb
 - spec/support/test_project.rb
 homepage: https://github.com/brownleej/ruby-yacht
 licenses:
@@ -199,7 +258,9 @@ specification_version: 4
 summary: A DSL for building docker containers for a family of Rails apps
 test_files:
 - spec/docker/Dockerfile
-- spec/docker/build.bash
+- spec/docker/install_gems.bash
+- spec/docker/run.bash
+- spec/docker/startup.bash
 - spec/dsl/app_spec.rb
 - spec/dsl/configuration_spec.rb
 - spec/dsl/database_spec.rb
@@ -208,40 +269,61 @@ test_files:
 - spec/dsl/hook_spec.rb
 - spec/dsl/project_spec.rb
 - spec/dsl/server_type_spec.rb
+- spec/dsl/web_server_spec.rb
+- spec/fixtures/apollo-new-project-config
 - 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-with-no-repository
 - spec/fixtures/database-dockerfile
 - spec/fixtures/database-dockerfile-mysql
 - spec/fixtures/database-dockerfile-rails
+- spec/fixtures/database-dockerfile-rails-with-no-repository
 - 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
 - spec/fixtures/mars-before-startup
 - spec/fixtures/mars-before-startup-rails
 - spec/fixtures/mars-before-startup-with-before-startup-hooks
 - spec/fixtures/mars-before-startup-with-custom-file-copy
+- spec/fixtures/mars-before-startup-with-no-repository
 - spec/fixtures/mars-dockerfile
 - spec/fixtures/mars-dockerfile-rails
+- spec/fixtures/mars-dockerfile-rails-with-no-repository
 - spec/fixtures/mars-dockerfile-with-after-checkout-hooks
 - spec/fixtures/mars-dockerfile-with-before-startup-hooks
 - spec/fixtures/mars-dockerfile-with-custom-file-copy
 - spec/fixtures/mars-dockerfile-with-local-database
+- spec/fixtures/mars-dockerfile-with-no-repository
 - spec/fixtures/mars-dockerfile-with-remote-database
 - spec/fixtures/mars-startup
 - spec/fixtures/mars-startup-rails
-- spec/fixtures/multi-project-web-dockerfile
+- spec/fixtures/mars-startup-rails-with-no-repository
+- spec/fixtures/mars-startup-with-no-repository
 - spec/fixtures/web-dockerfile
+- spec/fixtures/web-dockerfile-jupiter
+- 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/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
 - spec/runner/build_images_spec.rb
 - spec/runner/build_spec.rb
 - spec/runner/checkout_spec.rb
 - spec/runner/command_spec.rb
+- spec/runner/create_new_project_spec.rb
 - spec/runner/help_spec.rb
 - spec/runner/implode_spec.rb
 - spec/runner/run_containers_spec.rb
@@ -251,4 +333,5 @@ test_files:
 - spec/runner/update_hosts_spec.rb
 - spec/spec_helper.rb
 - spec/support/docker_stubbing.rb
+- spec/support/integration_helpers.rb
 - spec/support/test_project.rb

data/spec/docker/build.bash

@@ -1,10 +0,0 @@
-#! /bin/bash
-
-# This script builds a docker container for running tests.
-#
-# This keeps the development dependencies isolated from other parts of the
-# system.
-
-docker build -t ruby-yacht-tests spec/docker
-docker rm -f ruby-yacht-tests 2> /dev/null
-docker run -dit --name=ruby-yacht-tests -v $PWD:/var/code ruby-yacht-tests 

data/spec/fixtures/deploy-dockerfile

@@ -1,2 +0,0 @@
-FROM apollo-app-dependencies
-CMD bash

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

@@ -1,25 +0,0 @@
-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_project.rb apollo apollo.test.com mars,saturn
-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 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
-RUN apt-get autoremove -y