Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

app/services/projects/import_export/export_service.rb

@@ -4,12 +4,16 @@ module Projects
 
       def execute(options = {})
         @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work'))
-        save_all if [save_project_tree, bundle_repo, bundle_wiki_repo].all?
-        notify_worker if @shared.errors.any?
+        save_all if [save_version, save_project_tree, bundle_repo, bundle_wiki_repo].all?
+        cleanup_and_notify_worker if @shared.errors.any?
       end
 
       private
 
+      def save_version
+        Gitlab::ImportExport::VersionSaver.save(shared: @shared)
+      end
+
       def save_project_tree
         Gitlab::ImportExport::ProjectTreeSaver.new(project: project, shared: @shared).save
       end
@@ -26,7 +30,8 @@ module Projects
         Gitlab::ImportExport::Saver.save(shared: @shared)
       end
 
-      def notify_worker
+      def cleanup_and_notify_worker
+        FileUtils.rm_rf(@shared.export_path)
         raise Gitlab::ImportExport::Error.new(@shared.errors.join(', '))
       end
     end

lib/gitlab/import_export.rb

@@ -2,6 +2,8 @@ module Gitlab
   module ImportExport
     extend self
 
+    VERSION = '0.1.0'
+
     def export_path(relative_path:)
       File.join(storage_path, relative_path)
     end
@@ -17,5 +19,9 @@ module Gitlab
     def project_bundle_filename
       "project.bundle"
     end
+
+    def version_filename
+      'VERSION'
+    end
   end
 end

lib/gitlab/import_export/import_service.rb

@@ -16,7 +16,7 @@ module Gitlab
       def execute
         Gitlab::ImportExport::Importer.import(archive_file: @archive_file,
                                               shared: @shared)
-        if [restore_project_tree, restore_repo, restore_wiki_repo].all?
+        if [restore_version, restore_project_tree, restore_repo, restore_wiki_repo].all?
           project_tree.project
         else
           project_tree.project.destroy if project_tree.project
@@ -26,6 +26,10 @@ module Gitlab
 
       private
 
+      def restore_version
+        Gitlab::ImportExport::VersionRestorer.restore(shared: @shared)
+      end
+
       def restore_project_tree
         project_tree.restore
       end

lib/gitlab/import_export/version_restorer.rb

@@ -0,0 +1,37 @@
+module Gitlab
+  module ImportExport
+    class VersionRestorer
+
+      def self.restore(*args)
+        new(*args).restore
+      end
+
+      def initialize(shared:)
+        @shared = shared
+      end
+
+      def restore
+        version = File.open(version_file, &:readline)
+        verify_version!(version)
+      rescue => e
+        @shared.error(e)
+        false
+      end
+
+      private
+
+      def version_file
+        File.join(@shared.export_path, Gitlab::ImportExport.version_filename)
+      end
+
+      def verify_version!(version)
+        if Gem::Version.new(version) > Gem::Version.new(Gitlab::ImportExport.VERSION)
+          raise Gitlab::ImportExport::Error("Import version mismatch: Required <= #{Gitlab::ImportExport.VERSION} but was #{version}")
+        else
+          true
+        end
+      end
+    end
+  end
+end
+

lib/gitlab/import_export/version_saver.rb

@@ -0,0 +1,29 @@
+module Gitlab
+  module ImportExport
+    class VersionSaver
+
+      def self.save(*args)
+        new(*args).save
+      end
+
+      def initialize(shared:)
+        @shared = shared
+      end
+
+      def save
+        File.open(version_file, 'w') do |file|
+          file.write(Gitlab::ImportExport.VERSION)
+        end
+      rescue => e
+        @shared.error(e)
+        false
+      end
+
+      private
+
+      def version_file
+        File.join(@shared.export_path, Gitlab::ImportExport.version_filename)
+      end
+    end
+  end
+end