envirobly 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca86599ff3741799e0a3faf9d3386c3c937713b15c8fb063dc6c647879eacfd1
-  data.tar.gz: d22ece59c009474e6f3bf465e96452eddfc344c344e1a64e4255c88c828d7e12
+  metadata.gz: 7cbc25ee0033c84e86fd94e67a3be65ee43c8fbcfd86cd962ecf9e5f616bf042
+  data.tar.gz: e07002a42e3490bd841f6538ab7cd565990bf55e159fe8d7ce033cff62f6c38d
 SHA512:
-  metadata.gz: 341a285db112636480ec428f8647ecddc573ce063e64a57e0a79f289bebad4567397c428179d0b109e2e9b443d1e0853f9a4edadbae7280744b42e79381ee834
-  data.tar.gz: efed0f09a1fa8a33095d4a838c04a8c2657b7673e986796bc5df68f962e181ad7db975678532a31e2f86f2b2b9efe3ba2fb823b0a7582a91bc5adfc37c2d7253
+  metadata.gz: eb490ba6309b3775f548522596c6a5d42504ba2ca878ef8c74b530af12733b9a9ac1ce016ece2afdb7d6c616f4121ca418a49ef3037e06790a9e3da3b916ba93
+  data.tar.gz: 7abc4689844be2617b74bb425c0ba8136b793d5c0c36600d58defdeadf8a84e9b31715442467c1e912b8988ee1c708c61eedb0192a2af3eadf9fc0b54bf0a327

data/lib/envirobly/config.rb

@@ -35,7 +35,7 @@ class Envirobly::Config
   def to_deployment_params
     {
       environ: {
-        logical_id: @environment,
+        name: @environment,
         project_url: @project_url
       },
       commit: {
@@ -57,17 +57,17 @@ class Envirobly::Config
     end
 
     def set_project_url
-      @project_url = dig :remote, :origin
+      @project_url = dig :project
       if @project_url.blank?
-        @errors << "Missing a `remote.origin` link to project."
+        @errors << "Missing `project: <url>` top level attribute."
       end
     end
 
     def transform_env_var_values!
-      @project.fetch(:services, {}).each do |logical_id, service|
+      @project.fetch(:services, {}).each do |name, service|
         service.fetch(:env, {}).each do |key, value|
           if value.is_a?(Hash) && value.has_key?(:file)
-            @project[:services][logical_id][:env][key] = @commit.file_content(value.fetch(:file)).strip
+            @project[:services][name][:env][key] = @commit.file_content(value.fetch(:file)).strip
           end
         end
       end
@@ -75,39 +75,38 @@ class Envirobly::Config
 
     NON_BUILDABLE_TYPES = %w[ postgres mysql valkey ]
     BUILD_DEFAULTS = {
-      dockerfile: "Dockerfile",
-      build_context: "."
+      dockerfile: [ "Dockerfile", :file_exists? ],
+      build_context: [ ".", :dir_exists? ]
     }
     def append_image_tags!
-      @project.fetch(:services, {}).each do |logical_id, service|
+      @project.fetch(:services, {}).each do |name, service|
         next if NON_BUILDABLE_TYPES.include?(service[:type]) || service[:image].present?
         checksums = []
 
-        BUILD_DEFAULTS.each do |attribute, default|
-          value = service.fetch(attribute, default)
-          checksum = @commit.objects_with_checksum_at value
-          if checksum.empty?
-            @errors << "Service `#{logical_id}` specifies `#{attribute}` as `#{value}` which doesn't exist in this commit."
+        BUILD_DEFAULTS.each do |attribute, options|
+          value = service.fetch(attribute, options.first)
+          unless @commit.public_send(options.second, value)
+            @errors << "Service `#{name}` specifies `#{attribute}` as `#{value}` which doesn't exist in this commit."
           else
-            checksums << checksum
+            checksums << @commit.objects_with_checksum_at(value)
           end
         end
 
         if checksums.size == 2
-          @project[:services][logical_id][:image_tag] = Digest::SHA1.hexdigest checksums.to_json
+          @project[:services][name][:image_tag] = Digest::SHA1.hexdigest checksums.to_json
         end
       end
     end
 
     def merge_environment_overrides!
       return unless services = @project.dig(:environments, @environment.to_sym)
-      services.each do |logical_id, service|
+      services.each do |name, service|
         service.each do |attribute, value|
-          if value.is_a?(Hash) && @project[:services][logical_id][attribute].is_a?(Hash)
-            @project[:services][logical_id][attribute].merge! value
-            @project[:services][logical_id][attribute].compact!
+          if value.is_a?(Hash) && @project[:services][name][attribute].is_a?(Hash)
+            @project[:services][name][attribute].merge! value
+            @project[:services][name][attribute].compact!
           else
-            @project[:services][logical_id][attribute] = value
+            @project[:services][name][attribute] = value
           end
         end
       end

data/lib/envirobly/git/commit.rb

@@ -23,6 +23,15 @@ class Envirobly::Git::Commit
     Time.parse git(%(log #{@ref} -n1 --date=iso --pretty=format:"%ad")).stdout
   end
 
+  def file_exists?(path)
+    git(%(cat-file -t #{@ref}:#{path})).stdout.strip == "blob"
+  end
+
+  def dir_exists?(path)
+    suffix = path.end_with?("/") ? nil : "/"
+    git(%(cat-file -t #{@ref}:#{path}#{suffix})).stdout.strip == "tree"
+  end
+
   def file_content(path)
     git(%(show #{@ref}:#{path})).stdout
   end

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Robert Starsi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor