ops_team 1.9.1 → 1.11.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fd6e0089c344fed6c8996c7621409e15a9be58f8ea6230d42d9e9e2512caf0c
-  data.tar.gz: 2d5cf64ee8a5f76f1657b41721602c8df92d157a22d10a38bce4abc6b3777714
+  metadata.gz: 643d86e6366ca29ee4d7368f9e913c0fad16fe3625e0480287936bb82a794f73
+  data.tar.gz: 8718e8d67b671d59f7252f0e59cd0aee15dfc1d458bf505609bd5a659330e6bc
 SHA512:
-  metadata.gz: 4af29af996f97cc07379cecc16a0a97f9ca4f656330d58242071cbda2221c5d7c6f94e3d28b465ff127ab478dab250b4eaec2384c1baa519918ec5ecdc3a6340
-  data.tar.gz: b33dc122c430a3fe53de740f1dd7b3df9a0cd908cecaf707d1d6d5ee080531e3301ed0cc7128a5a04bae39a6165face8871afb795ddf9784bc2b052af91f7dc3
+  metadata.gz: a5b86e7520a99816668db2fa5e57bb1b5a667f5b486f1d58ad01cc8b3612ec40fee7ee7764f2242fc5b24472d132b9a69bc324a09d050890e69905d309c49191
+  data.tar.gz: c20a44ba9ec6fdebf3d951513b17d9c7f2fac5e15ff08dd816894c460aa6520801c3de7e15b23187c400072a9c1e347261c63aea39e645df6d0d4de0c9df2a16

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

@@ -13,6 +13,8 @@ module Builtins
 
 		def run
 			Output.print(environment)
+
+			true
 		end
 
 		def environment

data/lib/builtins/envdiff.rb

@@ -20,6 +20,8 @@ module Builtins
 
 			output_key_summary(source_only_keys, source_env, dest_env) if source_only_keys.any?
 			output_key_summary(dest_only_keys, dest_env, source_env) if dest_only_keys.any?
+
+			true
 		end
 
 		private

data/lib/builtins/exec.rb

@@ -20,6 +20,7 @@ module Builtins
 				Kernel.exec(args.join(" "))
 			else
 				Output.error("Usage: ops exec '<command>'")
+				false
 			end
 		end
 	end

data/lib/builtins/help.rb

@@ -25,6 +25,8 @@ module Builtins
 			Output.out("")
 			Output.out("Actions:")
 			Output.out("  #{actions.join("\n  ")}")
+
+			true
 		end
 
 		private

data/lib/builtins/init.rb

@@ -21,10 +21,14 @@ module Builtins
 		def run
 			if File.exist?(OPS_YML)
 				Output.error("File '#{OPS_YML} exists; not initializing.")
-			else
-				Output.out("Creating '#{OPS_YML} from template...")
-				FileUtils.cp(template_path, OPS_YML)
+
+				return false
 			end
+
+			Output.out("Creating '#{OPS_YML} from template...")
+			FileUtils.cp(template_path, OPS_YML)
+
+			true
 		rescue SystemCallError
 			Output.error(template_not_found_message)
 			exit 1

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/builtins/version.rb

@@ -13,6 +13,8 @@ module Builtins
 
 		def run
 			Output.out(::Version.version)
+
+			true
 		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,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.9.1'
+	s.version = '1.11.0-rc3'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2021-05-05'
+	s.date = '2021-10-25'
 	s.summary = 'ops_team handles basic automation for your project, driven by self-documenting YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[
@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.11.0.pre.rc3
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -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: