ops_team 1.10.0 → 1.11.0.pre.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ea800cf1d407a6b9e372b422ac29ae6e7ace9597e55181aaef981290382dca
-  data.tar.gz: 37f00565ecdcfa789df0022a83352966e2c54080979321d82baaa2a0e99868aa
+  metadata.gz: 296e5dabea491580c6f1673cc4f07ab010a3e914fa949532101afe23f5ef2a90
+  data.tar.gz: a14f9e7d5b38a9a752f6682a9558c641448344802a993af32a9aad98122acbc8
 SHA512:
-  metadata.gz: 6f5a443b2cc90a6d390a4f8f8805e1ab7236af5a04921177569ae8f64d7288295a83823606cbbc4402be419152a1ae2072e7704b846ee2653191d86bcb2be4ef
-  data.tar.gz: af770963d44d9eca6140d033626751143de5561625fb4180906350eeb0b6c36391c0193267e7ed32c37ce0f47ccc70a332561ed011ccf126538c04badc543146
+  metadata.gz: 6654ec92375f8270ddb85f9a9fbc4dcc114b858ac7672fa86d4bcec92cac5fc163157feb4bdfee6a0a73ad15c673ac8337e336f53dd7fc8a85e943d3c2dbfd75
+  data.tar.gz: 8f1266dfdf10a8b1da48ae7fc37a1baa07c7bcc86b420338e8a5ef962a5f9b6033c1bbdea233df36137fc4e2c09cfb3bfb7f61863dceaa5220d5769eaad46e5d

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/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/up.rb

@@ -16,21 +16,17 @@ module Builtins
 		end
 
 		def run
-			# TODO: return a success/failure status to the caller
 			meet_dependencies
-		end
 
-		private
+			return true unless fail_on_error?
 
-		def dependency_handler
-			Helpers::DependencyHandler.new(deps_to_meet)
+			deps_to_meet.all?(&:success?)
 		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?
+		private
 
+		def meet_dependencies
+			deps_to_meet.each do |dependency|
 				Output.status("[#{dependency.type}] #{dependency.name}")
 
 				meet_dependency(dependency)
@@ -38,7 +34,6 @@ module Builtins
 		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?
@@ -51,9 +46,21 @@ module Builtins
 		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?
 
-			return @config["dependencies"].select { |dep, names| @args.include?(dep) }
+			@config["dependencies"].select { |dep, _names| @args.include?(dep) }
+		end
+
+		def fail_on_error?
+			Options.get("up.fail_on_error") || false
 		end
 	end
 end

data/lib/dependencies/custom.rb

@@ -39,11 +39,9 @@ module Dependencies
 		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.10.0'
+	s.version = '1.11.0-rc'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0.pre.rc
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -223,9 +223,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: