ops_team 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffbfe47eb5ac6fd8b908604cb1409e4b90f5e03761d6f111b53dfd93ecb2d9fe
-  data.tar.gz: ce01d34fcab6f08a8b07a41cf7cfe99d3ed96c6ac9a3353f48ebbb65d2c03694
+  metadata.gz: e2d73684ffca5eb14c1ea36dc8ee868a981ad883889598ffb95514f7a4bfc7d1
+  data.tar.gz: 63ccdc699d7c1fe55eec5d97a704decac9effd325faf7b2dcd1b18c59e644457
 SHA512:
-  metadata.gz: fd14eed08cc7eb9e38e1bc8c995142b197d27ef8789718a0c8daea0af57f45704c5720fed3e15b7a8f6d0a0021d21e098bd02cd234cfde3ba822804a532bbec5
-  data.tar.gz: 27b74a7306b5577f38b1864be03a13fd3eeababf2447a37f317b0a55c5f59c94d648f957f93b010ce981fbb3b161e1889d1b841509d0cd638e7850d143558939
+  metadata.gz: bbcbeb70c8b1d49bb8e7273c0fa32611edb6e977cd3d049c3f51c4ad45855d9680c15bb591b8da7f048c6f7173108b6406df45b01d2014e16298becc8efba95c
+  data.tar.gz: 44a9fc21e22dd6e6c33fa9820a390e9d53b64fbdbe9a6b0e356add07e67d88024cefb9f879467b0cea5c623a4e3e90161362fb802de333531dcc29ae410ac05c

data/bin/print_config

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

data/etc/ops.template.yml

@@ -7,5 +7,7 @@ dependencies:
 actions:
   start:
     command: docker-compose up -d
+    description: starts the service
   stop:
     command: docker-compose down
+    description: stops the service

data/etc/ruby.template.yml

@@ -7,23 +7,31 @@ dependencies:
 actions:
   start:
     command: echo update me
+    description: starts the app
   stop:
     command: echo update me too
+    description: stops the app
   test:
     command: rspec
     alias: t
+    description: runs unit tests
   test-watch:
     command: rerun -x ops test
     alias: tw
+    description: runs unit tests every time a file changes
   lint:
     command: bundle exec rubocop --safe-auto-correct
     alias: l
+    description: runs rubocop with safe autocorrect
   build:
     command: gem build *.gemspec
     alias: b
+    description: builds the gem
   install:
     command: gem install `ls -t *.gem | head -n1`
     alias: i
+    description: installs the gem
   build-and-install:
     command: ops build && ops install
     alias: bi
+    description: builds and installs the gem

data/etc/terraform.template.yml

@@ -9,21 +9,28 @@ actions:
   apply:
     command: terraform apply
     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:
     command: terraform destroy
     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:
     command: terraform plan
     alias: p
+    description: runs 'terraform plan'
   graph:
     command: terraform graph | dot -T pdf -o resource_graph.pdf
     alias: g
+    description: runs 'terraform graph'
   open-graph:
     command: ops graph && open resource_graph.pdf
     alias: og
+    description: opens the terraform graph with the OS 'open' command

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
+		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

@@ -10,11 +10,11 @@ module Builtins
 	class Down < Builtin
 		class << self
 			def description
-				"Stops dependent services listed in ops.yml"
+				"stops dependent services listed in ops.yml"
 			end
 		end
 
-			def run
+		def run
 			# TODO: return a success/failure status to the caller
 			unmeet_dependencies
 		end
@@ -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/env.rb

@@ -7,7 +7,7 @@ module Builtins
 	class Env < Builtin
 		class << self
 			def description
-				"Prints the current environment, e.g. 'dev', 'production', 'staging', etc."
+				"prints the current environment, e.g. 'dev', 'production', 'staging', etc."
 			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/help.rb

@@ -8,7 +8,7 @@ module Builtins
 	class Help < Builtin
 		class << self
 			def description
-				"Displays available builtins and actions"
+				"displays available builtins and actions"
 			end
 		end
 

data/lib/builtins/init.rb

@@ -14,7 +14,7 @@ module Builtins
 
 		class << self
 			def description
-				"Creates an ops.yml file from a template"
+				"creates an ops.yml file from a template"
 			end
 		end
 

data/lib/builtins/up.rb

@@ -11,7 +11,7 @@ module Builtins
 	class Up < Builtin
 		class << self
 			def description
-				"Attempts to meet dependencies listed in ops.yml"
+				"attempts to meet dependencies listed in ops.yml"
 			end
 		end
 
@@ -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/builtins/version.rb

@@ -10,7 +10,7 @@ module Builtins
 
 		class << self
 			def description
-				"Prints the version of ops that is running"
+				"prints the version of ops that is running"
 			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.2'
+	s.version = '0.2.7'
 	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.2
+  version: 0.2.7
 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