From 076f74e8e3cc21bb14f44c2b3c9786dc956b34a4 Mon Sep 17 00:00:00 2001
From: Mathijs van de Nes <git@mathijs.vd-nes.nl>
Date: Fri, 10 Apr 2015 11:40:22 +0200
Subject: [PATCH] Update to new Doc upload

---
 .travis.yml                   |   8 ++-----
 .travis/id_rsa.enc            | Bin 0 -> 3248 bytes
 .travis/publish_doc.sh        |  28 -----------------------
 .travis/travis-doc-upload.cfg |   4 ++++
 .travis/travis-doc-upload.sh  |  42 ++++++++++++++++++++++++++++++++++
 README.md                     |   2 +-
 6 files changed, 49 insertions(+), 35 deletions(-)
 create mode 100644 .travis/id_rsa.enc
 delete mode 100755 .travis/publish_doc.sh
 create mode 100644 .travis/travis-doc-upload.cfg
 create mode 100755 .travis/travis-doc-upload.sh

diff --git a/.travis.yml b/.travis.yml
index 1368865c..593ea650 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,11 @@ notifications:
         on_success: never
         on_failure: always
 
-env:
-    global:
-        - secure: "VeXvD0tLJyu38t87p8AAztSQVBxsCE1y016l/Nc44203V/RUxj4tz5ifaZcKziPqFHK2ITs2T6fBE1uu404zMVwA0W0J8vmG6+xDoJJLsbwKp4W3SlAI+oIEmFSTIxgzAB7hio17VPDmAqKbnbhbmbP+U94ygoztRNN3ObCZ8yo="
-
 script:
     - cargo build
     - cargo test
-    - cargo doc --no-deps
+    - cargo doc
     - rustdoc --test README.md -L target
 
 after_success:
-    - .travis/publish_doc.sh
+    - .travis/travis-doc-upload.sh
diff --git a/.travis/id_rsa.enc b/.travis/id_rsa.enc
new file mode 100644
index 0000000000000000000000000000000000000000..5431e4137fbbbef8f25bb46e7985a0c84780245a
GIT binary patch
literal 3248
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

literal 0
HcmV?d00001

diff --git a/.travis/publish_doc.sh b/.travis/publish_doc.sh
deleted file mode 100755
index 541abed5..00000000
--- a/.travis/publish_doc.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-if  [ "$TRAVIS_BRANCH" = "master" ] &&
-    [ "$TRAVIS_PULL_REQUEST" = "false" ] &&
-    [ "$TRAVIS_REPO_SLUG" = "mvdnes/zip-rs" ] &&
-    [ "$TRAVIS_RUST_VERSION" = "1.0.0-beta" ]
-then
-    echo "Publishing documentation..."
-
-    cd $HOME
-    git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/mvdnes/zip-rs gh-pages > /dev/null
-
-    cd gh-pages
-    git config user.email "travis@travis-ci.org"
-    git config user.name "travis-ci"
-
-    git rm -rf . > /dev/null
-    cp -Rf $TRAVIS_BUILD_DIR/target/doc/* .
-
-    git reset HEAD -- index.html > /dev/null
-    git checkout -- index.html > /dev/null
-
-    git add -f .
-    git commit -m "Auto doc upload from travis"
-    git push -fq origin gh-pages > /dev/null
-
-    echo "Published documentation"
-fi
diff --git a/.travis/travis-doc-upload.cfg b/.travis/travis-doc-upload.cfg
new file mode 100644
index 00000000..4ce80a34
--- /dev/null
+++ b/.travis/travis-doc-upload.cfg
@@ -0,0 +1,4 @@
+PROJECT_NAME=zip-rs
+DOCS_REPO=mvdnes/rust-docs.git
+SSH_KEY_TRAVIS_ID=70a3dd61d838
+DOC_RUST_VERSION=1.0.0-beta
diff --git a/.travis/travis-doc-upload.sh b/.travis/travis-doc-upload.sh
new file mode 100755
index 00000000..12c67ccd
--- /dev/null
+++ b/.travis/travis-doc-upload.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# License: CC0 1.0 Universal
+# https://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+set -e
+
+SCRIPT_PATH=.travis
+
+. $SCRIPT_PATH/travis-doc-upload.cfg
+
+[ "$TRAVIS_BRANCH" = master ]
+
+[ "$TRAVIS_PULL_REQUEST" = false ]
+
+[ "$TRAVIS_RUST_VERSION" = "$DOC_RUST_VERSION" ]
+
+echo "Publishing docs..."
+
+eval key=\$encrypted_${SSH_KEY_TRAVIS_ID}_key
+eval iv=\$encrypted_${SSH_KEY_TRAVIS_ID}_iv
+
+mkdir -p ~/.ssh
+openssl aes-256-cbc -K $key -iv $iv -in $SCRIPT_PATH/id_rsa.enc -out ~/.ssh/id_rsa -d
+chmod 600 ~/.ssh/id_rsa
+
+git clone --branch gh-pages git@github.com:$DOCS_REPO deploy_docs
+
+cd deploy_docs
+git config user.name "doc upload bot"
+git config user.email "nobody@example.com"
+rm -rf $PROJECT_NAME
+mv ../target/doc $PROJECT_NAME
+git add -A $PROJECT_NAME
+git commit -qm "doc upload for $PROJECT_NAME ($TRAVIS_REPO_SLUG)"
+
+for i in {0..5}; do
+    git push -q origin gh-pages && break # redo when push fails
+    git pull -r || break # give up if rebase fails
+done
+
+echo "Doc upload completed"
diff --git a/README.md b/README.md
index 42b73822..bfde9a5f 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ zip-rs
 
 [![Build Status](https://travis-ci.org/mvdnes/zip-rs.svg?branch=master)](https://travis-ci.org/mvdnes/zip-rs)
 
-[Documentation](http://mvdnes.github.io/zip-rs/)
+[Documentation](http://mvdnes.github.io/rust-docs/zip-rs/zip/index.html)
 
 A zip library for rust wich supports reading and writing of simple ZIP files.