Refactor config path logic in to lib

txag1995 · Jan 25, 2015 · 23c307d · 23c307d
1 parent fa7e226
commit 23c307d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -43,6 +43,13 @@ module Pipeline
   module Helpers
     Chef::Recipe.send :include, self
 
+    def path_to_config_for(name)
+      file_cache_path = Chef::Config[:file_cache_path]
+      file_name = "#{name}-config.xml"
+
+      ::File.join file_cache_path, file_name
+    end
+
     def each_chef_org(&block)
       if Chef::Config[:solo]
         Chef::Log.warn 'This recipe uses search;' \

diff --git a/recipes/jobs.rb b/recipes/jobs.rb
@@ -1,6 +1,6 @@
 # set up chef-repo job per chef-repo
 each_chef_repo do |repo|
-  xml = File.join(Chef::Config[:file_cache_path], "#{repo['name']}-config.xml")
+  xml = path_to_config_for repo['name']
 
   template xml do
     source "job-config.xml.erb"
@@ -30,7 +30,7 @@
 
     berksfile.list.reject{|c| c.location == nil}.each do |cookbook|
       Chef::Log.info(cookbook.location.to_s)
-      xml = File.join(Chef::Config[:file_cache_path], "#{cookbook.name}-config.xml")
+      xml = path_to_config_for cookbook.name
 
       template xml do
         source "job-config.xml.erb"