roro 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff432672046f38d4adb0214e9c5125be36183f2
-  data.tar.gz: 5559ed50720181a77d4af026cd3b0b8bff90b674
+  metadata.gz: 28419719167db581fa026244d2628fa4c86c9d3b
+  data.tar.gz: b46403289b09d42a550ac9dff3a4edcc717f2c63
 SHA512:
-  metadata.gz: 44d46961f02e97b9d21ee5c7e76f2e4d1708824c3bb50dbb24291bdc3f3c9fa64c4c2ffeb70ff235c685898e4224bc6ba558f51a6158a68888f63d2be904bb77
-  data.tar.gz: 2b3d2e7129581279a7bca13f36a3a1287e06041b8ba1e2880251ca4aa65217cd47947c31d511509b724bf5d64119a31c47da1cb7afc82165922bc126322a31f9
+  metadata.gz: 3b2075ccae46a264f2d64bf2d2c09fb678bf95a44d534b0263dcb2a9e5cbf6345663d683bea3219ec728512e65eca391e1715a7334d304d4e46411a3e75f6ec1
+  data.tar.gz: 5ef3392e89e8e72af5e190a79f45ff7e107db744c0fe2a886b6e0e11bf6829c0fc723c6e298c0ad51d20a7b4882dbd84035b3b966a2eabdf5484e4c32827ae28

data/.circleci/config.yml

@@ -10,6 +10,11 @@ aliases:
 defaults: &defaults
   executor: machine-executor
   working_directory: ~/project
+
+major_only: &major_only
+  filters:
+    branches:
+      only: master, release
  
 version: 2.1
 
@@ -74,19 +79,15 @@ workflows:
     
   build-cli: 
     jobs: 
-      - build
+      - build 
       - test-rollon-rails: 
-          filters: 
-            branches: 
-              only: development
+          <<: *major_only
       - test:
-          filters: 
-            branches: 
-              only: master
+          <<: *major_only
       
       - release:
           requires: 
             - build
-          filters: 
-            branches: 
-              only: release
+          filters:
+            branches:
+              only: release      

data/.gitignore

@@ -14,11 +14,12 @@ roro/**/*.key
 *.key
 *.env
 !/.gitignore
-
+*.gem
 tmp/*
 !tmp/.keep 
 sandbox/*
 !sandbox/.keep 
 !sandbox/greenfield
 sandbox/greenfield/*
-!sandbox/greenfield/.keep
+!sandbox/greenfield/.keep
+TUTORIAL.md

data/Guardfile

@@ -1,17 +1,15 @@
 options = {
-  all_on_start: true,
-  all_after_pass: true, 
+  all_on_start: false,
+  all_after_pass: false, 
 }
 
 guard :minitest, options do
 
   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{^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" }
+  watch(%r{^test/helpers/(.*)\.rb$})          { 'test' }
+  watch(%r{^test/test_helper\.rb$})           { 'test' }
+  watch(%r{^lib/roro/(.+)\.rb$})              { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/cli/(.+)\.rb$})          { |m| "test/cli/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/cli/(.+)\.yml$})         { |m| "test/cli" }
+  watch(%r{^lib/roro/cli/(.+)\.tt$})          { |m| "test/cli" }
 end

data/README.md

@@ -217,4 +217,5 @@ $ docker system prune -af --volumes
 This gem and its associated practices are just one way of using these tools and not the canonical way. My purpose in publishing it is to get a conversation started about what conventions around these tools might look like. If you have ideas on how to make it better please put in an issue -- or fork the repo, make your changes, write your tests, and send me a pull request. It'll make me feel warm inside.    
 
 ## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+

data/lib/roro.rb

@@ -1,6 +1,7 @@
 require "thor"
 require "roro/version"
 require "roro/cli"
+require "roro/configurator"
 
 module Roro
   class Error < StandardError; end

data/lib/roro/cli.rb

@@ -1,25 +1,31 @@
-require 'roro/cli/base/base'
-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/generate/story'
 require 'roro/cli/greenfield/rails'
 require 'roro/cli/rollon'
-require 'roro/cli/rollon/rails'
+require 'roro/cli/rollon/rails/base/base'
 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
 
     include Thor::Actions
     
     def self.source_root
-      File.dirname(__FILE__) + '/cli/templates'
-    end    
+      File.dirname(__FILE__) + '/templates'
+    end
+    
+    def self.story_root
+      File.dirname(__FILE__) + '/stories'
+    end
+    
+    def self.roro_environments 
+      %w(development production test staging ci)
+    end
   end
 end

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

@@ -0,0 +1,18 @@
+module Roro
+  class CLI < Thor
+    
+    desc "generate::story", "Generate a config file at .roro_config.yml to use later" 
+    map "generate::story" => "generate_story"
+    
+    def generate_story
+      
+      @config ||= Roro::Configuration.new(options)
+      # configuration = {
+      #   env_vars: @config.env.keys,
+      #   intentions: @config.intentions,
+      #   story: @config.structure['story']
+      # }
+      # create_file ".roro_configurator.yml", @config.env.to_yaml 
+    end
+  end 
+end

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

@@ -5,32 +5,10 @@ module Roro
     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      
+    def greenfield_rails
+      greenfield( { story: :rails } )
     end
   end
 end

data/lib/roro/cli/rollon.rb

@@ -1,19 +1,146 @@
 module Roro
   class CLI < Thor
-        
-    no_commands do
-     
-      def configure_for_rollon
-        confirm_dependencies
+
+    class << self
+      private
+      def shared_options!
+        method_option :omakase, default: :omakase, desc: "Use the Roro setup with some configuring. 'Omakase' translates as 'I'll leave it up to you.'", aliases: ['-d', '--default']
+        method_option :fatsutofodo, desc: 'Use the Roro setup without having to think.', aliases: ['-f', '--fast']
+        method_option :okonomi, desc: "Use Roro how you like. 'Okonomi' has the opposite meaning of omakase.", aliases: ['-i', '--interactive'] 
+      end
+  
+      alias_method :orig_desc, :desc
+  
+      def desc(*args)
+        orig_desc(*args)
+        shared_options!
+      end
+    end
+    rollonto = ' into Roro.'
+    desc "rollon", "Roll an existing app#{rollonto}"
+    def rollon(args={})
+      @config ||= Roro::Configuration.new(args, options) 
+      greenfield_actions 
+      greenfield_commands
+      manifest_actions
+      manifest_intentions
+      congratulations
+      startup_commands 
+    end
+    
+    desc "greenfield", "Greenfield a new app and roll it#{rollonto}"
+    def greenfield(args={})
+      args[:greenfield] = :greenfield
+
+      rollon(args)
+    end
+    
+    desc "greenfield::rails", "Greenfield a new Rails app and roll it#{rollonto}"
+  
+    map "greenfield::rails" => "greenfield_rails"
+    
+    def greenfield_rails
+      greenfield( { story: :rails } )
+    end
+    
+    desc "rollon::rails", "Roll an existing app#{rollonto}"
+    map "rollon::rails" => "rollon_rails"
+    
+    def rollon_rails(args={}) 
+      rollon( { story: :rails } )
+    end
+    
+    desc "rollon::rails::kubernetes", "Adds Kubernetes for production."
+    map "rollon::rails::kubernetes" => "rollon_rails_kubernetes"
+    
+    def rollon_rails_kubernetes(args={}) 
+      story = { 
+        rails: [
+          { database: :postgresql },
+          { kubernetes: :postgresql },
+          { ci_cd: :circleci}
+        ] 
+      }  
+      rollon( { story: story } )
+    end
+
+    desc "greenfield::rails::kubernetes", "Adds Kubernetes for production."
+    map "greenfield::rails::kubernetes" => "greenfield_rails_kubernetes"
+    
+    def greenfield_rails_kubernetes(args={}) 
+      story = { 
+        rails: [
+          { database: :postgresql },
+          { kubernetes: :postgresql },
+          { ci_cd: :circleci}
+        ] 
+      }  
+      rollon( { story: story } )
+    end
+
+    no_commands do 
+      
+      def configure_for_rollon(aroptions=nil)
         @config ||= Roro::Configuration.new(options) 
       end
+
+      def manifest_actions
+        @config.structure[:actions].each {|a| eval a }
+      end
+      
+      def manifest_intentions
+        @config.intentions.each {|k, v| eval(k.to_s) if v.eql?('y') }  
+      end 
+      
+      def greenfield_actions 
+        return unless @config.structure[:greenfield_actions] 
+        @config.structure[:greenfield_actions].each {|a| eval a }
+      end 
+      
+      def greenfield_commands 
+        return unless @config.structure[:greenfield_actions] 
+        @config.structure[:greenfield_commands].each {|a| eval a }
+      end
+
+      def congratulations(story=nil)
+        ( @config.story[:rollon]) 
+        if @config.structure[:greenfield]
+          usecase = 'greenfielded a new '
+        else 
+          usecase = 'rolled your existing ' 
+        end 
+        array = ["You've successfully "]
+        array << usecase
+        congrats = array.join("") 
+        puts congrats
+      end
+      
+      def startup_commands
+        congratulations( @config.story[:rollon])
+        cmd = @config.structure[:startup]
+        commands = cmd[:commands] 
+        question = []
+        question << "\n\n You can start your app up with some combination of these commands:\n"
+        commands.each { |c| question << "\t#{c}"}
+        question << "\nOr if you'd like Roro to try and do it for you:"
+        question = question.join("\n")
+        if ask(question, default: 'y', limited_to: ['y', 'n']).eql?("y")
+          commands.each {|a| system(a) }
+          puts "\n\n#{cmd[:success]}\n\n" 
+        end
+      end
       
       def yaml_from_template(file)
-        File.read(File.dirname(__FILE__) + "/templates/#{file}")
+        File.read(find_in_source_paths(file))
       end
       
-      def take_thor_actions 
-        @config.thor_actions.each {|k, v| eval(k) if v.eql?('y') }  
+      def generate_config_story
+        roro_story = {
+          story: @config.story,
+          env_vars: @config.env,
+          intentions: @config.intentions
+        }
+        create_file ".roro_story.yml", roro_story.to_yaml 
       end
     end
   end

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

@@ -0,0 +1,4 @@
+
+require_relative 'insertions.rb'
+require_relative 'insert_gems.rb'
+

data/lib/roro/cli/{base → rollon/rails/base}/insert_gems.rb

@@ -10,16 +10,8 @@ module Roro
       end
       
       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
+        gems = %w(sqlite pg mysql2)
+        gems.each { |g| gsub_file('Gemfile', /.*#{g}.*/, '')}
         insert_into_file 'Gemfile', "gem '#{gem}'\n\n", before: "group :development, :test"
       end
 

data/lib/roro/cli/{base → rollon/rails/base}/insertions.rb

@@ -11,8 +11,16 @@ module Roro
         prepend_to_file(file, line, force: true)
       end 
       
+      def copy_dockerignore 
+        copy_file 'base/.dockerignore', '.dockerignore'
+      end 
+      
       def gitignore_sensitive_files
         append_to_file ".gitignore", "\nroro/**/*.env\nroro/**/*.key"
+        append_to_file ".gitignore", "\nroro/**/*.env\nroro/**/*.key"
+        append_to_file ".gitignore", "\n*kubeconfig.yaml"
+        append_to_file ".gitignore", "\n*kubeconfig.yml"
+        append_to_file ".gitignore", "\n*.roro_configurator.yml"
       end
     end
   end 

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

@@ -5,23 +5,19 @@ module Roro
     no_commands do
 
       def configure_database 
-        database = @config.thor_actions['configure_database']
-        vendor = @config.master['services']['database']['vendors']
+        database = @config.intentions[:configure_database]
         case database
         when 'p'
-          @config.app['database_vendor'] = 'postgresql'
-          @config.app['postgresql_env_vars'] = vendor['postgresql']['env_vars']
+          @config.env[:database_vendor] = 'postgresql'
           configure_for_pg
         when 'm'
-          @config.app['database_vendor'] = 'mysql'
-          @config.app['mysql_env_vars'] = vendor['mysql']['env_vars']
+          @config.env[:database_vendor] = 'mysql'
           configure_for_mysql
         end
-        
         %w(development production test staging ci).each do |environment| 
           src = 'rails/dotenv/web.env.tt'
           dest = "roro/containers/app/#{environment}.env"
-          template src, dest, @config.app
+          template src, dest, @config.env
         end
       end
     end 

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

@@ -7,10 +7,10 @@ module Roro
       def configure_for_mysql 
         insert_db_gem('mysql2')
         copy_file 'rails/config/database.mysql.yml', 'config/database.yml', force: true
-        config = @config.app.clone
+        config = @config.env.clone
 
         %w(development production test staging ci).each do |environment| 
-          config['rails_env'] = environment
+          config[:rails_env] = environment
           
           source = 'rails/dotenv/database.mysql.env.tt'
           target = "roro/containers/database/#{environment}.env" 

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

@@ -5,14 +5,13 @@ module Roro
     no_commands do
       
       def configure_for_pg 
-        insert_db_gem('pg')
         copy_file 'rails/config/database.pg.yml', 'config/database.yml', force: true
-        config = @config.app.clone
+        config = @config.env.clone
         %w(development production test staging ci).each do |environment| 
-          config['rails_env'] = environment
+          config[:rails_env] = environment
           
           source = 'rails/dotenv/database.pg.env.tt'
-          target = "roro/containers/database/#{environment}.env" 
+          target = "roro/containers/database/#{environment}.env"
           template( source, target, config )
         end
       end