roro 0.3.14 → 0.3.16

data/lib/roro/cli/rollon/{stories/rails → rails}/database.rb

@@ -1,5 +1,3 @@
-require 'roro/cli/rollon/stories/rails/database/with_mysql'
-require 'roro/cli/rollon/stories/rails/database/with_postgresql'
 module Roro
 
   class CLI < Thor
@@ -21,10 +19,9 @@ module Roro
         end
         
         %w(development production test staging ci).each do |environment| 
-          template(
-            'base/.env/web.env.tt',
-            "roro/containers/app/#{environment}.env", @config.app
-          )
+          src = 'rails/dotenv/web.env.tt'
+          dest = "roro/containers/app/#{environment}.env"
+          template src, dest, @config.app
         end
       end
     end 

data/lib/roro/cli/rollon/{stories/rails → rails}/database/with_mysql.rb

@@ -6,13 +6,13 @@ module Roro
       
       def configure_for_mysql 
         insert_db_gem('mysql2')
-        copy_file 'base/config/database.mysql.yml', 'config/database.yml', force: true
+        copy_file 'rails/config/database.mysql.yml', 'config/database.yml', force: true
         config = @config.app.clone
 
         %w(development production test staging ci).each do |environment| 
           config['rails_env'] = environment
           
-          source = 'base/.env/database.mysql.env.tt'
+          source = 'rails/dotenv/database.mysql.env.tt'
           target = "roro/containers/database/#{environment}.env" 
           template( source, target, config )
         end

data/lib/roro/cli/rollon/{stories/rails → rails}/database/with_postgresql.rb

@@ -6,12 +6,12 @@ module Roro
       
       def configure_for_pg 
         insert_db_gem('pg')
-        copy_file 'base/config/database.pg.yml', 'config/database.yml', force: true
+        copy_file 'rails/config/database.pg.yml', 'config/database.yml', force: true
         config = @config.app.clone
         %w(development production test staging ci).each do |environment| 
           config['rails_env'] = environment
           
-          source = 'base/.env/database.pg.env.tt'
+          source = 'rails/dotenv/database.pg.env.tt'
           target = "roro/containers/database/#{environment}.env" 
           template( source, target, config )
         end

data/lib/roro/cli/rollon/ruby_gem.rb

@@ -0,0 +1 @@
+require 'roro/cli/rollon/ruby_gem/with_ci_cd.rb'

data/lib/roro/cli/rollon/{stories/ruby_gem → ruby_gem}/with_ci_cd.rb

@@ -6,11 +6,11 @@ module Roro
 
     def rollon_ruby_gem_with_ci_cd(*args) 
       ruby_gem_with_ci_cd(*args)
+      configure_for_rollon
     end
     
     no_commands do 
       def ruby_gem_with_ci_cd(*args)
-        configure_for_rollon
         answer = ask("\nYou can add your rubygems api key in\n\t 
           './roro/containers/ruby_gem/ci.env' \n\nlater, or we'll try to add it here:", 
         default: '')

data/lib/roro/cli/rollon/stories.rb

@@ -1,2 +1,2 @@
-require 'roro/cli/rollon/stories/ruby_gem'
-require 'roro/cli/rollon/stories/rails'
+require 'roro/cli/rollon/ruby_gem'
+require 'roro/cli/rollon/rails'

data/lib/roro/cli/templates/base/.circleci/_defaults.yml

@@ -0,0 +1,15 @@
+defaults: &defaults
+  executor: machine-executor
+  working_directory: ~/project
+ 
+version: 2.1
+
+executors:
+  machine-executor: 
+    machine:
+      docker_layer_caching: true
+  ruby-executor: 
+    docker:
+      - image: cimg/ruby:2.7
+
+jobs:

data/lib/roro/cli/templates/base/.circleci/_workflow.yml

@@ -0,0 +1,2 @@
+workflows:
+  version: 2

data/lib/roro/cli/templates/base/.circleci/config.job-example.yml

@@ -0,0 +1,33 @@
+defaults: &defaults
+  working_directory: /tmp
+
+version: 2
+
+jobs:
+
+  build:
+    machine: true
+    steps:
+      - checkout
+      - add_ssh_keys
+      
+      - run: gem install handsome_fencer-circle_c_i
+      - run: handsome_fencer-circle_c_i expose circleci
+      - run: handsome_fencer-circle_c_i expose development
+      - run: echo 'source docker/env_files/circleci.env' >> $BASH_ENV
+      - run: docker-compose build
+      - run: docker-compose up -d
+      - run: docker-compose exec app bin/rails db:create db:migrate
+      - run: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS
+      - run:
+          name: Tag app image
+          command: docker tag $(docker images | grep project_app | awk '{ print $3 }') ${DOCKERHUB_ORG_NAME}/${APP_NAME}_app:$DEPLOY_TAG
+      - run:
+          name: Tag web image
+          command: docker tag $(docker images | grep project_web | awk '{ print $3 }') ${DOCKERHUB_ORG_NAME}/${APP_NAME}_web:$DEPLOY_TAG
+
+
+      - run: docker push ${DOCKERHUB_ORG_NAME}/${APP_NAME}_app:$DEPLOY_TAG
+      - run: docker push ${DOCKERHUB_ORG_NAME}/${APP_NAME}_web:$DEPLOY_TAG
+
+      - run: rake --rakefile .circleci/Rakefile

data/lib/roro/cli/templates/base/.circleci/jobs/_build.yml

@@ -0,0 +1,4 @@
+  build:
+    machine: true
+    steps:
+      - checkout

data/lib/roro/cli/templates/base/.circleci/jobs/_release.yml

@@ -0,0 +1,12 @@
+  release:
+    machine: true
+    steps:
+      - checkout
+      - run: gem install roro
+      - run: roro generate::exposed ci
+      - run: echo 'source roro/containers/ruby_image/ci.env' >> $BASH_ENV
+      - run: chmod +x ./.circleci/setup-gem-credentials.sh
+      - run: ./.circleci/setup-gem-credentials.sh
+      - run: cat ~/.gem/credentials
+      - run: git checkout .
+      - run: gem release

data/lib/roro/cli/templates/base/.circleci/workflows/_build_release.yml

@@ -0,0 +1,10 @@
+  build-release: 
+    jobs: 
+      - build
+      - test
+      - release:
+          requires: 
+            - build
+          filters: 
+            branches: 
+              only: release

data/lib/roro/cli/templates/base/dotenv

@@ -0,0 +1 @@
+RORO_ENV=development

data/lib/roro/cli/templates/rails/.circleci/_aliases.yml

@@ -0,0 +1,8 @@
+aliases:
+  - &workspace-location
+    at: /tmp/workspace
+  - &copy-ci-dotenv | 
+    cp -rf /tmp/workspace/roro .
+  - &source-ci-variables | 
+    echo 'source roro/containers/app/ci.env' >> $BASH_ENV
+    source $BASH_ENV

data/lib/roro/cli/templates/rails/.circleci/config.yml.tt

@@ -0,0 +1,15 @@
+<%= yaml_from_template("rails/.circleci/_aliases.yml") %>
+
+<%= yaml_from_template("base/.circleci/_defaults.yml") %>
+
+<%= yaml_from_template("rails/.circleci/jobs/_build.yml") %>
+  
+<%= yaml_from_template("rails/.circleci/jobs/_test.yml") %>
+
+<%= yaml_from_template("rails/.circleci/jobs/_push.yml") %>
+       
+<%= yaml_from_template("base/.circleci/_workflow.yml") %>
+
+<%= yaml_from_template("rails/.circleci/workflows/_build_test_push.yml") %>
+
+  

data/lib/roro/cli/templates/rails/.circleci/jobs/_build.yml

@@ -0,0 +1,16 @@
+  build:
+    <<: *defaults 
+    steps:
+      - checkout
+      - run: |
+          gem install roro 
+          roro generate::exposed ci
+      - run: | 
+          mkdir -p workspace 
+          cp -r roro workspace/
+      - persist_to_workspace: 
+          root: workspace 
+          paths:  
+            - roro
+      - run: *source-ci-variables
+      - run: RORO_ENV=ci docker-compose up -d --build

data/lib/roro/cli/templates/rails/.circleci/jobs/_push.yml

@@ -0,0 +1,23 @@
+  push:
+    machine: true
+    steps:
+      - checkout
+      - run: gem install handsome_fencer-circle_c_i
+      - run: handsome_fencer-circle_c_i expose circleci
+      - run: handsome_fencer-circle_c_i expose development
+      - run: echo 'source docker/env_files/circleci.env' >> $BASH_ENV
+      - run: cp docker/overrides/circleci.yml docker-compose.override.yml
+      - run: docker-compose build
+      - run: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS
+      - run:
+          name: Tag app image
+          command: docker tag $(docker images | grep project_app | awk '{ print $3 }') ${DOCKERHUB_ORG}/${APP_NAME}_app:$DEPLOY_TAG
+      # - run: docker tag $(docker images | grep project_app | awk '{ print $3 }') ${DOCKERHUB_ORG}/${APP_NAME}_app:latest
+      - run:
+          name: Tag app image
+          command: docker tag $(docker images | grep project_web | awk '{ print $3 }') ${DOCKERHUB_ORG}/${APP_NAME}_web:$DEPLOY_TAG
+      # - run: docker tag $(docker images | grep project_web | awk '{ print $3 }') ${DOCKERHUB_ORG}/${APP_NAME}_web:latest
+      - run: docker push ${DOCKERHUB_ORG}/${APP_NAME}_app:$DEPLOY_TAG
+      - run: docker push ${DOCKERHUB_ORG}/${APP_NAME}_app:latest
+      - run: docker push ${DOCKERHUB_ORG}/${APP_NAME}_web:$DEPLOY_TAG
+      - run: docker push ${DOCKERHUB_ORG}/${APP_NAME}_web:latest

data/lib/roro/cli/templates/rails/.circleci/jobs/_test.yml

@@ -0,0 +1,10 @@
+  test:
+    <<: *defaults 
+    steps:
+      - checkout
+      - attach_workspace: *workspace-location
+      - run: *copy-ci-dotenv
+      - run: *source-ci-variables
+      - run: |
+          RORO_ENV=ci docker-compose run web yarn
+          RORO_ENV=ci docker-compose run web bin/rails test

data/lib/roro/cli/templates/rails/.circleci/setup-gem-credentials.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/lib/roro/cli/templates/rails/.circleci/workflows/_build_test_push.yml

@@ -0,0 +1,9 @@
+  build-and-test:
+    jobs:
+      - build
+      - test:
+          requires: 
+            - build
+          filters:
+            branches:
+              only: development

data/lib/roro/cli/templates/{greenfield/Dockerfile.tt → rails/Dockerfile.greenfield.tt}

@@ -13,24 +13,28 @@ RUN mkdir ${APP_HOME}
 
 ## Tell bundler where to store downloaded gems:
 ENV BUNDLE_PATH /gems
-RUN mkdir ${BUNDLE_PATH}}
+RUN mkdir ${BUNDLE_PATH}
 
 ## Tell Docker to create volumes for our workspace and gems
 ## so other containers can access them.
 VOLUME ${APP_HOME}
-VOLUME /gems
+VOLUME ${BUNDLE_PATH}
+
+## Switch to the the work directory from container root:
+WORKDIR ${APP_HOME}
 
 ## Create a Gemfile with just the Rails gem inside:
 RUN echo "source 'https://rubygems.org'\ngem 'rails'" > Gemfile
 
 ## Bundle to install rails:
-
-## Switch to the the work directory from container root:
-WORKDIR ${APP_HOME}
-
 RUN bundle install
+
 ## Use Rails to generate a new app. We'll configure it later.
-RUN bundle exec rails new . --skip-webpack-install --skip-bundle
+RUN bundle exec rails new . 
+
+## setup yarn for rails:
+RUN bundle exec rails yarn:install
+
 
 ## Tell docker not to create a layer:
 FROM scratch AS export-stage

data/lib/roro/cli/templates/rails/dotenv/database.mysql.env.tt

@@ -0,0 +1,3 @@
+<% config['mysql_env_vars'].each do |k,v| %><%=  "\n" + k + "=" + v %><% end %>  
+MYSQL_DATABASE=<%= config['main_app_name'] + "_db"%>
+RAILS_ENV=<%= config['rails_env'] %>

data/lib/roro/cli/templates/rails/dotenv/database.pg.env.tt

@@ -0,0 +1,4 @@
+<% config['postgresql_env_vars'].each do |k,v| %><%=  "\n" + k + "=" + v %><% end %>  
+POSTGRES_DB=<%= config['main_app_name'] + "_" + config['rails_env'] %>
+RAILS_ENV=<%= config['rails_env'] %>
+

data/lib/roro/cli/templates/rails/dotenv/web.env.tt

@@ -0,0 +1,2 @@
+DATABASE_HOST=database
+RAILS_LOG_TO_STDOUT=true

data/lib/roro/cli/templates/{base → rails/roro/containers/app}/Dockerfile.tt

@@ -58,25 +58,34 @@ VOLUME ${BUNDLE_PATH}
 ## with slow-building layers that don't change often underneath smaller, 
 ## lighter, qucker oens that might change a lot. 
 
-## Build your big, slow gem layer by first copying your Gemfile && Gemfile.lock:  
-COPY Gemfile* ./ 
-
 ## Set your work directory:
 WORKDIR ${APP_HOME}
 
+## You may need to adjust the bundler version based on your app Gemfile.lock's 
+## bundler version:
+RUN gem install bundler:2.1.4
+
+## Set your work directory. After this line you will be running commands in 
+## ${APP_HOME}. COPY instructions will move files from host to ${APP_HOME}:
+WORKDIR ${APP_HOME}
+
+## Build your big, slow gem layer by first copying your Gemfile && Gemfile.lock:  
+COPY package.json ./ 
+COPY Gemfile* ./ 
+
 ## build the bundle layer, which now only runs if your Gemfile changes:
 RUN bundle 
 
-## Now build a layer layer with everything in your app that's likely to change
+## Now build a layer with everything in your app that's likely to change
 ## frequently. If you make a change to any of these files, only this layer has
-## to rebuild. smaller, lighter layer
+## to rebuild:
 COPY . ${APP_HOME}
 
+## Now make your entrypoint executable.  
+RUN chmod +x roro/docker-entrypoint.sh
 
-COPY roro/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod +x /usr/bin/docker-entrypoint.sh
-ENTRYPOINT ["docker-entrypoint.sh"]
-
+## Now update node modules: 
+RUN yarn
 
 
 

data/lib/roro/cli/templates/rails/roro/docker-compose.yml.tt

@@ -0,0 +1,59 @@
+version: '3.2'
+
+services:
+
+  web:
+    build:
+      context: .
+      dockerfile: roro/containers/app/Dockerfile
+    depends_on:
+      - database
+      - redis
+
+    command: ["bin/rails", "s", "-b", "0.0.0.0"]
+    ports:
+      - "3000:3000"
+      - "4000:4000"
+    volumes:
+      - .:/usr/src/app
+      - gem_cache:/gems
+    env_file:
+      - roro/containers/app/${RORO_ENV:-development}.env
+      - roro/containers/database/${RORO_ENV:-development}.env
+    environment:
+      - WEBPACKER_DEV_SERVER_HOST=webpack_dev_server
+
+  webpack_dev_server:
+    build:
+      context: .
+      dockerfile: roro/containers/app/Dockerfile
+
+
+    command: ./bin/webpack-dev-server
+    ports:
+      - 3035:3035
+    volumes:
+      - .:/usr/src/app
+      - gem_cache:/gems
+    env_file:
+      - roro/containers/app/${RORO_ENV:-development}.env
+      - roro/containers/database/${RORO_ENV:-development}.env
+    environment:
+      - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
+
+  redis:
+    image: redis
+
+<%= yaml_from_template("stories/with_#{config['database_vendor']}/_service.yml") %>
+
+  system_tests:
+    image: selenium/standalone-chrome-debug
+    logging:
+      driver: none
+    ports:
+      - "35729:35729"
+      - "5900:5900"
+
+volumes:
+  db_data:
+  gem_cache:

data/lib/roro/cli/templates/rails/roro/docker-entrypoint.sh.tt

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /usr/src/app/tmp/pids/server.pid
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"