envirobly 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9db9acf27d0480b89b7829efadea376640b537d25b36203c7d46594085dce72
-  data.tar.gz: 6a69d1efe90f96e9e4d6fd468f636f91172df47fe628e8e74df48b8bb6214a67
+  metadata.gz: a692c3ec890efdcb6ddf861e0503f3b64fe7266bcd460e4744aec19ab559fbcd
+  data.tar.gz: b65bf97e5d0e776035785b28566075818c2dd6db27a99c857a6300b1a4b7e9c3
 SHA512:
-  metadata.gz: cc358238c869bd05a9f524ad746272f4d8a796b13e7c23691cc69764c9b6fa0b4b6a16282abde51635d020136c563acffa89a9803449d8c13c8aa180d9b5045b
-  data.tar.gz: e656b358d128c91d68217430f53b6f3e8962b2149f043e03a9c812e12718f0e32b2613d51c7abbdaa7123eed0b6a25cf7754efd27b469e18701458649a8611e5
+  metadata.gz: 21b037970cc3dd974cb5f6660ff33fc846973565794b2601a7a64c1057c00fd320f673345428434184e9b17fbd3dc62a71d1c4495d0c32df5707921337d2c5ad
+  data.tar.gz: 86cf8cfce266fd410e669e05c29c0b28d297cba701fb2c991a759f45e0eb5b3ce61033f44d83f77269e0bc80feaae918172f587fa5546439804ec04b09e7f2cc

data/lib/envirobly/api.rb

@@ -38,22 +38,29 @@ class Envirobly::Api
     end
   end
 
-  private
-    def get_as_json(uri, headers: {})
-      request(uri, type: Net::HTTP::Get, headers:)
+  def get_as_json(url, headers: {})
+    request(url, type: Net::HTTP::Get, headers:)
+  end
+
+  def post_as_json(url, params: {}, headers: {})
+    request(url, type: Net::HTTP::Post, headers:) do |request|
+      request.body = params.to_json
     end
+  end
 
-    def post_as_json(uri, params: {}, headers: {})
-      request(uri, type: Net::HTTP::Post, headers:) do |request|
-        request.body = params.to_json
-      end
+  def put_as_json(url, params: {}, headers: {})
+    request(url, type: Net::HTTP::Put, headers:) do |request|
+      request.body = params.to_json
     end
+  end
 
+  private
     def api_v1_deployments_url
       URI::HTTPS.build(host: HOST, path: "/api/v1/deployments")
     end
 
-    def request(uri, type:, headers: {})
+    def request(url, type:, headers: {})
+      uri = URI(url)
       http = Net::HTTP.new uri.host, uri.port
       http.use_ssl = true
       http.open_timeout = 10

data/lib/envirobly/cli/main.rb

@@ -12,7 +12,13 @@ class Envirobly::Cli::Main < Envirobly::Base
   end
 
   desc "set_access_token TOKEN", "Save and use an access token generated at Envirobly"
-  def set_access_token(token)
+  def set_access_token
+    token = ask("Access Token:", echo: false).strip
+    if token == ""
+      $stderr.puts "Token can't be empty."
+      exit 1
+    end
+
     Envirobly::AccessToken.new(token).save
   end
 

data/lib/envirobly/deployment.rb

@@ -39,18 +39,21 @@ class Envirobly::Deployment
       end
     end
 
-    api = Envirobly::Api.new
-    response = api.create_deployment params
-    response = api.get_deployment_with_delay_and_retry response.object.fetch("url")
+    @api = Envirobly::Api.new
+    response = @api.create_deployment params
+    @url = response.object.fetch("url")
+    response = @api.get_deployment_with_delay_and_retry @url
     @credentials = Envirobly::Aws::Credentials.new response.object.fetch("credentials")
     @bucket = response.object.fetch("bucket")
 
     if archive_commit_and_upload
-      $stderr.puts "Build context exported into #{archive_uri}"
+      $stderr.puts "Build context uploaded."
     else
       $stderr.puts "Error exporting build context. Aborting."
       exit 1
     end
+
+    # TODO: Output URL to watch the deployment progress
   end
 
   private
@@ -60,6 +63,13 @@ 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?
+      $?.success?.tap do |result|
+        params = {
+          deployment: {
+            build_context_available: result
+          }
+        }
+        @api.put_as_json @url, params: params
+      end
     end
 end

data/lib/envirobly/git/commit.rb

@@ -6,15 +6,15 @@ class Envirobly::Git::Commit
   end
 
   def exists?
-    `git cat-file -t #{@ref}`.chomp("") == "commit"
+    `git cat-file -t #{@ref}`.strip == "commit"
   end
 
   def ref
-    @normalized_ref ||= `git rev-parse #{@ref}`.chomp("")
+    @normalized_ref ||= `git rev-parse #{@ref}`.strip
   end
 
   def message
-    `git log #{@ref} -n1 --pretty=%B`.chomp("")
+    `git log #{@ref} -n1 --pretty=%B`.strip
   end
 
   def time

data/lib/envirobly/version.rb

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

metadata

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