roro 0.3.5 → 0.3.6

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:
+RUN bundle install
+
+## Switch to the the work directory from container root:
+WORKDIR ${APP_HOME}
+
+## 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/roro/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 "$@"

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.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -147,7 +147,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".keep"
 - ".ruby-gemset"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -163,39 +162,38 @@ 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/configuration.rb
 - lib/roro/cli/expose.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/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/database/database.rb
+- lib/roro/cli/rollon/database/with_mysql.rb
+- lib/roro/cli/rollon/database/with_postgres.rb
 - lib/roro/cli/rollon/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/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/circleci/config.yml.tt
 - lib/roro/cli/templates/dockerize/.env/.keep
 - lib/roro/cli/templates/dockerize/.env/development/.keep
 - lib/roro/cli/templates/dockerize/.env/development/database
@@ -205,7 +203,6 @@ files:
 - lib/roro/cli/templates/dockerize/docker-compose.yml.tt
 - lib/roro/cli/templates/dockerize/docker-entrypoint.sh
 - 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,10 +211,18 @@ 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/livereload/hosts.example
 - 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/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/.gitignore
 - lib/roro/cli/templates/ruby_gem/config.yml
 - lib/roro/cli/templates/ruby_gem/docker-compose.yml
@@ -225,9 +230,12 @@ files:
 - 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/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
 - vendor/bundle/.keep
 - vendor/cache/actionpack-6.0.3.2.gem

data/lib/roro/cli/base/configuration.rb

@@ -1,118 +0,0 @@
-
-module Roro
-
-  class CLI < Thor
-    
-    no_commands do
-      
-      def get_configuration_variables(hash={})
-        options["interactive"] ? set_interactively : set_from_defaults
-        hash.each { |k,v| @env_hash[k] = v } unless hash.nil? 
-        @env_hash[:deploy_tag] = "${CIRCLE_SHA1:0:7}"
-        @env_hash[:server_port] = "22"
-        @env_hash[:server_user] = "root"
-        @env_hash
-      end
-      
-      def set_from_defaults
-        @env_hash = configuration_hash
-        @env_hash.map do  |key, hash| 
-          @env_hash[key] = hash.values.last 
-        end
-        @env_hash
-      end
-      
-      def set_interactively
-        @env_hash = configuration_hash
-        @env_hash.map do |key, prompt|
-          answer = ask("Please provide #{prompt.keys.first} or hit enter to accept: \[ #{prompt.values.first} \]")
-          @env_hash[key] = (answer == "") ? prompt.values.first : answer
-        end  
-      end
-      
-      def confirm_dependencies
-        dependencies = [
-          {
-            system_query: "which docker",
-            warning: "Docker isn't installed",
-            suggestion: "https://docs.docker.com/install/"
-          }, {
-            system_query: "which docker-compose",
-            warning: "Docker Compose isn't installed",
-            suggestion: "https://docs.docker.com/compose/install/"
-
-          }, {
-            system_query: "docker info",
-            warning: "the Docker daemon isn't running",
-            suggestion: "https://docs.docker.com/config/daemon/#start-the-daemon-manually"
-          }
-        ]
-
-        dependencies.each do |dependency|
-          confirm_dependency(dependency)
-        end
-      end
-      
-      
-      
-      def confirm_dependency(options)
-        msg = []
-        msg << ""
-        msg << delineator
-        msg << "It looks like #{options[:warning]}. The following bash command returns false:"
-        msg << "\t$ #{options[:system_query]}"
-        msg << "Please try these instructions:"
-        msg << ("\t" + options[:suggestion])
-        msg << delineator
-        conditional = options[:conditional] ? eval(options[:conditional]) : system(options[:system_query])
-        if conditional == false
-          raise(Roro::Error.new(msg.join("\n\n")))
-        end
-      end
-
-      
-      private
-      
-      def configuration_hash
-        {
-          app_name: {
-            "the name of your app" => `pwd`.split('/').last.strip! 
-          },
-          ruby_version: {
-            "the version of ruby you'd like" => `ruby -v`.scan(/\d.\d/).first 
-          },
-          server_host: {
-            "the ip address of your server" => "ip-address-of-your-server"
-          },
-          database_container: {
-            "the name of your database container" => "database"
-          },
-          frontend_container: {
-            "the name of your frontend container" => "frontend"
-          },
-          server_container: {
-            "the name of your server container" => "nginx"
-          },
-          dockerhub_email: {
-            "your Docker Hub email" => "your-docker-hub-email"
-          },
-          dockerhub_user: {
-            "your Docker Hub username" => "your-docker-hub-user-name" 
-          },
-          dockerhub_org: {
-            "your Docker Hub organization name" => "your-docker-hub-org-name"
-          },
-          dockerhub_password: {
-            "your Docker Hub password" => "your-docker-hub-password"
-          },
-          postgres_user: {
-            "your Postgres username" => "postgres"
-          },
-          postgres_password: {
-            "your Postgres password" => "your-postgres-password"
-          } 
-        }
-      end
-    end
-  end 
-end

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

@@ -1,42 +0,0 @@
-module Roro
-
-  class CLI < Thor
-
-    no_commands do
-
-      def rollon_as_dockerize
-        rollon_dockerize_files 
-        system 'docker-compose build'
-        system 'docker-compose run --no-deps web bin/rails webpacker:install'
-        system 'docker-compose up'
-      end
-      
-      def 
-      
-      def configure_for_pg 
-        service = [
-          "  database:",
-          "    image: postgres",
-          "    env_file:",
-          "      - .env/development/database",
-          "    volumes:",
-          "      - db_data:var/lib/postgresql/data"
-        ].join("\n")
-        
-        @env_hash[:database_service] = service
-      end
-      
-      def rollon_dockerize_files 
-        directory 'dockerize', '.', @env_hash
-        copy_dockerignore
-        if ask('Configure $stdout.sync for docker?', choices).eql?('y')
-          config_std_out_true
-        end
-        if ask('Configure your app to use Postgresql?', choices).eql?('y')
-          copy_database_yml_pg
-          insert_pg_gem_into_gemfile
-        end
-      end
-    end
-  end
-end