Merge pull request #20 from OpenVoxProject/standardize_tasks

Standardize rake tasks

Author: nmburgan

Rakefile

@@ -1,14 +1,26 @@
 require 'open3'
 
-def run_command(cmd, silent = false)
+RED = "\033[31m"
+GREEN = "\033[32m"
+RESET = "\033[0m"
+
+def run_command(cmd, silent: true, print_command: false, report_status: false)
+  puts "#{GREEN}Running #{cmd}#{RESET}" if print_command
   output = ''
   Open3.popen2e(cmd) do |_stdin, stdout_stderr, thread|
     stdout_stderr.each do |line|
       puts line unless silent
       output += line
     end
     exitcode = thread.value.exitstatus
-    abort "Command failed!" unless exitcode.zero?
+    unless exitcode.zero?
+      err = "#{RED}Command failed! Command: #{cmd}, Exit code: #{exitcode}"
+      # Print details if we were running silent
+      err += "\nOutput:\n#{output}" if silent
+      err += RESET
+      abort err
+    end
+    puts "#{GREEN}Command finished with status #{exitcode}#{RESET}" if report_status
   end
   output.chomp
 end

tasks/build.rake

@@ -19,13 +19,6 @@ namespace :vox do
 
     FileUtils.rm_rf('C:/ProgramFiles64Folder') if platform =~ /^windows-/
 
-    puts "Running #{cmd}"
-    exitcode = nil
-    Open3.popen2e(cmd) do |_stdin, stdout_stderr, thread|
-      stdout_stderr.each { |line| puts line }
-      exitcode = thread.value.exitstatus
-      puts "Command finished with status #{exitcode}"
-    end
-    exit exitcode
+    run_command(cmd, silent: false, print_command: true, report_status: true)
   end
 end

tasks/promote.rake

@@ -8,7 +8,7 @@ namespace :vox do
     abort "Could not find configs/components/#{component}.json" unless File.exist?("configs/components/#{component}.json")
     abort 'You must provide a ref.' if ref.nil? || ref.empty?
 
-    if ['puppet-runtime','pxp-agent'].include?(component)
+    if ['puppet-runtime', 'pxp-agent'].include?(component)
       munged = ref.gsub('-', '.')
       data = <<~DATA
         {"location":"https://s3.osuosl.org/openvox-artifacts/#{component}/#{ref}/","version":"#{munged}"}
@@ -26,7 +26,9 @@ namespace :vox do
     run_command("git add configs/components/#{component}.json")
     puts 'Creating commit'
     run_command("git commit -m 'Promote #{component} #{ref}'")
-    puts 'Pushing to origin'
-    run_command("git push origin #{branch}")
+    if ENV['NOPUSH'].nil?
+      puts 'Pushing to origin'
+      run_command("git push origin #{branch}")
+    end
   end
 end

tasks/tag.rake

@@ -24,9 +24,9 @@ namespace :vox do
 
     run_command("git tag -a #{version} -m '#{version}'")
 
-    unless !ENV['NOPUSH'].nil?
-      puts "Pushing #{version} to origin"
-      run_command("git push origin #{version}")
+    if ENV['NOPUSH'].nil?
+      puts "Pushing to origin"
+      run_command("git push origin && git push origin #{version}")
     end
   end
 end

tasks/upload.rake

@@ -34,8 +34,7 @@ namespace :vox do
 
     path = "s3://#{bucket}/#{component}/#{args[:tag]}"
     files.each do |f|
-      puts "Uploading #{File.basename(f)}"
-      run_command("#{s3} cp #{f} #{path}/#{File.basename(f)}")
+      run_command("#{s3} cp #{f} #{path}/#{File.basename(f)}", silent: false)
     end
   end
 end