ops_team 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4fd4661f8ea9e234bed8f61e205e625a232d301786557ce3c645519885c068a
-  data.tar.gz: af58d1ede9274d7a1aa884f036bc2dc6b93f7deff66307484bbcaae30806eea9
+  metadata.gz: 684c6b13e7c5440f067ed372f28f592fc24616aaeb42284ec30465166bd1ce79
+  data.tar.gz: 67ba1850a8f28e7025bc3d179bdb33d6506dffa0c5a94b2aa50fce20e0c20dce
 SHA512:
-  metadata.gz: bc505145b87e405a8a714196966ed2652bfd341fa8deec285c12ad6aa5fb07e01eb4797b888bc7ea5b253d90987b335e4fb6d45a5650af09b23fc74bac3086ed
-  data.tar.gz: 1227db2ce9be14ba4ee5bb1be55750fa6acbe92678a847b9d88a4e19bae6e465909bfa268b1700a73142946f4e0b751a69834630f8e6571860a6b8900403a8da
+  metadata.gz: 747a3dfac949e43f25f3ee19b31bb60d9824b25265b5c8d09c0af9f298a514b2fec0fd48cace35c4ebc553847ebd9bf9b6ea246433a5efb51b7c4918bbc39628
+  data.tar.gz: 32d665f336d2d31d7189b5bc9569155c00c4d27ba8b2260d282295c3e2664d0ead0729454996275a2d189f446a2afebc9ae6f9f66303d38245e511978ee58b88

data/lib/action.rb

@@ -32,6 +32,10 @@ class Action
 		@config["description"]
 	end
 
+	def skip_hooks?(name)
+		@config["skip_#{name}_hooks"]
+	end
+
 	private
 
 	def load_secrets?

data/lib/hook_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'output'
+
 class HookHandler
 	class HookConfigError < StandardError; end
 	class HookExecError < StandardError; end
@@ -22,6 +24,7 @@ class HookHandler
 
 	def execute_hooks(name)
 		hooks(name).each do |hook|
+			Output.notice("Running #{name} hook: #{hook}")
 			output, exit_code = Executor.execute(hook)
 
 			next if exit_code.zero?

data/lib/ops.rb

@@ -75,10 +75,12 @@ class Ops
 	end
 
 	def run_action
-		do_before_run_action
+		do_before_all
 
 		return builtin.run if builtin
 
+		do_before_action
+
 		Output.notice("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
 	rescue AppConfig::ParsingError => e
@@ -86,10 +88,16 @@ class Ops
 		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
 	end
 
-	def do_before_run_action
+	def do_before_all
 		environment.set_variables
 		AppConfig.load
-		hook_handler.do_hooks("before")
+	end
+
+	def do_before_action
+		hook_handler.do_hooks("before") unless ENV["OPS_RUNNING"] || action.skip_hooks?("before")
+
+		# this prevents before hooks from running in ops executed by ops
+		ENV["OPS_RUNNING"] = "1"
 	end
 
 	def hook_handler

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.12.0'
+	s.version = '0.12.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.2
 platform: ruby
 authors:
 - nickthecook@gmail.com