socotra-build 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48fe3035f0640059a4399b1efafe1db0d6bbc62
-  data.tar.gz: f63eeb2505e0b047a95a6258bafbe8dd24101bc3
+  metadata.gz: 4e0e0d7f0f50fbe044494d7ff23d4394927a75cb
+  data.tar.gz: 8d020afbdcdf2c8044aedb7087814d78d0a8d56a
 SHA512:
-  metadata.gz: 322985e031c6ad1697ada30faec8d4b0cccfec7b290ed4596cbaf63226add453547d365a9a207b4146ff17d7faca93a6bdfb589e8b4044a2d16a0c3b1d5cb2f9
-  data.tar.gz: 581855aaa58144328838c7dc5666dae7d2170ab148ba2a18c0cd8196ee80cca5c33bf51edc4eb88fece9b832894090cfcf163fccdbcce711f4d7faf62c832546
+  metadata.gz: 11f33eda69902159c0d16762692cf24600773c35dfcd2578d4bdd4d1618a1a4dec818b3ab2aa21b18c909265891503e03a867a6a15ed47716e82c6b77f9e903d
+  data.tar.gz: e7fda3856040216d84623b2e9de5045743b852a2654f94fbc551b31c631b409450948474bc811f6183eaa9fbe0c3658ec0804a60561dc0bf252a7683333556ca

data/lib/socotra-build.rb

@@ -2,22 +2,22 @@ require 'open3'
 require 'set'
 
 def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3)
-	begin
-		status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log)
-	rescue
-		if (tries -= 1) > 0
-			puts "\n#{cmd} failed, retry attempt #{tries}\n"
-			sleep 5
-			retry unless (tries).zero?
-		else
-			puts "ERROR: see logs/#{description}_out.log and #{description}_err.log for details"
-			if raise_on_fail
-				raise "ERROR: #{error_message}"
-			end
-		end
-	end
+    begin
+        status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log)
+    rescue
+        if (tries -= 1) > 0
+            puts "\n#{cmd} failed, retry attempt #{tries}\n"
+            sleep 5
+            retry unless (tries).zero?
+        else
+            puts "ERROR: see logs/#{description}_out.log and #{description}_err.log for details"
+            if raise_on_fail
+                raise "ERROR: #{error_message}"
+            end
+        end
+    end
 
-	return status
+    return status
 end
 
 def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true)
@@ -45,25 +45,24 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
     cmd = cmd.gsub(/\s+/m, ' ').strip.split(" ")
     replace = cmd.grep(Regexp.union(secret_fields))
     unless replace.empty?
-    	puts replace
         replace = Set.new replace
         cmd.collect! {|e| (replace.include? e) ? '<secret>': e}
     end
     cmd = cmd.join(' ')
 
-	if print_command
-		puts "Executing command: #{cmd}\n"
-	else
-		puts "Not logging command"
-	end
+    if print_command
+        puts "Executing command: #{cmd}\n"
+    else
+       puts "Not logging command"
+    end
 
     if log
-	    File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
-	    File.open("logs/#{cmd_description}_err.log" , 'w') { |file| file.write(stderr) }
-	    puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
-	else
-		puts "Not logging due to secrets in output"
-	end
+        File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
+        File.open("logs/#{cmd_description}_err.log" , 'w') { |file| file.write(stderr) }
+        puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
+    else
+        puts "Not logging due to secrets in output"
+    end
 
     puts "\t#{cmd_description} took #{elapsed} seconds"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Chris Antenesse