ops_team 0.3.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1832331084939d3f2b4d0b58fa2e50715051bdff1c82e984dfb289aee64a15
-  data.tar.gz: e2ecb1f387ce50d5c81500c29f0c67e727d105c66007dc090f67400c1617a4a5
+  metadata.gz: 011b0f2a12af0a58c9b48f53d2dd59b9a753eab0acd221ee2675c296c7b109d0
+  data.tar.gz: 157963863ac30030921804a37f57ab332502ba465ac9c4ea139b18a297f0618e
 SHA512:
-  metadata.gz: cac44a0b4576375fac4210493292537c84b7ef0be6d3c38a16cf17f854058026184f0e96d3a61d4d6a54c226db4b90256844980f5d746120b5e0c3530610c0c0
-  data.tar.gz: b9d1c6be114864c3890b9a391f0f82f481c1bd556349500e8787fbfe960c30604ce04d8f5f5d94f5445c0912cf941798b414343e3f6a55d56c13ff14c0df8488
+  metadata.gz: 9ce81eacd3adb1f7416a96adeabc38b244919ef8e8b17b349cea60e21a68535cc7aaeca57d8af1fb9fb1a03f7b94e98d423f018c2ecd2e9a4da556234ea64f65
+  data.tar.gz: 0e0b772bdd70841e197079c93124f53a0d61ea8558add16a4b89e2e7340a1dbeba58222a3631165c03ed3ea35c85c7c596f9834aa0ba3e0445196b27b35e3f41

data/lib/app_config.rb

@@ -1,6 +1,22 @@
 # frozen_string_literal: true
 
 class AppConfig
+	class << self
+		def load
+			new(app_config_path).load
+		end
+
+		private
+
+		def app_config_path
+			expand_path(Options.get("config.path"))
+		end
+
+		def expand_path(path)
+			`echo #{path}`.chomp
+		end
+	end
+
 	def initialize(filename = "")
 		@filename = filename.empty? ? default_filename : filename
 	end
@@ -18,8 +34,8 @@ class AppConfig
 	end
 
 	def config
-		@config ||= file_contents ? JSON.parse(file_contents) : {}
-	rescue JSON::ParserError => e
+		@config ||= file_contents ? YAML.safe_load(file_contents) : {}
+	rescue YAML::SyntaxError => e
 		Output.error("Error parsing config data: #{e}")
 		{}
 	end

data/lib/builtins/help.rb

@@ -35,7 +35,10 @@ module Builtins
 
 		def actions
 			@config["actions"].map do |name, value|
-				format("%<name>-35s %<desc>s", name: name.yellow, desc: value["description"] || value["command"])
+				format("%<name>-35s %<desc>s",
+					name: name.yellow,
+					desc: value["description"] || value["command"]
+				)
 			end
 		end
 	end

data/lib/environment.rb

@@ -6,11 +6,8 @@ class Environment
 	end
 
 	def set_variables
-		@env_hash.each do |key, value|
-			ENV[key] = value
-		end
-
-		ENV['environment'] = environment
+		set_environment_aliases
+		set_configured_variables
 	end
 
 	def environment
@@ -18,4 +15,22 @@ class Environment
 
 		ENV['environment']
 	end
+
+	private
+
+	def set_environment_aliases
+		environment_aliases.each do |alias_name|
+			ENV[alias_name] = environment
+		end
+	end
+
+	def environment_aliases
+		Options.get("environment_aliases") || ['environment']
+	end
+
+	def set_configured_variables
+		@env_hash.each do |key, value|
+			ENV[key] = `echo #{value}`.chomp
+		end
+	end
 end

data/lib/ops.rb

@@ -49,11 +49,11 @@ class Ops
 
 	def run_action
 		environment.set_variables
-		app_config.load
+		AppConfig.load
 
 		return builtin.run if builtin
 
-		Output.warn("Running '#{action}' from #{CONFIG_FILE}...")
+		Output.warn("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
 		action.run
 	end
 
@@ -106,12 +106,8 @@ class Ops
 		@environment ||= Environment.new(env_vars)
 	end
 
-	def app_config_file
-		`echo #{Options.get("config.path")}`.chomp
-	end
-
 	def app_config
-		@app_config ||= AppConfig.new(app_config_file)
+		@app_config ||= AppConfig.new
 	end
 end
 

data/lib/secrets.rb

@@ -8,23 +8,21 @@ require 'options'
 
 class Secrets < AppConfig
 	class << self
-		def load
-			Secrets.new(expand_path(Options.get("secrets.path"))).load
-		end
-
 		private
 
-		def expand_path(path)
-			`echo #{path}`.chomp
+		def app_config_path
+			expand_path(Options.get("secrets.path"))
 		end
 	end
 
+	def initialize(filename = "")
+		@filename = filename.empty? ? default_filename : actual_filename_for(filename)
+	end
+
 	private
 
 	def default_filename
-		return default_ejson_filename if File.exist?(default_ejson_filename)
-
-		default_json_filename
+		File.exist?(default_ejson_filename) ? default_ejson_filename : default_json_filename
 	end
 
 	def default_ejson_filename
@@ -35,6 +33,10 @@ class Secrets < AppConfig
 		"config/#{environment}/secrets.json"
 	end
 
+	def actual_filename_for(filename)
+		File.exist?(filename) ? filename : filename.sub(".ejson", ".json")
+	end
+
 	def file_contents
 		@file_contents ||= @filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : super
 	end

data/ops_team.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - nickthecook@gmail.com