blufin-lib 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951694bcd607959a657e046002654767755b74d6
-  data.tar.gz: def507a9855268d197362bad03e915720ef2c26f
+  metadata.gz: b1987fd9c5b7b8590adc63c9179ce7eb8d398fb3
+  data.tar.gz: 5064081160441c67b7bbe48f369688a9430c85c8
 SHA512:
-  metadata.gz: 0bedc142caf1e81f3aa0dcff437217451f8db5560f6d4ef4f58e3fa6540148ad913e781f28873a20a647e21877c21b0d0397a5877576a1f489d554a82ba6ca54
-  data.tar.gz: 6326f21a88d05ce9abf5296e14d5ccd1cf55a9cd57efd9a43628afd82b1afe095fb4ce9562f2f14618ca3562ff4df1f8989036b178fc9d1a2d95a746494cdf6e
+  metadata.gz: e7e9b674320a55992ae41b263bdaf9bcd4e8e5eeba2a821708640e876682f05f4b9209407eb79941955c0b95d2d9ad59b36ff19a096dc8568294b1bf9a61958a
+  data.tar.gz: db2bf6c32f4f9e27e06861633dd49b7a12972181860d01674470bd8314e18e421c587ca31b4bf6f0169f72dd3b768a1171eb468a3738902b6a22b1fcc887886b

data/lib/blufin-lib.rb

@@ -4,6 +4,7 @@ module Blufin
     autoload :AWS, 'core/aws'
     autoload :Base, 'core/base'
     autoload :Config, 'core/config'
+    autoload :Constants, 'core/constants'
     autoload :DateTimeUtils, 'core/datetime_utils'
     autoload :Files, 'core/files'
     autoload :GenerateBase, 'generate/generate_base'
@@ -14,6 +15,9 @@ module Blufin
     autoload :Numbers, 'core/numbers'
     autoload :Projects, 'core/projects'
     autoload :Routes, 'core/routes'
+    autoload :Scanner, 'scan/scanner'
+    autoload :ScannerJava, 'scan/scanner_java'
+    autoload :ScannerVue, 'scan/scanner_vue'
     autoload :Strings, 'core/strings'
     autoload :Terminal, 'core/terminal'
     autoload :Tools, 'core/tools'

data/lib/core/constants.rb

@@ -0,0 +1,92 @@
+module Blufin
+
+    class Constants
+
+        # Returns a Hash of gems. :repo is only filled in inside 'my' gem because it's the only gem where it's defined in the config file (.my.yml).
+        # Outside this gem, :repo will simply be nil.
+        # @return Hash
+        def self.gems
+
+            {
+                'blufin-lib' => {
+                    :name          => 'blufin-lib',
+                    :aliases       => %w(blufin-lib bl),
+                    :repo          => gem_get_repo('BlufinLib'),
+                    :version_file  => 'lib/version.rb',
+                    :version_const => 'BLUFIN_LIB_VERSION',
+                    :downstream    => %w(convoy awx blufin eworld my), # Needs to be in this specific order, with convoy first.
+                    :upstream      => %w()
+                },
+                'convoy'     => {
+                    :name          => 'convoy',
+                    :aliases       => %w(convoy),
+                    :repo          => gem_get_repo('Convoy'),
+                    :version_file  => 'version.rb',
+                    :version_const => 'CONVOY_VERSION',
+                    :downstream    => %w(awx blufin my eworld),
+                    :upstream      => %w(blufin-lib)
+                },
+                'columnist'  => {
+                    :name          => 'columnist',
+                    :aliases       => %w(columnist),
+                    :repo          => gem_get_repo('Columnist'),
+                    :version_file  => 'version.rb',
+                    :version_const => 'COLUMNIST_VERSION',
+                    :downstream    => %w(awx blufin my eworld),
+                    :upstream      => %w()
+                },
+                'awx'        => {
+                    :name          => 'awx',
+                    :aliases       => %w(awx a),
+                    :repo          => gem_get_repo('AWX'),
+                    :version_file  => 'lib/version.rb',
+                    :version_const => 'AWX_VERSION',
+                    :downstream    => %w(),
+                    :upstream      => %w(blufin-lib columnist convoy)
+                },
+                'blufin'     => {
+                    :name          => 'blufin',
+                    :aliases       => %w(blufin b bf),
+                    :repo          => gem_get_repo('Blufin'),
+                    :version_file  => 'lib/version.rb',
+                    :version_const => 'BLUFIN_VERSION',
+                    :downstream    => %w(),
+                    :upstream      => %w(blufin-lib columnist convoy)
+                },
+                'my'         => {
+                    :name          => 'my',
+                    :aliases       => %w(my m),
+                    :repo          => gem_get_repo('My'),
+                    :version_file  => 'lib/version.rb',
+                    :version_const => 'MY_VERSION',
+                    :downstream    => %w(),
+                    :upstream      => %w(blufin-lib columnist convoy)
+                },
+                'eworld'     => {
+                    :name          => 'eworld',
+                    :aliases       => %w(ew e),
+                    :repo          => gem_get_repo('eWorld'),
+                    :version_file  => 'lib/version.rb',
+                    :version_const => 'EWORLD_VERSION',
+                    :downstream    => %w(),
+                    :upstream      => %w(blufin-lib columnist convoy)
+                }
+            }
+
+        end
+
+        private
+
+        # Attempts to get repo. Returns nil if not exists.
+        # @return string
+        def self.gem_get_repo(key)
+            begin
+                Blufin::Config::get['Repositories'][key]
+            rescue
+                nil
+            end
+        end
+
+    end
+
+end

data/lib/core/projects.rb

@@ -29,10 +29,11 @@ module Blufin
         BUILD                    = 'Build'
         COMMANDS                 = 'Commands'
         API                      = 'API'
-        CRON                     = 'Cron'
+        SCHEDULER                = 'Scheduler'
         WORKER                   = 'Worker'
         LAMBDA                   = 'Lambda'
-        UI                       = 'UI'
+        UI                       = 'UI' # TODO - Probably need to extend this to every type of UI.
+        QUASAR                   = 'Quasar'
         ROUTES_FILE              = 'RoutesFile'
         TITLE                    = 'Title'
         ALIAS                    = 'Alias'
@@ -44,17 +45,21 @@ module Blufin
         STAGES                   = 'Stages'
         TYPE_ALEXA               = 'alexa'
         TYPE_API                 = 'api'
+        TYPE_API_SIMPLE          = 'api-simple'
         TYPE_LAMBDA              = 'lambda'
         TYPE_MVN_LIB             = 'mvn-lib'
         TYPE_NPM_LIB             = 'npm-lib'
-        TYPE_UI                  = 'ui'
         TYPE_MOBILE              = 'mobile'
+        TYPE_QUASAR              = 'quasar'
+        TYPE_UI                  = 'ui' # TODO - Probably need to extend this to every type of UI.
         VALID_TYPES              = [
             TYPE_ALEXA,
             TYPE_API,
+            TYPE_API_SIMPLE,
             TYPE_LAMBDA,
             TYPE_MVN_LIB,
             TYPE_NPM_LIB,
+            TYPE_QUASAR,
             TYPE_UI,
             TYPE_MOBILE,
         ]
@@ -69,7 +74,6 @@ module Blufin
         @@api_data                 = {}
         @@lambdas                  = nil
         @@libs                     = {}
-        @@uis                      = nil
         @@dependant_projects_cache = {}
         @@dependant_repos_cache    = {}
         @@project_path_cache       = {}
@@ -108,13 +112,14 @@ module Blufin
 
         # Gets Project(s) -- but in a single array.
         # @return Array
-        def self.get_projects_as_array(type: nil)
+        def self.get_projects_as_array(types: nil)
             projects_arr = []
-            if type.nil?
+            if types.nil?
                 validate_type(project_type, project_id)
                 projects_arr = @@projects_arr
             else
-                @@projects_arr.each { |project| projects_arr << project if project[TYPE] == type }
+                types = [types] unless types.is_a?(Array)
+                @@projects_arr.each { |project| projects_arr << project if types.include?(project[TYPE]) }
             end
             projects_arr
         end
@@ -281,7 +286,7 @@ module Blufin
             Blufin::Terminal::error('No projects found.') unless array_of_projects.any?
             return array_of_projects[0] if array_of_projects.length == 1
             projects = []
-            array_of_projects.each { |project| projects << { :text => project[PROJECT_ID], :value => project } }
+            array_of_projects.each { |project| projects << {:text => project[PROJECT_ID], :value => project} }
             Blufin::Terminal::prompt_select('Select project:', projects)
         end
 
@@ -339,7 +344,7 @@ module Blufin
                     if project_type == TYPE_MVN_LIB || TYPE_NPM_LIB
                         Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Duplicate Library Project.", "A library with this ID (#{Blufin::Terminal::format_invalid(project_id)}) has already been registered.") if @@libs.keys.include?(project_id)
                         @@libs[project_id] = project
-                    elsif project_type == TYPE_API
+                    elsif project_type == TYPE_API || project_type == TYPE_API_SIMPLE
                         [ALIAS, PROJECT_NAME, PROJECT_NAME_PASCAL_CASE, TITLE].each do |x|
                             @@api_data[x]  = [] unless @@api_data.has_key?(x) && @@api_data[x].is_a?(Array)
                             property_value = project[API][x].strip.downcase
@@ -373,6 +378,7 @@ module Blufin
                         API        => false,
                         LAMBDA     => false,
                         UI         => false,
+                        QUASAR     => false,
                         DEPLOYMENT => false,
                     }
                     Blufin::Validate::assert_valid_keys(expected, project.keys, source_file)
@@ -418,7 +424,7 @@ module Blufin
                     end
 
                     # Validate API property.
-                    if project_type == TYPE_API
+                    if project_type == TYPE_API || project_type == TYPE_API_SIMPLE
                         # Make sure we have the API property.
                         Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(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)
                         # Validate keys are in specific order.
@@ -432,18 +438,18 @@ module Blufin
                         }
                         Blufin::Validate::assert_valid_keys(expected, project[API].keys, source_file)
                         expected_ports = {
-                            API    => true,
-                            CRON   => true,
-                            WORKER => true
+                            API       => true,
+                            SCHEDULER => 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)
+                        validate_ports([project[API][PORTS][API], project[API][PORTS][SCHEDULER], 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
+                        used_ports[project[API][PORTS][API]]       = project_id
+                        used_ports[project[API][PORTS][SCHEDULER]] = project_id
+                        used_ports[project[API][PORTS][WORKER]]    = project_id
+                        @@apis                                     = {} if @@apis.nil?
+                        @@apis[project[PROJECT_ID]]                = project
                     else
                         # Make sure we DON'T have the API key.
                         Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(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)
@@ -472,24 +478,21 @@ module Blufin
                         Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Property not supported: #{Blufin::Terminal::format_invalid(LAMBDA)}", "This property is only allowed for project(s) with type: #{TYPE_LAMBDA}", true) if project.has_key?(LAMBDA)
                     end
 
-                    # Validate UI property.
-                    if project_type == TYPE_UI
-                        # Make sure we have the UI property.
-                        Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property: #{Blufin::Terminal::format_highlight(UI)}", "This property is required for project(s) with type: #{TYPE_UI}", true) unless project.has_key?(UI)
+                    # Validate Quasar property.
+                    if project_type == TYPE_QUASAR
+                        # Make sure we have the QUASAR property.
+                        Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property: #{Blufin::Terminal::format_highlight(QUASAR)}", "This property is required for project(s) with type: #{TYPE_QUASAR}", true) unless project.has_key?(QUASAR)
                         # Validate keys are in specific order.
                         expected = {
                             ROUTES_FILE => true
                         }
-                        Blufin::Validate::assert_valid_keys(expected, project[UI].keys, source_file)
+                        Blufin::Validate::assert_valid_keys(expected, project[QUASAR].keys, source_file)
                         # Validate RoutesFile exists.
-                        routes_file = "#{Blufin::Projects::get_project_path(project_id, true, project: project)}/#{project[UI][ROUTES_FILE]}"
+                        routes_file = "#{Blufin::Projects::get_project_path(project_id, true, project: project)}/#{project[QUASAR][ROUTES_FILE]}"
                         Blufin::Terminal::error("Cannot find #{Blufin::Terminal::format_highlight(ROUTES_FILE)}: #{Blufin::Terminal::format_directory(routes_file)}") unless Blufin::Files::file_exists(routes_file)
-                        @@uis = {} if @@uis.nil?
-                        Blufin::Terminal::error("Duplicate UI project: #{Blufin::Terminal::format_invalid(project[PROJECT_ID])}") if @@uis.has_key?(project[PROJECT_ID])
-                        @@uis[project[PROJECT_ID]] = project
                     else
                         # Make sure we DON'T have the UI key.
-                        Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Property not supported: #{Blufin::Terminal::format_invalid(UI)}", "This property is only allowed for project(s) with type: #{TYPE_UI}", true) if project.has_key?(UI)
+                        Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Property not supported: #{Blufin::Terminal::format_invalid(QUASAR)}", "This property is only allowed for project(s) with type: #{TYPE_QUASAR}", true) if project.has_key?(QUASAR)
                     end
 
                     # Validate upstream/downstream Libs(s).

data/lib/core/update.rb

@@ -5,9 +5,16 @@ module Blufin
         # Updates ruby-gem.
         # @return void
         def self.run(gem_name)
-
-            raise RuntimeError, "Update #{gem_name}. Not yet implemented!"
-
+            gems = Blufin::Constants::gems
+            raise RuntimeError, "Invalid gem name: #{gem_name}" unless gems.keys.include?(gem_name)
+            Blufin::Terminal::info("Updating gem: #{Blufin::Terminal::format_action(gem_name)}")
+            # Uninstall all gems (including upstream).
+            gems[gem_name][:upstream].each { |upstream_gem| Blufin::Terminal::execute("gem uninstall #{upstream_gem} --force -I -x") }
+            Blufin::Terminal::execute("gem uninstall #{gem_name} --force -I -x")
+            # Re-install all gems (including upstream).
+            gems[gem_name][:upstream].each { |upstream_gem| Blufin::Terminal::execute("gem install #{upstream_gem}") }
+            res = Blufin::Terminal::execute("gem install #{gem_name}", capture: true)
+            Blufin::Terminal::success("Your are now on: #{Blufin::Terminal::format_highlight(`gem list | grep "#{gem_name} "`).gsub("\n", '')}", Blufin::Arrays::convert_string_to_line_array(res[0]))
         end
 
     end

data/lib/generate/generate_base.rb

@@ -20,6 +20,28 @@ module Blufin
 
         end
 
+        # Display errors/warnings after code generation, if any.
+        # This method currently terminates with a 1 exit code if errors/warnings occurred, 0 if not.
+        # @return void
+        def self.exit_code_generation(errors, warnings)
+
+            if warnings.any?
+                Blufin::Terminal::warning('Please fix the following warnings(s):', nil, false)
+                warnings.each { |warning| puts "      #{warning}" }
+                puts
+            end
+
+            if errors.any?
+                Blufin::Terminal::error('Please fix the following error(s):', nil, false)
+                errors.each { |error| puts "      #{error}" }
+                puts
+                exit 1
+            end
+
+            return errors.any? || warnings.any? ? 1 : 0
+
+        end
+
     end
 
 end

data/lib/generate/generate_ui_routes.rb

@@ -8,7 +8,7 @@ module Blufin
         # Generates routes in the UI.
         # @return void
         def self.run(project)
-            raise RuntimeError, "Expected project type to be: #{Blufin::Projects::TYPE_UI}, instead got: #{project[Blufin::Projects::TYPE]}" unless project[Blufin::Projects::TYPE] == Blufin::Projects::TYPE_UI
+            raise RuntimeError, "Expected project type to be: #{Blufin::Projects::TYPE_QUASAR}, instead got: #{project[Blufin::Projects::TYPE]}" unless project[Blufin::Projects::TYPE] == Blufin::Projects::TYPE_QUASAR
             @errors          = []
             @warnings        = []
             @files           = []
@@ -19,7 +19,7 @@ const routes = [
     {
 TEMPLATE
                 project_path      = Blufin::Projects::get_project_path(project[Blufin::Projects::PROJECT_ID], true)
-                routes_file       = "#{project_path}/#{project[Blufin::Projects::UI][Blufin::Projects::ROUTES_FILE]}"
+                routes_file       = "#{project_path}/#{project[Blufin::Projects::QUASAR][Blufin::Projects::ROUTES_FILE]}"
                 routes_yml        = Blufin::Yml::read_file(routes_file, SCHEMA_FILE)
                 target_file       = "#{project_path}/src/#{Blufin::Strings::remove_surrounding_slashes(routes_yml['RoutesFile'])}"
                 layout            = routes_yml['Layout']

data/lib/scan/scanner.rb

@@ -0,0 +1,34 @@
+module Blufin
+
+    class Scanner
+
+        # Initialize the class.
+        # @return void
+        def initialize(java_path: nil, vue_path: nil)
+
+            scan_java(java_path) unless java_path.nil?
+            scan_vue(vue_path) unless vue_path.nil?
+
+        end
+
+        private
+
+        # Scan Java code.
+        # @return void
+        def scan_java(path)
+
+            Blufin::ScannerJava::scan(path)
+
+        end
+
+        # Scan Vue code.
+        # @return void
+        def scan_vue(path)
+
+            Blufin::ScannerVue::scan(path)
+
+        end
+
+    end
+
+end

data/lib/scan/scanner_java.rb

@@ -0,0 +1,19 @@
+module Blufin
+
+    class ScannerJava
+
+        # Scan Java code.
+        # @return void
+        def self.scan(path)
+
+            # Check path exists.
+            Blufin::Terminal::error("Path does not exist: #{Blufin::Terminal::format_invalid(path)}") unless Blufin::Files::path_exists(path)
+
+            # TODO - REMOVE
+            raise 'Not yet implemented!'
+
+        end
+
+    end
+
+end

data/lib/scan/scanner_vue.rb

@@ -0,0 +1,20 @@
+module Blufin
+
+    class ScannerVue
+
+        # Scan Vue code.
+        # @return void
+        def self.scan(path)
+
+            # Check path exists.
+            Blufin::Terminal::error("Path does not exist: #{Blufin::Terminal::format_invalid(path)}") unless Blufin::Files::path_exists(path)
+
+            # TODO - REMOVE
+            raise 'Not yet implemented!'
+
+        end
+
+
+    end
+
+end

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '1.8.0'
+BLUFIN_LIB_VERSION = '1.8.1'

data/opt/schema/projects.yml

@@ -125,7 +125,7 @@ mapping:
                 API:
                   type: number
                   required: yes
-                Cron:
+                Scheduler:
                   type: number
                   required: yes
                 Worker:
@@ -146,8 +146,13 @@ mapping:
               required: yes
               sequence:
                 - type: str
-        UI:
+        Quasar:
           type: map
           mapping:
             RoutesFile:
+              required: yes
+        UI:
+          type: map
+          mapping:
+            DeleteMe: # TODO - Finish this (or remove)
               required: yes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -133,6 +133,7 @@ files:
 - lib/core/aws.rb
 - lib/core/base.rb
 - lib/core/config.rb
+- lib/core/constants.rb
 - lib/core/datetime_utils.rb
 - lib/core/files.rb
 - lib/core/git.rb
@@ -150,6 +151,9 @@ files:
 - lib/core/yml.rb
 - lib/generate/generate_base.rb
 - lib/generate/generate_ui_routes.rb
+- lib/scan/scanner.rb
+- lib/scan/scanner_java.rb
+- lib/scan/scanner_vue.rb
 - lib/version.rb
 - opt/schema/projects.yml
 - opt/schema/routes.yml
@@ -174,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Blufin Lib