This reverts commit fac4b91.

Author: clintoncwolfe

lib/omnibus/builder.rb

@@ -373,16 +373,11 @@ def bundle(command, options = {})
     # @param (see #command)
     # @return (see #command)
     #
-    def appbundle(software_name, options = {})
+    def appbundle(software_name, lockdir: nil, gem: nil, without: nil, extra_bin_files: nil , **options)
       build_commands << BuildCommand.new("appbundle `#{software_name}'") do
         bin_dir            = "#{install_dir}/bin"
         appbundler_bin     = embedded_bin("appbundler")
 
-        lockdir = options[:lockdir]
-        gem = options[:gem]
-        without = options[:without]
-        extra_bin_files = options[:extra_bin_files]
-
         lockdir ||=
           begin
             app_software = project.softwares.find do |p|
@@ -540,7 +535,7 @@ def erb(options = {})
     def mkdir(directory, options = {})
       build_commands << BuildCommand.new("mkdir `#{directory}'") do
         Dir.chdir(software.project_dir) do
-          FileUtils.mkdir_p(directory, **options)
+          FileUtils.mkdir_p(directory, options)
         end
       end
     end
@@ -562,7 +557,7 @@ def touch(file, options = {})
           parent = File.dirname(file)
           FileUtils.mkdir_p(parent) unless File.directory?(parent)
 
-          FileUtils.touch(file, **options)
+          FileUtils.touch(file, options)
         end
       end
     end
@@ -583,7 +578,7 @@ def delete(path, options = {})
       build_commands << BuildCommand.new("delete `#{path}'") do
         Dir.chdir(software.project_dir) do
           FileSyncer.glob(path).each do |file|
-            FileUtils.rm_rf(file, **options)
+            FileUtils.rm_rf(file, options)
           end
         end
       end
@@ -634,7 +629,7 @@ def copy(source, destination, options = {})
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.cp_r(file, destination, **options)
+              FileUtils.cp_r(file, destination, options)
             end
           end
         end
@@ -663,7 +658,7 @@ def move(source, destination, options = {})
             log.warn(log_key) { "no matched files for glob #{command}" }
           else
             files.each do |file|
-              FileUtils.mv(file, destination, **options)
+              FileUtils.mv(file, destination, options)
             end
           end
         end
@@ -695,7 +690,7 @@ def link(source, destination, options = {})
               log.warn(log_key) { "no matched files for glob #{command}" }
             else
               files.each do |file|
-                FileUtils.ln_s(file, destination, **options)
+                FileUtils.ln_s(file, destination, options)
               end
             end
           end