Skip to content

Commit 94e935b

Browse files
committed
(maint) Selectively delete directories during gem_revendor
Previously the gem_revendor would blow away the entire revendor directory however there will be cases where this is not required. This commit, only gems that are being revendored will be deleted.
1 parent 91ef967 commit 94e935b

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

server/Rakefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ task :gem_revendor do
4848
# Clean out the vendor directory first
4949
puts "Clearing the vendor directory..."
5050
vendor_dir = File.join(File.dirname(__FILE__),'vendor')
51-
FileUtils.rm_rf(vendor_dir) if Dir.exists?(vendor_dir)
52-
Dir.mkdir(vendor_dir)
51+
gem_list.each do |vendor|
52+
gem_dir = File.join(vendor_dir,vendor[:directory])
53+
FileUtils.rm_rf(gem_dir) if Dir.exists?(gem_dir)
54+
end
55+
Dir.mkdir(vendor_dir) unless Dir.exists?(vendor_dir)
5356

5457
gem_list.each do |vendor|
5558
puts "Vendoring #{vendor[:directory]}..."
@@ -82,7 +85,7 @@ Gem List
8285
--------
8386
8487
HEREDOC
85-
gem_list.each { |vendor| readme += "* #{vendor[:directory]} (#{vendor[:github_repo]} ref #{vendor[:github_ref]})"}
88+
gem_list.each { |vendor| readme += "* #{vendor[:directory]} (#{vendor[:github_repo]} ref #{vendor[:github_ref]})\n"}
8689
File.open(File.join(vendor_dir,'README.md'), 'wb') { |file| file.write(readme + "\n") }
8790
end
8891

server/vendor/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ Gem List
1212
--------
1313

1414
* puppet-lint (https://github.com/rodjek/puppet-lint.git ref 2.3.5)
15+

0 commit comments

Comments
 (0)