ops_team 1.9.0 → 1.11.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6748a5f3f6c8e89731bd41488a8173dff6d2198dbd4498f02311b50aafa762e9
-  data.tar.gz: eb846d4e60073e8c575d11d51cca4f2d1de64cdae84698a5ef432d3723b7f0bf
+  metadata.gz: 35716d2bf91784127a89404ce9bc1a17b3a2998af4d247a96b530e05dac9ef57
+  data.tar.gz: 6621e93166e7a950f6ce0727ce050ef2b9bd3b71a4ea019ca8a0e57060702f78
 SHA512:
-  metadata.gz: ad9dd5ec65d37be0852049d68d73e98e7469dbc06db976b9c76b1cad39a0c1b65ccbc67dcc43d57453b0ab15061ba27ee5b655955394e4406eb4e73955ee0ea4
-  data.tar.gz: f05344a3215f9b015ec0d3890b7fd378263205908fb357e10cdd13a8c2489e40cb77b59b0c963b0f6ae8d3061380915153dd4405765c4535cdd0f8e966538dff
+  metadata.gz: e028c88f7c61166dde9b13bd759989563bbbbbcf6e965a231f9c3d96027699183aaf0f957bf956c8c14af3f6b8008a05cd38b47f1a743766e67b56206d22202e
+  data.tar.gz: '005046085d18c29d476275dbb2bef159872b495c8bfd963130b46d2d38884d26bef2929ff7340b3a948fda2fd7e666c4a4ad635dcd817082da1bb3b2dbe219a8'

data/bin/ops

@@ -28,4 +28,4 @@ end
 require_relative "../loader"
 require 'ops'
 
-Ops.new(ARGV, config_file: options[:file]).run
+exit Ops.new(ARGV, config_file: options[:file]).run

data/lib/builtins/common/up_down.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'require_all'
+require_rel "../../dependencies"
+
+require 'builtin'
+require 'builtins/helpers/dependency_handler'
+require 'output'
+
+module Builtins
+	module Common
+		class UpDown < Builtin
+			class << self
+				def description
+					"attempts to meet dependencies listed in ops.yml"
+				end
+			end
+
+			def run
+				meet_dependencies
+
+				return true unless fail_on_error?
+
+				deps_to_meet.all?(&:success?)
+			end
+
+			private
+
+			def meet_dependencies
+				deps_to_meet.each do |dependency|
+					Output.status("[#{dependency.type}] #{dependency.name}")
+
+					meet_dependency(dependency)
+				end
+			end
+
+			def meet_dependency(dependency)
+				handle_dependency(dependency) if !dependency.met? || dependency.always_act?
+
+				if dependency.success?
+					Output.okay
+				else
+					Output.failed
+					Output.error("Error meeting #{dependency.type} dependency '#{dependency.name}':")
+					Output.out(dependency.output)
+				end
+			end
+
+			def deps_to_meet
+				@deps_to_meet ||= dependency_handler.dependencies.select(&:should_meet?)
+			end
+
+			def dependency_handler
+				Helpers::DependencyHandler.new(dependencies)
+			end
+
+			def dependencies
+				return @config["dependencies"] if @args.empty?
+
+				@config["dependencies"].select { |dep, _names| @args.include?(dep) }
+			end
+
+			def fail_on_error?
+				Options.get("up.fail_on_error") || false
+			end
+		end
+	end
+end

data/lib/builtins/countdown.rb

@@ -25,6 +25,8 @@ module Builtins
 				timer_task.shutdown if task_complete?
 			end
 			Output.out("\rCountdown complete after #{sleep_seconds}s.")
+
+			true
 		end
 
 		private

data/lib/builtins/down.rb

@@ -3,50 +3,12 @@
 require 'require_all'
 require_rel "../dependencies"
 
-require 'builtin'
-require 'builtins/helpers/dependency_handler'
+require 'builtins/common/up_down'
 
 module Builtins
-	class Down < Builtin
-		class << self
-			def description
-				"stops dependent services listed in ops.yml"
-			end
-		end
-
-		def run
-			# TODO: return a success/failure status to the caller
-			unmeet_dependencies
-		end
-
-		private
-
-		def dependency_handler
-			Helpers::DependencyHandler.new(@config["dependencies"])
-		end
-
-		def unmeet_dependencies
-			dependency_handler.dependencies.each do |dependency|
-				# don't even output anything for dependencies that shouldn't be considered on this machine
-				next unless dependency.should_meet?
-
-				Output.status("[#{dependency.type}] #{dependency.name}")
-
-				unmeet_dependency(dependency)
-			end
-		end
-
-		def unmeet_dependency(dependency)
-			# TODO: make this simpler, and factor in `should_meet?` above, too
-			dependency.unmeet if dependency.met? || dependency.always_act?
-
-			if dependency.success?
-				Output.okay
-			else
-				Output.failed
-				Output.error("Error unmeeting #{dependency.type} dependency '#{dependency.name}':")
-				Output.out(dependency.output)
-			end
+	class Down < Common::UpDown
+		def handle_dependency(dependency)
+			dependency.unmeet
 		end
 	end
 end

data/lib/builtins/up.rb

@@ -3,57 +3,13 @@
 require 'require_all'
 require_rel "../dependencies"
 
-require 'builtin'
-require 'builtins/helpers/dependency_handler'
+require 'builtins/common/up_down'
 require 'output'
 
 module Builtins
-	class Up < Builtin
-		class << self
-			def description
-				"attempts to meet dependencies listed in ops.yml"
-			end
-		end
-
-		def run
-			# TODO: return a success/failure status to the caller
-			meet_dependencies
-		end
-
-		private
-
-		def dependency_handler
-			Helpers::DependencyHandler.new(deps_to_meet)
-		end
-
-		def meet_dependencies
-			dependency_handler.dependencies.each do |dependency|
-				# don't even output anything for dependencies that shouldn't be considered on this machine
-				next unless dependency&.should_meet?
-
-				Output.status("[#{dependency.type}] #{dependency.name}")
-
-				meet_dependency(dependency)
-			end
-		end
-
-		def meet_dependency(dependency)
-			# TODO: make this simpler, and factor in `should_meet?` above, too
-			dependency.meet if !dependency.met? || dependency.always_act?
-
-			if dependency.success?
-				Output.okay
-			else
-				Output.failed
-				Output.error("Error meeting #{dependency.type} dependency '#{dependency.name}':")
-				Output.out(dependency.output)
-			end
-		end
-
-		def deps_to_meet
-			return @config["dependencies"] if @args.empty?
-
-			return @config["dependencies"].select { |dep, names| @args.include?(dep) }
+	class Up < Common::UpDown
+		def handle_dependency(dependency)
+			dependency.meet
 		end
 	end
 end

data/lib/dependencies/custom.rb

@@ -31,19 +31,17 @@ module Dependencies
 		private
 
 		def up_command
-			@up_command ||= @definition.is_a?(Hash) ? @config["up"] : name
+			@up_command ||= @definition.is_a?(Hash) ? @config&.dig("up") : name
 		end
 
 		def down_command
-			@down_command ||= @config["down"]
+			@down_command ||= @config && @config&.dig("down") || nil
 		end
 
 		def parse_definition
-			return @definition, {} if @definition.is_a?(String)
 			return @definition.first if @definition.is_a?(Hash)
 
-			raise CustomConfigError, "Expected custom dependency @definition '#{@definition}' " \
-				"to be a String or a Hash; received #{@definition.class}."
+			[@definition.to_s, {}]
 		end
 	end
 end

data/lib/runner.rb

@@ -9,7 +9,9 @@ require 'environment'
 
 class Runner
 	class UnknownActionError < StandardError; end
+
 	class ActionConfigError < StandardError; end
+
 	class NotAllowedInEnvError < StandardError; end
 
 	def initialize(action_name, args, config, config_path)

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.9.0'
+	s.version = '1.11.0-rc2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 		'etc/*',
 		'lib/builtins/*',
 		'lib/builtins/helpers/*',
+		'lib/builtins/common/*',
 		'lib/dependencies/*',
 		'lib/dependencies/helpers/*',
 		'loader.rb',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0.pre.rc2
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -172,6 +172,7 @@ files:
 - lib/builtin.rb
 - lib/builtins/background.rb
 - lib/builtins/background_log.rb
+- lib/builtins/common/up_down.rb
 - lib/builtins/countdown.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
@@ -223,9 +224,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3.1
 signing_key: