ops_team 1.8.0 → 1.11.0.pre.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf24d85630158410b50202a7ccae33b7faecdd649a4a259aa3a69e5b4d245d1a
-  data.tar.gz: 494af1f1ba4e0e75544be49cb0adba5b8178dcb17aaeb9fae878cb67b2ac7b92
+  metadata.gz: 296e5dabea491580c6f1673cc4f07ab010a3e914fa949532101afe23f5ef2a90
+  data.tar.gz: a14f9e7d5b38a9a752f6682a9558c641448344802a993af32a9aad98122acbc8
 SHA512:
-  metadata.gz: 31e68329d30149ce528c43f12a1eca82312dc9032b8a4c55d7321cbac32f093b193f87505bbd56f1d09e08e02b93aa274e3b6c7f880293cae70d33c4289e8e09
-  data.tar.gz: 3d0c41e1a1dd6f36d53a5d020cfd318abfc50405bea0ae9781e82a264d82bc6c2a3e64a4b9abf952e20485b57e9a45e0a417abaceab14adad9c3ef1ed836196d
+  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/down.rb

@@ -22,7 +22,7 @@ module Builtins
 		private
 
 		def dependency_handler
-			Helpers::DependencyHandler.new(@config["dependencies"])
+			Helpers::DependencyHandler.new(deps_to_meet)
 		end
 
 		def unmeet_dependencies
@@ -48,5 +48,11 @@ module Builtins
 				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) }
+		end
 	end
 end

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

@@ -4,18 +4,44 @@ require 'dependency'
 
 module Dependencies
 	class Custom < Dependency
+		class CustomConfigError < StandardError; end
+
+		def initialize(definition)
+			super
+			@definition = definition
+			@name, @config = parse_definition
+		end
+
 		def met?
-			# we always want to try to meet this dependency
 			false
 		end
 
+		def always_act?
+			true
+		end
+
 		def meet
-			# this dependency is just a custom, idempotent command
-			execute(name)
+			execute(up_command) if up_command
 		end
 
 		def unmeet
-			true
+			execute(down_command) if down_command
+		end
+
+		private
+
+		def up_command
+			@up_command ||= @definition.is_a?(Hash) ? @config&.dig("up") : name
+		end
+
+		def down_command
+			@down_command ||= @config && @config&.dig("down") || nil
+		end
+
+		def parse_definition
+			return @definition.first if @definition.is_a?(Hash)
+
+			[@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.8.0'
+	s.version = '1.11.0-rc'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.11.0.pre.rc
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2021-05-05 00:00:00.000000000 Z
@@ -114,22 +114,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !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: []
@@ -212,7 +212,7 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,12 +223,12 @@ 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.2.22
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting
   YAML config