stack_car 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c72e980bbffa17149e6be7837ad3ad9e5976067c
-  data.tar.gz: e145e199cc0618a45a819a788be3f48b06e88874
+  metadata.gz: f6733f0600c47bc8fe2254c6cb13f319f95c951e
+  data.tar.gz: 6d6ae0940f19e2f2ad7ca10878f2d359018940d9
 SHA512:
-  metadata.gz: dd315865d0ad824d4cf554fddb8840d562ff14f21bea436c7678db68b532d9bb5c0da77b9b83e4c2b3cc289c5edf702f6bbe89d144f53f89d4b1a1eb4cc265bb
-  data.tar.gz: 404f6a4b47a30caa5abe10f67cd5835eab88a3e567a860906a139d343105e9df0ab172d9469e798d85b60bf6d937ade496ed17e410692d246d21205377fa666c
+  metadata.gz: 1ce405538df50e3ea51e9adb2cf6664333091ba2a96689c17a09a308ad6d94e6a20531c0384fad527ca17436ab6ff698e6b6f12cbd81b133d6decbdb07de59c8
+  data.tar.gz: 1a3c3b6627138f91875d0d0bd66bb9726e1ed3759e124bb7ee8f49602ae15ec35a64e1df51314557d39530e806b05299beb35d8a7d80dd1d549fa953d504d608

data/lib/stack_car/cli.rb

@@ -11,13 +11,14 @@ module StackCar
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
-    method_option :build, default: true, type: :boolean, aliases: '-b'
+    method_option :build, default: false, type: :boolean, aliases: '-b'
     desc "up", "starts docker-compose with rebuild and orphan removal, defaults to web"
     def up
       args = ['--remove-orphans']
       args << '--build' if options[:build]
       run("rm -rf tmp/pids/server.pid")
       run("docker-compose up #{args.join(' ')} #{options[:service]}")
+# TODO      run("docker cp #{@project_name}_#{options[:service]}_1:/bundle .")
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
@@ -32,7 +33,6 @@ module StackCar
     def build
       @project_name = File.basename(File.expand_path('.'))
       run("docker-compose build #{options[:service]}")
-      run("docker cp #{@project_name}_#{options[:service]}_1:/bundle .")
     end
 
 
@@ -114,10 +114,19 @@ module StackCar
      @db_libs = @db_libs.join(' ')
 
 
-      ['.dockerignore', 'Dockerfile', 'docker-compose.yml', 'docker-compose-prod.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
+     ['.dockerignore', 'Dockerfile', 'docker-compose.yml', 'docker-compose-prod.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
+       puts template_file
         template("#{template_file}.erb", template_file)
-      end
-      empty_directory('bundle')
+     end
+     template("database.yml.erb", "config/database.yml")
+     empty_directory('bundle')
+     run("touch bundle/.gitkeep && git add bundle/.gitkeep") unless File.exists?('bundle/.gitkeep')
+     insert_into_file "config/environment.rb", "/bundle", :after => "/.bundle"
+
+     prepend_to_file "README.md" do
+       File.read("#{self.class.source_root}/README.md")
+     end
+
       if options[:deploy] || options[:rancher]
         directory('ops')
         ['hosts'].each do |template_file|

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/templates/.env.erb

@@ -2,12 +2,18 @@
 POSTGRES_DB=<%= @project_name %>
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=DatabaseFTW
+POSTGRES_HOST=postgres
+TEST_DB=<%= @project_name %>
 <% end -%>
 <% if options[:mysql] -%>
 MYSQL_DATABASE=<%= @project_name %>
+MYSQL_USER=root
+MYSQL_PASSWORD=DatabaseFTW
 MYSQL_ROOT_PASSWORD=DatabaseFTW
+MYSQL_HOST=mysql
+TEST_DB=<%= @project_name %>
 <% end -%>
 <% if options[:deploy] || options[:rancher] -%>
 REGISTRY_HOST=registry.gitlab.com
-REGISTRY_URI /TODO/<%= @project_name %>
+REGISTRY_URI=/TODO/<%= @project_name %>
 <% end -%>

data/templates/.gitlab-ci.yml.erb

@@ -18,12 +18,12 @@ services:
 
 variables:
   <% if options[:postgres] -%>
-  POSTGRES_DB: <%= project_name %>
+  POSTGRES_DB: <%= @project_name %>
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: DatabaseFTW
   <% end -%>
   <% if options[:MYSQL] -%>
-  MYSQL_DATABASE: <%= project_name %>
+  MYSQL_DATABASE: <%= @project_name %>
   MYSQL_ROOT_PASSWORD: DatabaseFTW
   <% end -%>
 

data/templates/Dockerfile.erb

@@ -2,7 +2,7 @@ FROM ruby:2.3.0
 
 RUN apt-get update -qq && apt-get install -y build-essential nodejs pv libsasl2-dev <%= @db_libs %> && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 <% if options[:fcrepo] %>
 RUN mkdir -p /opt/fits && \

data/templates/README.md

@@ -0,0 +1,23 @@
+# Docker development setup
+
+1) Install Docker.app 
+
+2) Get .env file from team member
+
+3) gem install stack_car
+
+4) sc up
+
+``` bash
+gem install stack_car
+sc up
+
+```
+
+# Deploy a new release
+
+``` bash
+sc release {staging | production} # creates and pushes the correct tags
+sc deploy {staging | production} # deployes those tags to the server
+```
+

data/templates/database.yml.erb

@@ -0,0 +1,31 @@
+<% if options[:mysql] -%>
+login: &login
+  adapter: mysql2
+  host: <%%= ENV['MYSQL_HOST'] %>
+  username: <%%= ENV['MYSQL_USER'] %>
+  password: <%%= ENV['MYSQL_PASSWORD'] %>
+  database: <%%= ENV['MYSQL_DATABASE'] %>
+<% end -%>
+<% if options[:postgres] -%>
+login: &login
+  adapter: postgresql
+  host: <%%= ENV['POSTGRES_HOST'] %>
+  username: <%%= ENV['POSTGRES_USER'] %>
+  password: <%%= ENV['POSTGRES_PASSWORD'] %>
+  database: <%%= ENV['POSTGRES_DB'] %>
+<% end -%>
+
+
+development:
+  <<: *login
+
+test:
+  <<: *login
+  database: <%%= ENV['TEST_DB'] %>
+
+staging:
+  <<: *login
+
+
+production:
+  <<: *login

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,6 +140,8 @@ files:
 - templates/.env.erb
 - templates/.gitlab-ci.yml.erb
 - templates/Dockerfile.erb
+- templates/README.md
+- templates/database.yml.erb
 - templates/docker-compose-prod.yml.erb
 - templates/docker-compose.yml.erb
 - templates/hosts.erb