roro 0.2.5 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999f9916a8bcac4281835fbec6b843e19436b62c43e103945a9e5ebcf09d741e
-  data.tar.gz: f6484791b8829df9c2d8a776a86e9ec4e1b0e1afba35cd92df60ab73faced09b
+  metadata.gz: d1748207f4c1b87ab2301b252cd90eac18dc36107544b404b031e9ba9b0df62f
+  data.tar.gz: eda27e549ca1789b75f5f0af646415b92c8c82f5e3b05dcf612a7d591326c33d
 SHA512:
-  metadata.gz: c136c9d690376e0d82e6f79e71a2485854b77caf640e81b634509e336f0a1f4b3a615e7ff84982b4008bacb9bdbfa33107b42b28ab1b04052dcfc1bd51c4bf9f
-  data.tar.gz: 46087ecabf31acd42ddc93922518053279ec1519488919608a658e38c2491d9ed498fba1d56b7f68e603dcea4c410b7775f9b7d78ac0d9f5a79773b222fcf7a9
+  metadata.gz: ec101f6fba2f50fe296792633d606e3ee2a0680e798c7fef0508706ef37d58dd979f04ea6be7e0fffe044596315aca2933d9ca7416d5694b4f083b18de923182
+  data.tar.gz: 3b89bd8d48d381ef5461deb8b99712cea71a8c2708cc32fdd5c195f931001736598ca48ddbebc0269f09e6c7cbd9e5294e7c7fcb943c1627b8c48e5bdcdae684

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

@@ -2,16 +2,19 @@
 # More info at https://github.com/guard/guard#readme
 
 options = {
-  cli: '',
-  all_after_run: false
+  # cli: '',
+  # 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$})
   watch(%r{^lib/roro/cli/(.+)\.rb$}) { |m| "test/generators/#{m[1]}_test.rb" }
+  watch(%r{^lib/roro/cli/rollon/*.rb$}) { 'test/generators' }
+  watch(%r{^lib/roro/cli/(.+).rb$}) { 'test' }
+
 
   watch(%r{^test/thor_helper\.rb$})      { 'test' }
 

data/lib/roro/cli.rb

@@ -1,5 +1,5 @@
 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 +15,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,30 @@
+module Roro
+  
+  class CLI < Thor
+    
+    no_commands do
+      
+      def copy_dockerignore 
+        copy_file 'base/.dockerignore', '.dockerignore'
+      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
+      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]
+      end
+    end
+  end 
+end

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

@@ -0,0 +1,118 @@
+
+module Roro
+
+  class CLI < Thor
+    
+    no_commands do
+      
+      def get_configuration_variables(hash={})
+        options["interactive"] ? set_interactively : set_from_defaults
+        hash.each { |k,v| @env_hash[k] = v } unless hash.nil? 
+        @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
+      
+      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
+      
+      
+      
+      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")))
+        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", force: @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,39 @@
+
+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   
+      
+      def as_system(command)
+        command = OS.linux? ? "sudo #{command}" : command
+        system command
+      end
+
+      def chown_if_required()
+        warning = "It looks like you're running Docker on some flavor of Linux, in which case the files created by your containers are owned by the root user of the container, and not by the user of the host machine. Please change their ownership by supplying your password at the prompt.",
+        action = "system 'sudo chown -R $USER .'"
+        msg = []
+        msg << ""
+        msg << delineator
+        msg << warning
+        msg << ""
+        msg.join("\n\n")
+        puts msg
+        eval(action)
+      end
+
+      def delineator
+        ("-" * 80)
+      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,85 +11,31 @@ 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
+      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
       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'
+      copy_greenfield_to_host
+      @env_hash[:use_force] = { force: true }
+      rollon
     end
-
+    
     no_commands do
-
-      def as_system(command)
-        command = OS.linux? ? "sudo #{command}" : command
-        system command
-      end
-
-      def chown_if_required()
-        warning = "It looks like you're running Docker on some flavor of Linux, in which case the files created by your containers are owned by the root user of the container, and not by the user of the host machine. Please change their ownership by supplying your password at the prompt.",
-        action = "system 'sudo chown -R $USER .'"
-        msg = []
-        msg << ""
-        msg << delineator
-        msg << warning
-        msg << ""
-        msg.join("\n\n")
-        puts msg
-        eval(action)
-      end
-
-      def delineator
-        ("-" * 80)
-      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")))
-        end
+            
+      def copy_greenfield_files
+        template 'greenfield/Dockerfile.tt', 'Dockerfile', @env_hash
+        template 'greenfield/docker-compose.yml.tt', 'docker-compose.yml', @env_hash
       end
-
-      def confirm_dependencies
-        dependencies = [
-          {
-            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?"
-          }, {
-
-            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
+      
+      def copy_greenfield_to_host 
+        system "DOCKER_BUILDKIT=1 docker build --file Dockerfile --output . ."
       end
     end
   end

data/lib/roro/cli/rollon.rb

@@ -1,21 +1,38 @@
+require_relative 'rollon/stories'
+
 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"
-    method_option :interactive, desc: "Set up your environment variables as you go."
+    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"
-
+      confirm_dependencies
+      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?" })
+      @env_hash || 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_dockerize
+    end
+    
+    no_commands do
+    
     end
   end
-end
+end