ops_team 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df06362d31ad96870848712991804c147d63f780395587ea7237eacabfbb683
-  data.tar.gz: d125dfaa4423fa07eae13672f5c045f064b084f2c7c05db3e76ab5088b92f410
+  metadata.gz: 2ed40f82a2c6312381a243ea6ccbfc12ba46f1742af6a8935a2c59d7fcb783f9
+  data.tar.gz: 65ec586f9adb40be64e31f5d581845efc8cc303548b4eea8b7d4b5f6620ae8f1
 SHA512:
-  metadata.gz: 8e7f27173645a685d1146c9a8e73565c9cee017e0bdeb834db0258f17b4e9d655d2f19949b386f4b401818ef37d45e4c3552c31b19571c580de0f6c60b3d4638
-  data.tar.gz: 6f5e9398f184381b503cf579b7e8468db32a5ce9707b6f6818b9f55b6fba94054a96fbfa6d99fc7b0bce0159f63fbf92f53506712fafebe925622753b143eae1
+  metadata.gz: 333c1446f7b2d59f33dda51e29f918d8fe2d54d79f60310d952bbf538dad5ae93c0aa8503fe5af1ed4ba964b336514d21a6d7b6e13948539710bccb259fe2a36
+  data.tar.gz: dac43c177bb4681f3a66a418175c52bd93af2974793400b8db018385fe7abf5743ad89d1ba0398d0ed3cde39b9d68b56dc1919e664621a2366c77e479ef9e100

data/bin/print_config

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo $KEY1
+echo $KEY2

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 -n #{@options&.dig("secrets", "path")}`
-	end
 end

data/lib/app_config.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class AppConfig
+	def initialize(filename = "")
+		@filename = filename.empty? ? default_filename : filename
+	end
+
+	def load
+		config['environment']&.each do |key, value|
+			ENV[key] = value.to_s
+		end
+	end
+
+	private
+
+	def default_filename
+		"config/#{environment}/config.json"
+	end
+
+	def config
+		@config ||= file_contents ? JSON.parse(file_contents) : {}
+	rescue JSON::ParserError => e
+		Output.error("Error parsing config data: #{e}")
+		{}
+	end
+
+	def file_contents
+		@file_contents ||= begin
+			File.open(@filename).read
+		rescue Errno::ENOENT
+			nil
+		end
+	end
+
+	def environment
+		ENV['environment']
+	end
+end

data/lib/builtins/down.rb

@@ -45,7 +45,7 @@ module Builtins
 			else
 				Output.failed
 				Output.error("Error unmeeting #{dependency.type} dependency '#{dependency.name}':")
-				puts(dependency.output)
+				Output.out(dependency.output)
 			end
 		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/builtins/up.rb

@@ -46,7 +46,7 @@ module Builtins
 			else
 				Output.failed
 				Output.error("Error meeting #{dependency.type} dependency '#{dependency.name}':")
-				puts(dependency.output)
+				Output.out(dependency.output)
 			end
 		end
 	end

data/lib/ops.rb

@@ -29,6 +29,7 @@ class Ops
 		exit(INVALID_SYNTAX_EXIT_CODE) unless syntax_valid?
 
 		environment.set_variables
+		app_config.load
 
 		return builtin.run if builtin
 
@@ -70,7 +71,7 @@ class Ops
 
 	def actions
 		config["actions"].transform_values do |config|
-			Action.new(config, @args, action_options)
+			Action.new(config, @args)
 		end
 	end
 
@@ -91,10 +92,6 @@ class Ops
 		end
 	end
 
-	def action_options
-		@action_options ||= @config.dig("options", "actions")
-	end
-
 	def env_vars
 		@config.dig("options", "environment") || {}
 	end
@@ -102,6 +99,14 @@ class Ops
 	def environment
 		@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)
+	end
 end
 
 Ops.new(ARGV).run if $PROGRAM_NAME == __FILE__

data/lib/secrets.rb

@@ -3,15 +3,19 @@
 require 'json'
 
 require 'output'
+require 'app_config'
+require 'options'
 
-class Secrets
-	def initialize(filename = "")
-		@filename = filename.empty? ? default_filename : filename
-	end
+class Secrets < AppConfig
+	class << self
+		def load
+			Secrets.new(expand_path(Options.get("secrets.path"))).load
+		end
 
-	def load
-		secrets['environment']&.each do |key, value|
-			ENV[key] = value
+		private
+
+		def expand_path(path)
+			`echo #{path}`.chomp
 		end
 	end
 
@@ -31,18 +35,7 @@ class Secrets
 		"config/#{environment}/secrets.json"
 	end
 
-	def secrets
-		@secrets ||= JSON.parse(file_contents)
-	rescue JSON::ParserError => e
-		Output.error("Error parsing secrets data: #{e}")
-		{}
-	end
-
 	def file_contents
-		@filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : File.open(@filename).read
-	end
-
-	def environment
-		ENV['environment']
+		@file_contents ||= @filename.match(/\.ejson$/) ? `ejson decrypt #{@filename}` : super
 	end
 end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '0.2.3'
+	s.version = '0.2.8'
 	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.3
+  version: 0.2.8
 platform: ruby
 authors:
 - nickthecook@gmail.com
@@ -59,15 +59,18 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - bin/ops
+- bin/print_config
 - bin/print_secrets
 - bin/tag
 - etc/ops.template.yml
 - etc/ruby.template.yml
 - etc/terraform.template.yml
 - lib/action.rb
+- lib/app_config.rb
 - 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
@@ -81,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