envirobly 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f069dc6d95c23a6de8153725e9079eb5bbd4a5c1d7607e7617e1f8bd98c1acc
-  data.tar.gz: 98dc46266dcf5fab8fb3b11da3ef5601b75038b4551c88002392696e0f07eb48
+  metadata.gz: 67a8f774fbb1618b3b2ed3401af23dd53a0455e3b2439cc540724c95566ee063
+  data.tar.gz: 27cf8de4722ce015fcf4be795212912e84319b4ce3a9ca7a293b5ecb01f9631a
 SHA512:
-  metadata.gz: 1a3164960b7f76ae4ecbe36d3f12427750b550846a591fad82d3598668ce10e755c7b7886887ab71be327fbde4abf9a43b52e5d8d9b30fe3033f0065a28acf25
-  data.tar.gz: 4399aef0cb3c883af5441e6e5cfcdf986f2712968a73dfe40baf34c7e017b355837d7b6478ed165c0f7d2a3308626c2ff82b5d33274f4fd91631e923af827b9c
+  metadata.gz: 5dc44c7ef4dc39dd1b80e71301309e749cadda497f03a5088c15d20c35af27d5e305751980e824b5503022115aa67afff4968c56c57c09560ec229c690f344af
+  data.tar.gz: 8deea030920fa4aacc0d0018e6eb2256c7c7982a2376aedbbcb58f0374e3d26d90a2352e80ec35defb65b3e1515f1c267a491b0d2c9a90f93b536387a39be38f

data/lib/envirobly/cli/main.rb

@@ -40,10 +40,10 @@ class Envirobly::Cli::Main < Envirobly::Base
   def validate
     Envirobly::AccessToken.new(shell:).require!
 
-    configs = Envirobly::Config.new
+    config = Envirobly::Config.new
     api = Envirobly::Api.new
 
-    params = { validation: configs.to_params }
+    params = { validation: { configs: config.configs } }
     api.validate_shape params
 
     say "Config is valid #{green_check}"

data/lib/envirobly/config.rb

@@ -1,39 +1,25 @@
 # frozen_string_literal: true
 
-require "dotenv"
-
 class Envirobly::Config
   DIR = ".envirobly"
   BASE = "deploy.yml"
-  ENV_VARS = "env"
   OVERRIDES_PATTERN = /deploy\.([a-z0-9\-_]+)\.yml/i
 
   def initialize(dir = DIR)
     @dir = Pathname.new dir
   end
 
-  def to_params
-    {
-      configs:,
-      env_vars:
-    }
-  end
+  def configs
+    Dir.entries(@dir).map do |file|
+      path = File.join(@dir, file)
 
-  private
-    def configs
-      Dir.entries(@dir).map do |file|
-        path = File.join(@dir, file)
+      next unless File.file?(path) && config_file?(file)
 
-        next unless File.file?(path) && config_file?(file)
-
-        [ "#{DIR}/#{file}", File.read(path) ]
-      end.compact.to_h
-    end
-
-    def env_vars
-      Dotenv.parse @dir.join(ENV_VARS), overwrite: true
-    end
+      [ "#{DIR}/#{file}", ERB.new(File.read(path)).result ]
+    end.compact.to_h
+  end
 
+  private
     def config_file?(file)
       file == BASE || file.match?(OVERRIDES_PATTERN)
     end

data/lib/envirobly/deployment.rb

@@ -53,7 +53,7 @@ module Envirobly
           commit_time: @commit.time,
           commit_message: @commit.message,
           object_tree_checksum: @commit.object_tree_checksum,
-          **@config.to_params
+          configs: @config.configs
         }
       }
     end

data/lib/envirobly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Envirobly
-  VERSION = "1.8.1"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Robert Starsi
@@ -65,20 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement