Avoid removing files not ended in .rb

jruby · May 16, 2019 · 90b21e3 · 90b21e3
1 parent 4b1d45a
commit 90b21e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/warbler/task.rb b/lib/warbler/task.rb
@@ -108,6 +108,9 @@ def define_compiled_task
       task "compiled" do
         jar.compile(config)
         task @name do
+          extensions = config.compiled_ruby_files&.map { |f| File.extname(f) }&.uniq || ['.rb']
+          regex_extensions = extensions.map { |extension| extension.sub('.', '\.') }.join('|')
+          rm_f config.compiled_ruby_files.map {|f| f.sub(/#{regex_extensions}$/, '.class') }
           rm_f config.compiled_ruby_files.map {|f| f.sub(/\.rb$/, '.class') }
         end
       end

diff --git a/spec/warbler/task_spec.rb b/spec/warbler/task_spec.rb
@@ -18,6 +18,8 @@
       config.gems = ["rake"]
       config.webserver = "test"
       config.webxml.jruby.max.runtimes = 5
+
+      config.compiled_ruby_files = FileList['**/*.rb', '**/.rake']
     end
   end
 
@@ -150,6 +152,12 @@ def run_task(t)
     File.exist?('app/helpers/application_helper.class').should be false
   end
 
+  it "should not delete another extensions but .class files after finishing the jar" do
+    config.features << "compiled"
+    silence { run_task "warble" }
+    File.exist?('lib/tasks/utils.rake').should be true
+  end
+
   context "where symlinks are available" do
     begin
       FileUtils.ln_s "README.txt", "r.txt.symlink", :verbose => false