ops_team 0.4.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a818c3a6f9c810468c58fac9589aec995198d01ecdf1c226ba7531e50b7f8976
-  data.tar.gz: 0d25bf9e8e30e73939e134f2c258a12d087c4724d1ae4819f66813873e289771
+  metadata.gz: bb7e6762ba43bcdd97cc72b6bc5a65bf1280d5bb69ad52eab7455f580fe1f7ea
+  data.tar.gz: ac3102e06909139501ffef2468bc7005a3c7db215253136c5c08ff6a8d4fc2b2
 SHA512:
-  metadata.gz: d1dacb5ff0fc5c4839143ab957d86c20b0e17d304ba11fec4784ea59c496ed86995aed268dca23df8b2e32712934ff6d8f1f248704b3ef628e7d4444a5b81e9d
-  data.tar.gz: a1bc4be2d8f04c81cc48de7944cb4bbb2e49c9bad7c0962bbefd925ada750ba8fa4cc5690c6e64ee817c7580cd8112d832dd644222a04fdfde31ee8b13eadd0f
+  metadata.gz: 2195cba85da82ef592d6368300eaac3bfe856cec816352c82c0acb07c54488ead3abf9e3963d78c4f658c593714e7819834728fa75f6a4cf6432b131da46bb3b
+  data.tar.gz: 459f5ad1db23e335cb5ec9f15919a84546f66b98abd4fbb286dce0ddb66ae71c034d298507256317ca382f10572d9898c03fcdc2df741add7ad02811606ee3dd

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

@@ -29,7 +29,7 @@ module Builtins
 		def meet_dependencies
 			dependency_handler.dependencies.each do |dependency|
 				# don't even output anything for dependencies that shouldn't be considered on this machine
-				next unless dependency.should_meet?
+				next unless dependency&.should_meet?
 
 				Output.status("[#{dependency.type}] #{dependency.name}")
 

data/lib/dependencies/apt.rb

@@ -9,7 +9,7 @@ module Dependencies
 		end
 
 		def meet
-			execute("#{sudo_string}#{meet_command}")
+			execute("#{sudo_string}apt-get install -y #{name}")
 		end
 
 		def unmeet
@@ -28,9 +28,5 @@ module Dependencies
 
 			"sudo "
 		end
-
-		def meet_command
-			"apt-get install -y #{name}"
-		end
 	end
 end

data/lib/dependencies/sshkey.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'dependency'
+
+module Dependencies
+	class Sshkey < Dependency
+		DEFAULT_KEY_SIZE = 2048
+		DEFAULT_KEY_ALGO = "rsa"
+
+		def met?
+			File.exist?(priv_key_name) && File.exist?(pub_key_name)
+		end
+
+		def meet
+			Secrets.load if Options.get("sshkey.load_secrets")
+
+			FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+
+			execute("ssh-keygen -b #{key_size} -t #{key_algo} -f #{priv_key_name} -q -N '#{passphrase}'")
+		end
+
+		def unmeet
+			true
+		end
+
+		def should_meet?
+			true
+		end
+
+		private
+
+		def dir_name
+			`echo #{File.dirname(name)}`.chomp
+		end
+
+		def priv_key_name
+			`echo #{name}`.chomp
+		end
+
+		def pub_key_name
+			"#{priv_key_name}.pub"
+		end
+
+		def key_size
+			Options.get("sshkey.key_size") || DEFAULT_KEY_SIZE
+		end
+
+		def key_algo
+			Options.get("sshkey.key_algo") || DEFAULT_KEY_ALGO
+		end
+
+		def passphrase
+			`echo #{configured_passphrase}`.chomp
+		end
+
+		def configured_passphrase
+			Options.get("sshkey.passphrase")
+		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] = `echo #{value}`.chomp
+		end
+	end
 end

data/lib/ops.rb

@@ -49,11 +49,11 @@ class Ops
 
 	def run_action
 		environment.set_variables
-		app_config.load
+		AppConfig.load
 
 		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
 
@@ -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.4.1'
+	s.version = '0.8.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.4.1
+  version: 0.8.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -84,6 +84,7 @@ files:
 - lib/dependencies/dir.rb
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
+- lib/dependencies/sshkey.rb
 - lib/dependency.rb
 - lib/environment.rb
 - lib/ops.rb