ops_team 0.15.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3beee0325741d140b711ee3f939306452b176b9be9f7d9094c1e578ed780373
-  data.tar.gz: 33aef85445dd2494967e246c1b4ebfe7433d76b9b09512756cb2a086321438cd
+  metadata.gz: 1fe720771051eb12c4f6786c7a9409d8e2ab01e592abb7959349ceba74f47eed
+  data.tar.gz: d2fdd069587db893f74d599abf875d15dcad4a09c19b94169496527ba462c77f
 SHA512:
-  metadata.gz: b0d69fca7b243d34d4c14cf53d8b10942b212cd53fd897c136079d9883e939670f3b74c3383df547d6c2f9a7c1d25f0ce4ba11e3337e566cdab010a6ebe81ef9
-  data.tar.gz: 96e25352e3b8b337a53632e560e1f494c38d2fc09b0b314c4a4e6e07aec92324b52051ac0c5235a4ab8d394247683890230dd5b29fe86b8ec26102af0482c559
+  metadata.gz: 48f067fd6e9379a1b40830defed7652301786020310137c1be4349e8abb5ab45eae478084b6614d807e10db6738531fb1f169c44146445fed77c1b517eabdba5
+  data.tar.gz: 32d83b0e2cf94f4178f577b3fbc2b9d232bd10f1de3370f5d516fac9e98f86abe1401749428a486c1f436d0d4646ad332f88701e889ac75764e432978f634000

data/lib/action.rb

@@ -5,12 +5,18 @@ 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
+
 	def initialize(config, args)
 		@config = config
 		@args = args
 	end
 
 	def run
+		unless allowed_in_current_env?
+			raise NotAllowedInEnvError, "Action not allowed in #{Environment.environment} environment."
+		end
+
 		Secrets.load if load_secrets?
 
 		Kernel.exec(to_s)
@@ -55,4 +61,20 @@ class Action
 	def load_secrets?
 		@config["load_secrets"]
 	end
+
+	def not_in_envs
+		@config["not_in_envs"] || []
+	end
+
+	def in_envs
+		@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
+	end
 end

data/lib/action_list.rb

@@ -28,11 +28,15 @@ class ActionList
 
 	private
 
+	def actions_list
+		@actions_list ||= []
+	end
+
 	def process_action_list
 		@actions = {}
 		@aliases = {}
 
-		@actions_list.each do |name, config|
+		actions_list.each do |name, config|
 			action = Action.new(config, @args)
 
 			@actions[name] = action

data/lib/builtins/envdiff.rb

@@ -49,21 +49,29 @@ module Builtins
 		end
 
 		def keys_for(env)
-			config_keys_for(env) | secrets_keys_for(env)
+			tagged_config_keys_for(env) + tagged_secrets_keys_for(env)
 		end
 
-		def config_keys_for(env)
-			(config_for(env)["environment"]&.keys || []).map do |key|
+		def tagged_config_keys_for(env)
+			config_keys_for(env).map do |key|
 				"[CONFIG] #{key}"
 			end
 		end
 
-		def secrets_keys_for(env)
-			(secrets_for(env)["environment"]&.keys || []).map do |key|
+		def tagged_secrets_keys_for(env)
+			secrets_keys_for(env).map do |key|
 				"[SECRET] #{key}"
 			end
 		end
 
+		def config_keys_for(env)
+			(config_for(env)["environment"]&.keys || []) - ignored_keys
+		end
+
+		def secrets_keys_for(env)
+			(secrets_for(env)["environment"]&.keys || []) - ignored_keys
+		end
+
 		def config_for(env)
 			YAML.load_file(config_path_for(env))
 		end
@@ -111,6 +119,10 @@ module Builtins
 		def secrets_path_for(env)
 			Secrets.config_path_for(env)
 		end
+
+		def ignored_keys
+			Options.get("envdiff.ignored_keys") || []
+		end
 	end
 
 	Envdiff = EnvDiff

data/lib/builtins/help.rb

@@ -54,12 +54,18 @@ module Builtins
 		def actions
 			return [] unless @config["actions"]
 
-			@config["actions"].map do |name, value|
-				format("%<name>-35s %<desc>s",
-					name: name.yellow,
-					desc: value["description"] || value["command"]
+			@config["actions"].map do |name, action_config|
+				format("%<name>-40s %<desc>s",
+					name: "#{name.yellow} #{alias_string_for(action_config)}",
+					desc: action_config["description"] || action_config["command"]
 				)
 			end.sort
 		end
+
+		def alias_string_for(action_config)
+			return "[#{action_config["alias"]}]" if action_config["alias"]
+
+			""
+		end
 	end
 end

data/lib/environment.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'version'
+require 'secrets'
+require 'app_config'
 
 class Environment
 	class << self
@@ -26,6 +28,8 @@ class Environment
 	def set_ops_variables
 		ENV["OPS_YML_DIR"] = Dir.pwd
 		ENV["OPS_VERSION"] = Version.version.to_s
+		ENV["OPS_SECRETS_FILE"] = Secrets.config_path_for(Environment.environment)
+		ENV["OPS_CONFIG_FILE"] = AppConfig.config_path_for(Environment.environment)
 	end
 
 	def set_environment_aliases

data/lib/ops.rb

@@ -29,6 +29,7 @@ class Ops
 	MIN_VERSION_NOT_MET_EXIT_CODE = 67
 	ACTION_CONFIG_ERROR_EXIT_CODE = 68
 	BUILTIN_SYNTAX_ERROR_EXIT_CODE = 69
+	ACTION_NOT_ALLOWED_IN_ENV_EXIT_CODE = 70
 
 	RECOMMEND_HELP_TEXT = "Run 'ops help' for a list of builtins and actions."
 
@@ -115,6 +116,9 @@ class Ops
 	rescue AppConfig::ParsingError => e
 		Output.error("Error parsing app config: #{e}")
 		exit(ERROR_LOADING_APP_CONFIG_EXIT_CODE)
+	rescue Action::NotAllowedInEnvError => e
+		Output.error("Error running action #{@action_name}: #{e}")
+		exit(ACTION_NOT_ALLOWED_IN_ENV_EXIT_CODE)
 	end
 
 	def do_before_all
@@ -161,8 +165,12 @@ class Ops
 
 	def config
 		@config ||= begin
-			Output.warn("File '#{CONFIG_FILE}' does not exist.") unless File.exist?(CONFIG_FILE)
-			YAML.load_file(CONFIG_FILE)
+			if File.exist?(CONFIG_FILE)
+				YAML.load_file(CONFIG_FILE)
+			else
+				Output.warn("File '#{CONFIG_FILE}' does not exist.") unless @action_name == "init"
+				{}
+			end
 		rescue StandardError => e
 			Output.warn("Error parsing '#{CONFIG_FILE}': #{e}")
 			{}
@@ -170,7 +178,7 @@ class Ops
 	end
 
 	def env_vars
-		@config.dig("options", "environment") || {}
+		config.dig("options", "environment") || {}
 	end
 
 	def environment

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.15.0'
+	s.version = '0.18.0'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-08-12 00:00:00.000000000 Z
@@ -130,8 +130,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
-description: 
-email: 
+description:
+email:
 executables:
 - ops
 extensions: []
@@ -187,7 +187,7 @@ homepage: https://github.com/nickthecook/ops
 licenses:
 - GPL-3.0-only
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ops_team handles basic operations tasks for your project, driven by YAML
   config