roro 0.3.14 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23af0aef63d401cf4307914b6900fca6c65204b7
-  data.tar.gz: c5ec5625d41f98dcf412e8d80f636a45c8dcde31
+  metadata.gz: c21dea82b0e30a105b0ac41e03d9630418672d63
+  data.tar.gz: 7eb7950531987c7a93a8f1e21b286c1d149b2eb0
 SHA512:
-  metadata.gz: 868731a885948198f1a876b554ff538abed022794b03c51c87f5906b817290c487f26e0f5e472315ae3462a90a42b11240de005d5b11581d728567e3153b543d
-  data.tar.gz: b1fcbe257489a6c0ef5d00054d9a18e7c8e98fdd4ce9aa81f88a838aaab163448be4e40996d47a12ae1724b5fa4a206e6536f518f934f7edf636748e53d209f5
+  metadata.gz: bd8d5fd5b9b5b51c4063b8b167aadb3f00d7f87e2f7928730eee9ca281bc30a65131e15fd73757ec87ae61fc8c01cc7fa5399389bc29c64f673f1aca97ad70c2
+  data.tar.gz: 23cfe00c8535806eb5102db12325e70392abf942fe32749d5dfc7f44525e5694e6a1fb9664fa1fba23bcde86a431d4446b5f3cd28b47ebbfb9b489d72de4dd6e

data/.circleci/config.yml

@@ -1,22 +1,47 @@
+aliases:
+  - &workspace-location
+    at: /tmp/workspace
+  - &copy-ci-dotenv | 
+    cp -rf /tmp/workspace/roro .
+  - &source-ci-variables | 
+    echo 'source roro/containers/app/ci.env' >> $BASH_ENV
+    source $BASH_ENV
+
+defaults: &defaults
+  executor: machine-executor
+  working_directory: ~/project
+ 
 version: 2.1
 
+executors:
+  machine-executor: 
+    machine: true
+  ruby-executor: 
+    docker:
+      - image: cimg/ruby:2.7
+      
 jobs:
 
   build:
-    machine: true
+    <<: *defaults
     steps:
       - checkout
   
-  test-cli: 
-    machine: true 
+  test-rollon-rails: 
+    executor: ruby-executor
     steps: 
       - checkout 
-      - run: gem install --local pkg/roro-0.3.12.gem 
-      - run: roro greenfield --force
-
+      - setup_remote_docker:
+          version: 19.03.12
+      - run: |
+          rake install 
+          mkdir greenfield
+          cd greenfield
+          (yes || true) | roro greenfield
+      - run: echo 'success'
   
   test:
-    machine: true
+    <<: *defaults
     steps:
       - checkout
       - run: RUBY_VERSION=2.5 docker-compose build ruby_gem
@@ -30,7 +55,7 @@ jobs:
       - run: RUBY_VERSION=2.7 docker-compose run ruby_gem bundle exec rake test    
       
   release:
-    machine: true
+    <<: *defaults
     steps:
       - checkout
       - run: gem install roro
@@ -47,10 +72,10 @@ jobs:
 workflows:
   version: 2
     
-  build-release: 
+  build-cli: 
     jobs: 
       - build
-      - test-cli: 
+      - test-rollon-rails: 
           filters: 
             branches: 
               only: development

data/Guardfile

@@ -1,17 +1,17 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
 options = {
-  cli: '-f',
   all_on_start: true,
-  all_after_pass: true
+  all_after_pass: true, 
 }
 
 guard :minitest, options do
 
-  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
   watch(%r{^test/(.*)\/?(.*)_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' }
+  watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/cli/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/cli/templates/base(.+)\.yml$}) { |m| "test/cli" }
+  watch(%r{^lib/roro/cli/templates/rollon(.+)\.yml$}) { |m| "test/cli/rollon" }
+  watch(%r{^lib/roro/cli/templates/rollon(.+)\.tt$}) { |m| "test/cli/rollon" }
+  watch(%r{^lib/roro/cli/templates/greenfield(.+)\.yml$}) { |m| "test/cli/greenfield" }
+  watch(%r{^lib/roro/cli/templates/greenfield(.+)\.tt$}) { |m| "test/cli/greenfield" }
 end

data/lib/roro.rb

@@ -1,5 +1,5 @@
-require "roro/version"
 require "thor"
+require "roro/version"
 require "roro/cli"
 
 module Roro

data/lib/roro/cli.rb

@@ -1,13 +1,17 @@
 require 'roro/cli/base/base'
-require 'roro/cli/greenfield'
-require 'roro/cli/obfuscate'
-require 'roro/cli/expose'
-require 'roro/cli/generate/config/rails'
-require 'roro/cli/generate/config'
-require 'roro/cli/generate/generate_keys'
 require 'roro/cli/configuration'
-
+require 'roro/cli/generate/config'
+require 'roro/cli/generate/exposed'
+require 'roro/cli/generate/keys'
+require 'roro/cli/generate/obfuscated'
+require 'roro/cli/greenfield/rails'
 require 'roro/cli/rollon'
+require 'roro/cli/rollon/rails'
+require 'roro/cli/rollon/rails/database/with_mysql'
+require 'roro/cli/rollon/rails/database/with_postgresql'
+
+require 'roro/cli/rollon/ruby_gem'
+
 module Roro
   
   class CLI < Thor
@@ -16,74 +20,6 @@ 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
 end

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

@@ -53,7 +53,6 @@ module Roro
           remove_clashes.each {|c| system c }
         end
       end
-    
       def confirm_dependency(options)
         msg = []
         msg << ""

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

@@ -1,4 +1,3 @@
-
 module Roro
 
   class CLI < Thor

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

@@ -1,13 +1,11 @@
 module Roro
   class CLI < Thor
-    include Thor::Actions
     
-    # 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
+    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
   end 
 end

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

@@ -0,0 +1,14 @@
+module Roro
+  class CLI < Thor
+    
+    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) 
+      environments = args.first ? [args.first] : gather_environments
+      environments.each do |environment|
+        HandsomeFencer::Crypto.expose(environment, 'roro')
+      end
+    end
+  end
+end

data/lib/roro/cli/generate/{generate_keys.rb → keys.rb}

@@ -2,6 +2,28 @@ module Roro
 
   class CLI < Thor
     
+    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
+    
     no_commands do
 
       def generate_key_or_keys(*args)

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

@@ -0,0 +1,17 @@
+require 'handsome_fencer/crypto'
+
+module Roro
+
+  class CLI < Thor
+
+    desc "generate::obfuscated", "obfuscates any files matching the pattern ./roro/**/*.env"
+    map "generate::obfuscated" => "generate_obfuscated"
+    
+    def generate_obfuscated(*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/greenfield/rails.rb

@@ -0,0 +1,36 @@
+module Roro
+
+  class CLI < Thor
+    
+    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) 
+      confirm_directory_empty
+      configure_for_rollon
+      copy_greenfield_files
+      run_greenfield_commands
+      rollon_rails(*args)
+    end
+        
+    no_commands do
+    
+      def copy_greenfield_files
+        @config.app['force'] = true
+        src = 'rails/Dockerfile.greenfield.tt'
+        dest = 'roro/containers/app/Dockerfile'
+        template src, dest, @config.app
+      end
+      
+      def run_greenfield_commands
+        system "DOCKER_BUILDKIT=1 docker build --file roro/containers/app/Dockerfile --output . ."
+      end      
+    end
+  end
+end

data/lib/roro/cli/rollon.rb

@@ -1,29 +1,10 @@
-require 'roro/cli/rollon/stories'
-
 module Roro
-
   class CLI < Thor
-
-    desc "rollon", "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."
-
-    def rollon
-      confirm_directory_not_empty
-      confirm_dependencies
-      remove_roro_artifacts 
-
-      configure_for_rollon
-      
-      copy_roro_files
-      generate_config
-      startup_commands
-    end
-    
+        
     no_commands do
      
       def configure_for_rollon
+        confirm_dependencies
         @config ||= Roro::Configuration.new(options) 
       end
       
@@ -31,54 +12,9 @@ module Roro
         File.read(File.dirname(__FILE__) + "/templates/#{file}")
       end
       
-      def copy_roro_files 
-        configure_database  
-        directory 'roro', './', @config.app
-        template 'base/Dockerfile.tt', 'roro/containers/app/Dockerfile', @config.app
-        take_thor_actions
-      end
-      
       def take_thor_actions 
         @config.thor_actions.each {|k, v| eval(k) if v.eql?('y') }  
       end
-              
-      def startup_commands
-        system 'docker-compose build'
-        system 'docker-compose run web bundle'
-        system 'docker-compose run web bin/rails webpacker:install'
-        system 'docker-compose run web bin/rails yarn:install'
-        system 'docker-compose run web bin/rails db:create'
-        system 'docker-compose run web bin/rails db:migrate'
-        system 'docker-compose up'
-      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 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
-      
     end
   end
 end

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

@@ -0,0 +1,47 @@
+require 'roro/cli/rollon/stories'
+require 'roro/cli/rollon/rails/database'
+
+module Roro
+
+  class CLI < Thor
+        
+    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(*args) 
+      confirm_directory_not_empty
+      confirm_dependencies
+      configure_for_rollon
+      copy_rails_files
+      generate_config
+      startup_commands
+    end
+    
+    no_commands do
+     
+      def copy_rails_files
+        template 'rails/.circleci/config.yml.tt', './.circleci/config.yml' 
+        configure_database  
+        directory 'roro', './', @config.app
+        template 'base/dotenv', './.env', @config.app
+        directory 'rails/roro', './roro', @config.app
+        take_thor_actions
+      end
+                 
+      def startup_commands
+        success_msg = "'\n\n#{'*' * 5 }\n\nYour Rails app is available at http://localhost:3000/'\n\n#{'*' * 5 }"
+        system 'docker-compose build'
+        system 'docker-compose run web bundle'
+        system 'docker-compose run web bin/rails webpacker:install'
+        system 'docker-compose run web bin/rails yarn:install'
+        system 'docker-compose run web bin/rails db:create'
+        system 'docker-compose run web bin/rails db:migrate'
+        system 'docker-compose up -d'
+        system "docker-compose run web echo '\n\nYour Rails app is available at http://localhost:3000/'"
+      end
+    end
+  end
+end