Merge branch 'master' into relative_links_in_documentation

app/observers/project_observer.rb

@@ -14,6 +14,11 @@ class ProjectObserver < BaseObserver
 
       log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
     end
+
+    if project.wiki_enabled?
+      # force the creation of a wiki,
+      GollumWiki.new(project, project.owner).wiki
+    end
   end
 
   def after_update(project)

doc/api/repositories.md

@@ -356,3 +356,16 @@ Parameters:
 + `id` (required) - The ID of a project
 + `sha` (required) - The commit or branch name
 + `filepath` (required) - The path the file
+
+
+## Get file archive
+
+Get a an archive of the repository
+
+```
+GET /projects/:id/repository/archive
+```
+
+Parameters:
++ `id` (required) - The ID of a project
++ `sha` (optional) - The commit sha to download defaults to the tip of the default branch
\ No newline at end of file

lib/api/repositories.rb

@@ -144,7 +144,7 @@ module API
         trees = []
 
         %w(trees blobs submodules).each do |type|
-          trees += tree.send(type).map { |t| { name: t.name, type: type.singularize, mode: t.mode, id: t.id } }
+          trees += tree.send(type).map { |t| {name: t.name, type: type.singularize, mode: t.mode, id: t.id} }
         end
 
         trees
@@ -176,6 +176,34 @@ module API
         content_type blob.mime_type
         present blob.data
       end
+
+      # Get a an archive of the repository
+      #
+      # Parameters:
+      #   id (required) - The ID of a project
+      #   sha (optional) - the commit sha to download defaults to the tip of the default branch
+      # Example Request:
+      #   GET /projects/:id/repository/archive
+      get ":id/repository/archive" do
+        authorize! :download_code, user_project
+        repo = user_project.repository
+        ref = params[:sha]
+        storage_path = Rails.root.join("tmp", "repositories")
+
+        file_path = repo.archive_repo(ref, storage_path)
+        if file_path && File.exists?(file_path)
+          data = File.open(file_path, 'rb').read
+
+          header "Content-Disposition:", " infile; filename=\"#{File.basename(file_path)}\""
+          content_type 'application/x-gzip'
+
+          env['api.format'] = :binary
+
+          present data
+        else
+          not_found!
+        end
+      end
     end
   end
 end

spec/observers/users_project_observer_spec.rb

@@ -65,4 +65,30 @@ describe UsersProjectObserver do
       @users_project.destroy
     end
   end
-end
+
+  describe "#after_create" do
+    context 'wiki_enabled creates repository directory' do
+      context 'wiki_enabled true creates wiki repository directory' do
+        before do
+          @project = create(:project, wiki_enabled: true)
+          @path = GollumWiki.new(@project, user).send(:path_to_repo)
+        end
+
+        after do
+          FileUtils.rm_rf(@path)
+        end
+
+        it { File.exists?(@path).should be_true }
+      end
+
+      context 'wiki_enabled false does not create wiki repository directory' do
+        before do
+          @project = create(:project, wiki_enabled: false)
+          @path = GollumWiki.new(@project, user).send(:path_to_repo)
+        end
+
+        it { File.exists?(@path).should be_false }
+      end
+    end
+  end
+end
\ No newline at end of file

spec/requests/api/repositories_spec.rb

@@ -225,4 +225,16 @@ describe API::API do
     end
   end
 
+  describe "GET /projects/:id/repository/archive/:sha" do
+    it "should get the archive" do
+      get api("/projects/#{project.id}/repository/archive", user)
+      response.status.should == 200
+      response.content_type.should == 'application/x-gzip'
+    end
+
+    it "should return 404 for invalid sha" do
+      get api("/projects/#{project.id}/repository/archive/?sha=xxx", user)
+      response.status.should == 404
+    end
+  end
 end