roro 0.3.6 → 0.3.13

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) 
@@ -35,6 +24,7 @@ module Roro
       
       def copy_greenfield_files
         template 'greenfield/Dockerfile.tt', 'Dockerfile', @config.app
+        template 'roro/docker-compose.yml.tt', 'docker-compose.yml', @config.app
       end      
     end
   end

data/lib/roro/cli/obfuscate.rb

@@ -3,17 +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 ./docker/**/*.env"
-
-    def obfuscate(*args)
-      default_environments = %w[circleci development staging production]
-      environments = args.first ? [args.first] : default_environments
-      environments.each do |environment|
-        HandsomeFencer::Crypto.obfuscate(environment, 'docker')
+    
+    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
 
@@ -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_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'

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

@@ -0,0 +1 @@
+require 'roro/cli/rollon/stories/rails/database'

data/lib/roro/cli/rollon/{database → stories/rails}/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.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,45 @@
+module Roro 
+  class CLI < Thor 
+       
+    desc "rollon::ruby_gem::with_ci_cd", "Generate files for containerized gem testing, CircleCI, and releasing to RubyGems."
+    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
+        answer = ask("\nYou can add your rubygems api key in\n\t 
+          './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
+        @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| 
+          file = '.circleci/config.yml'
+          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

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

@@ -0,0 +1,3 @@
+require_relative 'ruby_gem/ruby_gem'
+
+

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/.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/base/.env/database.mysql.env.tt

@@ -1,4 +1,3 @@
 <% config['mysql_env_vars'].each do |k,v| %><%=  "\n" + k + "=" + v %><% end %>  
 MYSQL_DATABASE=<%= config['main_app_name'] + "_db"%>
 RAILS_ENV=<%= config['rails_env'] %>
-RAILS_LOG_TO_STDOUT=true

data/lib/roro/cli/templates/base/.env/database.pg.env.tt

@@ -1,5 +1,4 @@
 <% config['postgresql_env_vars'].each do |k,v| %><%=  "\n" + k + "=" + v %><% end %>  
 POSTGRES_DB=<%= config['main_app_name'] + "_" + config['rails_env'] %>
 RAILS_ENV=<%= config['rails_env'] %>
-RAILS_LOG_TO_STDOUT=true
 

data/lib/roro/cli/templates/base/.env/web.env.tt

@@ -1 +1,2 @@
 DATABASE_HOST=database
+RAILS_LOG_TO_STDOUT=true

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"]