blufin-lib 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774f67cc50886880722c063c20fd1fb52ccaed60
-  data.tar.gz: d1dedaab78501e5d450154c63c94cb8bd41dd6f5
+  metadata.gz: 2e5791167393d7968f07af6998fd44e3e01682b0
+  data.tar.gz: 7d86180cd83561d70d074d2d1c7e7b4d10145e71
 SHA512:
-  metadata.gz: 6f0fed9cfde5fce8f27905542207704f53fb71aac5b739083fe6815f4a30b321ad60741840a75956ae36c071df6ddba627725009ab68f814faba9fe262c4f4a7
-  data.tar.gz: 0f68ef145d50f94c60fc270efbf8ad98c8a586e9e727508a2ea6de97f7b281701b581ced9b1652fa7850719ad794184b6027fc656e10fdae954107b3223dde6f
+  metadata.gz: 466b61784d9767ca6d7e32b4277f809dd7b1b79c6f97b9dc183274392d064a102451abbdaf20b9c710223b9c5565b4ed223db7b79f242081ffb7540fc3786ae3
+  data.tar.gz: d3bc26127ee11355383cf88b8a3eca92ab406196cd449ddfbd2430dd9f4235795cb3bd8bcec80e91bb47081ecd0d1ce47094895247f2e48b6d13f8d9e5aa6f18

data/lib/blufin-lib.rb

@@ -1,6 +1,7 @@
 module Blufin
 
     autoload :Arrays, 'core/arrays'
+    autoload :AWS, 'core/aws'
     autoload :Base, 'core/base'
     autoload :Config, 'core/config'
     autoload :DateTimeUtils, 'core/datetime_utils'

data/lib/core/aws.rb

@@ -0,0 +1,44 @@
+module Blufin
+
+    module AWS
+
+        # Pulls a file from S3 and saves it to the /tmp folder.
+        # To avoid making multiple calls, caching is turned on by default.
+        # @return string (path to tmp file).
+        def self.download_s3_data(bucket_name, bucket_path, file: nil, profile: nil, region: nil, use_cache: true)
+            raise RuntimeError, 'profile cannot be nil.' if profile.nil?
+            raise RuntimeError, 'region cannot be nil.' if region.nil?
+            bucket_path     = Blufin::Strings::remove_surrounding_slashes(bucket_path).strip
+            bucket_path_tmp = bucket_path.length > 0 ? "-#{bucket_path.gsub('/', '-')}" : ''
+            bucket_path_s3  = bucket_path.length > 0 ? "/#{bucket_path}" : ''
+            unless file.nil?
+                bucket_path_tmp = "#{bucket_path_tmp}-#{file}"
+                bucket_path_s3  = "#{bucket_path_s3}/#{file}"
+            end
+            tmp_location = "/tmp/awx-s3-cache-#{bucket_name}#{bucket_path_tmp}"
+            # If path/file exists and we're using cached values, simply return.
+            if file.nil?
+                return tmp_location if Blufin::Files::path_exists(tmp_location) && use_cache && Blufin::Files::get_files_in_dir(tmp_location).any?
+            else
+                return tmp_location if Blufin::Files::file_exists(tmp_location) && use_cache
+            end
+            begin
+                # Clear out all (possibly stale) files.
+                raise RuntimeError unless Blufin::Terminal::execute_proc("Wiping temp-folder: #{Blufin::Terminal::format_directory(tmp_location)}", Proc.new {
+                    system("rm -rf #{tmp_location}") if file.nil?
+                    system("rm #{tmp_location}") unless file.nil?
+                    Blufin::Files::create_directory(tmp_location)
+                }, verbose: true)
+                raise RuntimeError unless Blufin::Terminal::execute("aws s3 cp s3://#{bucket_name}#{bucket_path_s3} #{tmp_location} --recursive --profile #{profile} --region #{region}", verbose: true)
+                tmp_location
+            rescue
+                system("rm -rf #{tmp_location}") if file.nil?
+                system("rm #{tmp_location}") unless file.nil?
+                Blufin::Terminal::error("Unable to download from S3 bucket: #{Blufin::Terminal::format_highlight("s3://#{bucket_name}#{bucket_path_s3}")}", "Either the bucket doesn't exist, you don't have permissions or something else is wrong...", true, false)
+            end
+
+        end
+
+    end
+
+end

data/lib/core/projects.rb

@@ -2,79 +2,75 @@ module Blufin
 
     class Projects
 
-        SCHEMA_FILE = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/awx/project-schema.yml"
-        SCRIPT_RUN = 'run'
-        SCRIPT_TEST = 'test'
-        SCRIPT_BUILD = 'build'
-        SCRIPT_DEPLOY = 'deploy'
-        RUN_SCRIPTS = 'RunScripts'
-        TEST_SCRIPTS = 'TestScripts'
-        BUILD_SCRIPTS = 'BuildScripts'
-        DEPLOY_SCRIPTS = 'DeployScripts'
-        DEPLOYMENT_ID = 'Id'
-        TYPE = 'Type'
-        PROJECT = 'Project'
-        REPO_ROOT = 'RepoRoot'
-        REPO_PATH = 'RepoPath'
-        PORT_RANGE = 'PortRange'
-        RUN = 'Run'
-        TEST = 'Test'
-        BUILD = 'Build'
-        DEPLOY = 'Deploy'
-        SERVERS = 'Servers'
-        REGION = 'Region'
-        STACK = 'Stack'
-        ENVIRONMENTS = 'Environments'
-        TARGETS = 'Targets'
-        COMMANDS = 'Commands'
-        API = 'API'
-        TITLE = 'Title'
-        ALIAS = 'Alias'
-        DOMAIN = 'Domain'
+        SCHEMA_FILE              = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/awx/project-schema.yml"
+        SCRIPT_RUN               = 'run'
+        SCRIPT_TEST              = 'test'
+        SCRIPT_BUILD             = 'build'
+        SCRIPT_DEPLOY            = 'deploy'
+        RUN_SCRIPTS              = 'RunScripts'
+        TEST_SCRIPTS             = 'TestScripts'
+        BUILD_SCRIPTS            = 'BuildScripts'
+        ID                       = 'Id'
+        PROJECT_ID               = 'ProjectId'
+        PROJECT                  = 'Project'
+        TYPE                     = 'Type'
+        REPOSITORY               = 'Repository'
+        DEPLOYMENT               = 'Deployment'
+        DEPLOYMENT_BUCKET        = 'Bucket'
+        DEPLOYMENT_FILES         = 'Files'
+        RUN                      = 'Run'
+        TEST                     = 'Test'
+        BUILD                    = 'Build'
+        COMMANDS                 = 'Commands'
+        API                      = 'API'
+        CRON                     = 'Cron'
+        WORKER                   = 'Worker'
+        LAMBDA                   = 'Lambda'
+        TITLE                    = 'Title'
+        ALIAS                    = 'Alias'
+        DOMAIN                   = 'Domain'
         PROJECT_NAME_PASCAL_CASE = 'ProjectNamePascalCase'
-        PROJECT_NAME = 'ProjectName'
-        TYPE_ALEXA = 'alexa'
-        TYPE_API = 'api'
-        TYPE_LAMBDA = 'lambda'
-        TYPE_UI = 'ui'
-        VALID_TYPES = [
+        PROJECT_NAME             = 'ProjectName'
+        PORT                     = 'Port'
+        PORTS                    = 'Ports'
+        STAGE                    = 'Stage'
+        TYPE_ALEXA               = 'alexa'
+        TYPE_API                 = 'api'
+        TYPE_LAMBDA              = 'lambda'
+        TYPE_UI                  = 'ui'
+        VALID_TYPES              = [
             TYPE_ALEXA,
             TYPE_API,
             TYPE_LAMBDA,
             TYPE_UI,
         ]
 
-        @@projects = nil
+        @@projects      = nil
         @@project_names = []
-        @@scripts = nil
-        @@deployments = nil
-        @@apis = nil
-        @@environments = []
+        @@scripts       = nil
+        @@apis          = nil
+        @@lambdas       = nil
 
-        # Takes a Hash that should have the APIs, Lambdas and UIs keys in the root.
+        # Takes a Hash that needs to have a 'Projects' key.
         # This can come from both .awx.yml['Profiles'] or .blufin.yml (root).
         # @return void
-        def self.init(hash, file)
+        def self.init(projects)
             raise RuntimeError, 'Cannot run Blufin::Projects::init() more than once.' unless @@projects.nil? && @@scripts.nil?
+            raise RuntimeError, "Need either a Local or S3Bucket key, found neither: #{projects.keys}" unless projects.has_key?('Local') || projects.has_key?('S3Bucket')
             @@projects = {}
-            @@scripts = {}
-            if hash.has_key?('Projects')
-                projects = hash['Projects']
-                # Throw error if we have multiple sources defined, can only have 1.
-                Blufin::Terminal::error("Found multiple sources for #{Blufin::Terminal::format_highlight(UIs)} property in: #{Blufin::Terminal::format_directory(file)}. Can #{Blufin::Terminal::format_highlight('only have one')} of the following, not both:", [Blufin::Terminal::format_invalid('Local'), Blufin::Terminal::format_invalid('S3Bucket')], true) if projects.has_key?('Local') && projects.has_key?('S3Bucket')
-                if projects.has_key?('Local')
-                    source_file = File.expand_path(projects['Local']['File'])
-                    # Throw error if source file doesn't exist.
-                    Blufin::Terminal::error("Cannot find source file: #{Blufin::Terminal::format_directory(source_file)}") unless Blufin::Files::file_exists(source_file)
-                    # Validate the source file against the expected schema.
-                    process_source_file(source_file)
-                elsif projects.has_key?('S3Bucket')
+            @@scripts  = {}
+            if projects.has_key?('Local')
+                source_file = File.expand_path(projects['Local']['File'])
+                # Throw error if source file doesn't exist.
+                Blufin::Terminal::error("Cannot find source file: #{Blufin::Terminal::format_directory(source_file)}") unless Blufin::Files::file_exists(source_file)
+                # Validate the source file against the expected schema.
+                process_source_file(source_file)
+            elsif projects.has_key?('S3Bucket')
 
-                    # TODO - Finish this once we start running this on an EC2 instance (build/deploy server).
-                    # TODO - Whatever file we validate should be available on disk locally.
-                    # TODO - If the source is an S3 bucket, pull it down into a /tmp folder (on EC2 instance) and validate from there.
+                # TODO - Finish this once we start running this on an EC2 instance (build/deploy server).
+                # TODO - Whatever file we validate should be available on disk locally.
+                # TODO - If the source is an S3 bucket, pull it down into a /tmp folder (on EC2 instance) and validate from there.
 
-                end
             end
         end
 
@@ -102,38 +98,10 @@ module Blufin
             @@apis
         end
 
-        # Gets Environments(s).
-        # @return Array
-        def self.get_environments
-            @@environments
-        end
-
-        # Get matching deployments for parameters.
+        # Gets Lambda(s).
         # @return Hash
-        def self.get_deployments(project, stack, region, environment)
-            if @@deployments.nil?
-                @@deployments = {}
-                if @@projects.is_a?(Hash) && @@projects.has_key?(project)
-                    project = @@projects[project]
-                    project.each do |deployment_id, data|
-                        if data.is_a?(Hash) && data.has_key?(SERVERS)
-                            servers = data[SERVERS]
-                            if servers.is_a?(Array)
-                                servers.each do |server|
-                                    if server.has_key?(REGION) && server[REGION] == region
-                                        if server.has_key?(STACK) && server[STACK] == stack
-                                            if server.has_key?(ENVIRONMENTS) && server[ENVIRONMENTS].include?(environment)
-                                                @@deployments[deployment_id] = data
-                                            end
-                                        end
-                                    end
-                                end
-                            end
-                        end
-                    end
-                end
-            end
-            @@deployments
+        def self.get_lambdas
+            @@lambdas
         end
 
         # Maps root-level property to enum.
@@ -145,8 +113,6 @@ module Blufin
                 return TEST_SCRIPTS
             elsif [BUILD_SCRIPTS, BUILD].include?(script_type)
                 return BUILD_SCRIPTS
-            elsif [DEPLOY_SCRIPTS, DEPLOY].include?(script_type)
-                return DEPLOY_SCRIPTS
             else
                 raise RuntimeError, "Unhandled script type: #{script_type}"
             end
@@ -175,13 +141,13 @@ module Blufin
                 end
 
                 # Buffer script(s).
-                [RUN_SCRIPTS, TEST_SCRIPTS, BUILD_SCRIPTS, DEPLOY_SCRIPTS].each do |script_type|
+                [RUN_SCRIPTS, TEST_SCRIPTS, BUILD_SCRIPTS].each do |script_type|
                     if file_parsed.has_key?(script_type)
                         if file_parsed[script_type].is_a?(Array)
-                            script_key = script_key_mapper(script_type)
+                            script_key            = script_key_mapper(script_type)
                             @@scripts[script_key] = {} unless @@scripts.has_key?(script_key)
                             file_parsed[script_type].each do |script|
-                                script_id = script[DEPLOYMENT_ID]
+                                script_id = script[ID]
                                 # Throw error if duplicate script is found for type.
                                 Blufin::Terminal::error("#{Blufin::Terminal::format_highlight("#{script_type} - #{script_id}")} \xe2\x80\x94 Duplicate script found: #{Blufin::Terminal::format_invalid(script_id)}") if @@scripts[script_key].has_key?(script_id)
                                 @@scripts[script_key][script_id] = script
@@ -205,112 +171,102 @@ module Blufin
                 file_parsed['Projects'].each do |project|
                     # Validate keys are in specific order.
                     expected = {
-                        DEPLOYMENT_ID => true,
-                        TYPE => true,
-                        PROJECT => true,
-                        REPO_ROOT => true,
-                        REPO_PATH => true,
-                        PORT_RANGE => false,
-                        RUN => false,
-                        TEST => false,
-                        BUILD => false,
-                        DEPLOY => false,
-                        SERVERS => false,
-                        API => false
+                        PROJECT_ID => true,
+                        PROJECT    => true,
+                        TYPE       => true,
+                        REPOSITORY => true,
+                        RUN        => false,
+                        TEST       => false,
+                        BUILD      => false,
+                        API        => false,
+                        LAMBDA     => false,
+                        DEPLOYMENT => false
                     }
                     Blufin::Validate::assert_valid_keys(expected, project.keys, source_file)
-                    project_id = project[DEPLOYMENT_ID]
+                    project_id   = project[PROJECT_ID]
                     project_name = project[PROJECT]
                     project_type = project[TYPE]
-
                     @@project_names << project_name
-
                     # Validate Type.
                     Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Invalid Project Type: #{Blufin::Terminal::format_invalid(project_type)}. Valid types are:", VALID_TYPES, true) unless VALID_TYPES.include?(project_type)
                     # Validate Script(s).
-                    [RUN, TEST, BUILD, DEPLOY].each do |script_type|
+                    [RUN, TEST, BUILD].each do |script_type|
                         if project.has_key?(script_type)
                             # Validate the LAMBDA functions don't need build scripts.
-                            Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Project type: #{Blufin::Terminal::format_highlight(TYPE_LAMBDA)} cannot have #{Blufin::Terminal::format_invalid(script_type)} property.", 'This type of project does not support this.', true) if [BUILD].include?(script_type) && project_type == TYPE_LAMBDA
-                            if project[script_type].is_a?(Array)
-                                script_key = script_key_mapper(script_type)
+                            Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Project type: #{Blufin::Terminal::format_highlight(TYPE_LAMBDA)} does not require #{Blufin::Terminal::format_invalid(script_type)} script(s).", 'This type of project does not support this.', true) if [BUILD].include?(script_type) && project_type == TYPE_LAMBDA
+                            if project[script_type].is_a?(Hash)
+                                script_key    = script_key_mapper(script_type)
                                 valid_scripts = []
                                 valid_scripts = @@scripts[script_key].keys if @@scripts.has_key?(script_key)
-                                project[script_type].each do |script|
-                                    script_name = script['Script']
-                                    unless valid_scripts.include?(script_name)
-                                        error = valid_scripts.any? ? 'Valid values are:' : "There currently are no #{script_key} script(s) defined."
-                                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 #{Blufin::Terminal::format_highlight(script_type)} \xe2\x80\x94 Invalid script reference: #{Blufin::Terminal::format_invalid(script_name)}. #{error}", valid_scripts)
-                                    end
+                                script        = project[script_type]
+                                script_name   = script['Script']
+                                unless valid_scripts.include?(script_name)
+                                    error = valid_scripts.any? ? 'Valid values are:' : "There currently are no #{script_key} script(s) defined."
+                                    Blufin::Terminal::error("#{project_id} \xe2\x80\x94 #{Blufin::Terminal::format_highlight(script_type)} \xe2\x80\x94 Invalid script reference: #{Blufin::Terminal::format_invalid(script_name)}. #{error}", valid_scripts)
                                 end
                             end
                         end
                     end
-                    # Validate Server(s) and create new 'Targets' Hash from it.
-                    if project.has_key?(SERVERS)
-                        targets = {}
-                        project[SERVERS].each do |server|
-                            region = server['Region']
-                            stack = server['Stack']
-                            environments = server['Environments']
-                            environments.each do |environment|
-                                targets[environment] = {} unless targets.has_key?(environment)
-                                targets[environment] = {
-                                    :region => region,
-                                    :stack => stack,
-                                }
-                                @@environments << environment
-                            end
-                        end
-                        project[TARGETS] = targets
+
+                    # Validate Deployment property.
+                    if project.has_key?(DEPLOYMENT)
+                        expected = {
+                            DEPLOYMENT_BUCKET => true,
+                            DEPLOYMENT_FILES  => true
+                        }
+                        Blufin::Validate::assert_valid_keys(expected, project[DEPLOYMENT].keys, source_file)
                     end
-                    # Validate APIs and build @@api Hash.
+
+                    # Validate API property.
                     if project_type == TYPE_API
-                        # Make sure we have the API & PortRange properties.
+                        # Make sure we have the API property.
                         Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Missing property: #{Blufin::Terminal::format_highlight(API)}", "This property is required for project(s) with type: #{API}", true) unless project.has_key?(API)
-                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Missing property: #{Blufin::Terminal::format_highlight(PORT_RANGE)}", "This property is required for project(s) with type: #{API}", true) unless project.has_key?(PORT_RANGE)
                         # Validate keys are in specific order.
                         expected = {
-                            TITLE => true,
-                            ALIAS => true,
-                            DOMAIN => true,
-                            PROJECT_NAME => true,
-                            PROJECT_NAME_PASCAL_CASE => true
+                            TITLE                    => true,
+                            ALIAS                    => true,
+                            DOMAIN                   => true,
+                            PROJECT_NAME             => true,
+                            PROJECT_NAME_PASCAL_CASE => true,
+                            PORTS                    => true
                         }
                         Blufin::Validate::assert_valid_keys(expected, project[API].keys, source_file)
-                        @@apis = {} if @@apis.nil?
-                        @@apis[project[DEPLOYMENT_ID]] = {
-                            REPO_ROOT => project[REPO_ROOT],
-                            TITLE => project[API][TITLE],
-                            ALIAS => project[API][ALIAS],
-                            PROJECT_NAME => project[API][PROJECT_NAME],
-                            PROJECT_NAME_PASCAL_CASE => project[API][PROJECT_NAME_PASCAL_CASE],
-                            DOMAIN => project[API][DOMAIN],
-                            PORT_RANGE => project[PORT_RANGE]
+                        expected_ports = {
+                            API    => true,
+                            CRON   => true,
+                            WORKER => true
                         }
+                        Blufin::Validate::assert_valid_keys(expected_ports, project[API][PORTS].keys, source_file)
+                        validate_ports([project[API][PORTS][API], project[API][PORTS][CRON], project[API][PORTS][WORKER]], project_id, used_ports)
+                        # Add ports to used_ports.
+                        used_ports[project[API][PORTS][API]]    = project_id
+                        used_ports[project[API][PORTS][CRON]]   = project_id
+                        used_ports[project[API][PORTS][WORKER]] = project_id
+                        @@apis                                  = {} if @@apis.nil?
+                        @@apis[project[PROJECT_ID]]             = project[API]
                     else
                         # Make sure we DON'T have the API key.
                         Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Property not supported: #{Blufin::Terminal::format_invalid(API)}", "This property is only allowed for project(s) with type: #{API}", true) if project.has_key?(API)
                     end
 
-                    # Validate the ports range.
-                    if project.has_key?(PORT_RANGE)
-                        port_range = project[PORT_RANGE].strip
-                        # Make sure Port Range is in format: XXXX-XXXX
-                        port_range_regex = /^\d{4}-\d{4}$/
-                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Port Range does not match regex: #{Blufin::Terminal::format_invalid(port_range)}", "Must match regex: #{port_range_regex}", true) unless port_range =~ port_range_regex
-                        prs = port_range.split('-')
-                        raise RuntimeError, "Expected port range to have exactly one hyphen (-), instead got: #{port_range}" unless prs.length == 2
-                        # Make sure port range spans exactly 20 ports (by having a difference of 19).
-                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Port Range either doesn't span 20 ports or is not in correct, numerical order: #{Blufin::Terminal::format_invalid(port_range)}") unless prs[1].to_i - prs[0].to_i == 19
-                        # Make sure none of the ports conflict with other projects.
-                        (prs[0].to_i..prs[1].to_i).each do |i|
-                            if used_ports.has_key?(i)
-                                Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Port overlap detected for range: #{Blufin::Terminal::format_invalid(port_range)}", ["The conflicting project is: #{used_ports[i]}"])
-                            end
-                        end
+                    # Validate Lambda property.
+                    if project_type == TYPE_LAMBDA
+                        # Make sure we have the Lambda
+                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Missing property: #{Blufin::Terminal::format_highlight(LAMBDA)}", "This property is required for project(s) with type: #{LAMBDA}", true) unless project.has_key?(LAMBDA)
+                        # Validate keys are in specific order.
+                        expected = {
+                            PORT  => true,
+                            STAGE => true
+                        }
+                        Blufin::Validate::assert_valid_keys(expected, project[LAMBDA].keys, source_file)
+                        validate_ports([project[LAMBDA][PORT]], project_id, used_ports)
                         # Add ports to used_ports.
-                        (prs[0].to_i..prs[1].to_i).each { |i| used_ports[i] = "#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 #{port_range}" }
+                        used_ports[project[LAMBDA][PORT]] = project_id
+                        @@lambdas                         = {} if @@lambdas.nil?
+                        @@lambdas[project[PROJECT_ID]]    = project[LAMBDA]
+                    else
+                        # Make sure we DON'T have the Lambda key.
+                        Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Property not supported: #{Blufin::Terminal::format_invalid(LAMBDA)}", "This property is only allowed for project(s) with type: #{LAMBDA}", true) if project.has_key?(LAMBDA)
                     end
 
                     @@projects[project_name] = {} unless @@projects.has_key?(project_name)
@@ -318,9 +274,18 @@ module Blufin
                     @@projects[project_name][project_id] = project
 
                 end
+                @@project_names.uniq!
+                @@project_names.sort!
+            end
+        end
 
-                @@project_names.uniq!.sort!
-                @@environments.uniq!.sort!
+        # Validate the ports. Make sure none of the ports conflict with other projects.
+        # @return void
+        def self.validate_ports(ports, project_id, used_ports)
+            ports.each do |port|
+                if used_ports.has_key?(port)
+                    Blufin::Terminal::error("#{project_id} \xe2\x80\x94 Duplicate port detected: #{Blufin::Terminal::format_invalid(port)} ", ["The conflicting project is: #{Blufin::Terminal::format_highlight(used_ports[port])}"])
+                end
 
             end
 

data/lib/core/strings.rb

@@ -89,8 +89,12 @@ module Blufin
         # Generate Random string.
         # Currently returns something like: 1ec6c763
         # @return String
-        def self.random_string
-            "#{SecureRandom.uuid.split('-')[0].downcase}#{SecureRandom.uuid.split('-')[0].downcase}"
+        def self.random_string(x = 1)
+            rs = ''
+            x.times do
+                rs = "#{rs}#{SecureRandom.uuid.split('-')[0].downcase}"
+            end
+            rs
         end
 
         private

data/lib/core/terminal.rb

@@ -12,15 +12,15 @@ module Blufin
 
         extend Columnist
 
-        MSG_INFO = 'info'
-        MSG_WARNING = 'warning'
-        MSG_ERROR = 'error'
-        MSG_TODO = 'todo'
-        MSG_AUTOMATIC = 'automatic'
-        MSG_GENERATED = 'generated'
-        MSG_PROCESSED = 'processed'
-        MSG_PROGRESS = 'progress'
-        MSG_CUSTOM = 'custom'
+        MSG_INFO            = 'info'
+        MSG_WARNING         = 'warning'
+        MSG_ERROR           = 'error'
+        MSG_TODO            = 'todo'
+        MSG_AUTOMATIC       = 'automatic'
+        MSG_GENERATED       = 'generated'
+        MSG_PROCESSED       = 'processed'
+        MSG_PROGRESS        = 'progress'
+        MSG_CUSTOM          = 'custom'
         MSG_CUSTOM_AUTO_PAD = 'custom_auto_pad'
 
         # Runs a series of commands in the terminal.
@@ -79,8 +79,8 @@ module Blufin
         # See: https://github.com/piotrmurach/tty-spinner/blob/master/lib/tty/spinner/formats.rb (for spinner options).
         # @return void
         def self.execute(command, path = nil, capture: false, verbose: true, text: nil)
-            text = text.is_a?(String) ? text : command
-            t1 = Time.now
+            text    = text.is_a?(String) ? text : command
+            t1      = Time.now
             spinner = TTY::Spinner.new("[:spinner] \x1B[38;5;208m#{text}#{!path.nil? ? " \x1B[38;5;246m\xe2\x86\x92 \x1B[38;5;240m#{path}" : nil}\x1B[0m", format: :dots) if verbose
             spinner.auto_spin if verbose
             path = File.expand_path('~/') if path.nil?
@@ -89,7 +89,7 @@ module Blufin
             else
                 res = system("cd #{path} && #{command} > /tmp/execute-output")
             end
-            t2 = Time.now
+            t2    = Time.now
             delta = "#{'%.3f' % (t2 - t1).abs}s"
             if res || capture
                 spinner.success("\x1B[38;5;246m\xe2\x86\x92 \x1B[38;5;46mComplete \x1B[38;5;240m(#{delta})\x1B[0m\x1B[0m") if verbose
@@ -108,12 +108,12 @@ module Blufin
         def self.execute_proc(title, proc, verbose: true)
             raise RuntimeError, "Expected String, instead got:#{title.class}" unless title.is_a?(String)
             raise RuntimeError, "Expected proc to be an instance of Proc, instead got: #{proc.class}" unless proc.is_a?(Proc)
-            t1 = Time.now
+            t1      = Time.now
             spinner = nil
             spinner = TTY::Spinner.new("[:spinner] \x1B[38;5;208m#{title}\x1B[0m", format: :dots) if verbose
             spinner.auto_spin if verbose
-            res = proc.call
-            t2 = Time.now
+            res   = proc.call
+            t2    = Time.now
             delta = "#{'%.3f' % (t2 - t1).abs}s"
             spinner.success("\x1B[38;5;246m\xe2\x86\x92 \x1B[38;5;46mComplete \x1B[38;5;240m(#{delta})\x1B[0m\x1B[0m") if verbose && res
             spinner.error("\x1B[38;5;246m\xe2\x86\x92 \x1B[38;5;196mFailed (#{delta})\x1B[0m") if verbose && !res
@@ -159,7 +159,7 @@ module Blufin
         # Displays error and exits script by default.
         # @return void
         def self.abort(title = nil, message = nil, exit_script = true, preceding_blank_line = false)
-            title = 'Abandon ship!' if title.nil?
+            title   = 'Abandon ship!' if title.nil?
             message = "You have chosen to \x1B[38;5;196mABORT\x1B[38;5;240m the script." if message.nil?
             Blufin::Terminal::error(title, message, exit_script, preceding_blank_line, 'ABORT')
         end
@@ -250,7 +250,7 @@ module Blufin
         # Returns command name in consistent, uniform manner.
         # @return String
         def self.format_command(command_name)
-            "\x1B[38;5;220m#{command_name}\x1B[0m"
+            "\x1B[38;5;70m$ \x1B[38;5;240m#{command_name}\x1B[0m"
         end
 
         # Returns directory name in consistent, uniform manner.
@@ -284,16 +284,16 @@ module Blufin
         def self.format_highlight(highlighted_text, capitalize = false, target: nil)
             case target
                 when 'cf' # CloudFormation
-                    color = 82
+                    color     = 82
                     color_end = "\x1B[38;5;246m"
                 when 'cf-ctt' # CloudFormation (Creation Time Title)
-                    color = 196
+                    color     = 196
                     color_end = "\x1B[38;5;246m"
                 when 'cf-ct' # CloudFormation (Creation Time)
-                    color = 82
+                    color     = 82
                     color_end = "\x1B[38;5;246m"
                 else
-                    color = 117
+                    color     = 117
                     color_end = "\x1B[0m"
             end
             if capitalize
@@ -326,7 +326,7 @@ module Blufin
         # Gives a prompt where 'y/Y' will return TRUE, 'n/N' will return false, and ANY other key will do nothing.
         # @return void
         def self.prompt_yes_no(title = nil, message = nil, confirmation_message = nil, preceding_blank_line = true)
-            title = 'Please confirm YES or NO.' if title.nil?
+            title                = 'Please confirm YES or NO.' if title.nil?
             confirmation_message = 'Would you like to continue?' if confirmation_message.nil?
             puts if preceding_blank_line
             puts "  \x1B[38;5;231m\x1B[48;5;55m Confirm \x1B[0m #{title.nil? ? '' : "\xe2\x86\x92 "}#{title}\n"
@@ -423,16 +423,26 @@ module Blufin
             if options[0].is_a?(String)
                 prompt.select(display_prompt_text(question), options, per_page: per_page)
             elsif options[0].is_a?(Hash)
-                prompt.select(display_prompt_text(question), per_page: per_page) do |menu|
-                    options.each do |option|
-                        raise RuntimeError, "Expected option to be Hash, instead got: (#{option.class}) #{option.inspect}" unless option.is_a?(Hash)
-                        raise RuntimeError, 'Option is missing key => :text' unless option.has_key?(:text)
-                        raise RuntimeError, 'Option is missing key => :value' unless option.has_key?(:value)
-                        raise RuntimeError, "Expected :disabled option to be String, instead got: #{option[:disabled].class}" if option.has_key?(:disabled) && !option[:disabled].is_a?(String) && !option[:disabled].nil?
+                options_fixed = []
+                options.each do |option|
+                    raise RuntimeError, "Expected option to be Hash, instead got: (#{option.class}) #{option.inspect}" unless option.is_a?(Hash)
+                    raise RuntimeError, 'Option is missing key => :text' unless option.has_key?(:text)
+                    raise RuntimeError, 'Option is missing key => :value' unless option.has_key?(:value)
+                    raise RuntimeError, "Expected :disabled option to be String, instead got: #{option[:disabled].class}" if option.has_key?(:disabled) && !option[:disabled].is_a?(String) && !option[:disabled].nil?
+                    v = option[:value]
+                    v = 'true' if option[:value].is_a?(TrueClass)
+                    v = 'false' if option[:value].is_a?(FalseClass)
+                    options_fixed << {:text => option[:text], :value => v}
+                end
+                result = prompt.select(display_prompt_text(question), per_page: per_page) do |menu|
+                    options_fixed.each do |option|
                         menu.choice option[:text], option[:value] unless option.has_key?(:disabled)
                         menu.choice option[:text], option[:value], disabled: "\x1B[38;5;196m#{option[:disabled]}\x1B[0m" if option.has_key?(:disabled)
                     end
                 end
+                return true if result == 'true'
+                return false if result == 'false'
+                return result
             else
                 raise RuntimeError, "Expected options Array to consist of either Strings or Hashes, instead got: #{options.inspect}"
             end
@@ -493,8 +503,8 @@ module Blufin
         def self.prompt_expand(question, options)
             raise RuntimeError, "Expected Array, instead got #{options.class}" unless options.is_a?(Array)
             options.each do |option|
-                found_key = false
-                found_name = false
+                found_key   = false
+                found_name  = false
                 found_value = false
                 option.each do |k, v|
                     case k
@@ -560,11 +570,11 @@ module Blufin
         # @return void
         def self.print_files_written(array_of_paths_or_files, message = nil, limit = 10, preceding_blank_line = true)
             raise RuntimeError, "Expected Array of files, instead got: #{array_of_paths_or_files.class}" unless array_of_paths_or_files.is_a?(Array)
-            message = "Wrote the following #{Blufin::Terminal::format_highlight('files/directories')}" if message.nil?
-            limit = limit.nil? ? 99999999999 : limit.to_i
+            message     = "Wrote the following #{Blufin::Terminal::format_highlight('files/directories')}" if message.nil?
+            limit       = limit.nil? ? 99999999999 : limit.to_i
             file_output = []
-            file_count = 0
-            file_more = 0
+            file_count  = 0
+            file_more   = 0
             array_of_paths_or_files.compact!
             array_of_paths_or_files.sort!
             array_of_paths_or_files.each do |path_or_file|
@@ -594,13 +604,13 @@ module Blufin
         # @return void
         def self.code_highlight(string, type, indent = 5)
             raise RuntimeError, "Expected String, instead got:#{string.class}" unless string.is_a?(String)
-            type = type.downcase
+            type  = type.downcase
             types = {
-                'yml' => Rouge::Lexers::YAML.new,
+                'yml'  => Rouge::Lexers::YAML.new,
                 'json' => Rouge::Lexers::JSON.new
             }
             raise RuntimeError, "Lexer not defined for type: #{type}" unless types.has_key?(type)
-            repeat = ' ' * indent
+            repeat    = ' ' * indent
             formatter = Rouge::Formatters::Terminal256.new
             formatter.format(types[type].lex(string)).split("\n").each do |line|
                 puts "#{repeat}#{line}"
@@ -619,14 +629,9 @@ module Blufin
                 else
                     messages = message.split("\n")
                 end
-                table(:border => false) do
-                    messages.each do |line|
-                        new_line = line.nil? ? '' : line.to_s.gsub("\x1B[0m", "\x1B[38;5;240m")
-                        row do
-                            column('', :align => 'left', :width => 4)
-                            column("\x1B[38;5;240m#{new_line}\x1B[0m", :align => 'left', :width => 180)
-                        end
-                    end
+                messages.each do |line|
+                    new_line = line.nil? ? '' : line.to_s.gsub("\x1B[0m", "\x1B[38;5;240m")
+                    puts "     \x1B[38;5;240m#{new_line}\x1B[0m"
                 end
                 puts
             end

data/lib/core/tools.rb

@@ -102,6 +102,42 @@ module Blufin
             end
         end
 
+        # Returns a value based on OS. If any of the values are nil, throws an Exception.
+        # Linux supports both LINUX and UNIX enums.
+        # @return string
+        def self.value_based_on_os(mac: nil, windows: nil, linux: nil)
+            begin
+                case Blufin::Tools::os
+                    when Blufin::Tools::OS_WINDOWS
+                        raise RuntimeError if windows.nil?
+                        return windows
+                    when Blufin::Tools::OS_MAC
+                        raise RuntimeError if mac.nil?
+                        return mac
+                    when Blufin::Tools::OS_LINUX
+                        raise RuntimeError if linux.nil?
+                        return linux
+                    when Blufin::Tools::OS_UNIX
+                        raise RuntimeError if linux.nil?
+                        return linux
+                    else
+                        raise RuntimeError
+                end
+            rescue => e
+                Blufin::Terminal::error("This command/operation is not yet supported on: #{Blufin::Terminal::format_highlight(Blufin::Tools::os)}", e.split("\n"), true)
+            end
+        end
+
+        # Throws uniform error for non-supported os'.
+        # @return void
+        def self.os_not_supported(array_of_os)
+            raise RuntimeError, "Expected Array, instead got: #{array_of_os.class}" unless array_of_os.is_a?(Array)
+            array_of_os.each { |os| raise RuntimeError, "Unsupported OS value: #{Blufin::Terminal::format_invalid(os)}" unless [OS_MAC, OS_WINDOWS, OS_LINUX, OS_UNIX].include?(os) }
+            current_os = os
+            if array_of_os.include?(current_os)
+                Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(current_os.capitalize)} is not supported to run this command/operation.", 'Someone needs to program it and make it compatible.')
+            end
+        end
 
     end
 

data/lib/core/validate.rb

@@ -9,7 +9,6 @@ module Blufin
         # @return null - If errors, will raise exception.
         def self.assert_valid_keys(expected, actual, description)
             raise RuntimeError, "Expected Hash, instead got: #{expected.class}" unless expected.is_a?(Hash)
-            raise RuntimeError, "Expected Array, instead got: #{actual.class}" unless actual.is_a?(Array)
             errors        = []
             required_keys = []
             optional_keys = []
@@ -48,4 +47,5 @@ module Blufin
         end
 
     end
+
 end

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '1.6.1'
+BLUFIN_LIB_VERSION = '1.7.0'

data/opt/awx/project-schema.yml

@@ -36,85 +36,66 @@ mapping:
           required: yes
           sequence:
           - type: str
-  DeployScripts:
-    type: seq
-    sequence:
-    - type: map
-      mapping:
-        Id:
-          required: yes
-        Commands:
-          type: seq
-          required: yes
-          sequence:
-          - type: str
   Projects:
     type: seq
     required: yes
     sequence:
     - type: map
       mapping:
-        Id:
-          required: yes
-        Type:
+        ProjectId:
           required: yes
         Project:
           required: yes
-        RepoRoot:
-          required: yes
-        RepoPath:
+        Type:
           required: yes
-        PortRange:
+        Repository:
+          type: map
+          mapping:
+            Local:
+            Remote:
+              required: yes
+            ProjectRoot:
+              required: yes
         Run:
-          type: seq
-          sequence:
-          - type: map
-            mapping:
-              Path:
-                required: yes
-              Script:
-                required: yes
+          type: map
+          mapping:
+            Path:
+              required: yes
+            Script:
+              required: yes
         Test:
-          type: seq
-          sequence:
-          - type: map
-            mapping:
-              Path:
-                required: yes
-              Script:
-                required: yes
+          type: map
+          mapping:
+            Path:
+              required: yes
+            Script:
+              required: yes
         Build:
-          type: seq
-          sequence:
-          - type: map
-            mapping:
-              Path:
-                required: yes
-              Script:
-                required: yes
-        Deploy:
-          type: seq
-          sequence:
-          - type: map
-            mapping:
-              Path:
-                required: yes
-              Script:
-                required: yes
-        Servers:
-          type: seq
-          sequence:
-          - type: map
-            mapping:
-              Region:
-                required: yes
-              Stack:
-                required: yes
-              Environments:
-                type: seq
-                required: yes
-                sequence:
-                - type: str
+          type: map
+          mapping:
+            Path:
+              required: yes
+            Script:
+              required: yes
+        Deployment:
+          type: map
+          mapping:
+            Bucket:
+              type: map
+              required: yes
+              mapping:
+                Name:
+                  required: yes
+                Region:
+                  required: yes
+            Files:
+              type: seq
+              required: yes
+              sequence:
+                - type: map
+                  mapping:
+                    Path:
+                    Files:
         API:
           type: map
           mapping:
@@ -127,4 +108,25 @@ mapping:
             ProjectName:
               required: yes
             ProjectNamePascalCase:
+              required: yes
+            Ports:
+              type: map
+              required: yes
+              mapping:
+                API:
+                  type: number
+                  required: yes
+                Cron:
+                  type: number
+                  required: yes
+                Worker:
+                  type: number
+                  required: yes
+        Lambda:
+          type: map
+          mapping:
+            Port:
+              type: number
+              required: yes
+            Stage:
               required: yes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -130,6 +130,7 @@ extra_rdoc_files: []
 files:
 - lib/blufin-lib.rb
 - lib/core/arrays.rb
+- lib/core/aws.rb
 - lib/core/base.rb
 - lib/core/config.rb
 - lib/core/datetime_utils.rb
@@ -158,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Blufin Lib