envirobly 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a692c3ec890efdcb6ddf861e0503f3b64fe7266bcd460e4744aec19ab559fbcd
-  data.tar.gz: b65bf97e5d0e776035785b28566075818c2dd6db27a99c857a6300b1a4b7e9c3
+  metadata.gz: 4df26217f5f0c3dc57f4b1413d8d78e60f12532067ddd33036d3fff8910c69ed
+  data.tar.gz: 04bb82ea5693b170be38484890f2ecab17a6c080c8c443cf03f6231084a89082
 SHA512:
-  metadata.gz: 21b037970cc3dd974cb5f6660ff33fc846973565794b2601a7a64c1057c00fd320f673345428434184e9b17fbd3dc62a71d1c4495d0c32df5707921337d2c5ad
-  data.tar.gz: 86cf8cfce266fd410e669e05c29c0b28d297cba701fb2c991a759f45e0eb5b3ce61033f44d83f77269e0bc80feaae918172f587fa5546439804ec04b09e7f2cc
+  metadata.gz: 66ca715c8dd25acae13bef402d65a45602972e4f97bebeb52880de1b9df0e93b4a9c0b256fd619ae06af905c32d59c927e21945fec539295bd01b01ac8a7fbb5
+  data.tar.gz: 194dde3701339effc1d5da5673195efad226fe9253d6db9dfc987a0478a69493216cf687f9ddcff9c5a66e049564ff9864fb0a406cc104e946425d68725ee390

data/lib/envirobly/config.rb

@@ -6,14 +6,14 @@ class Envirobly::Config
   DIR = ".envirobly"
   PATH = "#{DIR}/project.yml"
 
-  attr_reader :parsing_error
+  attr_reader :parsing_error, :raw
 
   def initialize(commit)
     @commit = commit
     @parsing_error = nil
-    @project = parse_config_content_at_commit
+    @raw = config_content_at_commit
 
-    if @project
+    if @project = parse
       transform_env_var_values!
       append_image_tags!
     end
@@ -38,8 +38,8 @@ class Envirobly::Config
   end
 
   private
-    def parse_config_content_at_commit
-      YAML.load config_content_at_commit, aliases: true
+    def parse
+      YAML.load @raw, aliases: true
     rescue Psych::Exception => exception
       @parsing_error = exception.message
       nil

data/lib/envirobly/deployment.rb

@@ -25,10 +25,12 @@ class Envirobly::Deployment
         time: @commit.time,
         message: @commit.message
       },
-      config: config.to_h
+      config: config.to_h,
+      raw_config: config.raw
     }
 
-    puts params.to_json
+    puts "Deployment config:"
+    puts params.to_yaml
 
     unless environment =~ URL_MATCHER
       if project_url = config.dig("remote", "origin")
@@ -41,18 +43,20 @@ class Envirobly::Deployment
 
     @api = Envirobly::Api.new
     response = @api.create_deployment params
-    @url = response.object.fetch("url")
-    response = @api.get_deployment_with_delay_and_retry @url
+    deployment_url = response.object.fetch("url")
+    response = @api.get_deployment_with_delay_and_retry deployment_url
     @credentials = Envirobly::Aws::Credentials.new response.object.fetch("credentials")
     @bucket = response.object.fetch("bucket")
 
-    if archive_commit_and_upload
-      $stderr.puts "Build context uploaded."
-    else
+    puts "Uploading build context, please wait..."
+    unless archive_commit_and_upload
       $stderr.puts "Error exporting build context. Aborting."
       exit 1
     end
 
+    puts "Build context uploaded."
+    @api.put_as_json deployment_url
+
     # TODO: Output URL to watch the deployment progress
   end
 
@@ -63,13 +67,6 @@ class Envirobly::Deployment
 
     def archive_commit_and_upload
       `git archive --format=tar.gz #{@commit.ref} | #{@credentials.as_inline_env_vars} aws s3 cp - #{archive_uri}`
-      $?.success?.tap do |result|
-        params = {
-          deployment: {
-            build_context_available: result
-          }
-        }
-        @api.put_as_json @url, params: params
-      end
+      $?.success?
     end
 end

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "0.4.1"
+  VERSION = "0.4.3"
 end

metadata

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