ops_team 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb200091bd81044096f650bc1647958dd129b12b14c309516b7e7ce0324e8889
-  data.tar.gz: 0edf7442cd2106ac2de48b6c14d16510111fa10759fe320aaea1856f366c8703
+  metadata.gz: 825a1361283396d68558e9584c6a3b550bbd44965c38829890c0ba2610eb7c55
+  data.tar.gz: b553774400887ee8e22882aa9cccff57e4f5168cb0eccecbe7ad5673ff09c6a6
 SHA512:
-  metadata.gz: '0379eecf548037718aebf63b722f9571f21410daafd13a6b9ae893cfe7d3fbd3c0a58c40ea10dd1ac35d52c1de580894a774859755185dd8c32eb130db6d31fc'
-  data.tar.gz: 6e08799eb7cf0c196c88e93ecd68f7d48beedd803291d07b362750c9d738785736e9db49ca3c02d180544efa731f7064d5b5537016db8427b826e8057e4a2210
+  metadata.gz: 0665d5cfbb51391ec40775e219c60c2fc01548bc803c19f048dba5352d3f1c327f2bc150658dbcedbfa35f6e28d8dd3b9108935b460905f2a5cdcc3b1a6570f7
+  data.tar.gz: 0aa5809debd1fa918e9f5b223d37fd2bfe38d7d7abb50e81cbc176e5490bcb5d8a1323c1a536837d90902e753edad2b9770063cf41f92a1e41edba72e7de7ffe

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

@@ -71,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
 
@@ -92,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
@@ -105,7 +101,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.5'
 	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.5
 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