roro 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec8ef8f72b6fd4ff28b8d74e1a6b85a7dc17d62af0b4e8c9f78948c51533dd4
-  data.tar.gz: 8583287621045a0cf864d82728480ce4a80fd814bbe99112948f13327c10ce0d
+  metadata.gz: 5d2920a993245b49f9ac51cf665584007cd9cf1b93e5910a18201b914d62e9b1
+  data.tar.gz: 44fe546dafd609adb0162cc2296f8562afa7f5cd6cb23bb7b607f1aaf2b08bc6
 SHA512:
-  metadata.gz: 444be7de23db2d83ac72cc0520386c05b4b029667469d96d17cafc39c27fae94bf26168fae05b13fc8c8d64b1160b7f1201d62b1acabede65e667d312e2f6e09
-  data.tar.gz: 9f05dcdf81371ef94275b5b262380d5ad360edcc745e61fe7b8ec99d913b7c4d69374ddeb0770362dd5133fe35abfab813f9817688cd730d3659e813bd5cf4c3
+  metadata.gz: be706b2f7677d2e0b1967b645190197be96ed89cdab015bba2de649dd300d395b17acc395feb4687d2a3d7c9805d51c788fa10af3d1163d37d51ef67753d272a
+  data.tar.gz: 052aca113a452bf5cf9ee7c01f18e0d4c33e46cdfea5a2d97e768c0652c22d952e4d905770a985d150279c9c8efb7fa7b8a6fed2b2b165bcfa11c194a458468b

data/Guardfile

@@ -11,7 +11,7 @@ guard :minitest, options do
 
   watch(%r{^test/(.*)\/?test_(.*)\.rb$})
   watch(%r{^test/(.*)\/?(.*)_test\.rb$})
-  watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/cli/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" }
   watch(%r{^test/thor_helper\.rb$})      { 'test' }
   watch(%r{^test/fixtures/files/(.*/)?([^/]+)\.yml$})     { 'test' }
 end

data/lib/roro.rb

@@ -1,3 +1,4 @@
+require 'byebug' 
 require "roro/version"
 require "thor"
 require "roro/cli"

data/lib/roro/cli.rb

@@ -1,15 +1,13 @@
-require 'thor'
 require 'roro/cli/base/base'
-require 'roro/cli/rollon'
 require 'roro/cli/greenfield'
 require 'roro/cli/obfuscate'
 require 'roro/cli/expose'
-require 'roro/cli/ruby_gem'
 require 'roro/cli/generate/config/rails'
 require 'roro/cli/generate/config'
 require 'roro/cli/generate/generate_keys'
 require 'roro/cli/configuration'
 
+require 'roro/cli/rollon'
 module Roro
   
   class CLI < Thor
@@ -19,5 +17,73 @@ module Roro
     def self.source_root
       File.dirname(__FILE__) + '/cli/templates'
     end
+    
+   
+    desc "rollon::rails", "Generates files for and makes changes to your app 
+      so it can run using Docker containers."
+    method_option :interactive, desc: "Set up your environment variables as 
+      you go."
+    map "rollon::rails" => "rollon_rails"
+    
+    def rollon_rails 
+      rollon
+    end
+
+    
+    desc "greenfield::rails", "Greenfield a new, dockerized rails app with
+      either MySQL or PostgreSQL in a separate container."
+    
+    method_option :env_vars, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "key1:value1 key2:value2"
+    method_option :interactive, desc: "Set up your environment variables as you go."
+    method_option :force, desc: "force over-write of existing files"
+
+    map "greenfield::rails" => "greenfield_rails"
+    
+    def greenfield_rails(*args) 
+      greenfield(*args)
+    end
+    desc "generate::exposed", "Generate private .env files from 
+      encrypted .env.enc files inside the roro directory."
+    map "generate::exposed" => "generate_exposed"
+    
+    def generate_exposed(*args) 
+      expose(*args)
+    end
+    
+    desc "generate::key", "Generate a key inside roro/keys. Takes the name of 
+      an environment as an argument to private .env files from 
+    encrypted .env.enc files inside the roro directory.
+    Expose encrypted files"
+    
+    map "generate::key" => "generate_key"
+    method_option :environment, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "development, staging"
+    
+    def generate_key(*args)
+      generate_key_or_keys(*args)
+    end
+
+    desc "generate::keys", "Generate keys for each environment inside roro/keys.
+      If you have .env files like 'roro/containers/app/[staging_env].env' and 
+      'roro/[circle_ci_env].env' it will generate '/roro/keys/[staging_env].key'
+      and '/roro/keys/[circle_ci_env].key'."
+    map "generate::keys" => "generate_keys"
+
+    def generate_keys(*args)
+      generate_key(*args)
+    end
+    
+    desc "generate::config", "Generate a config file at .roro_config.yml" 
+    map "generate::config" => "generate_config"
+    
+    def generate_config
+      create_file ".roro_config.yml", @config.app.to_yaml 
+    end
+    
+    desc "generate::obfuscated", "obfuscates any files matching the pattern ./roro/**/*.env"
+    map "generate::obfuscated" => "generate_obfuscated"
+    
+    def generate_obfuscated(*args) 
+      obfuscate(*args)
+    end
   end
 end

data/lib/roro/cli/cli.rb

@@ -0,0 +1,99 @@
+require 'thor'
+require 'roro/cli/base/base'
+require 'roro/cli/rollon/stories'
+require 'roro/cli/rollon'
+require 'roro/cli/greenfield'
+require 'roro/cli/obfuscate'
+require 'roro/cli/expose'
+require 'roro/cli/ruby_gem'
+require 'roro/cli/generate/config/rails'
+require 'roro/cli/generate/config'
+require 'roro/cli/generate/generate_keys'
+require 'roro/cli/configuration'
+
+module Roro
+  
+  class CLI < Thor
+    
+    include Thor::Actions
+    
+    def self.source_root
+      File.dirname(__FILE__) + '/cli/templates'
+    end
+    
+    desc "rollon::ruby_gem", "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" => "rollon_ruby_gem"
+
+    def rollon_ruby_gem(*args) 
+      ruby_gem(*args)
+    end
+    
+    desc "rollon::rails", "Generates files for and makes changes to your app 
+      so it can run using Docker containers."
+    method_option :interactive, desc: "Set up your environment variables as 
+      you go."
+    map "rollon::rails" => "rollon_rails"
+    
+    def rollon_rails 
+      rollon
+    end
+
+    
+    desc "greenfield::rails", "Greenfield a new, dockerized rails app with
+      either MySQL or PostgreSQL in a separate container."
+    
+    method_option :env_vars, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "key1:value1 key2:value2"
+    method_option :interactive, desc: "Set up your environment variables as you go."
+    method_option :force, desc: "force over-write of existing files"
+
+    map "greenfield::rails" => "greenfield_rails"
+    
+    def greenfield_rails(*args) 
+      greenfield(*args)
+    end
+    desc "generate::exposed", "Generate private .env files from 
+      encrypted .env.enc files inside the roro directory."
+    map "generate::exposed" => "generate_exposed"
+    
+    def generate_exposed(*args) 
+      expose(*args)
+    end
+    
+    desc "generate::key", "Generate a key inside roro/keys. Takes the name of 
+      an environment as an argument to private .env files from 
+    encrypted .env.enc files inside the roro directory.
+    Expose encrypted files"
+    
+    map "generate::key" => "generate_key"
+    method_option :environment, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "development, staging"
+    
+    def generate_key(*args)
+      generate_key_or_keys(*args)
+    end
+
+    desc "generate::keys", "Generate keys for each environment inside roro/keys.
+      If you have .env files like 'roro/containers/app/[staging_env].env' and 
+      'roro/[circle_ci_env].env' it will generate '/roro/keys/[staging_env].key'
+      and '/roro/keys/[circle_ci_env].key'."
+    map "generate::keys" => "generate_keys"
+
+    def generate_keys(*args)
+      generate_key(*args)
+    end
+    
+    desc "generate::config", "Generate a config file at .roro_config.yml" 
+    map "generate::config" => "generate_config"
+    
+    def generate_config
+      create_file ".roro_config.yml", @config.app.to_yaml 
+    end
+    
+    desc "generate::obfuscated", "obfuscates any files matching the pattern ./roro/**/*.env"
+    map "generate::obfuscated" => "generate_obfuscated"
+    
+    def generate_obfuscated(*args) 
+      obfuscate(*args)
+    end
+  end
+end

data/lib/roro/cli/configuration.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 module Roro
   class Configuration < Thor
     

data/lib/roro/cli/expose.rb

@@ -1,13 +1,14 @@
 module Roro
   class CLI < Thor
+    
+    no_commands do 
 
-    desc "expose", "Expose encrypted files"
-
-    def expose(*args)
-      environments = args.first ? [args.first] : gather_environments
-      environments.each do |environment|
-        HandsomeFencer::Crypto.expose(environment, 'roro')
+      def expose(*args)
+        environments = args.first ? [args.first] : gather_environments
+        environments.each do |environment|
+          HandsomeFencer::Crypto.expose(environment, 'roro')
+        end
       end
     end
   end
-end
+end

data/lib/roro/cli/generate/config.rb

@@ -2,12 +2,12 @@ module Roro
   class CLI < Thor
     include Thor::Actions
     
-    desc "generate::config::roro", "Generates a config file at .roro_config.yml" 
-    map "generate::config::roro" => "generate_roro_config"
+    # desc "generate::config::roro", "Generate a config file at .roro_config.yml" 
+    # map "generate::config::roro" => "generate_roro_config"
 
      
-    def generate_roro_config
-      create_file ".roro_config.yml", @config.app.to_yaml 
-    end
+    # def generate_roro_config
+    #   create_file ".roro_config.yml", @config.app.to_yaml 
+    # end
   end 
 end

data/lib/roro/cli/generate/generate_keys.rb

@@ -1,33 +1,17 @@
-require 'openssl'
-require 'base64'
-require 'handsome_fencer/crypto'
-
 module Roro
 
   class CLI < Thor
+    
+    no_commands do
 
-    include Thor::Actions
-    include HandsomeFencer::Crypto
-
-    desc "generate_keys", "Generates keys for all environments. If you have .env files like './**/production.env' and './**/staging.env' this command assumes you need keys for the production and staging environments, and will generate them for you."
-
-    def generate_keys
-      generate_key
-    end
-
-    desc "generate_key", "Generate a key for each environment"
-    method_option :environment, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "development, staging"
-
-    def generate_key(*args)
-      environments = args.first ? [args.first] : gather_environments
-      environments.each do |environment|
-        
-        confirm_files_decrypted?(environment)
-        create_file "roro/keys/#{environment}.key", encoded_key
+      def generate_key_or_keys(*args)
+        environments = args.first ? [args.first] : gather_environments
+        environments.each do |environment|
+          
+          confirm_files_decrypted?(environment)
+          create_file "roro/keys/#{environment}.key", encoded_key
+        end
       end
-    end
-
-    no_commands do
 
       def encoded_key
         @cipher = OpenSSL::Cipher.new 'AES-128-CBC'

data/lib/roro/cli/greenfield.rb

@@ -1,28 +1,17 @@
-require 'os'
-
 module Roro
 
   class CLI < Thor
-
-    include Thor::Actions
-
-    desc "greenfield", "Greenfield a brand new rails app using Docker's instructions"
-    
-    method_option :env_vars, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "key1:value1 key2:value2"
-    method_option :interactive, desc: "Set up your environment variables as you go."
-    method_option :force, desc: "force over-write of existing files"
-    
-    
-    def greenfield
-      confirm_directory_empty
-      confirm_dependencies
-      remove_roro_artifacts
-      configure_for_greenfielding
-      copy_greenfield_files
-      run_greenfield_commands
-    end
-    
+        
     no_commands do
+    
+      def greenfield
+        confirm_directory_empty
+        confirm_dependencies
+        remove_roro_artifacts
+        configure_for_greenfielding
+        copy_greenfield_files
+        run_greenfield_commands
+      end
       
       def configure_for_greenfielding
         @config ||= Roro::Configuration.new(options) 

data/lib/roro/cli/obfuscate.rb

@@ -3,16 +3,16 @@ require 'handsome_fencer/crypto'
 module Roro
 
   class CLI < Thor
-
-    include Thor::Actions
-    include HandsomeFencer::Crypto
-
-    desc "obfuscate", "obfuscates any files matching the pattern ./roro/**/*.env"
-
-    def obfuscate(*args)
-      environments = args.first ? [args.first] : gather_environments
-      environments.each do |environment|
-        HandsomeFencer::Crypto.obfuscate(environment, 'roro')
+    
+    no_commands do 
+      include Thor::Actions
+      include HandsomeFencer::Crypto
+  
+      def obfuscate(*args)
+        environments = args.first ? [args.first] : gather_environments
+        environments.each do |environment|
+          HandsomeFencer::Crypto.obfuscate(environment, 'roro')
+        end
       end
     end
   end

data/lib/roro/cli/rollon.rb

@@ -1,4 +1,4 @@
-require_relative 'rollon/stories'
+require 'roro/cli/rollon/stories'
 
 module Roro
 

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

@@ -1,3 +1,3 @@
-require_relative 'database/with_postgres.rb'
-require_relative 'database/with_mysql.rb'
-require_relative 'database/database.rb'
+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

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

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

@@ -0,0 +1,77 @@
+require 'roro/cli/rollon/stories/ruby_gem/with_ci_cd.rb'
+# class RubyGem
+#   attr_reader :getsome
+  
+#   def initialize
+#     @getsome = 'getsome'    
+#   end
+# end
+
+# include Stories::RubyGem
+# module Rollon 
+#   module Story 
+    
+#   end
+# end
+# class Rollon::Story::RubyGem < Roro::CLI
+#   attr_reader :getsome
+#   def initialize
+#     @getsome = 'getsome'    
+#   end
+# end
+
+# # module Roro
+
+# #   class CLI < Thor
+
+    
+# #     no_commands do
+      
+# #       def ruby_gem(*args) 
+        
+        
+# #       end
+# #       def copy_ruby_gem_files
+# #         copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
+# #       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/rollon/stories/ruby_gem/with_ci_cd.rb

@@ -0,0 +1,60 @@
+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) 
+      ruby_gem_with_ci_cd(*args)
+    end
+    
+    no_commands do 
+      def ruby_gem_with_ci_cd(*args)
+        configure_for_rollon
+        directory 'ruby_gem', './', @config.app
+        gitignore_sensitive_files
+        append_to_file ".gitignore", "Gemfile.lock\n"
+      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/rollon/stories/stories.rb

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

data/lib/roro/cli/ruby_gem.rb

@@ -1,54 +1,67 @@
-module Roro
-
-  class CLI < Thor
+# module Rollon 
+#   module Story 
+    
+#   end
+# end
+# class Rollon::Story::RubyGem < Roro::CLI
+#   attr_reader :getsome
+#   def initialize
+#     @getsome = 'getsome'    
+#   end
+# end
 
-    include Thor::Actions
+# # module Roro
 
-    desc "ruby_gem", "Generate files for containerized gem testing, CircleCI, and releasing to RubyGems."
-    method_option :rubies, type: :array, banner: "2.5.3 2.4.2"
+# #   class CLI < Thor
 
-    no_commands do
-      def copy_ruby_gem_files
-        copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
-      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"}
+# #     no_commands do
+      
+# #       def ruby_gem(*args) 
+        
+        
+# #       end
+# #       def copy_ruby_gem_files
+# #         copy_file 'ruby_gem/config.yml', '.circleci/config.yml'
+# #       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
+# #       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
+# #   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
+# #       # 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/Dockerfile.tt

@@ -1,44 +1,82 @@
+## The FROM instruction below builds our first layer using an official image:
 FROM ruby:<%= config['ruby_version'] %>
+
 LABEL maintainer="<%= config['dockerhub_email'] %>"
 
+## This is a rails app so, we will want to add node and yarn. In order for our 
+## container to trust yarn as a source, we first need to add yarn's public key. 
+## One good way to accomplish this is with apt-key, but apt-key is designed to 
+## send output to the terminal and not to stdout, and thus apt-key will send a 
+## warning message during the build context. One way to deal with the warning
+## is to set an environment variable telling apt-get to be quiet. To do this,
+## you'd first write an ENV instruction setting the environment variable, then 
+## write the RUN instruction adding the key to the container, and then you'd 
+## have to write another ENV instruction unsetting the variable. This would be 
+## ugly and inconvenient. Another way to deal with the warning is to just ignore 
+## it. There's no shame in that but ignoring it in the build context might 
+## condition us to ignore it in other contexts. But what if there was a way to 
+## deal with it that allowed you to set that variable just for the build 
+## context? Fortunately there is, using the ARG instruction. Variables set with 
+## ARG instructions stay in the build context while those set with ENV 
+## instructions follow into the container. 
+
+## Use an ARG instruction to set a variable disabling the apt-key warning:
+ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
 
-## Make sure we have yarn properly sourced:
+## Add yarn's public key using apt-key:
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+
+## Add yarn to our sources:
 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:
+
+## Build a layer updating the image while adding node and yarn from the source
+## 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}
+## We have two directories we'd like to follow from the build context into 
+## our containers. APP_HOME is where we'll do most of our work and BUNDLE_PATH 
+## is where we want bundler to store our gems.  
 
-## Tell bundler where to store downloaded gems:
+## Set APP_HOME and BUNDLE_PATH as using ENV instructions:
+ENV APP_HOME /usr/src/app/
 ENV BUNDLE_PATH /gems
-RUN mkdir ${BUNDLE_PATH}}
+
+## Create both as directories to make sure they exist:
+RUN mkdir ${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
+VOLUME ${BUNDLE_PATH}
+
+## If we copy our entire app using a single COPY instruction, Docker will build 
+## it all as a single new layer. When Docker notices a change to a file, it then 
+## has to rebuild the entire layer. This can slow development. One way to speed 
+## it back up is to break a single big COPY layer into several smaller ones, 
+## with slow-building layers that don't change often underneath smaller, 
+## lighter, qucker oens that might change a lot. 
 
-## To speed up development, copy Gemfile and Gemfile.lock from host
-## and then bundle so changing other parts of the app don't trigger 
-## a full gem install.
+## Build your big, slow gem layer by first copying your Gemfile && Gemfile.lock:  
 COPY Gemfile* ./ 
 
+## Set your work directory:
 WORKDIR ${APP_HOME}
 
+## build the bundle layer, which now only runs if your Gemfile changes:
 RUN bundle 
 
+## Now build a layer layer with everything in your app that's likely to change
+## frequently. If you make a change to any of these files, only this layer has
+## to rebuild. smaller, lighter layer
+COPY . ${APP_HOME}
+
+
 COPY roro/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 RUN chmod +x /usr/bin/docker-entrypoint.sh
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-COPY . /usr/src/app/
-
-# RUN chmod +x /usr/src/app/roro/docker-entrypoint.sh
-# ENTRYPOINT ["/usr/src/app/roro/docker-entrypoint.sh"]
 
 
 

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

@@ -24,11 +24,11 @@ VOLUME /gems
 RUN echo "source 'https://rubygems.org'\ngem 'rails'" > Gemfile
 
 ## Bundle to install rails:
-RUN bundle install
 
 ## 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
 

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

@@ -1,9 +1,9 @@
-version: '3.1'
+version: '3.2'
 
 services:
 
-  app:
+  ruby_gem:
     build:
       context: .
-      dockerfile: docker/containers/app/Dockerfile
+      dockerfile: roro/containers/gem/Dockerfile
     command: rake test

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

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

data/lib/roro/version.rb

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

data/roro.gemspec

@@ -37,8 +37,8 @@ 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"

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: roro
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - schadenfred
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-08-21 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
@@ -167,6 +181,7 @@ files:
 - 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/config.rb
@@ -176,10 +191,15 @@ files:
 - lib/roro/cli/greenfield.rb
 - lib/roro/cli/obfuscate.rb
 - lib/roro/cli/rollon.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/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/database/with_mysql.rb
+- lib/roro/cli/rollon/stories/rails/database/with_postgres.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
@@ -211,10 +231,6 @@ files:
 - 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
@@ -222,12 +238,11 @@ 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/.gitignore
-- lib/roro/cli/templates/ruby_gem/config.yml
+- 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/containers/gem/Dockerfile.tt
+- lib/roro/cli/templates/ruby_gem/roro/env_files/.keep
+- 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
@@ -237,7 +252,6 @@ files:
 - lib/tasks/deploy.rake
 - roro.gemspec
 - sandbox/.keep
-- tmp/.gitkeep
 - vendor/bundle/.keep
 - vendor/cache/actionpack-6.0.3.2.gem
 - vendor/cache/actionview-6.0.3.2.gem
@@ -253,6 +267,7 @@ files:
 - 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

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

@@ -1,20 +0,0 @@
-FROM ruby:<%= config[:ruby_version] %>
-
-RUN apt-get update -qq && apt-get install -y nodejs postgresql-client
-RUN mkdir /myapp
-WORKDIR /myapp
-COPY Gemfile /myapp/Gemfile
-COPY Gemfile.lock /myapp/Gemfile.lock
-
-RUN gem install bundler
-RUN bundle install
-COPY . /myapp
-
-# Add a script to be executed every time the container starts.
-COPY entrypoint.sh /usr/bin/
-RUN chmod +x /usr/bin/entrypoint.sh
-ENTRYPOINT ["entrypoint.sh"]
-EXPOSE 3000
-
-# Start the main process.
-CMD ["rails", "server", "-b", "0.0.0.0"]

data/lib/roro/cli/templates/quickstart/database.yml

@@ -1,85 +0,0 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  # For details on connection pooling, see Rails configuration guide
-  # https://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-
-development:
-  <<: *default
-  database: sandbox_development
-
-  # The specified database role being used to connect to postgres.
-  # To create additional roles in postgres see `$ createuser --help`.
-  # When left blank, postgres will use the default role. This is
-  # the same name as the operating system user that initialized the database.
-  #username: sandbox
-
-  # The password associated with the postgres role (username).
-  #password:
-
-  # Connect on a TCP socket. Omitted by default since the client uses a
-  # domain socket that doesn't need configuration. Windows does not have
-  # domain sockets, so uncomment these lines.
-  #host: localhost
-
-  # The TCP port the server listens on. Defaults to 5432.
-  # If your server runs on a different port number, change accordingly.
-  #port: 5432
-
-  # Schema search path. The server defaults to $user,public
-  #schema_search_path: myapp,sharedapp,public
-
-  # Minimum log levels, in increasing order:
-  #   debug5, debug4, debug3, debug2, debug1,
-  #   log, notice, warning, error, fatal, and panic
-  # Defaults to warning.
-  #min_messages: notice
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: sandbox_test
-
-# As with config/credentials.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
-production:
-  <<: *default
-  database: sandbox_production
-  username: sandbox
-  password: <%= ENV['SANDBOX_DATABASE_PASSWORD'] %>

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

@@ -1,17 +0,0 @@
-version: '3'
-services:
-  db:
-    image: postgres
-    volumes:
-      - ./tmp/db:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: password
-  web:
-    build: .
-    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
-    volumes:
-      - .:/myapp
-    ports:
-      - "3000:3000"
-    depends_on:
-      - db

data/lib/roro/cli/templates/quickstart/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-# Remove a potentially pre-existing server.pid for Rails.
-rm -f /myapp/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/.gitignore

@@ -1,8 +0,0 @@
-# Also see https://github.com/github/gitignore/blob/master/Ruby.gitignore
-
-Gemfile.lock
-*.gem
-.bundle
-.env
-rdoc
-tmp

data/lib/roro/cli/templates/ruby_gem/docker/containers/app/Dockerfile.tt

@@ -1,10 +0,0 @@
-FROM ruby:<%= config[:ruby_version] %>-alpine
-
-RUN apk add --no-cache --update build-base linux-headers \
-    postgresql-dev nodejs tzdata libxml2-dev libxslt-dev git
-
-WORKDIR /usr/src/app
-COPY . /usr/src/app/
-RUN rake install
-RUN gem install bundler
-RUN bundle