roro 0.3.4 → 0.3.9

data/lib/roro/cli/templates/base/.dockerignore

@@ -1,13 +1,51 @@
-# Git
-.git            # <label id="chapter.fine-tuning-our-rails-image.dockerignore.git-history" /> 
-.gitignore      # <label id="chapter.fine-tuning-our-rails-image.dockerignore.gitignore" />
+.git
+.gitignore
+README.md
 
-# Logs
-log/*           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.log_dir" />
+#
+# OS X
+#
+.DS_Store
+.AppleDouble
+.LSOverride
+# Icon must end with two \r
+Icon
+# Thumbnails
+._*
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
 
-# Temp files
-tmp/*           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.tmp_dir" />
+#
+# Rails
+#
+.env
+.env.sample
+*.rbc
+capybara-*.html
+log
+tmp
+db/*.sqlite3
+db/*.sqlite3-journal
+public/system
+coverage/
+spec/tmp
+**.orig
 
-# Editor temp files
-*.swp           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.vim_swp_files" />
-*.swo           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.vim_swo_files" />
+.bundle
+
+.ruby-version
+.ruby-gemset
+
+.rvmrc
+
+# if using bower-rails ignore default bower_components path bower.json files
+vendor/assets/bower_components
+*.bowerrc
+bower.json

data/lib/roro/cli/templates/base/.roro_config.yml

@@ -0,0 +1,15 @@
+---
+main_app_name: greenfield
+database_host: database
+ruby_version: '2.7'
+frontend_service: frontend
+webserver_service: nginx
+database_service: database
+database_vendor: mysql
+mysql_env_vars:
+  MYSQL_ROOT_PASSWORD: root
+  MYSQL_PASSWORD: root
+  MYSQL_USERNAME: root
+  MYSQL_DATABASE_PORT: '3306'
+thor_actions: 
+  insert_hfci_gem_into_gemfile: y

data/lib/roro/cli/templates/base/Dockerfile.tt

@@ -0,0 +1,82 @@
+## The FROM instruction below builds our first layer using an official image:
+FROM ruby:<%= config['ruby_version'] %>
+
+LABEL maintainer="<%= config['dockerhub_email'] %>"
+
+## This is a rails app so, we will want to add node and yarn. In order for our 
+## container to trust yarn as a source, we first need to add yarn's public key. 
+## One good way to accomplish this is with apt-key, but apt-key is designed to 
+## send output to the terminal and not to stdout, and thus apt-key will send a 
+## warning message during the build context. One way to deal with the warning
+## is to set an environment variable telling apt-get to be quiet. To do this,
+## you'd first write an ENV instruction setting the environment variable, then 
+## write the RUN instruction adding the key to the container, and then you'd 
+## have to write another ENV instruction unsetting the variable. This would be 
+## ugly and inconvenient. Another way to deal with the warning is to just ignore 
+## it. There's no shame in that but ignoring it in the build context might 
+## condition us to ignore it in other contexts. But what if there was a way to 
+## deal with it that allowed you to set that variable just for the build 
+## context? Fortunately there is, using the ARG instruction. Variables set with 
+## ARG instructions stay in the build context while those set with ENV 
+## instructions follow into the container. 
+
+## Use an ARG instruction to set a variable disabling the apt-key warning:
+ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
+
+## Add yarn's public key using apt-key:
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+
+## Add yarn to our sources:
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+
+## Build a layer updating the image while adding node and yarn from the source
+## above:
+RUN apt-get update -qq && apt-get install -y build-essential git nodejs yarn
+
+## We have two directories we'd like to follow from the build context into 
+## our containers. APP_HOME is where we'll do most of our work and BUNDLE_PATH 
+## is where we want bundler to store our gems.  
+
+## Set APP_HOME and BUNDLE_PATH as using ENV instructions:
+ENV APP_HOME /usr/src/app/
+ENV BUNDLE_PATH /gems
+
+## Create both as directories to make sure they exist:
+RUN mkdir ${APP_HOME}
+RUN mkdir ${BUNDLE_PATH}
+
+## Tell Docker to create volumes for our workspace and gems
+## so other containers can access them.
+VOLUME ${APP_HOME}
+VOLUME ${BUNDLE_PATH}
+
+## If we copy our entire app using a single COPY instruction, Docker will build 
+## it all as a single new layer. When Docker notices a change to a file, it then 
+## has to rebuild the entire layer. This can slow development. One way to speed 
+## it back up is to break a single big COPY layer into several smaller ones, 
+## 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}
+
+## 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
+## frequently. If you make a change to any of these files, only this layer has
+## to rebuild. smaller, lighter layer
+COPY . ${APP_HOME}
+
+
+COPY roro/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
+RUN chmod +x /usr/bin/docker-entrypoint.sh
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+
+
+

data/lib/roro/cli/templates/base/config/database.mysql.yml

@@ -0,0 +1,19 @@
+default: &default
+  adapter: mysql2
+  encoding: utf8
+  pool:     <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
+  host:     <%= ENV.fetch('DATABASE_HOST') %>
+  username: <%= ENV.fetch('MYSQL_USERNAME') %>
+  password: <%= ENV.fetch('MYSQL_PASSWORD') %>
+  database: <%= ENV.fetch('MYSQL_DATABASE') %>
+  port:     <%= ENV.fetch('MYSQL_DATABASE_PORT') %>
+  socket: /var/run/mysqld/mysqlx.sock
+  
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  <<: *default

data/lib/roro/cli/templates/greenfield/Dockerfile.tt

@@ -1,21 +1,43 @@
-FROM ruby:<%= config[:ruby_version] %> AS stage1
+FROM ruby:<%= config['ruby_version'] %> AS builder
 
+## Make sure we have yarn properly sourced:
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+## Update OS and download yarm from source specified above:
 RUN apt-get update -qq && apt-get install -y build-essential git nodejs yarn
 
+## Set up our workspace directories:
+ENV APP_HOME /usr/src/app/
+RUN mkdir ${APP_HOME}
 
+## Tell bundler where to store downloaded gems:
 ENV BUNDLE_PATH /gems
-ENV APP_HOME /usr/src/app/
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
+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
 
+## Create a Gemfile with just the Rails gem inside:
 RUN echo "source 'https://rubygems.org'\ngem 'rails'" > Gemfile
 
-RUN bundle
-RUN bundle exec rails new greenfield --skip-bundle --skip-webpack-install 
+## 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
+
+## Tell docker not to create a layer:
 FROM scratch AS export-stage
 
-COPY --from=stage1 /usr/src/app/greenfield .
+## Copy the generated files onto the host. Note that because we are in a  
+## new container, we don't have access to the previous ${APP_HOME} 
+## variable and so we must hard code it as our source:
+COPY --from=builder /usr/src/app/ .
 
 

data/lib/roro/cli/templates/{dockerize/docker-compose.yml → roro/docker-compose.yml.tt}

@@ -1,51 +1,50 @@
-version: '3'
+version: '3.2'
 
 services:
 
   web:
-    build: .
+    build:
+      context: .
+      dockerfile: roro/containers/app/Dockerfile
     depends_on:
       - database
-      - webpack_dev_server
       - redis
-    # entrypoint: ./docker-entrypoint.sh
-    command: ["bin/rails", "s", "-b", "0.0.0.0"]
 
+    command: ["bin/rails", "s", "-b", "0.0.0.0"]
     ports:
       - "3000:3000"
       - "4000:4000"
     volumes:
-      - .:/usr/src/app
+      - app:/usr/src/app
       - gem_cache:/gems
     env_file:
-      - .env/development/web
-      - .env/development/database
+      - roro/containers/app/development.env
+      - roro/containers/database/development.env
     environment:
       - WEBPACKER_DEV_SERVER_HOST=webpack_dev_server
 
   webpack_dev_server:
-    build: .
+    build:
+      context: .
+      dockerfile: roro/containers/app/Dockerfile
+
+
     command: ./bin/webpack-dev-server
     ports:
       - 3035:3035
     volumes:
-      - .:/usr/src/app
+      - app:/usr/src/app
       - gem_cache:/gems
     env_file:
-      - .env/development/database
-      - .env/development/web
+      - roro/containers/app/development.env
+      - roro/containers/database/development.env
     environment:
       - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
 
   redis:
     image: redis
 
-  database:
-    image: postgres
-    env_file:
-      - .env/development/database
-    volumes:
-      - db_data:/var/lib/postgresql/data
+<%= yaml_from_template("stories/with_#{config['database_vendor']}/_service.yml") %>
 
   system_tests:
     image: selenium/standalone-chrome-debug
@@ -58,3 +57,4 @@ services:
 volumes:
   db_data:
   gem_cache:
+  app:

data/lib/roro/cli/templates/{quickstart/entrypoint.sh → roro/roro/docker-entrypoint.sh.tt}

@@ -2,7 +2,7 @@
 set -e
 
 # Remove a potentially pre-existing server.pid for Rails.
-rm -f /myapp/tmp/pids/server.pid
+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 "$@"

data/lib/roro/cli/templates/ruby_gem/.circleci/config.yml

@@ -0,0 +1,17 @@
+defaults: &defaults
+  working_directory: /tmp
+
+version: 2
+
+jobs:
+
+  build:
+    machine: true
+    steps:
+      - checkout
+      - run: gem install roro
+      - run: roro expose ci
+      - run: echo 'source roro/containers/gem/ci.env' >> $BASH_ENV
+      - run: setup_gem_credentials.sh
+      - run: gem install gem-release -k
+      - run: gem release

data/lib/roro/cli/templates/ruby_gem/docker-compose.yml

@@ -1,9 +1,11 @@
-version: '3.1'
+version: '3.2'
 
 services:
 
-  app:
+  ruby_gem:
     build:
       context: .
-      dockerfile: docker/containers/app/Dockerfile
-    command: rake test
+      dockerfile: roro/containers/ruby_image/Dockerfile
+    environment:
+      - RUBY_IMAGE=${RUBY_IMAGE}
+    command: bundle exec rake test

data/lib/roro/cli/templates/ruby_gem/roro/ci.env.tt

@@ -0,0 +1 @@
+RUBYGEMS_API_KEY=<%= config['rubygems_api_key'] %>

data/lib/roro/cli/templates/ruby_gem/roro/containers/ruby_image/Dockerfile.tt

@@ -0,0 +1,16 @@
+ARG RUBY_IMAGE=ruby:<%= config['ruby_version'] %>-alpine
+FROM $RUBY_IMAGE
+
+RUN apk add --no-cache --update build-base linux-headers git
+
+ENV APP_HOME /usr/src/app/
+
+RUN mkdir ${APP_HOME}
+
+
+WORKDIR ${APP_HOME}
+
+
+COPY . ${APP_HOME}
+RUN gem update bundler
+RUN bundle 

data/lib/roro/cli/templates/stories/with_mysql/_service.yml

@@ -0,0 +1,10 @@
+  database:
+    image: mysql:5.7
+    env_file:
+      - roro/containers/database/development.env
+      - roro/containers/app/development.env
+    volumes:
+      - db_data:/var/lib/mysql
+    restart: always
+    ports:
+      - '3307:3306'

data/lib/roro/cli/templates/stories/with_postgresql/_service.yml

@@ -0,0 +1,7 @@
+  database:
+    image: postgres
+    env_file:
+      - roro/containers/database/development.env
+      - roro/containers/app/development.env
+    volumes:
+      - db_data:/var/lib/postgresql/data

data/lib/roro/version.rb

@@ -1,3 +1,3 @@
 module Roro
-  VERSION = "0.3.4"
+  VERSION = "0.3.9"
 end

data/roro.gemspec

@@ -37,14 +37,15 @@ Gem::Specification.new do |spec|
   # spec.bindir        = "exe"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_dependency "thor"
+  spec.add_dependency "gem-release", "~> 2.1"
+  spec.add_dependency "thor", "~> 1.0"
   spec.add_dependency "os", "1.0.0"
   spec.add_dependency "sshkit", "1.18.2"
-  spec.add_dependency "handsome_fencer-crypto", "0.1.6"
+  spec.add_dependency "handsome_fencer-crypto"
+  spec.add_dependency "byebug"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.3"
   spec.add_development_dependency "handsome_fencer-test", "0.1.1"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "mocha"
 
 end