roro 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07120301e41039997a4c33fb6f688fe24c8ff257b59e98565cb205aaf1da6b3e
-  data.tar.gz: '08bc0b854fe1b8539e0936991f5e9608962fa350d53667bca9c36455b7cd5611'
+  metadata.gz: 6ae59fe35a7653d9c15191a99184ad9f850a50eb49ae6cde1da06ddf29b420a9
+  data.tar.gz: 00c864acbcf2155ad14ee0ab6d1b01bb0194352d80fa8191c950691863feb2df
 SHA512:
-  metadata.gz: 26620f53160df41b7633647924031b7d1da511418b70ac360ccc81e2ba8164d8c5d79f54e5f721ccc6c98560e7a902281c6c249a03326742b8553f3bd52a86ea
-  data.tar.gz: 1d4179d095a15666a55a4eadefa71677f896036592f0df642d6585d784703bda4e49ea70281260f4b367e02ddf97a35a369160bd780e4807c64d74fb966f492a
+  metadata.gz: 9c181460cfb92d19799ad53801f690fcc02335153985a849685a4e4472d935502b25e65387c3a9124b19453498b9f6d575ea128ac73dffe68b556b0c99391beb
+  data.tar.gz: a8051fd9f5d70b54dc490c5735396e7bca783554ce42cae6ecab90490d870c77b2b0aa41ce1ed46f00cf7c0c9195b7b5153b9a966ce1028c6f2c5fa53325e887

data/.gitignore

@@ -5,13 +5,7 @@
 /doc/
 /pkg/
 /spec/reports/
-tmp/dummy/
-tmp/dummy_gem/
-tmp/dummy_roro/
-tmp/greenfield/
-!tmp/.keep
-greenfield/**/*
+tmp/*
+Gemfile.lock
 .byebug_history
-
-docker/**/*.env
-docker/**/*.key
+/sandbox/**/*

data/Guardfile

@@ -3,11 +3,11 @@
 
 options = {
   cli: '',
-  all_after_run: false
+  all_after_run: true,
+  all_after_pass: true
 }
 
 guard :minitest, options do
-  # with Minitest::Unit
 
   watch(%r{^test/(.*)\/?test_(.*)\.rb$})
   watch(%r{^test/(.*)\/?(.*)_test\.rb$})

data/lib/roro/cli.rb

@@ -1,5 +1,6 @@
+require 'byebug'
 require 'thor'
-require 'roro/cli/base'
+require 'roro/cli/base/base'
 require 'roro/cli/rollon'
 require 'roro/cli/greenfield'
 require 'roro/cli/generate_keys'
@@ -15,7 +16,5 @@ module Roro
     def self.source_root
       File.dirname(__FILE__) + '/cli/templates'
     end
-
-
   end
 end

data/lib/roro/cli/base/base.rb

@@ -0,0 +1,7 @@
+require_relative 'configuration.rb'
+require_relative 'continuous_integration.rb'
+require_relative 'utilities.rb'
+require_relative 'insertions.rb'
+require_relative 'insert_gems.rb'
+require_relative 'base_files.rb'
+

data/lib/roro/cli/base/base_files.rb

@@ -0,0 +1,38 @@
+module Roro
+  
+  class CLI < Thor
+    
+    no_commands do
+      
+      def copy_dockerignore 
+        copy_file 'base/.dockerignore', '.dockerignore', @env_hash[:use_force]
+
+      end 
+      
+      def copy_host_example 
+        copy_file 'base/livereload/hosts.example', 'hosts.example' 
+      end
+
+      def copy_docker_compose 
+        template "base/docker-compose.yml", 'docker-compose.yml', @env_hash[:force]
+      end
+      
+      def copy_roro 
+        directory 'base/roro/containers/app', "roro/containers/#{@env_hash[:app_name]}", @env_hash
+        directory 'base/roro/containers/database', "roro/containers/#{@env_hash[:database_container]}", @env_hash
+        directory 'base/roro/containers/frontend', "roro/containers/#{@env_hash[:frontend_container]}", @env_hash
+      end
+      
+      def copy_config_database_yml 
+        copy_file "base/config/database.yml", 'config/database.yml', @env_hash[:use_force]
+      end
+
+      def copy_base_files
+        copy_circleci
+        copy_roro 
+        copy_docker_compose 
+        copy_config_database_yml
+      end
+    end
+  end 
+end

data/lib/roro/cli/base/configuration.rb

@@ -0,0 +1,63 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do
+      
+      def get_configuration_variables
+        options["interactive"] ? set_interactively : set_from_defaults
+        @env_hash[:deploy_tag] = "${CIRCLE_SHA1:0:7}"
+        @env_hash[:server_port] = "22"
+        @env_hash[:server_user] = "root"
+        @env_hash
+      end
+      
+      def set_from_defaults
+        @env_hash = configuration_hash
+        @env_hash.map do  |key, hash| 
+          @env_hash[key] = hash.values.last 
+        end
+        @env_hash
+      end
+      
+      def set_interactively
+        @env_hash = configuration_hash
+        @env_hash.map do |key, prompt|
+          answer = ask("Please provide #{prompt.keys.first} or hit enter to accept: \[ #{prompt.values.first} \]")
+          @env_hash[key] = (answer == "") ? prompt.values.first : answer
+        end  
+      end 
+      
+      private
+      
+      def configuration_hash
+        {
+          app_name: {
+            "the name of your app" => `pwd`.split('/').last.strip! },
+          ruby_version: {
+            "the version of ruby you'd like" => `ruby -v`.scan(/\d.\d/).first },
+          server_host: {
+            "the ip address of your server" => "ip-address-of-your-server"},
+          database_container: {
+            "the name of your database container" => "database"},
+          frontend_container: {
+            "the name of your frontend container" => "frontend"},
+          server_container: {
+            "the name of your server container" => "nginx"},
+          dockerhub_email: {
+            "your Docker Hub email" => "your-docker-hub-email"},
+          dockerhub_user: {
+            "your Docker Hub username" => "your-docker-hub-user-name" },
+          dockerhub_org: {
+            "your Docker Hub organization name" => "your-docker-hub-org-name"},
+          dockerhub_password: {
+            "your Docker Hub password" => "your-docker-hub-password"},
+          postgres_user: {
+            "your Postgres username" => "postgres"},
+          postgres_password: {
+            "your Postgres password" => "your-postgres-password"} }
+      end
+    end
+  end 
+end

data/lib/roro/cli/base/continuous_integration.rb

@@ -0,0 +1,13 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do
+   
+      def copy_circleci 
+        directory 'base/circleci', '.circleci', @env_hash
+      end  
+    end
+  end 
+end

data/lib/roro/cli/base/insert_gems.rb

@@ -0,0 +1,23 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do 
+          
+      def insert_roro_gem_into_gemfile
+        insert_into_file 'Gemfile', "gem 'roro'", before: "group :development, :test do"
+      end
+
+      def insert_pg_gem_into_gemfile
+        comment_lines 'Gemfile', /sqlite/
+        comment_lines 'Gemfile', /mysql/
+        insert_into_file 'Gemfile', "gem 'pg'\n", before: "group :development, :test do"
+      end
+
+      def insert_hfci_gem_into_gemfile
+        insert_into_file 'Gemfile', "gem 'handsome_fencer-test'", after: "group :development, :test do"
+      end  
+    end
+  end 
+end

data/lib/roro/cli/base/insertions.rb

@@ -0,0 +1,17 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do 
+          
+      def config_std_out_true
+        prepend_to_file('config/boot.rb', "$stdout.sync = true\n\n", @env_hash[:use_force])
+      end 
+      
+      def gitignore_sensitive_files
+        append_to_file ".gitignore", "\nroro/**/*.env\nroro/**/*.key"
+      end
+    end
+  end 
+end

data/lib/roro/cli/base/utilities.rb

@@ -0,0 +1,17 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do  
+
+      def choices 
+        { default: 'y', limited_to: ["y", "n"] }
+      end
+      
+      def own_if_required
+        system 'sudo chown -R $USER .'
+      end   
+    end
+  end 
+end

data/lib/roro/cli/generate_keys.rb

@@ -16,7 +16,7 @@ module Roro
     end
 
     desc "generate_key", "Generate a key for each environment"
-    method_option :environment, type: :string, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "development, staging"
+    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

data/lib/roro/cli/greenfield.rb

@@ -11,20 +11,24 @@ module Roro
     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_dependencies
-      copy_greenfield_files
-      as_system("docker-compose run web rails new . --force --database=postgresql --skip-bundle")
-      chown_if_required
-      as_system('sudo docker-compose build')
-      as_system('mv -f config/database.yml.example config/database.yml')
-      as_system('docker-compose up --build --force-recreate -d ')
-      as_system 'docker-compose run web bin/rails db:create'
+      get_configuration_variables
+      @env_hash[:use_force] = { force: true }
+      template 'greenfield/Dockerfile.tt', 'Dockerfile', @env_hash
+      system "DOCKER_BUILDKIT=1 docker build --file Dockerfile --output . ."
+      rollon_as_dockerized
     end
-
+    
     no_commands do
+      
+      def copy_greenfield_files
+        template 'greenfield/Dockerfile.tt', 'Dockerfile', @env_hash
+        template 'greenfield/docker-compose.yml', 'docker-compose.yml'
+        copy_file 'greenfield/Gemfile', 'Gemfile'
+        copy_file 'greenfield/Gemfile.lock', 'Gemfile.lock'
+      end
 
       def as_system(command)
         command = OS.linux? ? "sudo #{command}" : command

data/lib/roro/cli/rollon.rb

@@ -1,21 +1,28 @@
+require_relative 'rollon/use_cases'
+
 module Roro
 
   class CLI < Thor
 
-    method_option :env_vars, type: :hash, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "key1:value1 key2:value2"
-    desc "rollon", "Generates files necessary to greenfield a new app within a dockerized rails container, along with a set of files necessary for continuous deployment using CircleCI"
+    desc "rollon", "Generates files and makes changes to your rails app necessary
+          to run it using Docker containers."
     method_option :interactive, desc: "Set up your environment variables as you go."
 
     def rollon
-      configurate
-      if Dir['./*'].empty?
-        raise Roro::Error.new("Oops -- Roro can't roll itself onto a Rails app if it doesn't exist. Please either change into a directory with a Rails app or generate a new one using '$ roro greenfield'.")
-      end
-      copy_base_files
-      append_to_existing_files
-      insert_into_file 'Gemfile', "gem 'sshkit'\n\n", before: "group :development, :test do"
-      insert_into_file 'Gemfile', "\n\tgem 'handsome_fencer-test'", after: "group :development, :test do"
-
+      # if Dir['./*'].empty?
+      #   raise Roro::Error.new("Oops -- Roro can't roll itself onto a Rails app if it
+      #     doesn't exist. Please either change into a directory with a Rails app or 
+      #     generate a new one using '$ roro greenfield'.")
+      # end
+      get_configuration_variables
+      # case ask("Configure using the Quickstart, Curated, or HandsomeFencer way?\n\n(1) Quikstart\n\n(2) Curated\n\n(3) HandsomeFencer\n\n", { default: '2', limited_to: %w(1 2 3) })
+      # when '1'
+      #   rollon_as_quickstart
+      # when '2'
+      #   rollon_as_dockerized
+      # when '3'
+      # end
+      rollon_as_dockerized
     end
   end
-end
+end

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

@@ -0,0 +1,28 @@
+module Roro
+
+  class CLI < Thor
+
+    no_commands do
+
+      def rollon_as_dockerized
+        copy_dockerignore
+        if @env_hash[:use_force][:force]
+          config_std_out_true
+        else 
+          if ask('Configure $stdout.sync for docker?', choices).eql?('y')
+          end
+        end
+        copy_config_database_yml 
+        insert_pg_gem_into_gemfile
+        copy_file 'dockerize/docker-compose.yml', 'docker-compose.yml'
+        template "dockerize/Dockerfile", 'Dockerfile', @env_hash
+        copy_file 'dockerize/docker-entrypoint.sh', 'docker-entrypoint.sh'
+        directory 'dockerize/.env', '.env'
+        system 'docker-compose build'
+        system 'docker-compose run --no-deps web bin/rails webpacker:install'
+        system 'docker-compose up'
+        copy_host_example
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Roro
+  class CLI < Thor
+
+    no_commands do
+
+      def rollon_as_quickstart
+        copy_file "quickstart/docker-compose.yml", 'docker-compose.yml'
+        copy_file "quickstart/entrypoint.sh", 'entrypoint.sh'
+        copy_file "quickstart/database.yml", "config/database.yml"
+        template "quickstart/Dockerfile", 'Dockerfile', @env_hash
+
+        insert_pg_gem_into_gemfile
+        system 'sudo chown -R $USER .'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Roro
+
+  class CLI < Thor
+
+    no_commands do
+
+      def rollon_as_roro
+        if Dir['./*'].empty?
+          raise Roro::Error.new("Oops -- Roro can't roll itself onto a Rails app if it doesn't exist. Please either change into a directory with a Rails app or generate a new one using '$ roro greenfield'.")
+        end
+        if ask('Configure $stdout.sync for docker?', choices).eql?('y')
+          config_std_out_true
+        end
+        if ask('Configure .gitignore for roro?', choices).eql?('y')
+          gitignore_sensitive_files
+        end
+        if ask('Add RoRo to your Gemfile?', choices).eql?('y')
+          insert_roro_gem_into_gemfile
+        end
+        if ask('Add handsome_fencer-test to your Gemfile?', choices).eql?('y')
+          insert_hfci_gem_into_gemfile
+        end
+        if ask("Backup 'config/database.yml'?").eql?('y')
+          FileUtils.mv 'config/database.yml', "config/database.yml.backup"
+        end
+        copy_base_files
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+require_relative 'as_quickstart.rb'
+require_relative 'as_dockerize.rb'
+require_relative 'as_roro.rb'

data/lib/roro/cli/ruby_gem.rb

@@ -7,6 +7,12 @@ 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"
 
+    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'

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

@@ -0,0 +1,13 @@
+# Git
+.git            # <label id="chapter.fine-tuning-our-rails-image.dockerignore.git-history" /> 
+.gitignore      # <label id="chapter.fine-tuning-our-rails-image.dockerignore.gitignore" />
+
+# Logs
+log/*           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.log_dir" />
+
+# Temp files
+tmp/*           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.tmp_dir" />
+
+# Editor temp files
+*.swp           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.vim_swp_files" />
+*.swo           # <label id="chapter.fine-tuning-our-rails-image.dockerignore.vim_swo_files" />