ops_team 0.2.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c2fa7f06155a753554402aa2063aec1bf192aa171a6c2e601619ee6f80e148
-  data.tar.gz: ca9c1bcde247a55ad469e423f5bde3a1ba3a85ad51694b519622e6a572304afc
+  metadata.gz: c66d41a99b01b2cb8a491c3fcc21c81914cf6981ffe757965940ad125f7d4721
+  data.tar.gz: edb9c00bdef96370a79586638fc1541c5ad1e0ae301fe14053bc30004f149333
 SHA512:
-  metadata.gz: 7baea51515c766fd4409382b91560dd21948b95470d62fad73a6f23c3b58d92a0a0030d55c95dd7de6dfeb0fed73f6b35f7728419da1ca9962598873440cccf3
-  data.tar.gz: c544f035850f131ff02882cf88196f4fc62ab91dc4142ce292cf10531f685415ad349aeaabd52e26f988932eba9fc02888a820502e7efff6fde8478cecfc1941
+  metadata.gz: 1f1bbbd85e768c5f20b0d1fb70c28db11875aabadaf3fc647a2dc8c590be470cdab990c2fa9a657c02b7f6a2798eb5c2a94623d05aa9bb5ef95dd1706d742a6b
+  data.tar.gz: 056d36e1c94f72709568d95e5eb2608a0804e9b322491cf1ff0a9fa4d17cefe5862e508aaf0d73bac5949dafbba8d2fcc8e6d6028235e2beb2b87410fa1cd5e3

data/lib/app_config.rb

@@ -18,8 +18,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/version.rb

@@ -14,7 +14,7 @@ module Builtins
 			end
 		end
 
-			def run
+		def run
 			unless gemspec
 				Output.error("Unable to load gemspec at '#{GEMSPEC_FILE}")
 				return false

data/lib/dependencies/apt.rb

@@ -9,7 +9,7 @@ module Dependencies
 		end
 
 		def meet
-			execute("apt-get install -y #{name}")
+			execute("#{sudo_string}#{meet_command}")
 		end
 
 		def unmeet
@@ -20,5 +20,17 @@ module Dependencies
 		def should_meet?
 			`uname`.chomp == "Linux"
 		end
+
+		private
+
+		def sudo_string
+			return "" if ENV['USER'] == "root" || Options.get("apt.use_sudo") == false
+
+			"sudo "
+		end
+
+		def meet_command
+			"apt-get install -y #{name}"
+		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] = value.to_s
+		end
+	end
 end

data/lib/ops.rb

@@ -53,7 +53,7 @@ class Ops
 
 		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
 

data/lib/options.rb

@@ -3,7 +3,7 @@
 class Options
 	class << self
 		def get(path)
-			@options.dig(*path.split('.'))
+			@options&.dig(*path.split('.'))
 		end
 
 		def set(options)

data/lib/secrets.rb

@@ -9,22 +9,28 @@ require 'options'
 class Secrets < AppConfig
 	class << self
 		def load
-			Secrets.new(expand_path(Options.get("secrets.path"))).load
+			Secrets.new(secrets_path).load
 		end
 
 		private
 
+		def secrets_path
+			expand_path(Options.get("secrets.path"))
+		end
+
 		def expand_path(path)
 			`echo #{path}`.chomp
 		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 +41,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.2.9'
+	s.version = '0.6.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.2.9
+  version: 0.6.0
 platform: ruby
 authors:
 - nickthecook@gmail.com