ops_team 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df06362d31ad96870848712991804c147d63f780395587ea7237eacabfbb683
-  data.tar.gz: d125dfaa4423fa07eae13672f5c045f064b084f2c7c05db3e76ab5088b92f410
+  metadata.gz: fb200091bd81044096f650bc1647958dd129b12b14c309516b7e7ce0324e8889
+  data.tar.gz: 0edf7442cd2106ac2de48b6c14d16510111fa10759fe320aaea1856f366c8703
 SHA512:
-  metadata.gz: 8e7f27173645a685d1146c9a8e73565c9cee017e0bdeb834db0258f17b4e9d655d2f19949b386f4b401818ef37d45e4c3552c31b19571c580de0f6c60b3d4638
-  data.tar.gz: 6f5e9398f184381b503cf579b7e8468db32a5ce9707b6f6818b9f55b6fba94054a96fbfa6d99fc7b0bce0159f63fbf92f53506712fafebe925622753b143eae1
+  metadata.gz: '0379eecf548037718aebf63b722f9571f21410daafd13a6b9ae893cfe7d3fbd3c0a58c40ea10dd1ac35d52c1de580894a774859755185dd8c32eb130db6d31fc'
+  data.tar.gz: 6e08799eb7cf0c196c88e93ecd68f7d48beedd803291d07b362750c9d738785736e9db49ca3c02d180544efa731f7064d5b5537016db8427b826e8057e4a2210

data/bin/print_config

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo $KEY1
+echo $KEY2

data/lib/action.rb

@@ -44,6 +44,6 @@ class Action
 	end
 
 	def secrets_file
-		`echo -n #{@options&.dig("secrets", "path")}`
+		`echo #{@options&.dig("secrets", "path")}`.chomp
 	end
 end

data/lib/app_config.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class AppConfig
+	def initialize(filename = "")
+		@filename = filename.empty? ? default_filename : filename
+	end
+
+	def load
+		config['environment']&.each do |key, value|
+			ENV[key] = value
+		end
+	end
+
+	private
+
+	def default_filename
+		"config/#{environment}/config.json"
+	end
+
+	def config
+		@config ||= file_contents ? JSON.parse(file_contents) : {}
+	rescue JSON::ParserError => e
+		Output.error("Error parsing config data: #{e}")
+		{}
+	end
+
+	def file_contents
+		@file_contents ||= begin
+			File.open(@filename).read
+		rescue Errno::ENOENT
+			nil
+		end
+	end
+
+	def environment
+		ENV['environment']
+	end
+end

data/lib/builtins/down.rb

@@ -45,7 +45,7 @@ module Builtins
 			else
 				Output.failed
 				Output.error("Error unmeeting #{dependency.type} dependency '#{dependency.name}':")
-				puts(dependency.output)
+				Output.out(dependency.output)
 			end
 		end
 	end

data/lib/builtins/up.rb

@@ -46,7 +46,7 @@ module Builtins
 			else
 				Output.failed
 				Output.error("Error meeting #{dependency.type} dependency '#{dependency.name}':")
-				puts(dependency.output)
+				Output.out(dependency.output)
 			end
 		end
 	end

data/lib/ops.rb

@@ -29,6 +29,7 @@ class Ops
 		exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
 
 		environment.set_variables
+		app_config.load
 
 		return builtin.run if builtin
 
@@ -102,6 +103,14 @@ class Ops
 	def environment
 		@environment ||= Environment.new(env_vars)
 	end
+
+	def app_config_file
+		`echo #{@options&.dig("config", "path")}`.chomp
+	end
+
+	def app_config
+		@app_config ||= AppConfig.new(app_config_file)
+	end
 end
 
 Ops.new(ARGV).run if $PROGRAM_NAME == __FILE__

data/lib/secrets.rb

@@ -3,18 +3,9 @@
 require 'json'
 
 require 'output'
+require 'app_config'
 
-class Secrets
-	def initialize(filename = "")
-		@filename = filename.empty? ? default_filename : filename
-	end
-
-	def load
-		secrets['environment']&.each do |key, value|
-			ENV[key] = value
-		end
-	end
-
+class Secrets < AppConfig
 	private
 
 	def default_filename
@@ -31,18 +22,7 @@ class Secrets
 		"config/#{environment}/secrets.json"
 	end
 
-	def secrets
-		@secrets ||= JSON.parse(file_contents)
-	rescue JSON::ParserError => e
-		Output.error("Error parsing secrets data: #{e}")
-		{}
-	end
-
 	def file_contents
-		@filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : File.open(@filename).read
-	end
-
-	def environment
-		ENV['environment']
+		@file_contents ||= @filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : super
 	end
 end

data/ops_team.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -59,12 +59,14 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - bin/ops
+- bin/print_config
 - bin/print_secrets
 - bin/tag
 - etc/ops.template.yml
 - etc/ruby.template.yml
 - etc/terraform.template.yml
 - lib/action.rb
+- lib/app_config.rb
 - lib/builtin.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb