ops_team 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0950247f85acd2717010175d13c9e0e11ac5028856322ce4141f8b0e8a41614b'
-  data.tar.gz: a0c2e8ffc12803caa0fcdef133e7bc06b2f180a21310d245ae9a4a6478d4353a
+  metadata.gz: bf24d85630158410b50202a7ccae33b7faecdd649a4a259aa3a69e5b4d245d1a
+  data.tar.gz: 494af1f1ba4e0e75544be49cb0adba5b8178dcb17aaeb9fae878cb67b2ac7b92
 SHA512:
-  metadata.gz: 9a55cd5bd3d72268e42547669bc5eaaeec94b4d191f9c6af37a71c63f9d6f2bb05dc190c45e4ea83850172529c64a99ca88751a641f6b324c405d6ae309fe548
-  data.tar.gz: 4440dc557457a84ab6b2e32c02cd51c2d842e5ee1b716a00093a5228d58aadf6d23ea608a8e346dbd704eb08c77608d1605fce01775ee4632e3cc32793ce8d6b
+  metadata.gz: 31e68329d30149ce528c43f12a1eca82312dc9032b8a4c55d7321cbac32f093b193f87505bbd56f1d09e08e02b93aa274e3b6c7f880293cae70d33c4289e8e09
+  data.tar.gz: 3d0c41e1a1dd6f36d53a5d020cfd318abfc50405bea0ae9781e82a264d82bc6c2a3e64a4b9abf952e20485b57e9a45e0a417abaceab14adad9c3ef1ed836196d

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/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.0'
+	s.version = '1.8.0'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2021-05-05 00:00:00.000000000 Z
@@ -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
@@ -227,8 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-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