ops_team 1.6.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717c2ad8be725cfd550b88f3df1e54d2cb4b2047f161c6aca3ee59a23c27aa31
-  data.tar.gz: c92b3b36d66d387735b6ea7c5dcd1fc52ad8f5656364855fd947cad152b515b0
+  metadata.gz: 6748a5f3f6c8e89731bd41488a8173dff6d2198dbd4498f02311b50aafa762e9
+  data.tar.gz: eb846d4e60073e8c575d11d51cca4f2d1de64cdae84698a5ef432d3723b7f0bf
 SHA512:
-  metadata.gz: 479c079172a46dd0f08a999d32bedb44b32c61ef1060371efc8a2ead1196a247fd075b6b44594baca6d2ca07c8b659ed4d300ecbd4c45389c1108d16b37b4efc
-  data.tar.gz: d03837188b042bf484fa48b79cb312b0a20295872c0670fd430fe63d80bee42f2b53f5445edd5522fa7511ec48af4228d1c9539a90ec15001c3e05ed47c315cf
+  metadata.gz: ad9dd5ec65d37be0852049d68d73e98e7469dbc06db976b9c76b1cad39a0c1b65ccbc67dcc43d57453b0ab15061ba27ee5b655955394e4406eb4e73955ee0ea4
+  data.tar.gz: f05344a3215f9b015ec0d3890b7fd378263205908fb357e10cdd13a8c2489e40cb77b59b0c963b0f6ae8d3061380915153dd4405765c4535cdd0f8e966538dff

data/lib/action.rb

@@ -5,18 +5,15 @@ require 'secrets'
 # represents one action to be performed in the shell
 # can assemble a command line from a command and args
 class Action
-	class NotAllowedInEnvError < StandardError; end
+	attr_reader :name
 
-	def initialize(config, args)
+	def initialize(name, config, args)
+		@name = name
 		@config = config
 		@args = args
 	end
 
 	def run
-		unless allowed_in_current_env?
-			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
-		end
-
 		if perform_shell_expansion?
 			Kernel.exec(to_s)
 		else
@@ -62,6 +59,18 @@ class Action
 		@config["load_secrets"].nil? ? false : @config["load_secrets"]
 	end
 
+	def execute_in_env?(env)
+		!skip_in_envs.include?(env)
+	end
+
+	def allowed_in_env?(env)
+		return false if not_in_envs.include?(env)
+
+		return false if in_envs.any? && !in_envs.include?(env)
+
+		true
+	end
+
 	private
 
 	def to_a
@@ -76,12 +85,8 @@ class Action
 		@config["in_envs"] || []
 	end
 
-	def allowed_in_current_env?
-		return false if not_in_envs.include?(Environment.environment)
-
-		return false if in_envs.any? && !in_envs.include?(Environment.environment)
-
-		true
+	def skip_in_envs
+		@config["skip_in_envs"] || []
 	end
 
 	def perform_shell_expansion?

data/lib/action_list.rb

@@ -37,7 +37,7 @@ class ActionList
 		@aliases = {}
 
 		actions_list.each do |name, config|
-			action = Action.new(config, @args)
+			action = Action.new(name, config, @args)
 
 			@actions[name] = action
 			@aliases[action.alias] = action

data/lib/dependencies/custom.rb

@@ -4,18 +4,46 @@ 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["up"] : name
+		end
+
+		def down_command
+			@down_command ||= @config["down"]
+		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}."
 		end
 	end
 end

data/lib/dependencies/sshkey.rb

@@ -6,7 +6,7 @@ require 'dependency'
 
 module Dependencies
 	class Sshkey < Dependency
-		DEFAULT_KEY_SIZE = 2048
+		DEFAULT_KEY_SIZE = 4096
 		DEFAULT_KEY_ALGO = "rsa"
 		DEFAULT_KEY_LIFETIME_S = 3600
 		DEFAULT_KEY_FILE_COMMENT_COMMAND = "$USER@`hostname -s`"
@@ -83,7 +83,7 @@ module Dependencies
 		end
 
 		def opt_key_algo
-			DEFAULT_KEY_ALGO
+			Options.get("sshkey.key_algo") || DEFAULT_KEY_ALGO
 		end
 
 		def passphrase

data/lib/ops.rb

@@ -59,7 +59,7 @@ class Ops
 	rescue AppConfig::ParsingError => e
 		Output.error("Error parsing app config: #{e}")
 		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
-	rescue Action::NotAllowedInEnvError => e
+	rescue Runner::NotAllowedInEnvError => e
 		Output.error("Error running action #{@action_name}: #{e}")
 		exit(ACTION_NOT_ALLOWED_IN_ENV_EXIT_CODE)
 	end

data/lib/runner.rb

@@ -10,6 +10,7 @@ require 'environment'
 class Runner
 	class UnknownActionError < StandardError; end
 	class ActionConfigError < StandardError; end
+	class NotAllowedInEnvError < StandardError; end
 
 	def initialize(action_name, args, config, config_path)
 		@action_name = action_name
@@ -29,8 +30,8 @@ class Runner
 		raise ActionConfigError, action.config_errors.join("; ") unless action.config_valid?
 
 		do_before_action
-		Output.notice("Running '#{action}' in environment '#{ENV['environment']}'...")
-		action.run
+
+		run_action
 	end
 
 	def suggestions
@@ -72,6 +73,20 @@ class Runner
 		@forward ||= Forwards.new(@config, @args).get(@action_name)
 	end
 
+	def run_action
+		unless action.allowed_in_env?(Environment.environment)
+			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
+		end
+
+		unless action.execute_in_env?(Environment.environment)
+			Output.warn("Skipping action '#{action.name}' in environment #{Environment.environment}.")
+			return true
+		end
+
+		Output.notice("Running '#{action}' in environment '#{ENV['environment']}'...")
+		action.run
+	end
+
 	def action
 		return action_list.get(@action_name) if action_list.get(@action_name)
 		return action_list.get_by_alias(@action_name) if action_list.get_by_alias(@action_name)

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.6.1'
+	s.version = '1.9.0'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
 	s.add_runtime_dependency 'colorize', '~> 0.8', '>= 0.8.1'
 	s.add_runtime_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.7'
 	s.add_runtime_dependency 'ed25519', '~> 1.2', '>= 1.2.4'
-	s.add_runtime_dependency 'json', '~> 2.5', '>= 2.5.1'
 	s.add_runtime_dependency 'ejson', '~> 1.2', '>= 1.2.1'
 	s.add_runtime_dependency 'net-ssh', '~> 6.1', '>= 6.1.0'
 	s.add_runtime_dependency 'require_all', '~> 1.1', '>= 1.1.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.9.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -90,26 +90,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: ejson
   requirement: !ruby/object:Gem::Requirement
@@ -134,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
@@ -247,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting