roro 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2920a993245b49f9ac51cf665584007cd9cf1b93e5910a18201b914d62e9b1
-  data.tar.gz: 44fe546dafd609adb0162cc2296f8562afa7f5cd6cb23bb7b607f1aaf2b08bc6
+  metadata.gz: 04dbb241c4e833ddc92e4092594bafdc9be7d4e9a97f235ef2b3430af5c08081
+  data.tar.gz: 68dc2d2a07987ebeb819f7a4c15bc33ef43b2f1f544caf628706970a5f239bbc
 SHA512:
-  metadata.gz: be706b2f7677d2e0b1967b645190197be96ed89cdab015bba2de649dd300d395b17acc395feb4687d2a3d7c9805d51c788fa10af3d1163d37d51ef67753d272a
-  data.tar.gz: 052aca113a452bf5cf9ee7c01f18e0d4c33e46cdfea5a2d97e768c0652c22d952e4d905770a985d150279c9c8efb7fa7b8a6fed2b2b165bcfa11c194a458468b
+  metadata.gz: 4debcc463150555b50360924374028fa74664955a33d47cf67f6362b3a9c1f84f2b2694551da8c342104e6e5d1386303f7018219b82549873b2a7d413747fea6
+  data.tar.gz: 0ec3c8fb00c1378007f6cad61e729b157b56b7be0d3bb4438f33e974365d6323f29bf1ded3dfb55293d24e23fab125f6bae02db786e77f3ea64766e865b95fea

data/Guardfile

@@ -4,7 +4,7 @@
 options = {
   cli: '-f',
   all_on_start: true,
-  all_after_pass: false
+  all_after_pass: true
 }
 
 guard :minitest, options do

data/lib/roro/cli/rollon.rb

@@ -17,7 +17,7 @@ module Roro
       configure_for_rollon
       
       copy_roro_files
-      generate_roro_config
+      generate_config
       startup_commands
     end
     

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

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

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

@@ -1 +1 @@
-# require 'roro/cli/rollon/stories/ruby_gem/with_ci_cd.rb'
+require 'roro/cli/rollon/stories/rails/database'

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

@@ -1,3 +1,5 @@
+require 'roro/cli/rollon/stories/rails/database/with_mysql'
+require 'roro/cli/rollon/stories/rails/database/with_postgresql'
 module Roro
 
   class CLI < Thor

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

@@ -12,9 +12,30 @@ module Roro
     no_commands do 
       def ruby_gem_with_ci_cd(*args)
         configure_for_rollon
-        directory 'ruby_gem', './', @config.app
+        answer = ask("\nYou can add your rubygems api key in\n\t 
+          './roro/ci.env' \n\nlater, or we'll try to add it here:", 
+        default: '')
+        rubygems_api_key = (answer.eql?("") ? 'some-key' : answer)
+        @config.app['rubygems_api_key'] = rubygems_api_key
+        @config.app['rubies'] = [] 
+        3.times do |index| 
+          newruby = @config.app['ruby_version'].gsub('.', '').to_i - index
+          @config.app['rubies'] << newruby.to_s.split('').join('.')
+        end
+        directory 'ruby_gem/roro', './roro', @config.app
+        directory 'ruby_gem/.circleci', './.circleci', @config.app
+        copy_file 'ruby_gem/docker-compose.yml', './docker-compose.yml'
+        
+        @config.app['rubies'].each do |ruby| 
+          img_name = 'ruby_gem:' + ruby
+          file = '.circleci/config.yml'
+          
+          run_build = "\n      - run: RUBY_IMAGE=ruby:#{ruby}-alpine docker-compose build ruby_gem"
+          run_test = "\n      - run: RUBY_IMAGE=ruby:#{ruby}-alpine docker-compose run ruby_gem rake test"
+          append_to_file file, run_build + run_test, after: 'gem install roro'
+        end
+        append_to_file ".gitignore", "\nGemfile.lock"
         gitignore_sensitive_files
-        append_to_file ".gitignore", "Gemfile.lock\n"
       end
     end
   end

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

@@ -1,7 +1,3 @@
 require_relative 'ruby_gem/ruby_gem'
 
-# module Stories
-#   module RubyGem 
-#   end
-# end
 

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

@@ -1,5 +1,5 @@
 defaults: &defaults
-  working_directory: /repo
+  working_directory: /tmp
 
 version: 2
 
@@ -9,114 +9,9 @@ jobs:
     machine: true
     steps:
       - checkout
-
-  test:
-    docker:
-       - image: circleci/ruby:2.5.3
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: gem install bundler
-      - run: bundle
-      - run: rake install
-      - run: mkdir tmp
-      - run: docker-compose up app
-
-  test_all:
-    docker:
-       - image: circleci/ruby:2.5.3
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: gem install bundler
-      - run: bundle
-      - run: rake install
-      - run: mkdir tmp
-      - run: docker-compose up
-
-  build-greenfield:
-    machine: true
-    steps:
-      - checkout
-      - run: bundle
-      - run: rake install
-      - run:
-          name: Greenfield
-          working_directory: sooperdooper
-          command: |
-            bundle
-            sleep 2s
-            rake install
-            sleep 5s
-            roro greenfield
-            sleep 5s
-            curl -Is localhost:3000 | head -n 1
-
-  build-rollon:
-    machine: true
-    steps:
-      - checkout
-      - run: bundle
-      - run: rake install
-      - run:
-          name: Rollon
-          working_directory: test_apps/dummy
-          command: |
-            roro rollon
-            docker-compose up -d
-            docker-compose exec app bin/rails db:create
-            docker-compose exec app rake test
-            curl -Is localhost:3000 | head -n 1
-
-  release:
-    docker:
-      - image: circleci/ruby:2.5.3
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run: gem install bundler
-      - run: bundle
-      - run: rake install
-      - run: roro expose
-      - run: echo 'source docker/env_files/circleci.env' >> $BASH_ENV
-      - run: bash .circleci/setup-gem-credentials.sh
-      - run: rake release
-
-
-workflows:
-  version: 2
-  build-and-deploy:
-    jobs:
-      - build
-      - test:
-          filters:
-            branches:
-              except:
-                - build-greenfield
-                - build-rollon
-                - release
-                - master
-      - build-greenfield:
-          filters:
-            branches:
-              only:
-                - build-greenfield
-                - master
-      - build-rollon:
-          filters:
-            branches:
-              only:
-                - build-rollon
-                - master
-      - test_all:
-          filters:
-            branches:
-              only:
-                - development
-                - master
-
-      - release:
-          filters:
-            branches:
-              only:
-                - release
+      - 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

@@ -5,5 +5,7 @@ services:
   ruby_gem:
     build:
       context: .
-      dockerfile: roro/containers/gem/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/version.rb

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

data/roro.gemspec

@@ -41,11 +41,11 @@ Gem::Specification.new do |spec|
   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 "mocha"
-  spec.add_development_dependency "byebug"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -70,16 +70,30 @@ 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'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        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
@@ -136,20 +150,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."
@@ -194,9 +194,10 @@ files:
 - 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/database/database.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_postgres.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
@@ -212,15 +213,6 @@ files:
 - 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
-- 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/greenfield/Dockerfile.tt
 - lib/roro/cli/templates/jumpstart/.env/.keep
 - lib/roro/cli/templates/jumpstart/.env/development/.keep
@@ -240,8 +232,9 @@ files:
 - 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/roro/containers/gem/Dockerfile.tt
-- lib/roro/cli/templates/ruby_gem/roro/env_files/.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

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

@@ -1,70 +0,0 @@
-defaults: &defaults
-  working_directory: /tmp
-
-version: 2
-
-jobs:
-
-  build:
-    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: docker-compose up -d <%= config[:app_name] %> --build
-      - run: docker-compose exec <%= config[:app_name] %> bin/rails db:create db:migrate
-      - run: docker-compose exec <%= config[:app_name] %> bin/rails test
-
-  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: docker-compose build <%= config[:app_name] %> web
-      - run: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS
-      - run: docker login -u $DOCKERHUB_USER -p $DOCKERHUB_PASS
-      - run:
-          name: Tag <%= config[:app_name] %> image
-          command: docker tag $(docker images | grep project_<%= config[:app_name] %> | 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
-
-  deploy:
-    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: rake --rakefile .circleci/Rakefile
-
-workflows:
-  version: 2
-  build-and-deploy:
-    jobs:
-      - build
-      - push:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
-      - deploy:
-          requires:
-            - push
-          filters:
-            branches:
-              only: master

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

@@ -1,23 +0,0 @@
-FROM ruby:<%= config[:ruby_version] %>
-
-
-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
-RUN apt-get update -qq && apt-get install -y build-essential git nodejs yarn
-
-
-ENV APP_HOME /usr/src/app/
-RUN mkdir $APP_HOME
-WORKDIR $APP_HOME
-
-COPY Gemfile* $APP_HOME 
-
-ENV BUNDLE_PATH /gems
-
-RUN bundle install
-RUN yarn 
-
-COPY . ./$APP_HOME
-
-
-

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

@@ -1,60 +0,0 @@
-version: '3'
-
-services:
-
-  web:
-    build: .
-    depends_on:
-      - database
-      - webpack_dev_server
-      - redis
-    # entrypoint: ./docker-entrypoint.sh
-    command: ["bin/rails", "s", "-b", "0.0.0.0"]
-
-    ports:
-      - "3000:3000"
-      - "4000:4000"
-    volumes:
-      - .:/usr/src/app
-      - gem_cache:/gems
-    env_file:
-      - .env/development/web
-      - .env/development/database
-    environment:
-      - WEBPACKER_DEV_SERVER_HOST=webpack_dev_server
-
-  webpack_dev_server:
-    build: .
-    command: ./bin/webpack-dev-server
-    ports:
-      - 3035:3035
-    volumes:
-      - .:/usr/src/app
-      - gem_cache:/gems
-    env_file:
-      - .env/development/database
-      - .env/development/web
-    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
-
-  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/dockerize/docker-entrypoint.sh

@@ -1,9 +0,0 @@
-#!/bin/sh                                                                       
-
-set -e
-
-if [ -f tmp/pids/server.pid ]; then
-  rm tmp/pids/server.pid
-fi
-
-exec "$@"

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

@@ -1,9 +0,0 @@
-FROM ruby:<%= config['ruby_version'] %>-alpine
-
-RUN apk add --no-cache --update build-base linux-headers git
-
-WORKDIR /usr/src/app
-COPY . /usr/src/app/
-RUN gem install bundler
-RUN bundle 
-RUN bundle exec rake install