Move package_setup_files to general lib to minimize code duplication

lib/vagrant/action/general/package_setup_files.rb

@@ -0,0 +1,51 @@
+module Vagrant
+  module Action
+    module General
+      class PackageSetupFiles
+        def initialize(app, env)
+          @app = app
+
+          env["package.include"] ||= []
+          env["package.vagrantfile"] ||= nil
+        end
+
+        def call(env)
+          files = {}
+          env["package.include"].each do |file|
+            source = Pathname.new(file)
+            dest   = nil
+
+            # If the source is relative then we add the file as-is to the include
+            # directory. Otherwise, we copy only the file into the root of the
+            # include directory. Kind of strange, but seems to match what people
+            # expect based on history.
+            if source.relative?
+              dest = source
+            else
+              dest = source.basename
+            end
+
+            # Assign the mapping
+            files[file] = dest
+          end
+
+          if env["package.vagrantfile"]
+            # Vagrantfiles are treated special and mapped to a specific file
+            files[env["package.vagrantfile"]] = "_Vagrantfile"
+          end
+
+          # Verify the mapping
+          files.each do |from, _|
+            raise Vagrant::Errors::PackageIncludeMissing,
+                  file: from if !File.exist?(from)
+          end
+
+          # Save the mapping
+          env["package.files"] = files
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

plugins/providers/hyperv/action/package_setup_files.rb

@@ -1,49 +1,14 @@
+require_relative "../../../../lib/vagrant/action/general/package_setup_files"
+
 module VagrantPlugins
   module HyperV
     module Action
-      class PackageSetupFiles
+      class PackageSetupFiles < Vagrant::Action::General::PackageSetupFiles
-        def initialize(app, env)
+        # Doing this so that we can test that the parent is properly
-          @app = app
+        # called in the unit tests.
-
+        alias_method :general_call, :call
-          env["package.include"] ||= []
-          env["package.vagrantfile"] ||= nil
-        end
-
         def call(env)
-          files = {}
+          general_call(env)
-          env["package.include"].each do |file|
-            source = Pathname.new(file)
-            dest   = nil
-
-            # If the source is relative then we add the file as-is to the include
-            # directory. Otherwise, we copy only the file into the root of the
-            # include directory. Kind of strange, but seems to match what people
-            # expect based on history.
-            if source.relative?
-              dest = source
-            else
-              dest = source.basename
-            end
-
-            # Assign the mapping
-            files[file] = dest
-          end
-
-          if env["package.vagrantfile"]
-            # Vagrantfiles are treated special and mapped to a specific file
-            files[env["package.vagrantfile"]] = "_Vagrantfile"
-          end
-
-          # Verify the mapping
-          files.each do |from, _|
-            raise Vagrant::Errors::PackageIncludeMissing,
-              file: from if !File.exist?(from)
-          end
-
-          # Save the mapping
-          env["package.files"] = files
-
-          @app.call(env)
         end
       end
     end

plugins/providers/virtualbox/action/package_setup_files.rb

@@ -1,49 +1,14 @@
+require_relative "../../../../lib/vagrant/action/general/package_setup_files"
+
 module VagrantPlugins
   module ProviderVirtualBox
     module Action
-      class PackageSetupFiles
+      class PackageSetupFiles < Vagrant::Action::General::PackageSetupFiles
-        def initialize(app, env)
+        # Doing this so that we can test that the parent is properly
-          @app = app
+        # called in the unit tests.
-
+        alias_method :general_call, :call
-          env["package.include"] ||= []
-          env["package.vagrantfile"] ||= nil
-        end
-
         def call(env)
-          files = {}
+          general_call(env)
-          env["package.include"].each do |file|
-            source = Pathname.new(file)
-            dest   = nil
-
-            # If the source is relative then we add the file as-is to the include
-            # directory. Otherwise, we copy only the file into the root of the
-            # include directory. Kind of strange, but seems to match what people
-            # expect based on history.
-            if source.relative?
-              dest = source
-            else
-              dest = source.basename
-            end
-
-            # Assign the mapping
-            files[file] = dest
-          end
-
-          if env["package.vagrantfile"]
-            # Vagrantfiles are treated special and mapped to a specific file
-            files[env["package.vagrantfile"]] = "_Vagrantfile"
-          end
-
-          # Verify the mapping
-          files.each do |from, _|
-            raise Vagrant::Errors::PackageIncludeMissing,
-              file: from if !File.exist?(from)
-          end
-
-          # Save the mapping
-          env["package.files"] = files
-
-          @app.call(env)
         end
       end
     end