blufin-lib 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8120b72bf8ac1eeac43abd2db410924f918de11f
-  data.tar.gz: ab0d357b6f8b679085e1344f896b39a15da4c43f
+SHA256:
+  metadata.gz: b9d45f82bc9778ae3281cdcc7543d0a2a753a39e990f3f158f3d18a2a2e26408
+  data.tar.gz: 01fe028ff635264cc0367b7f207d35d9d45735fe01d85a44af5a8f31ce07f6f9
 SHA512:
-  metadata.gz: 4454626b69869f6f60492c26ab366e20d57a8bf6002d4aee13ab8a77e8a0e317ba4db04de614419757f95dae693ab9b6a0cbaba7c3dcecc957eb209f649c1dc3
-  data.tar.gz: ebf0ec803c6fc4a32edec0dc819a9aafe7255f266112507f3cfd379d0a58d20fc8eebcd9ffb5e7e8dab654237a419350742593f60377d72c3a4d750f098d95ba
+  metadata.gz: d62b0fa6f777a9d2624629907346180502668e5f7d736324866e43fa11094523994d475fe3c14c25001d7c05ca1b1d62b00a1a15e96496fa1380eb7d8a8b99a3
+  data.tar.gz: 8498ab7b2a37089bee47ad64834d89682b0430e21f78efcc0039f37568eb2afd5d6e5de0c754763af27f1f6c839bd77ada3539abc83aa427964c28af74d94f1a

data/lib/blufin-lib.rb

@@ -13,6 +13,7 @@ module Blufin
     autoload :Numbers, 'core/numbers'
     autoload :Projects, 'core/projects'
     autoload :Routes, 'core/routes'
+    autoload :Scrape, 'core/scrape'
     autoload :ScannerError, 'scan/scanner_error'
     autoload :ScannerJava, 'scan/scanner_java'
     autoload :ScannerJs, 'scan/scanner_js'

data/lib/core/files.rb

@@ -1,6 +1,5 @@
 require 'fileutils'
 require 'parseconfig'
-require 'fileutils'
 require 'digest/sha1'
 
 module Blufin

data/lib/core/projects.rb

@@ -2,67 +2,65 @@ module Blufin
 
     class Projects
 
-        SCHEMA_FILE              = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/schema/projects.yml"
-        SCHEMA_FILE_CODEGEN      = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/schema/codegen.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'
-        PROJECT_ROOT             = 'ProjectRoot'
-        TYPE                     = 'Type'
-        REPOSITORY               = 'Repository'
-        UPSTREAM                 = 'Upstream'
-        DOWNSTREAM               = 'Downstream'
-        LOCAL                    = 'Local'
-        REMOTE                   = 'Remote'
-        FILE                     = 'File'
-        DEPLOYMENT               = 'Deployment'
-        DEPLOYMENT_BUCKET        = 'Bucket'
-        DEPLOYMENT_FILES         = 'Files'
-        RUN                      = 'Run'
-        TEST                     = 'Test'
-        BUILD                    = 'Build'
-        COMMANDS                 = 'Commands'
-        API                      = 'API'
-        SCHEDULER                = 'Scheduler'
-        WORKER                   = 'Worker'
-        LAMBDA                   = 'Lambda'
-        UI                       = 'UI' # TODO - Probably need to extend this to every type of UI.
-        TRANSIENT_DATA           = 'TransientData'
-        CODEGEN                  = 'codegen'
-        CG_API_SIMPLE            = 'ApiSimple'
-        CG_QUASAR                = 'Quasar'
-        CG_QUASAR_ROOT           = 'Root'
-        CG_QUASAR_PAGES          = 'PathPages'
-        CG_QUASAR_PAGES_IGNORE   = 'PathPagesIgnore'
-        CG_QUASAR_API_DOCS_FILE  = 'ApiDocsFile'
-        CG_QUASAR_JS             = 'JsPath'
-        CG_QUASAR_TESTS          = 'JsPathTests'
-        CG_QUASAR_ROUTES_FILE    = 'RoutesFile'
-        TITLE                    = 'Title'
-        ALIAS                    = 'Alias'
-        DOMAIN                   = 'Domain'
-        PROJECT_NAME_PASCAL_CASE = 'ProjectNamePascalCase'
-        PROJECT_NAME             = 'ProjectName'
-        PORT                     = 'Port'
-        PORTS                    = 'Ports'
-        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_MOBILE              = 'mobile'
-        TYPE_QUASAR              = 'quasar'
-        TYPE_UI                  = 'ui' # TODO - Probably need to extend this to every type of UI.
-        VALID_TYPES              = [
+        SCHEMA_FILE                  = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/schema/projects.yml"
+        SCHEMA_FILE_CODEGEN          = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/schema/codegen.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'
+        PROJECT_ROOT                 = 'ProjectRoot'
+        TYPE                         = 'Type'
+        REPOSITORY                   = 'Repository'
+        UPSTREAM                     = 'Upstream'
+        DOWNSTREAM                   = 'Downstream'
+        LOCAL                        = 'Local'
+        REMOTE                       = 'Remote'
+        FILE                         = 'File'
+        DEPLOYMENT                   = 'Deployment'
+        DEPLOYMENT_BUCKET            = 'Bucket'
+        DEPLOYMENT_FILES             = 'Files'
+        RUN                          = 'Run'
+        TEST                         = 'Test'
+        BUILD                        = 'Build'
+        COMMANDS                     = 'Commands'
+        API                          = 'API'
+        SCHEDULER                    = 'Scheduler'
+        WORKER                       = 'Worker'
+        LAMBDA                       = 'Lambda'
+        UI                           = 'UI' # TODO - Probably need to extend this to every type of UI.
+        TRANSIENT_DATA               = 'TransientData'
+        CODEGEN                      = 'codegen'
+        CG_API_SIMPLE                = 'ApiSimple'
+        CG_QUASAR                    = 'Quasar'
+        CG_QUASAR_ROOT               = 'Root'
+        CG_QUASAR_PAGES              = 'PathPages'
+        CG_QUASAR_PAGES_IGNORE       = 'PathPagesIgnore'
+        CG_QUASAR_ROUTES_FILE        = 'RoutesFile'
+        CG_QUASAR_ROUTER_VIEW_LAYOUT = 'RouterViewLayout'
+        TITLE                        = 'Title'
+        ALIAS                        = 'Alias'
+        DOMAIN                       = 'Domain'
+        PROJECT_NAME_PASCAL_CASE     = 'ProjectNamePascalCase'
+        PROJECT_NAME                 = 'ProjectName'
+        PORT                         = 'Port'
+        PORTS                        = 'Ports'
+        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_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,
@@ -295,7 +293,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
 
@@ -335,6 +333,8 @@ module Blufin
                 end
             end
 
+            # TODO - This file is very broken: 06/01/20 -- Need to remove all the API SIMPLE + QUASAR STUFF!
+
             # Buffer/validate project(s) stuff.
             projects_yml['Projects'].each do |project|
                 project_id   = project[PROJECT_ID]
@@ -387,12 +387,15 @@ module Blufin
                 @codegen_file = "#{Blufin::Projects::get_project_path(project_id, project: project)}/.#{CODEGEN}/#{CODEGEN}.yml"
 
                 if [TYPE_API_SIMPLE, TYPE_QUASAR].include?(project_type)
-                    # Validate (and parse) .codegen/codegen.yml.
-                    Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing file: #{Blufin::Terminal::format_directory(@codegen_file)}", 'This file needs to exist.', true) unless Blufin::Files::file_exists(@codegen_file)
-                    # Parse  .codegen/codegen.yml
-                    document, errors = Blufin::Config::validate_file(@codegen_file, SCHEMA_FILE_CODEGEN)
-                    display_parse_errors_if_any(errors, @codegen_file)
-                    @codegen_yml = parse_yml(@codegen_file)
+
+                    # TODO - REMOVE THIS?
+
+                    # # Validate (and parse) .codegen/codegen.yml.
+                    # Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing file: #{Blufin::Terminal::format_directory(@codegen_file)}", 'This file needs to exist.', true) unless Blufin::Files::file_exists(@codegen_file)
+                    # # Parse  .codegen/codegen.yml
+                    # document, errors = Blufin::Config::validate_file(@codegen_file, SCHEMA_FILE_CODEGEN)
+                    # display_parse_errors_if_any(errors, @codegen_file)
+                    # @codegen_yml = parse_yml(@codegen_file)
                 end
 
                 # Validate Script(s).
@@ -403,7 +406,7 @@ module Blufin
                         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)
+                            valid_scripts = @@scripts[script_key].keys if @@scripts.is_a?(Hash) && @@scripts.has_key?(script_key)
                             script        = project[script_type]
                             script_name   = script['Script']
                             unless valid_scripts.include?(script_name)
@@ -464,11 +467,12 @@ module Blufin
                     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)
                 end
 
+                # TODO - REMOVE?
                 # Validate ApiSimple property.
-                if project_type == TYPE_API_SIMPLE
-                    Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property #{Blufin::Terminal::format_highlight(CG_API_SIMPLE)} in: #{Blufin::Terminal::format_directory(@codegen_file)}", "This property is required for project(s) with type: #{TYPE_API_SIMPLE}", true) unless @codegen_yml.has_key?(CG_API_SIMPLE)
-                    project[TRANSIENT_DATA] = @codegen_yml[CG_API_SIMPLE]
-                end
+                # if project_type == TYPE_API_SIMPLE
+                #     Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property #{Blufin::Terminal::format_highlight(CG_API_SIMPLE)} in: #{Blufin::Terminal::format_directory(@codegen_file)}", "This property is required for project(s) with type: #{TYPE_API_SIMPLE}", true) unless @codegen_yml.has_key?(CG_API_SIMPLE)
+                #     project[TRANSIENT_DATA] = @codegen_yml[CG_API_SIMPLE]
+                # end
 
                 # Validate Lambda property.
                 if project_type == TYPE_LAMBDA
@@ -493,11 +497,12 @@ 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
 
+                # TODO - REMOVE?
                 # Validate Quasar property.
-                if project_type == TYPE_QUASAR
-                    Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property #{Blufin::Terminal::format_highlight(CG_QUASAR)} in: #{Blufin::Terminal::format_directory(@codegen_file)}", "This property is required for project(s) with type: #{TYPE_QUASAR}", true) unless @codegen_yml.has_key?(CG_QUASAR)
-                    project[TRANSIENT_DATA] = @codegen_yml[CG_QUASAR]
-                end
+                # if project_type == TYPE_QUASAR
+                #     Blufin::Terminal::error("#{Blufin::Terminal::format_highlight(project_id)} \xe2\x80\x94 Missing property #{Blufin::Terminal::format_highlight(CG_QUASAR)} in: #{Blufin::Terminal::format_directory(@codegen_file)}", "This property is required for project(s) with type: #{TYPE_QUASAR}", true) unless @codegen_yml.has_key?(CG_QUASAR)
+                #     project[TRANSIENT_DATA] = @codegen_yml[CG_QUASAR]
+                # end
 
                 # Validate upstream/downstream Libs(s).
                 [UPSTREAM, DOWNSTREAM].each do |stream|

data/lib/core/scrape.rb

@@ -0,0 +1,16 @@
+module Blufin
+
+    class Scrape
+
+        # Remove this!
+        # @return void
+        def self.test
+
+            # TODO - Put all scrape related shared code here.
+            puts 'IT WORKS!'
+
+        end
+
+    end
+
+end

data/lib/core/strings.rb

@@ -35,7 +35,7 @@ module Blufin
         # @param String - The string to be trimmed (and returned).
         # @return String
         def self.remove_surrounding_slashes(string)
-            raise RuntimeError, "Expected String, instead got:#{string.class}" unless string.is_a?(String)
+            raise RuntimeError, "Expected String, instead got: #{string.class} (#{string.inspect})" unless string.is_a?(String)
             string = string.strip
             validate_string(string)
             string = string.gsub(/\A\/+/, '')

data/lib/core/terminal.rb

@@ -115,13 +115,13 @@ module Blufin
 
         # Same as above but with a proc/lambda instead of a terminal command.
         # @return void
-        def self.execute_proc(title, proc, verbose: true)
+        def self.execute_proc(title, proc, verbose: true, hide_progress: false)
             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
             spinner = nil
             spinner = TTY::Spinner.new("[:spinner] \x1B[38;5;208m#{title}\x1B[0m", format: :dots) if verbose
-            spinner.auto_spin if verbose
+            spinner.auto_spin if verbose && !hide_progress
             res   = proc.call
             t2    = Time.now
             delta = "#{'%.3f' % (t2 - t1).abs}s"
@@ -147,9 +147,9 @@ module Blufin
                 when MSG_TODO
                     puts "\x1B[38;5;231m\x1B[48;5;199m   @TODO   \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
                 when MSG_AUTOMATIC
-                    puts "\x1B[38;5;231m\x1B[48;5;96m Automatic \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
+                    puts "\x1B[38;5;231m\x1B[48;5;92m Automatic \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
                 when MSG_GENERATED
-                    puts "\x1B[38;5;231m\x1B[48;5;96m Generated \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
+                    puts "\x1B[38;5;231m\x1B[48;5;89m Generated \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
                 when MSG_PROCESSED
                     puts "\x1B[38;5;231m\x1B[48;5;238m Processed \x1B[0m \x1B[0m\xe2\x86\x92\x1B[0m \x1B[0m#{message}\x1B[0m\n"
                 when MSG_PROGRESS
@@ -661,4 +661,5 @@ module Blufin
         end
 
     end
+
 end

data/lib/scan/scanner_error.rb

@@ -70,7 +70,9 @@ module Blufin
             raise RuntimeError, "Expected String, instead got: #{file.class}" unless file.is_a?(String)
             fs = file.split('/')
             fl = fs.pop
-            "\x1B[48;5;233m \x1B[38;5;240m#{fs.join('/')}/\x1B[38;5;202m#{fl} \x1B[0m"
+            is_file = fl =~ /\./
+            color   = is_file ? 202 : 75
+            "\x1B[48;5;233m \x1B[38;5;240m#{fs.join('/')}/\x1B[38;5;#{color}m#{fl} \x1B[0m#{is_file ? nil : '(path)'}"
         end
 
         # Add an error.

data/lib/scan/scanner_js.rb

@@ -86,6 +86,9 @@ module Blufin
 
             end
 
+            # Make sure we have at least one method.
+            @errors << Blufin::ScannerError.new(file, nil, nil, "No methods/functions found in file: #{file}") unless @data[@file_short][:methods].length > 0
+
         end
 
         # Parses comments.

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '2.3.0'
+BLUFIN_LIB_VERSION = '2.3.1'

data/opt/schema/codegen.yml

@@ -9,7 +9,7 @@ mapping:
       ControllerPath:
         required: true
         pattern: /^[a-z0-9\-\/]+$/
-      ServicePath:
+      ModulePath:
         required: true
         pattern: /^[a-z0-9\-\/]+$/
   Lambda:
@@ -30,18 +30,9 @@ mapping:
         type: seq
         sequence:
           - type: str
-      ApiDocsFile:
-        required: true
-        pattern: /^[a-z0-9\-\.\/]+$/
-      JsDocsFile:
-        required: true
-        pattern: /^[a-z0-9\-\.\/]+$/
-      JsPath:
-        required: true
-        pattern: /^[a-z0-9\-\/]+$/
-      JsPathTests:
-        required: true
-        pattern: /^[a-z0-9\-\/]+$/
       RoutesFile:
         required: true
-        pattern: /^[a-z0-9\-\.\/]+$/
+        pattern: /^[a-z0-9\-\/]+\.js$/
+      RouterViewLayout:
+        required: true
+        pattern: /^[a-z0-9\-\/]+\.vue$/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - lib/core/numbers.rb
 - lib/core/projects.rb
 - lib/core/routes.rb
+- lib/core/scrape.rb
 - lib/core/strings.rb
 - lib/core/terminal.rb
 - lib/core/tools.rb
@@ -177,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Blufin Lib