roro 0.3.5 → 0.3.12

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/{greenfield → roro}/docker-compose.yml.tt

@@ -1,46 +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
 
-<%= config[:database_service] %>
+<%= yaml_from_template("stories/with_#{config['database_vendor']}/_service.yml") %>
 
   system_tests:
     image: selenium/standalone-chrome-debug
@@ -53,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 generate::exposed ci
+      - run: echo 'source roro/containers/gem/ci.env' >> $BASH_ENV
+      - run: setup_gem_credentials.sh
+      - run: gem install gem-release
+      - run: gem release -k

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.5"
+  VERSION = "0.3.12"
 end

data/roro.gemspec

@@ -37,15 +37,14 @@ 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_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.3"
   spec.add_development_dependency "handsome_fencer-test", "0.1.1"
   spec.add_development_dependency "mocha"
-  spec.add_development_dependency "byebug"
 
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.12
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: handsome_fencer-crypto
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  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'
 description: Roro is a containerization and continuous integration framework for Ruby
   on Rails applications. Like Rails, it favors convention over configuration "...for
   programmer happiness and sustainable productivity."
@@ -147,7 +147,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".keep"
 - ".ruby-gemset"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -163,49 +162,44 @@ files:
 - lib/roro/cli.rb
 - lib/roro/cli/base/base.rb
 - lib/roro/cli/base/base_files.rb
-- lib/roro/cli/base/configuration.rb
+- lib/roro/cli/base/check_dependencies.rb
 - lib/roro/cli/base/continuous_integration.rb
 - lib/roro/cli/base/insert_gems.rb
 - lib/roro/cli/base/insertions.rb
 - lib/roro/cli/base/utilities.rb
+- lib/roro/cli/cli.rb
+- lib/roro/cli/configuration.rb
 - lib/roro/cli/expose.rb
-- lib/roro/cli/generate_keys.rb
+- lib/roro/cli/generate/config.rb
+- lib/roro/cli/generate/config/rails.rb
+- lib/roro/cli/generate/generate.rb
+- lib/roro/cli/generate/generate_keys.rb
 - lib/roro/cli/greenfield.rb
 - lib/roro/cli/obfuscate.rb
 - lib/roro/cli/rollon.rb
-- lib/roro/cli/rollon/rollon_as_dockerize.rb
-- lib/roro/cli/rollon/rollon_as_quickstart.rb
-- lib/roro/cli/rollon/rollon_as_roro.rb
 - lib/roro/cli/rollon/stories.rb
+- lib/roro/cli/rollon/stories/database.rb
+- lib/roro/cli/rollon/stories/rails.rb
+- lib/roro/cli/rollon/stories/rails/.keep
+- lib/roro/cli/rollon/stories/rails/database.rb
+- lib/roro/cli/rollon/stories/rails/database/with_mysql.rb
+- lib/roro/cli/rollon/stories/rails/database/with_postgresql.rb
+- lib/roro/cli/rollon/stories/ruby_gem.rb
+- lib/roro/cli/rollon/stories/ruby_gem/with_ci_cd.rb
+- lib/roro/cli/rollon/stories/stories.rb
+- lib/roro/cli/roro_configurator.yml
 - lib/roro/cli/ruby_gem.rb
 - lib/roro/cli/templates/base/.dockerignore
+- lib/roro/cli/templates/base/.env/.keep
+- lib/roro/cli/templates/base/.env/database.mysql.env.tt
+- lib/roro/cli/templates/base/.env/database.pg.env.tt
+- lib/roro/cli/templates/base/.env/web.env.tt
 - lib/roro/cli/templates/base/.keep
-- lib/roro/cli/templates/base/circleci/config.yml.tt
-- lib/roro/cli/templates/base/config/database.yml.pg.tt
-- lib/roro/cli/templates/base/docker-compose.yml.tt
-- lib/roro/cli/templates/base/livereload/hosts.example
-- lib/roro/cli/templates/base/pg/config/database.yml.pg.tt
-- lib/roro/cli/templates/base/pg/database.yml.pg.tt
-- lib/roro/cli/templates/base/roro/.keep
-- lib/roro/cli/templates/base/roro/containers/.keep
-- lib/roro/cli/templates/base/roro/containers/app/.keep
-- lib/roro/cli/templates/base/roro/containers/app/Dockerfile.tt
-- lib/roro/cli/templates/base/roro/containers/app/development.env.tt
-- lib/roro/cli/templates/base/roro/containers/app/docker-entrypoint.sh
-- lib/roro/cli/templates/base/roro/containers/app/test.env.tt
-- lib/roro/cli/templates/base/roro/containers/database/development.env.tt
-- lib/roro/cli/templates/base/roro/containers/database/test.env.tt
-- lib/roro/cli/templates/base/roro/containers/frontend/.keep
-- lib/roro/cli/templates/dockerize/.env/.keep
-- lib/roro/cli/templates/dockerize/.env/development/.keep
-- lib/roro/cli/templates/dockerize/.env/development/database
-- lib/roro/cli/templates/dockerize/.env/development/web
-- lib/roro/cli/templates/dockerize/.keep
-- lib/roro/cli/templates/dockerize/Dockerfile.tt
-- lib/roro/cli/templates/dockerize/docker-compose.yml.tt
-- lib/roro/cli/templates/dockerize/docker-entrypoint.sh
+- lib/roro/cli/templates/base/.roro_config.yml
+- lib/roro/cli/templates/base/Dockerfile.tt
+- lib/roro/cli/templates/base/config/database.mysql.yml
+- lib/roro/cli/templates/base/config/database.pg.yml
 - lib/roro/cli/templates/greenfield/Dockerfile.tt
-- lib/roro/cli/templates/greenfield/docker-compose.yml.tt
 - lib/roro/cli/templates/jumpstart/.env/.keep
 - lib/roro/cli/templates/jumpstart/.env/development/.keep
 - lib/roro/cli/templates/jumpstart/.env/development/database
@@ -214,21 +208,29 @@ files:
 - lib/roro/cli/templates/jumpstart/Dockerfile.tt
 - lib/roro/cli/templates/jumpstart/docker-compose.yml
 - lib/roro/cli/templates/jumpstart/docker-entrypoint.sh
-- lib/roro/cli/templates/quickstart/Dockerfile.tt
-- lib/roro/cli/templates/quickstart/database.yml
-- lib/roro/cli/templates/quickstart/docker-compose.yml
-- lib/roro/cli/templates/quickstart/entrypoint.sh
-- lib/roro/cli/templates/ruby_gem/.gitignore
-- lib/roro/cli/templates/ruby_gem/config.yml
+- lib/roro/cli/templates/livereload/hosts.example
+- lib/roro/cli/templates/roro/.keep
+- lib/roro/cli/templates/roro/docker-compose.yml.tt
+- lib/roro/cli/templates/roro/roro/.keep
+- lib/roro/cli/templates/roro/roro/containers/.keep
+- lib/roro/cli/templates/roro/roro/containers/app/.keep
+- lib/roro/cli/templates/roro/roro/containers/frontend/.keep
+- lib/roro/cli/templates/roro/roro/docker-entrypoint.sh.tt
+- lib/roro/cli/templates/ruby_gem/.circleci/config.yml
 - lib/roro/cli/templates/ruby_gem/docker-compose.yml
-- lib/roro/cli/templates/ruby_gem/docker/containers/app/Dockerfile.tt
-- lib/roro/cli/templates/ruby_gem/docker/env_files/.keep
-- lib/roro/cli/templates/ruby_gem/docker/keys/.keep
+- lib/roro/cli/templates/ruby_gem/roro/ci.env.tt
+- lib/roro/cli/templates/ruby_gem/roro/containers/.keep
+- lib/roro/cli/templates/ruby_gem/roro/containers/ruby_image/Dockerfile.tt
+- lib/roro/cli/templates/ruby_gem/roro/keys/.keep
 - lib/roro/cli/templates/ruby_gem/setup-gem-credentials.sh
+- lib/roro/cli/templates/stories/.keep
+- lib/roro/cli/templates/stories/with_mysql/_service.yml
+- lib/roro/cli/templates/stories/with_postgresql/.keep
+- lib/roro/cli/templates/stories/with_postgresql/_service.yml
 - lib/roro/version.rb
 - lib/tasks/deploy.rake
-- roro-0.3.4.gem
 - roro.gemspec
+- sandbox/.keep
 - vendor/bundle/.keep
 - vendor/cache/actionpack-6.0.3.2.gem
 - vendor/cache/actionview-6.0.3.2.gem
@@ -237,13 +239,14 @@ files:
 - vendor/cache/builder-3.2.4.gem
 - vendor/cache/byebug-11.1.3.gem
 - vendor/cache/coderay-1.1.3.gem
-- vendor/cache/concurrent-ruby-1.1.6.gem
+- vendor/cache/concurrent-ruby-1.1.7.gem
 - vendor/cache/crass-1.0.6.gem
 - vendor/cache/em-websocket-0.5.1.gem
 - vendor/cache/erubi-1.9.0.gem
 - vendor/cache/eventmachine-1.2.7.gem
 - vendor/cache/ffi-1.13.1.gem
 - vendor/cache/formatador-0.2.5.gem
+- vendor/cache/gem-release-2.1.1.gem
 - vendor/cache/given_core-3.8.0.gem
 - vendor/cache/guard-2.16.2.gem
 - vendor/cache/guard-compat-1.2.1.gem