blufin-lib 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d670802e60811a458378ed20b28ee75b7691f1d6
-  data.tar.gz: 4b7ed248efce868e4d904003a7028749ff2b68e2
+  metadata.gz: 9d8f337c93f64a6e57950c46e77e5b4afdeda10b
+  data.tar.gz: ee830727eece51e807c88e50741635f57cc21ec9
 SHA512:
-  metadata.gz: c0319aec4d945f390446cef58804bbaadcad7dd6e8d0d02dfef375745ed2903b1e662b6b94d83f926489a65412f6f40a42f46c2123be2f94db39e10c1a1a0cd4
-  data.tar.gz: e015f083e35a9255eeffd566997d6e8fca1b90f7c8a0e6a362fa3aed998ccf800eb92544cac27361a276333051cd8f306a5b7b987c231dfb244266c6e34968c6
+  metadata.gz: 3d0d4070b66cb5e8cc2a267055f0b921d5c94dcd86897c1bc17204cabc19bc3104877f298189cc84fb5899aaac869981b5761a8f94700583fed1d7dfa0594bf5
+  data.tar.gz: 24444e6cca1d8b742d62b66e23a8342133f145157c1b987c543368819d0f9d1732161b3226c4552c1a7e8edd887de1edc80b63b69ea67c3fcd9cc3b547a408d3

data/lib/core/projects.rb

@@ -2,7 +2,7 @@ module Blufin
 
     class Projects
 
-        SCHEMA_FILE              = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/awx/project-schema.yml"
+        SCHEMA_FILE              = "#{Blufin::Base::get_base_path}#{Blufin::Base::OPT_PATH}/schema/projects.yml"
         SCRIPT_RUN               = 'run'
         SCRIPT_TEST              = 'test'
         SCRIPT_BUILD             = 'build'
@@ -13,8 +13,11 @@ module Blufin
         ID                       = 'Id'
         PROJECT_ID               = 'ProjectId'
         PROJECT                  = 'Project'
+        PROJECT_ROOT             = 'ProjectRoot'
         TYPE                     = 'Type'
         REPOSITORY               = 'Repository'
+        LOCAL                    = 'Local'
+        FILE                     = 'File'
         DEPLOYMENT               = 'Deployment'
         DEPLOYMENT_BUCKET        = 'Bucket'
         DEPLOYMENT_FILES         = 'Files'
@@ -33,7 +36,7 @@ module Blufin
         PROJECT_NAME             = 'ProjectName'
         PORT                     = 'Port'
         PORTS                    = 'Ports'
-        STAGE                    = 'Stage'
+        STAGES                   = 'Stages'
         TYPE_ALEXA               = 'alexa'
         TYPE_API                 = 'api'
         TYPE_LAMBDA              = 'lambda'
@@ -56,11 +59,11 @@ module Blufin
         # @return void
         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')
+            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 projects.has_key?('Local')
-                source_file = File.expand_path(projects['Local']['File'])
+            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.
@@ -71,6 +74,8 @@ module Blufin
                 # 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.
 
+                raise RuntimeError, 'Reading projects.yml from S3 is not yet implemented!'
+
             end
         end
 
@@ -255,15 +260,18 @@ module Blufin
                         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
+                            TITLE  => true,
+                            ALIAS  => true,
+                            PORT   => true,
+                            STAGES => 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.
                         used_ports[project[LAMBDA][PORT]] = project_id
                         @@lambdas                         = {} if @@lambdas.nil?
-                        @@lambdas[project[PROJECT_ID]]    = project[LAMBDA]
+                        Blufin::Terminal::error("Duplicate Lambda project: #{Blufin::Terminal::format_invalid(project[PROJECT_ID])}") if @@lambdas.has_key?(project[PROJECT_ID])
+                        @@lambdas[project[PROJECT_ID]] = project
                     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)

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '1.7.4'
+BLUFIN_LIB_VERSION = '1.7.5'

data/opt/{awx/project-schema.yml → schema/projects.yml}

@@ -50,6 +50,7 @@ mapping:
           required: yes
         Repository:
           type: map
+          required: yes
           mapping:
             Local:
             Remote:
@@ -125,8 +126,15 @@ mapping:
         Lambda:
           type: map
           mapping:
+            Title:
+              required: yes
+            Alias:
+              required: yes
             Port:
               type: number
               required: yes
-            Stage:
-              required: yes
+            Stages:
+              type: seq
+              required: yes
+              sequence:
+                - type: str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -146,7 +146,7 @@ files:
 - lib/core/validate.rb
 - lib/core/versioning.rb
 - lib/version.rb
-- opt/awx/project-schema.yml
+- opt/schema/projects.yml
 homepage: https://github.com/alb3rtuk
 licenses:
 - MIT
@@ -167,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