roro 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21dea82b0e30a105b0ac41e03d9630418672d63
-  data.tar.gz: 7eb7950531987c7a93a8f1e21b286c1d149b2eb0
+  metadata.gz: 4ff432672046f38d4adb0214e9c5125be36183f2
+  data.tar.gz: 5559ed50720181a77d4af026cd3b0b8bff90b674
 SHA512:
-  metadata.gz: bd8d5fd5b9b5b51c4063b8b167aadb3f00d7f87e2f7928730eee9ca281bc30a65131e15fd73757ec87ae61fc8c01cc7fa5399389bc29c64f673f1aca97ad70c2
-  data.tar.gz: 23cfe00c8535806eb5102db12325e70392abf942fe32749d5dfc7f44525e5694e6a1fb9664fa1fba23bcde86a431d4446b5f3cd28b47ebbfb9b489d72de4dd6e
+  metadata.gz: 44d46961f02e97b9d21ee5c7e76f2e4d1708824c3bb50dbb24291bdc3f3c9fa64c4c2ffeb70ff235c685898e4224bc6ba558f51a6158a68888f63d2be904bb77
+  data.tar.gz: 2b3d2e7129581279a7bca13f36a3a1287e06041b8ba1e2880251ca4aa65217cd47947c31d511509b724bf5d64119a31c47da1cb7afc82165922bc126322a31f9

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

@@ -25,7 +25,7 @@ module Roro
       def copy_rails_files
         template 'rails/.circleci/config.yml.tt', './.circleci/config.yml' 
         configure_database  
-        directory 'roro', './', @config.app
+        template 'rails/docker-compose.yml.tt', './docker-compose.yml', @config.app
         template 'base/dotenv', './.env', @config.app
         directory 'rails/roro', './roro', @config.app
         take_thor_actions

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

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

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

@@ -10,6 +10,4 @@
        
 <%= yaml_from_template("base/.circleci/_workflow.yml") %>
 
-<%= yaml_from_template("rails/.circleci/workflows/_build_test_push.yml") %>
-
-  
+<%= yaml_from_template("rails/.circleci/workflows/_build_test_push.yml") %>

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

@@ -13,4 +13,4 @@
           paths:  
             - roro
       - run: *source-ci-variables
-      - run: RORO_ENV=ci docker-compose up -d --build
+      - run: RORO_ENV=ci docker-compose build

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

@@ -5,6 +5,9 @@
       - 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
+      - run: RORO_ENV=ci docker-compose build
+      - run: RORO_ENV=ci docker-compose run web bundle
+      - run: RORO_ENV=ci docker-compose run web yarn
+      - run: RORO_ENV=ci docker-compose run web bin/rails db:create
+      - run: RORO_ENV=ci docker-compose run web bin/rails db:migrate
+      - run: RORO_ENV=ci docker-compose run web bin/rails test

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

@@ -44,7 +44,7 @@ services:
   redis:
     image: redis
 
-<%= yaml_from_template("stories/with_#{config['database_vendor']}/_service.yml") %>
+<%= yaml_from_template("rails/database/with_#{config['database_vendor']}/_service.yml") %>
 
   system_tests:
     image: selenium/standalone-chrome-debug

data/lib/roro/cli/templates/rails/roro/containers/app/Dockerfile.tt

@@ -84,8 +84,5 @@ COPY . ${APP_HOME}
 ## Now make your entrypoint executable.  
 RUN chmod +x roro/docker-entrypoint.sh
 
-## Now update node modules: 
-RUN yarn
-
 
 

data/lib/roro/version.rb

@@ -1,3 +1,3 @@
 module Roro
-  VERSION = "0.3.16"
+  VERSION = "0.3.17"
 end

data/roro.gemspec

@@ -36,16 +36,15 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   # spec.bindir        = "exe"
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.add_dependency "gem-release", "~> 2.1"
-  spec.add_dependency "handsome_fencer-crypto", "~> 0.1.9"
-  spec.add_dependency "os", "1.0.0"
-  spec.add_dependency "rake", ">= 12.3"
-  spec.add_dependency "sshkit", "1.18.2"
-  spec.add_dependency "thor", "~> 1.0"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "handsome_fencer-test", "~> 0.2.2"
-  spec.add_development_dependency "mocha"
+  spec.require_paths = ['lib']
+  spec.add_dependency 'gem-release', '~> 2.1'
+  spec.add_dependency 'handsome_fencer-crypto', '~> 0.1.9'
+  spec.add_dependency 'rake', '~> 13.0', '>= 13.0.1'
+  spec.add_dependency 'sshkit', '~> 1.21'
+  spec.add_dependency 'thor', '~> 1.0', '>= 1.0.1'
+  spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
+  spec.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.3'
+  spec.add_development_dependency 'handsome_fencer-test', '~> 0.2.2'
+  spec.add_development_dependency 'mocha', '~> 1.11', '>= 1.11.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - schadenfred
@@ -38,48 +38,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.9
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.2
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.2
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +79,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,34 +89,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
   name: handsome_fencer-test
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +150,22 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.2
 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."
@@ -212,15 +228,17 @@ files:
 - lib/roro/cli/templates/base/.dockerignore
 - lib/roro/cli/templates/base/.roro_config.yml
 - lib/roro/cli/templates/base/dotenv
-- lib/roro/cli/templates/jumpstart/.env/.keep
-- lib/roro/cli/templates/jumpstart/.env/development/.keep
-- lib/roro/cli/templates/jumpstart/.env/development/database
-- lib/roro/cli/templates/jumpstart/.env/development/web
-- lib/roro/cli/templates/jumpstart/.keep
-- 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/base/jumpstart/.keep
+- lib/roro/cli/templates/base/jumpstart/Dockerfile.tt
+- lib/roro/cli/templates/base/jumpstart/docker-compose.yml
+- lib/roro/cli/templates/base/jumpstart/docker-entrypoint.sh
+- lib/roro/cli/templates/base/livereload/hosts.example
+- lib/roro/cli/templates/base/roro/.keep
+- lib/roro/cli/templates/base/roro/roro/.keep
+- lib/roro/cli/templates/base/roro/roro/containers/.keep
+- lib/roro/cli/templates/base/roro/roro/containers/app/.keep
+- lib/roro/cli/templates/base/roro/roro/containers/frontend/.keep
+- lib/roro/cli/templates/base/roro/roro/docker-entrypoint.sh.tt
 - lib/roro/cli/templates/rails/.circleci/.keep
 - lib/roro/cli/templates/rails/.circleci/_aliases.yml
 - lib/roro/cli/templates/rails/.circleci/config.yml.tt
@@ -236,6 +254,7 @@ files:
 - lib/roro/cli/templates/rails/database/with_mysql/_service.yml
 - lib/roro/cli/templates/rails/database/with_postgresql/.keep
 - lib/roro/cli/templates/rails/database/with_postgresql/_service.yml
+- lib/roro/cli/templates/rails/docker-compose.yml.tt
 - lib/roro/cli/templates/rails/dotenv/.keep
 - lib/roro/cli/templates/rails/dotenv/database.mysql.env.tt
 - lib/roro/cli/templates/rails/dotenv/database.pg.env.tt
@@ -245,20 +264,12 @@ files:
 - lib/roro/cli/templates/rails/roro/containers/app/.keep
 - lib/roro/cli/templates/rails/roro/containers/app/Dockerfile.tt
 - lib/roro/cli/templates/rails/roro/containers/frontend/.keep
-- lib/roro/cli/templates/rails/roro/docker-compose.yml.tt
 - lib/roro/cli/templates/rails/roro/docker-entrypoint.sh.tt
 - lib/roro/cli/templates/rails/roro/roro/.keep
 - lib/roro/cli/templates/rails/roro/roro/containers/.keep
 - lib/roro/cli/templates/rails/roro/roro/containers/app/.keep
 - lib/roro/cli/templates/rails/roro/roro/containers/frontend/.keep
 - lib/roro/cli/templates/rails/roro/roro/docker-entrypoint.sh.tt
-- 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/.keep
 - lib/roro/cli/templates/ruby_gem/.circleci/config.yml.tt
 - lib/roro/cli/templates/ruby_gem/.circleci/setup-gem-credentials.sh
@@ -282,69 +293,6 @@ files:
 - sandbox/.keep
 - tmp/.keep
 - vendor/bundle/.keep
-- vendor/cache/activesupport-6.0.3.2.gem
-- vendor/cache/addressable-2.7.0.gem
-- vendor/cache/apparition-0.6.0.gem
-- vendor/cache/byebug-11.1.3.gem
-- vendor/cache/capybara-3.33.0.gem
-- vendor/cache/childprocess-3.0.0.gem
-- vendor/cache/coderay-1.1.3.gem
-- vendor/cache/concurrent-ruby-1.1.7.gem
-- vendor/cache/em-websocket-0.5.1.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
-- vendor/cache/guard-livereload-2.5.2.gem
-- vendor/cache/guard-minitest-2.4.6.gem
-- vendor/cache/handsome_fencer-crypto-0.1.9.gem
-- vendor/cache/handsome_fencer-test-0.2.2.gem
-- vendor/cache/http_parser.rb-0.6.0.gem
-- vendor/cache/i18n-1.8.5.gem
-- vendor/cache/launchy-2.5.0.gem
-- vendor/cache/listen-3.2.1.gem
-- vendor/cache/lumberjack-1.2.7.gem
-- vendor/cache/method_source-1.0.0.gem
-- vendor/cache/mini_mime-1.0.2.gem
-- vendor/cache/mini_portile2-2.4.0.gem
-- vendor/cache/minitest-5.14.1.gem
-- vendor/cache/minitest-given-3.8.0.gem
-- vendor/cache/minitest-matchers_vaccine-1.0.4.gem
-- vendor/cache/mocha-1.11.2.gem
-- vendor/cache/multi_json-1.15.0.gem
-- vendor/cache/nenv-0.3.0.gem
-- vendor/cache/net-scp-3.0.0.gem
-- vendor/cache/net-ssh-6.1.0.gem
-- vendor/cache/nokogiri-1.10.10.gem
-- vendor/cache/notiffany-0.1.3.gem
-- vendor/cache/os-1.0.0.gem
-- vendor/cache/pry-0.13.1.gem
-- vendor/cache/public_suffix-4.0.5.gem
-- vendor/cache/rack-2.2.3.gem
-- vendor/cache/rack-livereload-0.3.17.gem
-- vendor/cache/rack-test-1.1.0.gem
-- vendor/cache/rake-13.0.1.gem
-- vendor/cache/rb-fsevent-0.10.4.gem
-- vendor/cache/rb-inotify-0.10.1.gem
-- vendor/cache/regexp_parser-1.7.1.gem
-- vendor/cache/rubyzip-2.3.0.gem
-- vendor/cache/selenium-webdriver-3.142.7.gem
-- vendor/cache/shellany-0.0.1.gem
-- vendor/cache/shoulda-2.11.3.gem
-- vendor/cache/shoulda-context-2.0.0.rc2.gem
-- vendor/cache/shoulda-matchers-4.4.1.gem
-- vendor/cache/sorcerer-2.0.1.gem
-- vendor/cache/sshkit-1.18.2.gem
-- vendor/cache/thor-1.0.1.gem
-- vendor/cache/thread_safe-0.3.6.gem
-- vendor/cache/tzinfo-1.2.7.gem
-- vendor/cache/websocket-driver-0.7.3.gem
-- vendor/cache/websocket-extensions-0.1.5.gem
-- vendor/cache/xpath-3.2.0.gem
-- vendor/cache/zeitwerk-2.4.0.gem
 homepage: https://github.com/schadenfred/roro
 licenses:
 - MIT

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

@@ -1,59 +0,0 @@
-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: