ops_team 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe720771051eb12c4f6786c7a9409d8e2ab01e592abb7959349ceba74f47eed
-  data.tar.gz: d2fdd069587db893f74d599abf875d15dcad4a09c19b94169496527ba462c77f
+  metadata.gz: d591b58dad032824721105b4ce3e45c63ef40078273d77fbb85ddf50c3224f27
+  data.tar.gz: f3f72de653d0ad2d3b87ef1ac6c75bfe0543b6030b37954fae1ddf4dd2981e17
 SHA512:
-  metadata.gz: 48f067fd6e9379a1b40830defed7652301786020310137c1be4349e8abb5ab45eae478084b6614d807e10db6738531fb1f169c44146445fed77c1b517eabdba5
-  data.tar.gz: 32d83b0e2cf94f4178f577b3fbc2b9d232bd10f1de3370f5d516fac9e98f86abe1401749428a486c1f436d0d4646ad332f88701e889ac75764e432978f634000
+  metadata.gz: 42df63cce2068a86cbe127da74fdf4af2dfb33f3bb4d7ed176354566b11adc1ba3adbbc941b0df8440bcdc1cfaf76f4e9e7182c41618cee1ca9695d8fa1bdca7
+  data.tar.gz: 451205a2bde8e20689f2b5b1b76d60f3cf3d2db5d74d18c2f71cc21219863bc4a87373c5980833e90d647314eb937b4dc02f13ad940636603d7dd37faf4764e4

data/lib/executor.rb

@@ -3,15 +3,6 @@
 class Executor
 	attr_reader :output, :exit_code
 
-	class << self
-		def execute(command)
-			@output, status = Open3.capture2e(command)
-			@exit_code = status.exitstatus
-
-			[@output, @exit_code]
-		end
-	end
-
 	def initialize(command)
 		@command = command
 	end

data/lib/hook_handler.rb

@@ -25,11 +25,18 @@ class HookHandler
 	def execute_hooks(name)
 		hooks(name).each do |hook|
 			Output.notice("Running #{name} hook: #{hook}")
-			output, exit_code = Executor.execute(hook)
+			output, exit_code = execute_hook(hook)
 
 			next if exit_code.zero?
 
 			raise HookExecError, "#{name} hook '#{hook}' failed with exit code #{exit_code}:\n#{output}"
 		end
 	end
+
+	def execute_hook(name)
+		executor = Executor.new(name)
+		executor.execute
+
+		[executor.output, executor.exit_code]
+	end
 end

data/lib/ops.rb

@@ -127,10 +127,11 @@ class Ops
 	end
 
 	def do_before_action
-		hook_handler.do_hooks("before") unless ENV["OPS_RUNNING"] || action.skip_hooks?("before")
+		return if ENV["OPS_RUNNING"] || action.skip_hooks?("before")
 
 		# this prevents before hooks from running in ops executed by ops
 		ENV["OPS_RUNNING"] = "1"
+		hook_handler.do_hooks("before")
 	end
 
 	def hook_handler

data/ops_team.gemspec

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

metadata

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