ops_team 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ea800cf1d407a6b9e372b422ac29ae6e7ace9597e55181aaef981290382dca
-  data.tar.gz: 37f00565ecdcfa789df0022a83352966e2c54080979321d82baaa2a0e99868aa
+  metadata.gz: 58e624e071ff1192e4f1d53d3a76135f0cb93feb43730531012944c245109a5f
+  data.tar.gz: 55a945d92fc66f60ff5dce922a734d93e3ec74973d97505357efb1c57d0d7a76
 SHA512:
-  metadata.gz: 6f5a443b2cc90a6d390a4f8f8805e1ab7236af5a04921177569ae8f64d7288295a83823606cbbc4402be419152a1ae2072e7704b846ee2653191d86bcb2be4ef
-  data.tar.gz: af770963d44d9eca6140d033626751143de5561625fb4180906350eeb0b6c36391c0193267e7ed32c37ce0f47ccc70a332561ed011ccf126538c04badc543146
+  metadata.gz: a1b19fb48de6a17dc8430bd09855ae94483117562ab6c725870abcacf72df86dad737ffb4cdbfe1b0d1c1290acf27c466194c39b88f6b98b833cfe2b61a5b43b
+  data.tar.gz: fbae4f1f500e1d9ef96a1befc963111bfc28a32d3c7da2bc5e0c1a4a8e8e9ad2c5308eb3c3adaa58b3c55b5ce6e9f59e47482cb5e5e6c629a32dd74d35c7b14d

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,56 +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(deps_to_meet)
-		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
-		end
-
-		def deps_to_meet
-			return @config["dependencies"] if @args.empty?
-
-			return @config["dependencies"].select { |dep, names| @args.include?(dep) }
+	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.10.0'
+	s.version = '1.11.0'
 	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.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire:
+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
@@ -114,22 +114,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description:
-email:
+description: 
+email: 
 executables:
 - ops
 extensions: []
@@ -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
@@ -212,7 +213,7 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -227,8 +228,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting
   YAML config