roro 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1748207f4c1b87ab2301b252cd90eac18dc36107544b404b031e9ba9b0df62f
-  data.tar.gz: eda27e549ca1789b75f5f0af646415b92c8c82f5e3b05dcf612a7d591326c33d
+  metadata.gz: c448ed5c19cb319a371d294aac99449fbddadf605d0b46e1e694066b0807d7c9
+  data.tar.gz: f668e36a0fd1e5866a9165fea9a6459a45197d0f2188aa84800001541d0cd089
 SHA512:
-  metadata.gz: ec101f6fba2f50fe296792633d606e3ee2a0680e798c7fef0508706ef37d58dd979f04ea6be7e0fffe044596315aca2933d9ca7416d5694b4f083b18de923182
-  data.tar.gz: 3b89bd8d48d381ef5461deb8b99712cea71a8c2708cc32fdd5c195f931001736598ca48ddbebc0269f09e6c7cbd9e5294e7c7fcb943c1627b8c48e5bdcdae684
+  metadata.gz: b3727071acdd794946a8ca8bbd67644f589896d5bddd6675c7c1dfa61ba80dfe91f0c642553c9df09115e1fadc76bd01e8d7064c0808a9f1b08f61b8716800ff
+  data.tar.gz: cccd90560e9664c9f38b6b56ac0d6f2f1266f6a4a7f93f7f7638e95593b26232480c1673c5e70b2950b41618daba87c27fac5a21d7a59fad69f91779c4d42226

data/.gitignore

@@ -9,3 +9,6 @@ tmp/*
 Gemfile.lock
 .byebug_history
 /sandbox/**/*
+
+roro/**/*.env
+roro/**/*.key

data/Guardfile

@@ -2,18 +2,22 @@
 # More info at https://github.com/guard/guard#readme
 
 options = {
-  # cli: '',
-  # all_after_run: true,
-  # all_after_pass: true
+  cli: '-f',
+  all_on_start: true,
+  all_after_pass: false
 }
 
 guard :minitest, options do
 
   watch(%r{^test/(.*)\/?test_(.*)\.rb$})
   watch(%r{^test/(.*)\/?(.*)_test\.rb$})
-  watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/generators/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/cli/#{m[1]}_test.rb" }
   watch(%r{^lib/roro/cli/rollon/*.rb$}) { 'test/generators' }
-  watch(%r{^lib/roro/cli/(.+).rb$}) { 'test' }
+  watch(%r{^lib/roro/cli/roro_configurator.yml$}) { 'test/cli/configuration_test.rb' }
+  # watch(%r{^lib/roro/cli/(.+).rb$}) { 'test' }
+  # watch(%r{^lib/roro/cli/templates/roro(.+).rb$}) do 
+  #   'test/generators/rollon/rollon_as_roro_test.rb' 
+  # end
 
 
   watch(%r{^test/thor_helper\.rb$})      { 'test' }

data/lib/roro.rb

@@ -1,8 +1,8 @@
+
 require "roro/version"
 require "thor"
 require "roro/cli"
 
 module Roro
   class Error < StandardError; end
-  # Your code goes here...
 end

data/lib/roro/cli.rb

@@ -6,12 +6,16 @@ require 'roro/cli/generate_keys'
 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/configuration'
 
 module Roro
+  
   class CLI < Thor
 
     include Thor::Actions
-
+    
     def self.source_root
       File.dirname(__FILE__) + '/cli/templates'
     end

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

@@ -1,4 +1,5 @@
-require_relative 'configuration.rb'
+
+require_relative 'check_dependencies.rb'
 require_relative 'continuous_integration.rb'
 require_relative 'utilities.rb'
 require_relative 'insertions.rb'

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

@@ -16,14 +16,8 @@ module Roro
         template "base/docker-compose.yml", 'docker-compose.yml', @env_hash
       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_database_yml_pg 
-        copy_file "base/config/database.yml.pg", 'config/database.yml', force: @env_hash[:use_force]
+        copy_file "base/config/database.pg.yml", 'config/database.yml', force: @env_hash[:use_force]
       end
     end
   end 

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

@@ -0,0 +1,98 @@
+module Roro
+
+  class CLI < Thor
+
+    no_commands do
+     
+      def confirm_directory_not_empty 
+        confirm_dependency({
+          system_query: "ls -A",
+          warning: "This is an empty directory. You can generate a new and fully 
+            dockerized Rails app using the 'greenfield' command here here but if 
+            you want to containerize an existing app -- which is what the 'rollon'
+            command is for -- you'll need to navigate to a directory with an app we
+            can roll onto.",
+          suggestion: "$ roro greenfield",
+          conditional: "!Dir.glob('*').empty?" })
+      end
+      
+      def confirm_directory_empty 
+        confirm = confirm_dependency({
+          system_query: "ls -A",
+          warning: "this is not an empty directory. Roro will not greenfield a new Rails app unless either a) the current directory is empty or b) you run greenfield with the --force flag",
+          suggestion: "$ roro greenfield --force",
+          conditional: "Dir.glob('*').empty?" }) 
+        confirm || true
+      end
+          
+      def remove_roro_artifacts 
+        appname = Dir.pwd.split('/').last 
+        check_for_clashes = "docker ps --filter name=#{appname}* -aq"
+        no_artifact_containers = IO.popen(check_for_clashes).count.eql?(0)
+        no_artifact_volumes = IO.popen("docker volume ls --filter name=greenfield*").count > (1)
+        unless (no_artifact_containers && no_artifact_volumes)
+          remove_clashes = ["docker ps --filter name=#{appname}* -aq | xargs docker stop | xargs docker rm"]
+          volumes = %w(db_data app)
+          volumes.each {|v| remove_clashes << "docker volume rm #{appname}_#{v}"}
+          question = [
+            "\n\nWe found some container and volume artifacts which may clash",
+            "with RoRo moving forward. You can verify their existence in a ",
+            "separate terminal with:",
+            "\n\t$ #{check_for_clashes}'\n", 
+            "You can remove these artifacts with something like:\n" 
+          ]
+          remove_clashes.each { |c| question << "\t$ #{c}"}
+          question << "\nWould you like RoRo to attempt to remove them for you?"
+          question = question.join("\n")
+      
+          prompt = [question]
+          choices = {'y' => 'Yes', 'n' => 'No'}
+          choices.each { |k,v| prompt << "(#{k}) #{v.to_s}" }
+          answer = ask((prompt.join("\n\n") + "\n\n"), 
+          default: 'y', limited_to: choices.keys)
+          remove_clashes.each {|c| system c }
+        end
+      end
+    
+      def confirm_dependency(options)
+        msg = []
+        msg << ""
+        msg << delineator
+        msg << "It looks like #{options[:warning]}. The following bash command returns false:"
+        msg << "\t$ #{options[:system_query]}"
+        msg << "Please try these instructions:"
+        msg << ("\t" + options[:suggestion])
+        msg << delineator
+        conditional = options[:conditional] ? eval(options[:conditional]) : system(options[:system_query])
+        if conditional == false
+          raise(Roro::Error.new(msg.join("\n\n")))
+        else 
+          true 
+        end
+      end
+   
+      def confirm_dependencies
+        dependencies = [
+          {
+            system_query: "which docker",
+            warning: "Docker isn't installed",
+            suggestion: "https://docs.docker.com/install/"
+          }, {
+            system_query: "which docker-compose",
+            warning: "Docker Compose isn't installed",
+            suggestion: "https://docs.docker.com/compose/install/"
+
+          }, {
+            system_query: "docker info",
+            warning: "the Docker daemon isn't running",
+            suggestion: "https://docs.docker.com/config/daemon/#start-the-daemon-manually"
+          }
+        ]
+
+        dependencies.each do |dependency|
+          confirm_dependency(dependency)
+        end
+      end
+    end
+  end
+end

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

@@ -6,17 +6,25 @@ module Roro
     no_commands do 
           
       def insert_roro_gem_into_gemfile
-        insert_into_file 'Gemfile', "gem 'roro'", before: "group :development, :test do"
+        insert_into_file 'Gemfile', "gem 'roro'\n\n", 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"
+      
+      def insert_db_gem(gem)
+        gem_lines = [
+          /gem\s['"]sqlite3['"]/,
+          /gem\s['"]mysql2['"]/,
+          /gem\s['"]pg['"]/,
+          
+        ]
+        gem_lines.each do |line| 
+          comment_lines 'Gemfile', line 
+          gsub_file 'Gemfile', line, 'gem copied over by roro'
+        end
+        insert_into_file 'Gemfile', "gem '#{gem}'\n\n", before: "group :development, :test"
       end
 
       def insert_hfci_gem_into_gemfile
-        insert_into_file 'Gemfile', "gem 'handsome_fencer-test'", after: "group :development, :test do"
+        insert_into_file 'Gemfile', "gem 'handsome_fencer-test'\n\n", after: "group :development, :test do"
       end  
     end
   end 

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

@@ -6,7 +6,9 @@ module Roro
     no_commands do 
           
       def config_std_out_true
-        prepend_to_file('config/boot.rb', "$stdout.sync = true\n\n", force: @env_hash[:use_force])
+        file = 'config/boot.rb'
+        line = "$stdout.sync = true\n\n"
+        prepend_to_file(file, line, force: true)
       end 
       
       def gitignore_sensitive_files

data/lib/roro/cli/configuration.rb

@@ -0,0 +1,68 @@
+module Roro
+  class Configuration < Thor
+    
+    attr_reader :master, :app, :choices, :thor_actions
+      
+    def initialize(options={}) 
+      @options = options || {}
+      @master = YAML.load_file(File.dirname(__FILE__) + '/roro_configurator.yml')
+      @master['services']['server_app']['vendors']['rails']['version'] = `ruby -v`.scan(/\d.\d/).first
+      @choices = @master['services']['server_app']['vendors']['rails']['choices'] 
+      @app = {} 
+      @thor_actions = {}
+      configure
+    end
+    
+    no_commands do 
+
+      def configure
+        set_from_defaults 
+        case 
+        when @options['interactive'] && File.exist?('.roro_config.yml')
+          set_from_roro_config
+          set_from_interactive
+        when File.exist?('.roro_config.yml') 
+          set_from_roro_config
+        when @options['interactive']
+          set_from_interactive
+        end
+      end
+      
+      def set_from_defaults 
+        svcs = @master['services']
+        rails = svcs['server_app']['vendors']['rails']
+        @app = {
+          'main_app_name' =>        Dir.pwd.split('/').last,
+          'database_host' =>        rails['env_vars']['DATABASE_HOST'],
+          'ruby_version' =>         rails['version'],
+          'frontend_service' =>     svcs['frontend']['name'],
+          'webserver_service' =>    svcs['webserver']['default'],
+          'database_service' =>     svcs['database']['name'],
+          'database_vendor' =>      svcs['database']['vendor'],
+        } 
+        @choices.each { |key, value| @thor_actions[key] = value["default"] }
+      end
+      
+      def set_from_roro_config
+        yaml = YAML.load_file(Dir.pwd + '/.roro_config.yml')
+        yaml.each { |key, value| @app[key] = value }
+        if yaml['thor_actions'] 
+          yaml['thor_actions'].each do |key, value| 
+            @thor_actions[key] = value
+          end 
+        end 
+      end
+      
+      def set_from_interactive 
+        @choices.each do |key, v|
+          prompt = ["\n\n" + v['question']]
+          v['choices'].each { |k,v| prompt << "(#{k}) #{v.to_s}" }
+          answer = ask((prompt.join("\n\n") + "\n\n"), 
+          default: v['default'], 
+          limited_to: v['choices'].keys)
+          @thor_actions[key] = answer
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+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"
+
+     
+    def generate_roro_config
+      create_file ".roro_config.yml", @config.app.to_yaml 
+    end
+  end 
+end

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

@@ -0,0 +1,17 @@
+# module Roro
+#   class CLI < Thor
+#     include Thor::Actions
+    
+#     desc "generate::config::rails", "Generates a config file to use roro with
+#       a rails app at .roro.yml" 
+#     map "generate::config::rails" => "generate_config_rails"
+
+#     def generate_config_rails
+#       master_config = YAML.load_file(ENV['PWD'] + "/lib/roro/cli/roro_configurator.yml")
+#       template 'base/.roro_config.yml', '.roro_config.yml'
+#     end
+
+#     no_commands do
+#     end
+#   end 
+# end

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

@@ -0,0 +1 @@
+require_relative 'config/rails'

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

@@ -0,0 +1,79 @@
+# require 'openssl'
+# require 'base64'
+# require 'handsome_fencer/crypto'
+
+# module Roro
+
+#   class CLI < Thor
+
+#     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 "docker/keys/#{environment}.key", encoded_key
+#       end
+#     end
+
+#     no_commands do
+
+#       def encoded_key
+#         @cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+#         @salt = '8 octets'
+#         @new_key = @cipher.random_key
+#         Base64.encode64(@new_key)
+#       end
+
+#       def gather_environments
+#         environments = []
+#         ['.env', '.env.enc'].each do |extension|
+
+#           HandsomeFencer::Crypto.source_files('.', extension).each do |env_file|
+#             environments << env_file.split('/').last.split(extension).last
+#           end
+#         end
+#         environments.uniq
+#       end
+
+#       def confirm_files_decrypted?(environment)
+#         orphan_encrypted = []
+#         HandsomeFencer::Crypto.source_files('.', '.env.enc').each do |file|
+#           orphan_encrypted << file unless File.exist? file.split('.enc').first
+#         end
+
+#         if !orphan_encrypted.empty?
+#           raise Roro::Error.new("You have an encrypted files (.env.enc) #{orphan_encrypted} that do not have corresponding decrypted files (.env). Please decrypt or remove these encrypted files before generating a new key for #{environment}.")
+#         end
+#         true
+#       end
+#     end
+#   end
+
+#   # desc "generate keys", "Generate keys on a per-environment basis"
+#   #
+#   # method_option :environment, type: :string, default: {}, desc: "Pass a list of environment variables like so: env:var", banner: "development, staging"
+#   #
+
+#   # def generate_keys
+#   #   default_environments = %w[circleci development production]
+#   #   environments = args.first ? [args.first] : default_environments
+#   #   environments.each do |environment|
+#   #     @cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+#   #     @salt = '8 octets'
+#   #     @new_key = @cipher.random_key
+#   #
+#   #     create_file "docker/keys/#{environment}.key", Base64.encode64(@new_key)
+#   #   end
+#   # end
+# end

data/lib/roro/cli/greenfield.rb

@@ -7,36 +7,35 @@ module Roro
     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
-      confirm_dependency({
-        system_query: "ls -A",
-        warning: "this is not an empty directory. Roro will not greenfield a new Rails app unless either a) the current directory is empty or b) you run greenfield with the --force flag",
-        suggestion: "$ roro greenfield --force",
-        conditional: "Dir.glob('*').empty?" })
-      get_configuration_variables
+      remove_roro_artifacts
+      configure_for_greenfielding
       copy_greenfield_files
-      copy_greenfield_to_host
-      @env_hash[:use_force] = { force: true }
-      rollon
+      run_greenfield_commands
     end
     
     no_commands do
-            
-      def copy_greenfield_files
-        template 'greenfield/Dockerfile.tt', 'Dockerfile', @env_hash
-        template 'greenfield/docker-compose.yml.tt', 'docker-compose.yml', @env_hash
-      end
       
-      def copy_greenfield_to_host 
+      def configure_for_greenfielding
+        @config ||= Roro::Configuration.new(options) 
+      end 
+      
+      def run_greenfield_commands
         system "DOCKER_BUILDKIT=1 docker build --file Dockerfile --output . ."
+        rollon
       end
+      
+      def copy_greenfield_files
+        template 'greenfield/Dockerfile.tt', 'Dockerfile', @config.app
+      end      
     end
   end
 end