envirobly 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefc0201069c2ebcf4e9038a80904d7e3c6b3217a582572db2536cf9f877367e
-  data.tar.gz: 26b791aa16c6c38613e7ef5b32cc8f1c93eb7342327ed52968e6ee345a9fa12f
+  metadata.gz: 7cbc25ee0033c84e86fd94e67a3be65ee43c8fbcfd86cd962ecf9e5f616bf042
+  data.tar.gz: e07002a42e3490bd841f6538ab7cd565990bf55e159fe8d7ce033cff62f6c38d
 SHA512:
-  metadata.gz: b5dd97f5d8c19a6e3690884f9f9fc9803a338db2048aaf96a9e5502f68f1d70890a1906f5a478dc998b78e39874cce3db600411a71ee615b41276d63dccdf8c4
-  data.tar.gz: fe25c4413c314d7368e7fe6b0b05c44f3919159421b75a6511c1ee5c3ba3174ca8c5e3dc52628cd485556a1ef81e92cb2116549573b3d843ed1f753df3ba337b
+  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/deployment.rb

@@ -36,7 +36,7 @@ class Envirobly::Deployment
     bucket = response.object.fetch("bucket")
 
     puts "Uploading build context, please wait..."
-    unless commit.archive_and_upload(bucket:, credentials:)
+    unless commit.archive_and_upload(bucket:, credentials:).success?
       $stderr.puts "Error exporting build context. Aborting."
       exit 1
     end

data/lib/envirobly/git/commit.rb

@@ -8,47 +8,50 @@ class Envirobly::Git::Commit
   end
 
   def exists?
-    run(%(cat-file -t #{@ref})).strip == "commit"
+    git(%(cat-file -t #{@ref})).stdout.strip == "commit"
   end
 
   def ref
-    @normalized_ref ||= run(%(rev-parse #{@ref})).strip
+    @normalized_ref ||= git(%(rev-parse #{@ref})).stdout.strip
   end
 
   def message
-    run(%(log #{@ref} -n1 --pretty=%B)).strip
+    git(%(log #{@ref} -n1 --pretty=%B)).stdout.strip
   end
 
   def time
-    Time.parse run(%(log #{@ref} -n1 --date=iso --pretty=format:"%ad"))
+    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)
-    run %(show #{@ref}:#{path})
+    git(%(show #{@ref}:#{path})).stdout
   end
 
   def objects_with_checksum_at(path)
-    run(%{ls-tree #{@ref} --format='%(objectname) %(path)' #{path}}).lines.map(&:chomp).
+    git(%{ls-tree #{@ref} --format='%(objectname) %(path)' #{path}}).stdout.lines.map(&:chomp).
       reject { _1.split(" ").last == Envirobly::Config::DIR }
   end
 
   def archive_and_upload(bucket:, credentials:)
-    `GIT_WORK_TREE="#{@working_dir}" GIT_DIR="#{@working_dir}/.git" git archive --format=tar.gz #{ref} | #{credentials.as_inline_env_vars} aws s3 cp - #{archive_uri(bucket)}`
-    $?.success?
+    git(%(archive --format=tar.gz #{ref} | #{credentials.as_inline_env_vars} aws s3 cp - #{archive_uri(bucket)}))
   end
 
   private
-    def run(cmd)
-      @stdout = @stderr = @exit_code = @success = nil
-      full_cmd = %(GIT_WORK_TREE="#{@working_dir}" GIT_DIR="#{@working_dir}/.git" git #{cmd})
-      Open3.popen3(full_cmd) do |stdin, stdout, stderr, thread|
+    OUTPUT = Struct.new :stdout, :stderr, :exit_code, :success?
+    def git(cmd)
+      Open3.popen3("git #{cmd}", chdir: @working_dir) do |stdin, stdout, stderr, thread|
         stdin.close
-        @stdout = stdout.read
-        @stderr = stderr.read
-        @exit_code = thread.value.exitstatus
-        @success = thread.value.success?
+        OUTPUT.new stdout.read, stderr.read, thread.value.exitstatus, thread.value.success?
       end
-      @stdout
     end
 
     def archive_uri(bucket)

data/lib/envirobly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  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