envirobly 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e30e5017a85588ff1c6122ffb0a3fbb13b132793ca8a53a25b05e3402cdebc5
-  data.tar.gz: ff5049f4c3f9679586cfa6595ac52070eaaf8e10e34a9f96ec054a3df583e9c5
+  metadata.gz: 29cfdb4affffdb5f853e57d37894479e210ee71979e225d73e949cef6f224ab4
+  data.tar.gz: 7ba7f8036944a5c819e5bf5e6ad8322bbe5d2e212828535938445109051b773f
 SHA512:
-  metadata.gz: d4aa3b80f59d1dbe19a045e802a36341d7b7393ec7320c9382fecbaa3f8182800b86b6b25bb1af02ff69badc3efb1fd200e2229314b20ed8960ed894f567d562
-  data.tar.gz: fa4076c20c3cda9c05a6c356ea125aec3879ce68b4448c6becda3448ce8cb8a37c0dc8525fa8f4f4fdd85161e01a18efaad78dde37bfc80b4e4ebe15b85d84f1
+  metadata.gz: f6a725cea2759dcf2b4144b7a50c05a65d933f2b8e445768e160294df3630b523fe63c86e13e6f8dc3cffc60e38044b7237bc43ed90bef1eb40e171b6e59e15e
+  data.tar.gz: 864be10b4d1225342847e6910736d9a1e1b2486428a18295cd29db6c1ca531c2d806d721a005b34d5ba3494c974ea571ee26c46ca27dc3fa5550caf7ec7cffcd

data/lib/envirobly/config.rb

@@ -36,7 +36,6 @@ class Envirobly::Config
     @result = @project.slice(:services)
     set_project_url
     merge_environment_overrides! unless @environment.nil?
-    transform_env_var_values!
     append_image_tags!
   end
 
@@ -68,16 +67,6 @@ class Envirobly::Config
       @project_url = dig :project
     end
 
-    def transform_env_var_values!
-      @result[:services].each do |name, service|
-        service.fetch(:env, {}).each do |key, value|
-          if value.is_a?(Hash) && value.has_key?(:file)
-            @result[:services][name][:env][key] = @commit.file_content(value.fetch(:file)).strip
-          end
-        end
-      end
-    end
-
     NON_BUILDABLE_TYPES = %w[ postgres mysql valkey ]
     BUILD_DEFAULTS = {
       dockerfile: [ "Dockerfile", :file_exists? ],
@@ -134,6 +123,7 @@ class Envirobly::Config
     VALID_SERVICE_KEYS = %i[
       type
       image
+      build
       engine_version
       instance_type
       min_instances
@@ -149,7 +139,8 @@ class Envirobly::Config
       private
       aliases
     ]
-    NAME_FORMAT = /\A[a-z0-9\-_]+\z/
+    NAME_FORMAT = /\A[a-z0-9\-_\.\/]+\z/i
+    BUILD_VALUE_FORMAT = /\Av[\d+]\z/
     def validate_services(services)
       unless services.is_a?(Hash)
         @errors << "`services` key must be a hash."
@@ -158,7 +149,7 @@ class Envirobly::Config
 
       services.each do |name, service|
         unless name =~ NAME_FORMAT
-          @errors << "`#{name}` is not a valid service name. Allowed characters: a-z, 0-9, -, _"
+          @errors << "`#{name}` is not a valid service name. Use aplhanumeric characters, dash, underscore, slash or dot."
         end
 
         unless service.is_a?(Hash)
@@ -170,6 +161,12 @@ class Envirobly::Config
           unless VALID_SERVICE_KEYS.include?(attribute)
             @errors << "Service `#{name}` attribute `#{attribute}` is not a valid attribute."
           end
+
+          if attribute == :build
+            unless value =~ BUILD_VALUE_FORMAT
+              @errors << "Service `#{name}` attribute `#{attribute}` format needs to be a number prefixed with letter \"v\", for example \"v1\"."
+            end
+          end
         end
 
         BUILD_DEFAULTS.each do |attribute, options|
@@ -201,7 +198,7 @@ class Envirobly::Config
 
       environments.each do |environment, services|
         unless environment =~ NAME_FORMAT
-          @errors << "`#{environment}` is not a valid environment name. Allowed characters: a-z, 0-9, -, _"
+          @errors << "`#{environment}` is not a valid environment name. Use aplhanumeric characters, dash, underscore, slash or dot."
         end
 
         validate_services services

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "0.6.1"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.20
 signing_key:
 specification_version: 4
 summary: Envirobly command line interface