stack_car 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5c18ca3a905df3da0c9039321540b89745d2423
-  data.tar.gz: 73bb0eccbcf82a7bd062c480eeb4444976c71195
+  metadata.gz: ab548993e40ac69f202ebd527b9267a894384564
+  data.tar.gz: e83132c55cb05ecbfa64030fc4ef1c285a30e4ea
 SHA512:
-  metadata.gz: 3f0d974686a5500bf35d12c4ec3f69f1c1b5093e82ea8105529ab386c7b664c633ffc927398c4807a98674481d3f3ebe8b77ff05bb5a1425a4360fcd1137eff1
-  data.tar.gz: 550714d0683a6f3f0b7abd35b8b9899a7a4143066c450fb73adfcc88538f57c9da72c41808c131be270f14e2dbdb0da5f2dd812a76e184f05cb7b586177785e6
+  metadata.gz: 83328c92add8711e0d8a22519de375069ad8f3b11e5741eca0daaee75305564bdda5038f74183cb6da4b2c0da830791dfb2a2ea613761720b80fb373be6e99dc
+  data.tar.gz: 070fc4e7bf7d2d00a3b0607ac23d20ae77f33c3fdf398b605383c362dd527167634c64c3b2002738d6a4320b635cd8bbf9815536f8fd9c969fc882283789dacd

data/exe/sc

@@ -1 +1 @@
-stack_car
+exe/stack_car

data/lib/stack_car/cli.rb

@@ -12,25 +12,16 @@ module StackCar
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
     method_option :build, default: false, type: :boolean, aliases: '-b'
-    method_option :foreground, default: false, type: :boolean, aliases: '-f'
     method_option :logs, default: true, type: :boolean
     desc "up", "starts docker-compose with rebuild and orphan removal, defaults to web"
     def up
       args = ['--remove-orphans']
       args << '--build' if options[:build]
-      args << '-d' if !options[:foreground]
       if options[:build]
         run("docker-compose pull #{options[:service]}")
       end
 
       run("docker-compose up #{args.join(' ')} #{options[:service]}")
-
-      if options[:build]
-        @project_name = File.basename(File.expand_path('.'))
-        say 'copying bundle to local, you can start using the app now.'
-        run("docker cp #{@project_name}_#{options[:service]}_1:/bundle .") if options[:build]
-      end
-      run("docker-compose logs --tail 20 --follow ") if options[:logs]
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
@@ -63,8 +54,6 @@ module StackCar
     desc "bundle ARGS", "wraps docker-compose run web unless --service is used to specify"
     def bundle(*args)
       run("docker-compose exec #{options[:service]} bundle")
-      @project_name = File.basename(File.expand_path('.'))
-      run("docker cp #{@project_name}_#{options[:service]}_1:/bundle .")
     end
 
     method_option :service, default: 'web', type: :string, aliases: '-s'
@@ -119,9 +108,10 @@ module StackCar
     method_option :postgres, default: false, type: :boolean, aliases: '-p'
     method_option :mysql, default: false, type: :boolean, aliases: '-m'
     method_option :redis, default: false, type: :boolean, aliases: '-r'
-    method_option :delayed_job, default: false, type: :boolean, aliases: '-dj'
+    method_option :delayed_job, default: false, type: :boolean, aliases: '-j'
     method_option :fcrepo, default: false, type: :boolean, aliases: '-f'
     method_option :deploy, default: false, type: :boolean, aliases: '-d'
+    method_option :heroku, default: false, type: :boolean, aliases: '-h'
     method_option :rancher, default: false, type: :boolean, aliases: '-dr'
     method_option :sidekiq, default: false, type: :boolean, aliases: '-sq' # TODO
     method_option :mongodb, default: false, type: :boolean, aliases: '-mg'
@@ -148,9 +138,6 @@ module StackCar
         template("#{template_file}.erb", template_file)
      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 ".gitignore", "/bundle", :after => "/.bundle"
      if File.exists?('README.md')
        prepend_to_file "README.md" do
          File.read("#{self.class.source_root}/README.md")
@@ -166,6 +153,13 @@ module StackCar
           template("#{template_file}.erb", "ops/#{template_file}")
         end
         say 'Please update ops/hosts with the correct server addresses'
+      else
+        empty_directory('ops')
+      end
+
+      # Do this after we figure out whether to use an empty ops directory or a full one
+      ['env.conf', 'webapp.conf'].each do |template_file|
+        template("#{template_file}.erb", "ops/#{template_file}")
       end
     end
 

data/lib/stack_car/version.rb

@@ -1,3 +1,3 @@
 module StackCar
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/stack_car.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard"
   spec.add_development_dependency "yard-thor"
   spec.add_development_dependency "pry"
-  spec.add_dependency 'dotenv'
-  spec.add_dependency 'thor'
+  spec.add_dependency "dotenv", "~> 2.0"
+  spec.add_dependency "thor", "~> 0.19"
 end

data/templates/.env.erb

@@ -17,5 +17,7 @@ TEST_DB=<%= @project_name %>_test
 REGISTRY_HOST=registry.gitlab.com
 REGISTRY_URI=/TODO/<%= @project_name %>
 SITE_URI=https://TODO.com
+DEPLOY_HOOK=TODO
 <% end -%>
 TAG=dev
+VIRUAL_PORT=80

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

@@ -1,21 +1,21 @@
 image: docker:latest
 services:
   - docker:dind
-  <% if options[:postgres] -%>
+<% if options[:postgres] -%>
   - postgres:latest
-  <% end -%>
-  <% if options[:mysql] -%>
+<% end -%>
+<% if options[:mysql] -%>
   - mysql:latest
-  <% end -%>
-  <% if options[:solr] -%>
+<% end -%>
+<% if options[:solr] -%>
   - solr:latest
-  <% end -%>
-  <% if options[:elasticsearch] -%>
+<% end -%>
+<% if options[:elasticsearch] -%>
   - elasticsearch:latest
-  <% end -%>
-  <% if options[:redis] -%>
+<% end -%>
+<% if options[:redis] -%>
   - redis:latest
-  <% end -%>
+<% end -%>
 
 stages:
   - build
@@ -25,15 +25,15 @@ stages:
   - production
 
 variables:
-  <% if options[:postgres] -%>
+<% if options[:postgres] -%>
   POSTGRES_DB: <%= @project_name %>
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: DatabaseFTW
-  <% end -%>
-  <% if options[:MYSQL] -%>
+<% end -%>
+<% if options[:MYSQL] -%>
   MYSQL_DATABASE: <%= @project_name %>
   MYSQL_ROOT_PASSWORD: DatabaseFTW
-  <% end -%>
+<% end -%>
   TEST_DB: <%= @project_name %>
   DOCKER_DRIVER: overlay
 
@@ -85,12 +85,12 @@ review:
 stop_review:
   stage: review
   script:
-    <% if options[:rancher] -%>
+<% if options[:rancher] -%>
     - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
     - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
     - export RANCHER_ENVIRONMENT=staging
     - ./rancher-v0.4.1/rancher rm $CI_BUILD_REF_SLUG
-    <% end %>
+<% end %>
   variables:
     GIT_STRATEGY: none
   when: manual
@@ -102,13 +102,13 @@ staging:
   stage: staging
   type: deploy
   script:
-    <% if options[:rancher] -%>
-    - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
-    - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
-    - export RANCHER_ENVIRONMENT=staging
-    - export TAG=master
-    - ./rancher-v0.4.1/rancher up -p -d -u -c -f docker-compose-ci.yml --stack $CI_BUILD_REF_SLUG
-    <% end -%>
+<% if options[:rancher] -%>
+    - ./ops/deploy-app
+<% end -%>
+<% if options[:heroku] -%>
+  - gem install dpl multi_json
+  - dpl --provider=heroku --app=<%= @project_name %>-staging --api-key=$HEROKU_STAGING_API_KEY --run="bundle exec rake db:migrate"
+<% end -%>
   only:
     - master
   variables:
@@ -120,12 +120,13 @@ production:
   stage: production
   type: deploy
   script:
-    <% if options[:rancher] -%>
-    - wget https://github.com/rancher/cli/releases/download/v0.4.1/rancher-linux-amd64-v0.4.1.tar.gz
-    - tar zxfv rancher-linux-amd64-v0.4.1.tar.gz
-    - export RANCHER_ENVIRONMENT=production
-    - ./rancher-v0.4.1/rancher up -p -d -u -c -f docker-compose-prod.yml
-    <% end -%>
+<% if options[:rancher] -%>
+    - ./ops/deploy-app
+<% end -%>
+<% if options[:heroku] -%>
+  - gem install dpl multi_json
+  - dpl --provider=heroku --app=<%= @project_name %> --api-key=$HEROKU_PRODUCTION_API_KEY --run="bundle exec rake db:migrate"
+<% end -%>
   when: manual
   only:
     - master

data/templates/Dockerfile.erb

@@ -12,17 +12,30 @@ RUN mkdir -p /opt/fits && \
     chmod +x fits-0.8.5/fits.sh
 
 <% end -%>
-ENV APP_HOME /app
 
+RUN rm /etc/nginx/sites-enabled/default
+COPY ops/webapp.conf /etc/nginx/sites-enabled/webapp.conf
+COPY ops/env.conf /etc/nginx/main.d/env.conf
+
+ENV APP_HOME /home/app/webapp
 RUN mkdir $APP_HOME
 WORKDIR $APP_HOME
 
-COPY ./bundle /bundle
 ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
-  BUNDLE_JOBS=2 \
-  BUNDLE_PATH=/bundle
+  BUNDLE_JOBS=4
 
 ADD Gemfile* $APP_HOME/
 RUN bundle check || bundle install
 
+<% if options[:delayed_job] %>
+RUN touch /var/log/worker.log && chmod 666 /var/log/worker.log
+RUN mkdir /etc/service/worker
+ADD ops/worker.sh /etc/service/worker/run
+<% end %>
+
 COPY . $APP_HOME
+RUN chown -R app $APP_HOME
+
+RUN rm -f /etc/service/nginx/down
+
+CMD ["/sbin/my_init"]

data/templates/README.md

@@ -2,7 +2,7 @@
 
 1) Install Docker.app 
 
-2) Get .env file from team member
+2) Get .env file from team member or copy it from .env.example and fill it out
 
 3) gem install stack_car
 

data/templates/database.yml.erb

@@ -1,3 +1,5 @@
+# Hi - please dont edit this file directly, instead make changes in your .env file
+
 <% if options[:mysql] -%>
 login: &login
   adapter: mysql2

data/templates/docker-compose.yml.erb

@@ -73,11 +73,11 @@ services:
     ports:
       - "8080"
 <% end -%>
-  main:
+  web:
     build: .
     image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
     volumes:
-      - .:/app
+      - .:/home/app/webapp
     env_file:
       - .env
     # Keep the stdin open, so we can attach to our app container's process
@@ -85,20 +85,8 @@ services:
     stdin_open: true
     # Enable sending signals (CTRL+C, CTRL+P + CTRL+Q) into the container:
     tty: true
-<% if options[:delayed_job] -%>
-  delayed_job:
-    extends:
-      service: main
-    command: ./bin/delayed_job run
-    depends_on:
-<%= compose_depends(:delayed_job) %>
-<% end -%>
-  web:
-    extends:
-      service: main
-    command: bundle exec rails s -p 3000 -b '0.0.0.0'
     ports:
-      - "3000"
+      - "80"
     depends_on:
 <%= compose_depends %>
 

data/templates/env.conf.erb

@@ -0,0 +1,22 @@
+<% if options[:postgres] -%>
+env POSTGRES_DB;
+env POSTGRES_USER;
+env POSTGRES_PASSWORD;
+env POSTGRES_HOST;
+env TEST_DB;
+<% end -%>
+<% if options[:mysql] -%>
+env MYSQL_DATABASE;
+env MYSQL_USER;
+env MYSQL_PASSWORD;
+env MYSQL_ROOT_PASSWORD;
+env MYSQL_HOST;
+env TEST_DB;
+<% end -%>
+<% if options[:deploy] || options[:rancher] -%>
+env REGISTRY_HOST;
+env REGISTRY_URI;
+env SITE_URI;
+<% end -%>
+env TAG;
+env VIRUAL_PORT;

data/templates/ops/deploy-app

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -x
+
+curl -X POST -H "Content-Type: application/json" -d '{ "push_data": { "tag": "$TAG" }, "repository": { "repo_name":"$REGISTRY_HOST$REGISTRY_URI" }}' $DEPLOY_HOOK

data/templates/webapp.conf.erb

@@ -0,0 +1,15 @@
+server {
+    listen 80;
+    server_name _;
+    root /home/app/webapp/public;
+    client_body_in_file_only clean;
+    client_body_buffer_size 32K;
+
+    client_max_body_size 0;
+
+    sendfile on;
+    send_timeout 300s;
+    # The following deploys your Ruby/Python/Node.js/Meteor app on Passenger.
+    passenger_enabled on;
+    passenger_user app;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,30 +98,30 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 description: 
 email:
 - rob@notch8.com
@@ -159,7 +159,9 @@ files:
 - templates/docker-compose-ci.yml.erb
 - templates/docker-compose-prod.yml.erb
 - templates/docker-compose.yml.erb
+- templates/env.conf.erb
 - templates/hosts.erb
+- templates/ops/deploy-app
 - templates/ops/deploy.yml
 - templates/ops/provision.yml
 - templates/ops/roles/docker.centos/README.md
@@ -178,6 +180,7 @@ files:
 - templates/ops/roles/docker.ubuntu/templates/docker.conf
 - templates/ops/roles/docker.ubuntu/tests/vagrant.yml
 - templates/ops/roles/docker.ubuntu/vars/main.yml
+- templates/webapp.conf.erb
 homepage: https://gitlab.com/notch8/stack_car
 licenses: []
 metadata: {}
@@ -197,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A tool to make rails + docker easy