ops_team 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66d41a99b01b2cb8a491c3fcc21c81914cf6981ffe757965940ad125f7d4721
-  data.tar.gz: edb9c00bdef96370a79586638fc1541c5ad1e0ae301fe14053bc30004f149333
+  metadata.gz: 011b0f2a12af0a58c9b48f53d2dd59b9a753eab0acd221ee2675c296c7b109d0
+  data.tar.gz: 157963863ac30030921804a37f57ab332502ba465ac9c4ea139b18a297f0618e
 SHA512:
-  metadata.gz: 1f1bbbd85e768c5f20b0d1fb70c28db11875aabadaf3fc647a2dc8c590be470cdab990c2fa9a657c02b7f6a2798eb5c2a94623d05aa9bb5ef95dd1706d742a6b
-  data.tar.gz: 056d36e1c94f72709568d95e5eb2608a0804e9b322491cf1ff0a9fa4d17cefe5862e508aaf0d73bac5949dafbba8d2fcc8e6d6028235e2beb2b87410fa1cd5e3
+  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

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

@@ -30,7 +30,7 @@ class Environment
 
 	def set_configured_variables
 		@env_hash.each do |key, value|
-			ENV[key] = value.to_s
+			ENV[key] = `echo #{value}`.chomp
 		end
 	end
 end

data/lib/ops.rb

@@ -49,7 +49,7 @@ class Ops
 
 	def run_action
 		environment.set_variables
-		app_config.load
+		AppConfig.load
 
 		return builtin.run if builtin
 
@@ -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,19 +8,11 @@ require 'options'
 
 class Secrets < AppConfig
 	class << self
-		def load
-			Secrets.new(secrets_path).load
-		end
-
 		private
 
-		def secrets_path
+		def app_config_path
 			expand_path(Options.get("secrets.path"))
 		end
-
-		def expand_path(path)
-			`echo #{path}`.chomp
-		end
 	end
 
 	def initialize(filename = "")

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.6.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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - nickthecook@gmail.com