Merge branch 'development' release v0.5.1

Author: samrocketman

.gitignore

@@ -1,3 +1,4 @@
 config.sh
 *.pyc
 *.swp
+cron.log

CHANGELOG.md

@@ -1,3 +1,10 @@
+## gitlab-mirrors v0.5.1
+
+* Certified compatibility with GitLab 7.6.2.
+* Documentation updates.
+* Add logging to gitlab-mirrors.
+
+---
 ## gitlab-mirrors v0.5.0
 
 * Support pushing to GitLab via HTTP instead of SSH.

CONTRIBUTING.md

@@ -0,0 +1,21 @@
+# Contributing
+
+I enjoy contributions and encourage them!  You should add your code to my
+project and make your mark.  [Pick off an issue][issues] or implement a feature
+filling your need.  I only make a few simple requests in order to contribute.
+
+* Test your own work before submitting a pull request.  Most of this project is
+  bash code so we do not have the luxury of a test driven framework to assist
+  our development.  Needless to say I will be sure to test it myself before it
+  ever makes it into a production release.
+* Create a feature branch with a name that does not exist in any of my branches
+  (e.g. `feature/myfeature` or `feature-cool_feature`).  This is where you
+  should do your development.  This will allow you to integrate my development
+  with your own and ease integrating updated code if we're both concurrently
+  developing.
+* When your feature is ready make a pull request to the *development* branch.
+  Pull requests to the master branch will not be accepted.  The master branch is
+  intended to drive production systems and only stable production-ready commits
+  will be made to it.
+
+Happy hacking!

README.md

@@ -7,7 +7,9 @@ repositories.  gitlab-mirrors creates read only copies of remote repositories in
 gitlab.  It provides a CLI management interface for managing the mirrored
 repositories (e.g. add, delete, update) so that an admin may regularly update
 all mirrors using `crontab`.  It operates by interacting with the
-[GitLab API][gitlab-api] using [python-gitlab3][python-gitlab3].
+[GitLab API][gitlab-api] using [python-gitlab3][python-gitlab3].  Also, check
+out this cool [puppet module][puppet] for installing and configuring
+gitlab-mirrors.
 
 
 ## Features
@@ -63,30 +65,6 @@ freenode.net and direct your questions to user `sag47`.
   be instant but in most channels people are in different time zones.  At times
   chat replies can be in excess of 24hrs.
 
-
----
-# Contributing
-
-I enjoy contributions and encourage them!  You should add your code to my
-project and make your mark.  [Pick off an issue][issues] or implement a feature
-filling your need.  I only make a few simple requests in order to contribute.
-
-* Test your own work before submitting a pull request.  Most of this project is
-  bash code so we do not have the luxury of a test driven framework to assist
-  our development.  Needless to say I will be sure to test it myself before it
-  ever makes it into a production release.
-* Create a feature branch with a name that does not exist in any of my branches
-  (e.g. `feature/myfeature` or `feature-cool_feature`).  This is where you
-  should do your development.  This will allow you to integrate my development
-  with your own and ease integrating updated code if we're both concurrently
-  developing.
-* When your feature is ready make a pull request to the *development* branch.
-  Pull requests to the master branch will not be accepted.  The master branch is
-  intended to drive production systems and only stable production-ready commits
-  will be made to it.
-
-Happy hacking!
-
 ---
 # License
 
@@ -95,11 +73,14 @@ Created by Sam Gleske under [MIT License](LICENSE).
 ## Contributors
 
 * Docs #1 [lmakarov](https://github.com/lmakarov)
-* Bzr support #6 [Agustín Cruz Lozano](https://github.com/agb80) (atin81@gmail.com)
+* Bzr support #6 [Agustín Cruz Lozano](https://github.com/agb80)
 * SVN update tags #13 [Nikolaus Krismer](https://github.com/nikolauskrismer)
 * Docs #26 [Glen Mailer](https://github.com/glenjamin)
+* Docs #54  [Martijn Vermaat](https://github.com/martijnvermaat)
+* Better logging #57 [Loic Dachary](https://github.com/dachary)
 
-[mirror-missing]: http://feedback.gitlab.com/forums/176466-general/suggestions/4286666-mirror-git-svn-into-repo-
 [gitlab-api]: http://api.gitlab.org/
-[python-gitlab3]: https://github.com/alexvh/python-gitlab3
 [issues]: https://github.com/samrocketman/gitlab-mirrors/issues
+[mirror-missing]: http://feedback.gitlab.com/forums/176466-general/suggestions/4286666-mirror-git-svn-into-repo-
+[puppet]: https://github.com/logicminds/gitlab_mirrors
+[python-gitlab3]: https://github.com/alexvh/python-gitlab3

docs/installation.md

@@ -60,7 +60,7 @@ mirrored within the same repository folder.
 
 Clone the gitlab-mirrors repository and set values in config.sh.
 
-    su - gitmirrors
+    su - gitmirror
     mkdir repositories
     touch private_token
     git clone https://github.com/samrocketman/gitlab-mirrors.git

docs/prerequisites.md

@@ -2,25 +2,25 @@
 
 ### Required software
 
-* [GitLab 6.x][1]
-* [pyapi-gitlab3 @ v0.5.4][2]
-* [GNU coreutils][3]
-* [git 1.6.5][4] or later (git 1.6.5 introduced transport helpers)
+* [GitLab 6.x/7.x][gitlab]
+* [pyapi-gitlab3 @ v0.5.4][python-gitlab3]
+* [GNU coreutils][coreutils]
+* [git 1.6.5][git] or later (git 1.6.5 introduced transport helpers)
 
 If you plan on mirroring SVN repositories as well then you'll need the
 following additional options.
 
-* [git-svn][7]
+* [git-svn][git-svn]
 
 If you plan on mirroring BZR repositories then you'll need the following
 aditional options.
 
-* [git-bzr-helper][8]
+* [git-bzr-helper][git-bzr]
 
 If you plan on mirroring Mercurial repositories then you'll need the following
 aditional options.
 
-* [git-hg-helper][9]
+* [git-hg-helper][git-hg]
 
 ### Required software install snippets
 
@@ -37,8 +37,8 @@ aditional options.
 
 If you use package management then it will likely be best for you to install git
 via package management for your OS.  You can find the source to git at the
-[git-core project][5].  For instructions on other platforms see the
-[Getting Started - Installing Git section of the git book][6].  The following is
+[git-core project][git-src].  For instructions on other platforms see the
+[Getting Started - Installing Git section of the git book][git-guide].  The following is
 for compiling git 1.8.4 on RHEL 6.4.
 
     yum install perl-ExtUtils-MakeMaker zlib zlib-devel openssh libcurl libcurl-devel expat expat-devel gettext gettext-devel
@@ -55,6 +55,18 @@ for compiling git 1.8.4 on RHEL 6.4.
 Your git should now be located in `/usr/local/bin/git`.  You should edit
 `/etc/profile` and place `/usr/local/bin` at the beginning of your `$PATH`.
 
+#### git-svn
+
+Notice in [`config.sh.SAMPLE`](../config.sh.SAMPLE) the option
+`git_svn_additional_options="-s"`.  This behavior assumes that your SVN project
+is laid out with a standard directory structure: `trunk/`, `branches/`, and
+`tags/`.  If your project does not conform to this layout then you should modify
+that option by removing `-s`.  That means setting
+`git_svn_additional_options=""`.   See the [`git-svn(1)`][git-svn] man page to
+learn more about what `-s` does.  The additional options will pass in parameters
+to the `git svn` command.  If a project to be mirrored has a custom layout then
+this option can be modified to account for that.
+
 #### git-bzr-helper
 
     sudo -i -u gitmirror
@@ -73,12 +85,12 @@ Your git should now be located in `/usr/local/bin/git`.  You should edit
 ---
 Next up is [Installation and Setup](installation.md).
 
-[1]: https://github.com/gitlabhq/gitlabhq/tree/6-2-stable
-[2]: https://github.com/alexvh/python-gitlab3
-[3]: http://www.gnu.org/software/coreutils/
-[4]: http://git-scm.com/
-[5]: http://code.google.com/p/git-core/
-[6]: http://git-scm.com/book/en/Getting-Started-Installing-Git
-[7]: https://www.kernel.org/pub/software/scm/git/docs/git-svn.html
-[8]: https://github.com/felipec/git/wiki/git-remote-bzr
-[9]: https://github.com/felipec/git/wiki/git-remote-hg
+[coreutils]: http://www.gnu.org/software/coreutils/
+[git-bzr]: https://github.com/felipec/git/wiki/git-remote-bzr
+[git-guide]: http://git-scm.com/book/en/Getting-Started-Installing-Git
+[git-hg]: https://github.com/felipec/git/wiki/git-remote-hg
+[git]: http://git-scm.com/
+[gitlab]: https://about.gitlab.com/
+[git-src]: http://code.google.com/p/git-core/
+[git-svn]: https://www.kernel.org/pub/software/scm/git/docs/git-svn.html
+[python-gitlab3]: https://github.com/alexvh/python-gitlab3

git-mirrors.sh

@@ -18,8 +18,8 @@ cd "${git_mirrors_dir}"
 STATUS=0
 
 ls -1 "${repo_dir}/${gitlab_namespace}" | while read mirror;do
-  if ! ./update_mirror.sh "${mirror}" &> /dev/null;then
-    red_echo "Error: ./update_mirror.sh ${mirror}" 1>&2
+  if ! ./update_mirror.sh "${mirror}" >> ${git_mirrors_dir}/cron.log 2>&1 ;then
+    red_echo "Error: ./update_mirror.sh ${mirror} (more information in ${git_mirrors_dir}/cron.log)" 1>&2
     STATUS=1
   fi
 done

lib/VERSION

@@ -1 +1 @@
-VERSION="v0.5.0"
+VERSION="v0.5.1"