ops_team 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57af38c44173187c829e4f07a894dac672b86dd3033564591804b693afa87fc8
-  data.tar.gz: bb9c475b0959e8d81d491406d533307a2276252ae99a2d27bb8bd91d1b65d302
+  metadata.gz: 6ef9ff578bc479b6bbe53bee8143f2a0477393c32518ae15e417ab8338ac5fb4
+  data.tar.gz: 289a6516bda02ad14993a4529358a671a7ea500269ac9710f42a960cc5a3e524
 SHA512:
-  metadata.gz: d0ce89fe185230286256475fc1ada7d0fdf9d4aec5d31e0a6b2b735ea7f38d1d31a02c2dcdb65d99918cf4a47b745eb9953f60b8803b0fb739b38aabf4818984
-  data.tar.gz: a44717efc73eac86671f942322c9ca51e83403236c7897b854a86a32876e5c2e8179b50fb1b3cdb1e47d7c12342d7e4c29c39b0f9ddc9674a9fb7325db26842b
+  metadata.gz: 685a469476c1ccbf25511c8ac1b0eec7cfc1eb3e9056eb8102905c88fbc48266a88dc0aaf3969ee4a6bc16bfc3cd840889d2dd3d4a39e84ce70b3eb43bb5594c
+  data.tar.gz: 87e5e4cb4ed35aac7107cd5614ec7fecaa66fa4fc11ffd077df87cf33daea4d324c2a7df99bac2e63507624762a67a925d132a85b6b1e08e9814ac8715cac3c8

data/bin/ops

@@ -5,7 +5,7 @@ require 'optparse'
 
 
 def usage
-	puts "ops [-f|--file <ops_yml>] action [<action args>"
+	puts "Usage: ops [-f|--file <ops_yml>] action [<action args>"
 	puts "  ops_yml:      the config file to load instead of './ops.yml'"
 	puts "  action_args:  arguments to the action loaded from the config file; depends on the action"
 

data/lib/environment.rb

@@ -13,8 +13,9 @@ class Environment
 		end
 	end
 
-	def initialize(env_hash)
+	def initialize(env_hash, config_path)
 		@env_hash = env_hash
+		@config_path = config_path
 	end
 
 	def set_variables
@@ -26,7 +27,7 @@ class Environment
 	private
 
 	def set_ops_variables
-		ENV["OPS_YML_DIR"] = Dir.pwd
+		ENV["OPS_YML_DIR"] = File.dirname(@config_path)
 		ENV["OPS_VERSION"] = Version.version.to_s
 		ENV["OPS_SECRETS_FILE"] = Secrets.config_path_for(Environment.environment)
 		ENV["OPS_CONFIG_FILE"] = AppConfig.config_path_for(Environment.environment)

data/lib/ops.rb

@@ -97,7 +97,7 @@ class Ops
 	end
 
 	def runner
-		@runner ||= Runner.new(@action_name, @args, config)
+		@runner ||= Runner.new(@action_name, @args, config, config_file_absolute_path)
 	end
 
 	def config
@@ -121,6 +121,10 @@ class Ops
 	def config_file_exists?
 		File.exist?(@config_file)
 	end
+
+	def config_file_absolute_path
+		File.expand_path(@config_file)
+	end
 end
 
 Ops.new(ARGV).run if $PROGRAM_NAME == __FILE__

data/lib/runner.rb

@@ -11,10 +11,11 @@ class Runner
 	class UnknownActionError < StandardError; end
 	class ActionConfigError < StandardError; end
 
-	def initialize(action_name, args, config)
+	def initialize(action_name, args, config, config_path)
 		@action_name = action_name
 		@args = args
 		@config = config
+		@config_path = config_path
 	end
 
 	def run
@@ -89,6 +90,6 @@ class Runner
 	end
 
 	def environment
-		@environment ||= Environment.new(env_vars)
+		@environment ||= Environment.new(env_vars, @config_path)
 	end
 end

data/ops_team.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
 	s.name = 'ops_team'
-	s.version = '1.2.1'
+	s.version = '1.2.2'
 	s.authors = [
 		'nickthecook@gmail.com'
 	]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_team
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - nickthecook@gmail.com