roro 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c6bf9813b07f7c2c2f34a0e0e4578130062af0752865da885f4da75c4def51c2
-  data.tar.gz: 2ff26062242671ba49fdffd5b6e87d0477ffb906fb5af967b758440fb4dade1d
+SHA1:
+  metadata.gz: 6b8dac88c95d43a7e4531d2b44849f30e1e37c9e
+  data.tar.gz: 20af42166d1cc70f7b20d327d8cbc8027255cc6c
 SHA512:
-  metadata.gz: d272d16756b148c197ec2b0dcaf25463f0669e88ad4c79ff2f9fc19a2508be72d7ebd13b33ef595df1d146bd22346a8f9413f99ce4d61139167ee0923e103dc7
-  data.tar.gz: 1ce050d03045da0c39d93f8f6ecbf9e4a92782ee7a7594aa976dbdea7350b53964612cd6b970f852749d016b071ccc8c56afca4ce71ed8ab632360150f086fd8
+  metadata.gz: c05e7ff871bcfb14a52602ef71b3a331113ff87da423cca594fb07b41fb5463a432809e0526b8ca77987fb6838829c5ccacfc6e85e1823bf92d6d66a5c1bc3f9
+  data.tar.gz: db4039537980f16d922c0f08add246f66d1229b3055e0cfc0880f5bbdd968eca374d142639fb09d1b4d3d6246efac5dbe381239f516170e065ef3e72ab400366

data/.circleci/config.yml

@@ -0,0 +1,55 @@
+version: 2.1
+
+jobs:
+
+  build:
+    machine: true
+    steps:
+      - checkout
+  
+  test:
+    machine: true
+    steps:
+      - checkout
+      - run: RUBY_VERSION=2.5 docker-compose build ruby_gem
+      - run: RUBY_VERSION=2.5 docker-compose up -d --force-recreate ruby_gem
+      - run: RUBY_VERSION=2.5 docker-compose run ruby_gem bundle exec rake test
+      - run: RUBY_VERSION=2.6 docker-compose build ruby_gem
+      - run: RUBY_VERSION=2.6 docker-compose up -d --force-recreate ruby_gem
+      - run: RUBY_VERSION=2.6 docker-compose run ruby_gem bundle exec rake test
+      - run: RUBY_VERSION=2.7 docker-compose build ruby_gem
+      - run: RUBY_VERSION=2.7 docker-compose up -d --force-recreate ruby_gem
+      - run: RUBY_VERSION=2.7 docker-compose run ruby_gem bundle exec rake test    
+      
+  release:
+    machine: true
+    steps:
+      - checkout
+      - run: gem install roro
+      - run: roro generate::exposed ci
+      - run: | 
+          echo $(cat ./roro/containers/ruby_image/ci.env) >> $BASH_ENV
+          source $BASH_ENV
+      - run: chmod +x ./.circleci/setup-gem-credentials.sh
+      - run: ./.circleci/setup-gem-credentials.sh
+      - run: chmod 0600 ~/.gem/credentials
+      - run: git checkout .
+      - run: gem release
+  
+workflows:
+  version: 2
+    
+  build-release: 
+    jobs: 
+      - build
+      - test:
+          filters: 
+            branches: 
+              only: master
+      
+      - release:
+          requires: 
+            - build
+          filters: 
+            branches: 
+              only: release

data/{lib/roro/cli/templates/ruby_gem → .circleci}/setup-gem-credentials.sh

@@ -1,3 +1,3 @@
 mkdir ~/.gem
 echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
-chmod 0600 /home/circleci/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

data/.gitignore

@@ -13,10 +13,10 @@ roro/**/*.key
 
 *.key
 *.env
+!/.gitignore
 
 tmp/*
-tmp/*
-!tmp/.gitkeep 
+!tmp/.keep 
 sandbox/*
 !sandbox/.keep 
 !sandbox/greenfield

data/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.2'
+
+services:
+
+  ruby_gem:
+    build:
+      context: .
+      dockerfile: roro/containers/ruby_image/Dockerfile
+    environment:
+      - RUBY_VERSION=${RUBY_VERSION}
+    volumes:
+      - gem_cache:/gems
+
+volumes:
+  gem_cache:

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

@@ -2,7 +2,6 @@ module Roro
   class CLI < Thor 
        
     desc "rollon::ruby_gem::with_ci_cd", "Generate files for containerized gem testing, CircleCI, and releasing to RubyGems."
-    method_option :rubies, type: :array, banner: "2.5.3 2.4.2"
     map "rollon::ruby_gem::with_ci_cd" => "rollon_ruby_gem_with_ci_cd"
 
     def rollon_ruby_gem_with_ci_cd(*args) 
@@ -13,7 +12,7 @@ module Roro
       def ruby_gem_with_ci_cd(*args)
         configure_for_rollon
         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:", 
+          './roro/containers/ruby_gem/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
@@ -27,55 +26,20 @@ module Roro
         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'
+          spacer = "\n      - run: "
+          rv = "RUBY_VERSION=#{ruby} docker-compose "
+          build = "build ruby_gem"
+          up = "up -d --force-recreate ruby_gem"
+          run_tests = "run ruby_gem bundle exec rake test"
+          append_to_file file, spacer + rv + run_tests, after: "- placeholder"
+          append_to_file file, spacer + rv + up, after: "- placeholder"
+          append_to_file file, spacer + rv + build, after: "- placeholder"
         end
+        gsub_file '.circleci/config.yml', "- placeholder", "- checkout"
         append_to_file ".gitignore", "\nGemfile.lock"
         gitignore_sensitive_files
       end
     end
   end
 end
-# #     def ruby_gem
-# #       rubies = options["rubies"] || ["2.5.3", "2.6.0"]
-# #       copy_file 'ruby_gem/docker-compose.yml', 'docker-compose.yml'
-# #       copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
-# #       copy_file 'ruby_gem/setup-gem-credentials.sh', '.circleci/setup-gem-credentials.sh'
-# #       directory 'ruby_gem/docker', 'docker', { ruby_version: "2.5"}
-
-# #       rubies.each do |ruby|
-# #         rubydash = ruby.gsub('.', '-')
-# #         rubyunderscore = ruby.gsub('.', '_')
-# #         doc_loc = "docker/containers/#{rubyunderscore}/Dockerfile"
-# #         content = <<-EOM
-
-# #   app-#{rubydash}:
-# #     build:
-# #       context: .
-# #       dockerfile: #{doc_loc}
-# #     command: rake test
-# #         EOM
-# #         append_to_file 'docker-compose.yml', content
-# #         template 'ruby_gem/docker/containers/app/Dockerfile.tt', doc_loc, {ruby_version: ruby}
-# #         # append_to_file 'docker-compose.yml', "\n  app-#{ruby}:\n    build:\n\s\s\s\s\s\scontext:"
-# #       end
-
-# #       # end
-# # #       <<EOF
-# # #    This is the first way of creating
-# # #    here document ie. multiple line string.
-# # # EOF
-# #       # %w[app web].each do |container|
-# #       #   options = {
-# #       #     email: @env_hash['DOCKERHUB_EMAIL'],
-# #       #     app_name: @env_hash['APP_NAME'] }
-# #       #
-# #       #   template("docker/containers/#{container}/Dockerfile.tt", "docker/containers/#{container}/Dockerfile", options)
-# #       # end
-# #     end
-# #   end
-# # end

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

@@ -1,5 +1,4 @@
 .git
-.gitignore
 README.md
 
 #
@@ -30,7 +29,8 @@ Temporary Items
 *.rbc
 capybara-*.html
 log
-tmp
+tmp/*
+!tmp/.keep
 db/*.sqlite3
 db/*.sqlite3-journal
 public/system

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

@@ -0,0 +1,40 @@
+version: 2.1
+
+jobs:
+
+  build:
+    machine: true
+    steps:
+      - checkout
+  
+  test:
+    machine: true
+    steps:
+      - placeholder    
+      
+  release:
+    machine: true
+    steps:
+      - checkout
+      - run: gem install roro
+      - run: roro generate::exposed ci
+      - run: echo 'source roro/containers/ruby_image/ci.env' >> $BASH_ENV
+      - run: chmod +x ./.circleci/setup-gem-credentials.sh
+      - run: ./.circleci/setup-gem-credentials.sh
+      - run: cat ~/.gem/credentials
+      - run: git checkout .
+      - run: gem release
+  
+workflows:
+  version: 2
+    
+  build-release: 
+    jobs: 
+      - build
+      - test
+      - release:
+          requires: 
+            - build
+          filters: 
+            branches: 
+              only: release

data/lib/roro/cli/templates/ruby_gem/.circleci/setup-gem-credentials.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+chmod 0600 /home/circleci/.gem/credentials

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

@@ -7,5 +7,9 @@ services:
       context: .
       dockerfile: roro/containers/ruby_image/Dockerfile
     environment:
-      - RUBY_IMAGE=${RUBY_IMAGE}
-    command: bundle exec rake test
+      - RUBY_VERSION=${RUBY_VERSION}
+    volumes:
+      - gem_cache:/gems
+
+volumes:
+  gem_cache:

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

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

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

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

data/lib/roro/cli/templates/stories/rails/database/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/rails/database/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/cli/templates/stories/ruby_gem/with_ci_cd/_build.yml

@@ -0,0 +1,11 @@
+  build:
+    machine: true
+    steps:
+      - checkout
+      
+      <%= 'getsome' %>
+      - run: gem install roro
+      - run: roro generate::exposed ci
+      - run: echo 'source roro/containers/ruby_image/ci.env' >> $BASH_ENV
+      - run: gem install gem-release
+      # - run: gem release --key $RUBYGEMS_API_KEY

data/lib/roro/version.rb

@@ -1,3 +1,3 @@
 module Roro
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

data/roro.gemspec

@@ -46,5 +46,6 @@ Gem::Specification.new do |spec|
   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

data/roro/containers/ruby_image/Dockerfile

@@ -0,0 +1,16 @@
+ARG RUBY_VERSION=2.7
+ARG RUBY_IMAGE=ruby:${RUBY_VERSION}-alpine
+FROM $RUBY_IMAGE
+
+RUN apk add --no-cache --update build-base linux-headers git
+
+ENV APP_HOME /usr/src/app/
+ENV BUNDLE_PATH /gems
+ENV GEM_PATH ${BUNDLE_PATH}
+ENV GEM_HOME ${BUNDLE_PATH}
+
+RUN mkdir ${BUNDLE_PATH}
+
+WORKDIR ${APP_HOME}
+COPY . ${APP_HOME}
+RUN bundle install

data/roro/containers/ruby_image/ci.env.enc

@@ -0,0 +1,2 @@
+CP3WnhLldqGcoPdCRgAkzUiXdTYdd166oDCRsXDbJi+YWczgX53oaJsRNlu8
+S/cvOkds770ID3hmbcNXwfyR4A==

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-22 00:00:00.000000000 Z
+date: 2020-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -136,6 +136,20 @@ 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."
@@ -146,6 +160,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/.keep"
+- ".circleci/config.yml"
+- ".circleci/setup-gem-credentials.sh"
 - ".gitignore"
 - ".ruby-gemset"
 - ".travis.yml"
@@ -158,6 +175,7 @@ files:
 - bin/console
 - bin/roro
 - bin/setup
+- docker-compose.yml
 - lib/roro.rb
 - lib/roro/cli.rb
 - lib/roro/cli/base/base.rb
@@ -216,21 +234,31 @@ files:
 - 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/.circleci/.keep
+- lib/roro/cli/templates/ruby_gem/.circleci/config.yml.tt
+- lib/roro/cli/templates/ruby_gem/.circleci/setup-gem-credentials.sh
 - lib/roro/cli/templates/ruby_gem/docker-compose.yml
-- 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/containers/ruby_image/ci.env.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/rails/database/with_mysql/_service.yml
+- lib/roro/cli/templates/stories/rails/database/with_postgresql/.keep
+- lib/roro/cli/templates/stories/rails/database/with_postgresql/_service.yml
+- lib/roro/cli/templates/stories/ruby_gem/with_ci_cd/_build.yml
 - 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.gemspec
+- roro/containers/.keep
+- roro/containers/ruby_image/Dockerfile
+- roro/containers/ruby_image/ci.env.enc
+- roro/keys/.keep
 - sandbox/.keep
+- tmp/.keep
 - vendor/bundle/.keep
 - vendor/cache/actionpack-6.0.3.2.gem
 - vendor/cache/actionview-6.0.3.2.gem
@@ -316,7 +344,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Containerization framwork for Ruby on Rails applications.

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

@@ -1,17 +0,0 @@
-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/roro/ci.env.tt

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