ops_team 1.19.0 → 1.19.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f87bb63a70bee49f12e7279f94061cc29e8442addece8d06761528fde9cb0c9c
-  data.tar.gz: ac77a15296d299cd1f77e2ceab9afb3590e2e0bcbd8a2ce6b5b1973d33ff6565
+  metadata.gz: 2cbf7ab837504c3019433fb10aed266cdbb189e46d7da64b71fdafcef054dee4
+  data.tar.gz: c96510b0a2469da680ab59e15c7de55e3f9dceb3357f02de88c06e7acb977d4c
 SHA512:
-  metadata.gz: c29733262fc698a77102ab19ee6471bbc00abfdbe0e88fceb50ce4298f523debfe623004c30be374439c4149b9253ff1fa6b280f7faed3657d9bc465b4832970
-  data.tar.gz: 3364890f3a416d1206fa4eb5af5c7b922e7b7fa774b79b29b7ee87dc971f05b99c69c7267d0e75d784c99554c6d6638ab3cad4e314baa1b14ad653605784a874
+  metadata.gz: 95ba7d9d2ebc18b14c96fa7250b6d255a8ed2ffdd033925368617906202a23f9331bc02f2304b1ec5c73ef3b05faf86d1089ff17253d2805f1ef9814d89293e1
+  data.tar.gz: f48fe95210829edb5028d7880779cc39bb83829b60e558c9ea9b83ad69a1bdee1876720aea22b292825d105616169546d718eabce6c4260a6cdf5cea423dde37

data/lib/app_config.rb

@@ -18,21 +18,17 @@ class AppConfig
 			"config/#{env}/config.json"
 		end
 
-		private
-
 		def app_config_path
-			expand_path(Options.get("config.path"))
+			expand_path(Options.get("config.path") || default_filename)
 		end
 
+		private
+
 		def expand_path(path)
 			`echo #{path}`.chomp
 		end
 	end
 
-	def initialize(filename = "")
-		@filename = filename.empty? ? AppConfig.default_filename : filename
-	end
-
 	def load
 		config['environment']&.each do |key, value|
 			ENV[key] = value.is_a?(Hash) || value.is_a?(Array) ? value.to_json : value.to_s
@@ -41,6 +37,10 @@ class AppConfig
 
 	private
 
+	def initialize(filename = "")
+		@filename = filename
+	end
+
 	def config
 		@config ||= if file_contents == ""
 			Output.warn("Config file '#{@filename}' exists but is empty.")

data/lib/environment.rb

@@ -25,8 +25,8 @@ class Environment
 	def set_ops_variables
 		ENV["OPS_YML_DIR"] = File.dirname(@config_path)
 		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)
+		ENV["OPS_SECRETS_FILE"] = Secrets.app_config_path
+		ENV["OPS_CONFIG_FILE"] = AppConfig.app_config_path
 	end
 
 	def set_environment_aliases

data/lib/secrets.rb

@@ -13,6 +13,10 @@ class Secrets < AppConfig
 			File.exist?(ejson_path_for(env)) ? ejson_path_for(env) : json_path_for(env)
 		end
 
+		def app_config_path
+			expand_path(Options.get("secrets.path") || default_filename)
+		end
+
 		private
 
 		def ejson_path_for(env)
@@ -22,10 +26,6 @@ class Secrets < AppConfig
 		def json_path_for(env)
 			"config/#{env}/secrets.json"
 		end
-
-		def app_config_path
-			expand_path(Options.get("secrets.path"))
-		end
 	end
 
 	def initialize(filename = "")

data/ops_team.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.19.0'
+	s.version = '1.19.1.rc1'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]
-	s.date = '2021-10-25'
+	s.date = '2022-06-11'
 	s.summary = 'ops_team handles basic automation for your project, driven by self-documenting YAML config'
 	s.homepage = 'https://github.com/nickthecook/ops'
 	s.files = Dir[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.19.1.rc1
 platform: ruby
 authors:
 - nickthecook@gmail.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -248,11 +248,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: ops_team handles basic automation for your project, driven by self-documenting