ops_team 0.2.8 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed40f82a2c6312381a243ea6ccbfc12ba46f1742af6a8935a2c59d7fcb783f9
-  data.tar.gz: 65ec586f9adb40be64e31f5d581845efc8cc303548b4eea8b7d4b5f6620ae8f1
+  metadata.gz: 4f88b6c88e15edac660d47999114c165b4471ec74dea7ac5428908a8426a7062
+  data.tar.gz: 98746bb244d653277c299dc750d58100a01394a0109499c0ac72fd5772e80e60
 SHA512:
-  metadata.gz: 333c1446f7b2d59f33dda51e29f918d8fe2d54d79f60310d952bbf538dad5ae93c0aa8503fe5af1ed4ba964b336514d21a6d7b6e13948539710bccb259fe2a36
-  data.tar.gz: dac43c177bb4681f3a66a418175c52bd93af2974793400b8db018385fe7abf5743ad89d1ba0398d0ed3cde39b9d68b56dc1919e664621a2366c77e479ef9e100
+  metadata.gz: f1cab3c3fe85c61f55cd70d7fffd7513e9c55796e8b1d6fae7d9d0fd7c21685fbba31216adea935d09396ab4140b05bb514e62cd1255ad45f554a0a1832d4fcb
+  data.tar.gz: 70025e88ddd590901f058989a59eba054ff0af8cbf238a78bfd2150ef41504dc5b33f3726f72c166802e1613373a978d05320611cd793db028dc09e590bb1a5b

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

@@ -16,7 +16,8 @@ class Ops
 
 	CONFIG_FILE = "ops.yml"
 
-	INVALID_SYNTAX_EXIT_CODE = 1
+	INVALID_SYNTAX_EXIT_CODE = 64
+	UNKNOWN_ACTION_EXIT_CODE = 65
 
 	def initialize(argv)
 		@action_name = argv[0]
@@ -28,15 +29,10 @@ class Ops
 	def run
 		exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
 
-		environment.set_variables
-		app_config.load
-
-		return builtin.run if builtin
-
-		Output.warn("Running '#{action}' from #{CONFIG_FILE}...")
-		action.run
+		run_action
 	rescue UnknownActionError => e
 		Output.error("Error: #{e}")
+		exit(UNKNOWN_ACTION_EXIT_CODE)
 	end
 
 	private
@@ -51,6 +47,16 @@ class Ops
 		end
 	end
 
+	def run_action
+		environment.set_variables
+		app_config.load
+
+		return builtin.run if builtin
+
+		Output.warn("Running '#{action}' from #{CONFIG_FILE} in environment '#{ENV['environment']}'...")
+		action.run
+	end
+
 	def builtin
 		@builtin ||= Builtins.const_get(builtin_class_name, false).new(@args, config)
 	rescue NameError

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.8'
+	s.version = '0.5.1'
 	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.8
+  version: 0.5.1
 platform: ruby
 authors:
 - nickthecook@gmail.com