stack_car 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6733f0600c47bc8fe2254c6cb13f319f95c951e
-  data.tar.gz: 6d6ae0940f19e2f2ad7ca10878f2d359018940d9
+  metadata.gz: 29d6252b6c7b9f9bdc155585e7166cc3ba4bf35f
+  data.tar.gz: bf7a74d80e7caa0de9ecd68724c472455dc0bae9
 SHA512:
-  metadata.gz: 1ce405538df50e3ea51e9adb2cf6664333091ba2a96689c17a09a308ad6d94e6a20531c0384fad527ca17436ab6ff698e6b6f12cbd81b133d6decbdb07de59c8
-  data.tar.gz: 1a3c3b6627138f91875d0d0bd66bb9726e1ed3759e124bb7ee8f49602ae15ec35a64e1df51314557d39530e806b05299beb35d8a7d80dd1d549fa953d504d608
+  metadata.gz: 2619dad34b6a619141aa8d3a6b11cf60253dc95ecbcad07bbf839bd2cfa3bdbf2ee214de7fe6e25f20bbc3fa19a693f84022984f724dbe0473d70252c593af37
+  data.tar.gz: c7719812cf7bfa91d3613f69d6e5de53428f9589aa1ab5a1c46023f34f27a7380c7b28795d9267fcc6afb12432f0f096fd96f77ec30dd38731c72c674fa3a35d

data/exe/sc

@@ -0,0 +1 @@
+stack_car

data/lib/stack_car/cli.rb

@@ -12,13 +12,21 @@ 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]
       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 .")
+      if !options[:foreground]
+        @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]
+        run("docker-compose logs --tail --follow #{options[:service]}") if options[:logs]
+      end
     end
 
     method_option :service, default: '', type: :string, aliases: '-s'
@@ -28,14 +36,6 @@ module StackCar
       run("rm -rf tmp/pids/server.pid")
     end
 
-    method_option :service, default: 'web', type: :string, aliases: '-s'
-    desc "build", "build the services, defaults to web"
-    def build
-      @project_name = File.basename(File.expand_path('.'))
-      run("docker-compose build #{options[:service]}")
-    end
-
-
     method_option :service, default: 'web', type: :string, aliases: '-s'
     desc "walk ARGS", "wraps docker-compose run web unless --service is used to specify"
     def walk(*args)
@@ -88,6 +88,7 @@ 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 :fcrepo, default: false, type: :boolean, aliases: '-f'
     method_option :deploy, default: false, type: :boolean, aliases: '-d'
     method_option :rancher, default: false, type: :boolean, aliases: '-dr'
@@ -100,18 +101,14 @@ module StackCar
 
     Pick your dependencies by using the command line arguments
     DOCKERIZE
-    def dockerize(dir=nil)
-      if dir
-        Dir.chdir(dir)
-      else
-        dir = '.'
-      end
-     @project_name = File.basename(File.expand_path(dir))
-     @db_libs = []
-     @db_libs << "libpq-dev postgresql-client" if options[:postgres]
-     @db_libs << "mysql-client" if options[:mysql]
-     @db_libs << "libc6-dev libreoffice imagemagick unzip" if options[:fcrepo]
-     @db_libs = @db_libs.join(' ')
+    def dockerize(dir=".")
+      Dir.chdir(dir)
+      @project_name = File.basename(File.expand_path(dir))
+      @db_libs = []
+      @db_libs << "libpq-dev postgresql-client" if options[:postgres]
+      @db_libs << "mysql-client" if options[:mysql]
+      @db_libs << "libc6-dev libreoffice imagemagick unzip" if options[:fcrepo]
+      @db_libs = @db_libs.join(' ')
 
 
      ['.dockerignore', 'Dockerfile', 'docker-compose.yml', 'docker-compose-prod.yml', '.gitlab-ci.yml', '.env'].each do |template_file|
@@ -121,12 +118,16 @@ module StackCar
      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")
+     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")
+       end
+     else
+       create_file "README.md" do
+         File.read("#{self.class.source_root}/README.md")
+       end
      end
-
       if options[:deploy] || options[:rancher]
         directory('ops')
         ['hosts'].each do |template_file|
@@ -135,5 +136,17 @@ module StackCar
         say 'Please update ops/hosts with the correct server addresses'
       end
     end
+
+    protected
+    def compose_depends(*excludes)
+      @compose_depends = []
+      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :delayed_job] - excludes
+      services.each do |service|
+        if options[service]
+          @compose_depends << "      - #{service}"
+        end
+      end
+      return @compose_depends.join("\n")
+    end
   end
 end

data/lib/stack_car/version.rb

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

data/stack_car.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"
   spec.add_development_dependency "yard-thor"
+  spec.add_development_dependency "pry"
   spec.add_dependency 'dotenv'
   spec.add_dependency 'thor'
 end

data/templates/docker-compose.yml.erb

@@ -51,7 +51,7 @@ services:
     volumes:
       - 'redis:/var/lib/redis/data'
 <% end -%>
-<% if options[:fcrepo] %>
+<% if options[:fcrepo] -%>
   fcrepo:
     image: botimer/fcrepo:4.5.1
     volumes:
@@ -59,32 +59,29 @@ services:
     ports:
       - "8984:8080"
 <% end -%>
-  web:
+  main:
     build: .
     image: <%= @project_name %>:latest
-    command: bundle exec rails s -p 3000 -b '0.0.0.0'
     volumes:
       - .:/app
-    ports:
-      - "3000:3000"
     env_file:
       - .env
+<% if options[:delayed_job] -%>
+  delayed_job:
+    extends:
+      service: main
+    command: ./bin/delayed_job run
     depends_on:
-<% if options[:postgres] -%>
-      - postgres
-<% end -%>
-<% if options[:mysql] -%>
-      - mysql
-<% end -%>
-<% if options[:elasticsearch] -%>
-      - elasticsearch
-<% end -%>
-<% if options[:solr] -%>
-      - solr
-<% end -%>
-<% if options[:redis] -%>
-      - redis
+<%= compose_depends(:delayed_job) %>
 <% end -%>
+  web:
+  extends:
+      service: urp
+    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+    ports:
+      - "3000:3000"
+    depends_on:
+<%= compose_depends %>
 
 volumes:
 <% if options[:postgres] -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool to make rails + docker easy

data/exe/sc

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require "stack_car"
-
-StackCar::HammerOfTheGods.start(ARGV)