envirobly 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefc0201069c2ebcf4e9038a80904d7e3c6b3217a582572db2536cf9f877367e
-  data.tar.gz: 26b791aa16c6c38613e7ef5b32cc8f1c93eb7342327ed52968e6ee345a9fa12f
+  metadata.gz: ca86599ff3741799e0a3faf9d3386c3c937713b15c8fb063dc6c647879eacfd1
+  data.tar.gz: d22ece59c009474e6f3bf465e96452eddfc344c344e1a64e4255c88c828d7e12
 SHA512:
-  metadata.gz: b5dd97f5d8c19a6e3690884f9f9fc9803a338db2048aaf96a9e5502f68f1d70890a1906f5a478dc998b78e39874cce3db600411a71ee615b41276d63dccdf8c4
-  data.tar.gz: fe25c4413c314d7368e7fe6b0b05c44f3919159421b75a6511c1ee5c3ba3174ca8c5e3dc52628cd485556a1ef81e92cb2116549573b3d843ed1f753df3ba337b
+  metadata.gz: 341a285db112636480ec428f8647ecddc573ce063e64a57e0a79f289bebad4567397c428179d0b109e2e9b443d1e0853f9a4edadbae7280744b42e79381ee834
+  data.tar.gz: efed0f09a1fa8a33095d4a838c04a8c2657b7673e986796bc5df68f962e181ad7db975678532a31e2f86f2b2b9efe3ba2fb823b0a7582a91bc5adfc37c2d7253

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,41 @@ 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_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.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Robert Starsi