ops_team 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb200091bd81044096f650bc1647958dd129b12b14c309516b7e7ce0324e8889
-  data.tar.gz: 0edf7442cd2106ac2de48b6c14d16510111fa10759fe320aaea1856f366c8703
+  metadata.gz: e5c2fa7f06155a753554402aa2063aec1bf192aa171a6c2e601619ee6f80e148
+  data.tar.gz: ca9c1bcde247a55ad469e423f5bde3a1ba3a85ad51694b519622e6a572304afc
 SHA512:
-  metadata.gz: '0379eecf548037718aebf63b722f9571f21410daafd13a6b9ae893cfe7d3fbd3c0a58c40ea10dd1ac35d52c1de580894a774859755185dd8c32eb130db6d31fc'
-  data.tar.gz: 6e08799eb7cf0c196c88e93ecd68f7d48beedd803291d07b362750c9d738785736e9db49ca3c02d180544efa731f7064d5b5537016db8427b826e8057e4a2210
+  metadata.gz: 7baea51515c766fd4409382b91560dd21948b95470d62fad73a6f23c3b58d92a0a0030d55c95dd7de6dfeb0fed73f6b35f7728419da1ca9962598873440cccf3
+  data.tar.gz: c544f035850f131ff02882cf88196f4fc62ab91dc4142ce292cf10531f685415ad349aeaabd52e26f988932eba9fc02888a820502e7efff6fde8478cecfc1941

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/action.rb

@@ -5,14 +5,13 @@ require 'secrets'
 # represents one action to be performed in the shell
 # can assemble a command line from a command and args
 class Action
-	def initialize(config, args, options)
+	def initialize(config, args)
 		@config = config
 		@args = args
-		@options = options
 	end
 
 	def run
-		load_secrets if load_secrets?
+		Secrets.load if load_secrets?
 
 		Kernel.exec(to_s)
 	end
@@ -38,12 +37,4 @@ class Action
 	def load_secrets?
 		@config["load_secrets"]
 	end
-
-	def load_secrets
-		Secrets.new(secrets_file).load
-	end
-
-	def secrets_file
-		`echo #{@options&.dig("secrets", "path")}`.chomp
-	end
 end

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/exec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'builtin'
+require 'output'
+require 'secrets'
+require 'options'
+
+module Builtins
+	class Exec < Builtin
+		class << self
+			def description
+				"executes the given command in the `ops` environment, i.e. with environment variables set"
+			end
+		end
+
+		def run
+			Secrets.load if Options.get("exec.load_secrets")
+			Kernel.exec(@args.join(" "))
+		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
@@ -71,7 +77,7 @@ class Ops
 
 	def actions
 		config["actions"].transform_values do |config|
-			Action.new(config, @args, action_options)
+			Action.new(config, @args)
 		end
 	end
 
@@ -92,10 +98,6 @@ class Ops
 		end
 	end
 
-	def action_options
-		@action_options ||= @config.dig("options", "actions")
-	end
-
 	def env_vars
 		@config.dig("options", "environment") || {}
 	end
@@ -105,7 +107,7 @@ class Ops
 	end
 
 	def app_config_file
-		`echo #{@options&.dig("config", "path")}`.chomp
+		`echo #{Options.get("config.path")}`.chomp
 	end
 
 	def app_config

data/lib/secrets.rb

@@ -4,8 +4,21 @@ require 'json'
 
 require 'output'
 require 'app_config'
+require 'options'
 
 class Secrets < AppConfig
+	class << self
+		def load
+			Secrets.new(expand_path(Options.get("secrets.path"))).load
+		end
+
+		private
+
+		def expand_path(path)
+			`echo #{path}`.chomp
+		end
+	end
+
 	private
 
 	def default_filename

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.2.4'
+	s.version = '0.2.9'
 	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.4
+  version: 0.2.9
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -70,6 +70,7 @@ files:
 - lib/builtin.rb
 - lib/builtins/down.rb
 - lib/builtins/env.rb
+- lib/builtins/exec.rb
 - lib/builtins/help.rb
 - lib/builtins/helpers/dependency_handler.rb
 - lib/builtins/init.rb
@@ -83,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