stack_car 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e9a766c53dc60137049a34e4383dd1be2b58e4
-  data.tar.gz: 3a595fbf2e5aa3fea2ed40d7b31c37d96529c924
+  metadata.gz: e5c18ca3a905df3da0c9039321540b89745d2423
+  data.tar.gz: 73bb0eccbcf82a7bd062c480eeb4444976c71195
 SHA512:
-  metadata.gz: 5f26afb657875cd2a01fea147c36ad340c76f8439b5436c29d43eeaa90a6b494f88feab7844e7022f631748c3387243a3ecb6aed53b7bbd8b650075279185419
-  data.tar.gz: 2c0be0669b973341047c06fd70965fc7cc0f56e4c4b5587ffe04ed25aae92e8c6266598bf8a2d7eedd526344871aa7c4b3bcd02851e90009216c1eec0a07b347
+  metadata.gz: 3f0d974686a5500bf35d12c4ec3f69f1c1b5093e82ea8105529ab386c7b664c633ffc927398c4807a98674481d3f3ebe8b77ff05bb5a1425a4360fcd1137eff1
+  data.tar.gz: 550714d0683a6f3f0b7abd35b8b9899a7a4143066c450fb73adfcc88538f57c9da72c41808c131be270f14e2dbdb0da5f2dd812a76e184f05cb7b586177785e6

data/lib/stack_car/cli.rb

@@ -52,7 +52,7 @@ module StackCar
       run("docker-compose pull #{options[:service]} #{args.join(' ')}")
     end
 
-    method_option :service, default: 'web', type: :string, aliases: '-s'
+    method_option :service, default: '', type: :string, aliases: '-s'
     desc "ps ARGS", "wraps docker-compose pull web unless --service is used to specify"
     def ps(*args)
       run("docker-compose ps #{options[:service]} #{args.join(' ')}")
@@ -124,7 +124,8 @@ module StackCar
     method_option :deploy, default: false, type: :boolean, aliases: '-d'
     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' # TODO
+    method_option :mongodb, default: false, type: :boolean, aliases: '-mg'
+    method_option :memcached, default: false, type: :boolean, aliases: '-mc'
     desc 'dockerize DIR', 'Will copy the docker tempates in to your project, see options for supported dependencies'
     long_desc <<-DOCKERIZE
 
@@ -171,7 +172,7 @@ module StackCar
     protected
     def compose_depends(*excludes)
       @compose_depends = []
-      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :delayed_job] - excludes
+      services = [:postgres, :mysql, :elasticsearch, :solr, :redis, :mongodb, :memcached, :delayed_job] - excludes
       services.each do |service|
         if options[service]
           @compose_depends << "      - #{service}"

data/lib/stack_car/version.rb

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

data/templates/.env.erb

@@ -18,4 +18,4 @@ REGISTRY_HOST=registry.gitlab.com
 REGISTRY_URI=/TODO/<%= @project_name %>
 SITE_URI=https://TODO.com
 <% end -%>
-TAG=`git branch | grep \* | cut -d ' ' -f2-`
+TAG=dev

data/templates/docker-compose-ci.yml.erb

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
 <% if options[:postgres] -%>
   postgres:
@@ -51,6 +51,20 @@ services:
     volumes:
       - 'redis:/var/lib/redis/data'
 <% end -%>
+<% if options[:mongodb] -%>
+  mongodb:
+    image: mongo:2.6.12
+    volumes:
+      - 'mongodb:/data/db'
+    ports:
+      - "27017"
+<% end -%>
+<% if options[:memcached] -%>
+  memcached:
+    image: memcached
+    ports:
+      - "11211"
+<% end -%>
 <% if options[:fcrepo] -%>
   fcrepo:
     image: botimer/fcrepo:4.5.1
@@ -60,7 +74,7 @@ services:
       - "8080"
 <% end -%>
   main:
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG}"
+    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
     volumes:
       - .:/app
     env_file:
@@ -107,6 +121,7 @@ volumes:
 <% if options[:redis] -%>
   redis:
 <% end -%>
-
-
+<% if options[:mongodb] -%>
+  mongodb:
+<% end -%>
 

data/templates/docker-compose-prod.yml.erb

@@ -1,7 +1,7 @@
-version: '2'
+version: '2.1'
 services:
   web:
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG}"
+    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
     command: bash -c "bundle exec rake assets:precompile db:migrate && bundle exec passenger start -p 3000 -b '0.0.0.0'""
     environment:
       - RAILS_ENV=production

data/templates/docker-compose.yml.erb

@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 services:
 <% if options[:postgres] -%>
   postgres:
@@ -51,6 +51,20 @@ services:
     volumes:
       - 'redis:/var/lib/redis/data'
 <% end -%>
+<% if options[:mongodb] -%>
+  mongodb:
+    image: mongo:2.6.12
+    volumes:
+      - 'mongodb:/data/db'
+    ports:
+      - "27017"
+<% end -%>
+<% if options[:memcached] -%>
+  memcached:
+    image: memcached
+    ports:
+      - "11211"
+<% end -%>
 <% if options[:fcrepo] -%>
   fcrepo:
     image: botimer/fcrepo:4.5.1
@@ -61,7 +75,7 @@ services:
 <% end -%>
   main:
     build: .
-    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG}"
+    image: "${REGISTRY_HOST}/${REGISTRY_URI}:${TAG:-master}"
     volumes:
       - .:/app
     env_file:
@@ -104,3 +118,6 @@ volumes:
 <% if options[:redis] -%>
   redis:
 <% end -%>
+<% if options[:mongodb] -%>
+  mongodb:
+<% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stack_car
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler