diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-03-13 19:52:36 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-03-13 19:52:36 -0700 |
| commit | bfb6476f3991369d29e4860c34c449814eccde10 (patch) | |
| tree | ba6f2af7e8b8c4288a44a3cb024fc7e77824b77d | |
| parent | 10f6a0af128ad0f375575da74707d669f5289915 (diff) | |
| download | chef-bfb6476f3991369d29e4860c34c449814eccde10.tar.gz | |
Cleanup a bunch more files and pull in the smaller license-acceptance
With this change we have 25% fewer files than 15.8 and ~24% less space used on disk.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/config/software/more-ruby-cleanup.rb | 31 |
3 files changed, 32 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 21ca405764..9d2446afd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,7 +248,7 @@ GEM regexp_parser (~> 1.5) uri_template (~> 0.7) libyajl2 (1.2.0) - license-acceptance (1.0.13) + license-acceptance (1.0.18) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index ac23f40e7b..fc2a5edad1 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -193,7 +193,7 @@ GEM kitchen-vagrant (1.6.1) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) - license-acceptance (1.0.13) + license-acceptance (1.0.18) pastel (~> 0.7) tomlrb (~> 1.2) tty-box (~> 0.3) diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb index 7fab72fca2..f2176dff68 100644 --- a/omnibus/config/software/more-ruby-cleanup.rb +++ b/omnibus/config/software/more-ruby-cleanup.rb @@ -78,4 +78,33 @@ build do FileUtils.rm_rf(f) end end -end
\ No newline at end of file + + block "Removing Gemspec / Rakefile / Gemfile unless there's a bin dir / not a chef gem" do + # find the embedded ruby gems dir and clean it up for globbing + target_dir = "#{install_dir}/embedded/lib/ruby/gems/*/gems".tr('\\', "/") + files = %w{ + *.gemspec + Gemfile + Rakefile + tasks/*.rake + } + + Dir.glob(Dir.glob("#{target_dir}/*/{#{files.join(",")}}")).each do |f| + # don't delete these files if there's a bin dir in the same dir or we're in a chef owned gem + next if Dir.exist?(File.join(File.dirname(f), "bin")) || File.basename(File.expand_path("..", f)).start_with?("chef-") + + puts "Deleting #{f}" + FileUtils.rm_rf(f) + end + end + + block "Removing spec dirs from non-Chef gems" do + Dir.glob(Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*/spec".tr('\\', "/"))).each do |f| + # if we're in a chef- gem then don't remove the specs + next if File.basename(File.expand_path("..", f)).start_with?("chef-") + + puts "Deleting #{f}" + FileUtils.rm_rf(f) + end + end +end |