ops_team 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825a1361283396d68558e9584c6a3b550bbd44965c38829890c0ba2610eb7c55
-  data.tar.gz: b553774400887ee8e22882aa9cccff57e4f5168cb0eccecbe7ad5673ff09c6a6
+  metadata.gz: ff1832331084939d3f2b4d0b58fa2e50715051bdff1c82e984dfb289aee64a15
+  data.tar.gz: e2ecb1f387ce50d5c81500c29f0c67e727d105c66007dc090f67400c1617a4a5
 SHA512:
-  metadata.gz: 0665d5cfbb51391ec40775e219c60c2fc01548bc803c19f048dba5352d3f1c327f2bc150658dbcedbfa35f6e28d8dd3b9108935b460905f2a5cdcc3b1a6570f7
-  data.tar.gz: 0aa5809debd1fa918e9f5b223d37fd2bfe38d7d7abb50e81cbc176e5490bcb5d8a1323c1a536837d90902e753edad2b9770063cf41f92a1e41edba72e7de7ffe
+  metadata.gz: cac44a0b4576375fac4210493292537c84b7ef0be6d3c38a16cf17f854058026184f0e96d3a61d4d6a54c226db4b90256844980f5d746120b5e0c3530610c0c0
+  data.tar.gz: b9d1c6be114864c3890b9a391f0f82f481c1bd556349500e8787fbfe960c30604ce04d8f5f5d94f5445c0912cf941798b414343e3f6a55d56c13ff14c0df8488

data/etc/terraform.template.yml

@@ -11,7 +11,7 @@ actions:
     alias: a
     description: runs 'terraform apply'
   apply-auto-approve:
-    command: terraform apply --auto-approve
+    command: ops apply --auto-approve
     alias: aa
     description: runs 'terraform apply' with auto-approve
   destroy:
@@ -19,7 +19,7 @@ actions:
     alias: d
     description: runs 'terraform destroy'
   destroy-auto-approve:
-    command: terraform destroy --auto-approve
+    command: ops destroy --auto-approve
     alias: dd
     description: runs 'terraform destroy' with auto-approve
   plan:

data/lib/app_config.rb

@@ -7,7 +7,7 @@ class AppConfig
 
 	def load
 		config['environment']&.each do |key, value|
-			ENV[key] = value
+			ENV[key] = value.to_s
 		end
 	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/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}...")
+		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

@@ -4,7 +4,7 @@ require 'json'
 
 require 'output'
 require 'app_config'
-require 'Options'
+require 'options'
 
 class Secrets < AppConfig
 	class << self

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.2.5'
+	s.version = '0.3.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.5
+  version: 0.3.0
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -84,7 +84,6 @@ files:
 - lib/dependencies/dir.rb
 - lib/dependencies/docker.rb
 - lib/dependencies/gem.rb
-- lib/dependencies/terraform.rb
 - lib/dependency.rb
 - lib/environment.rb
 - lib/ops.rb

data/lib/dependencies/terraform.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'dependency'
-
-module Dependencies
-	class Terraform < Dependency
-		def met?
-			false
-		end
-
-		def always_act?
-			true
-		end
-
-		def meet
-			execute("cd #{name} && terraform init && terraform apply -input=false --auto-approve")
-		end
-
-		def unmeet
-			execute("cd #{name} && terraform destroy -input=false --auto-approve")
-		end
-	end
-end