Merge pull request #60 from github/release-1.4.0

jch · jch · commit 0bc166f1860f · 2014-11-03T15:58:49.000-08:00
Release 1.4.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# CHANGELOG
+
+## v1.4.0
+
+* Document constructor options [#57](https://github.com/github/github-ldap/pull/57)
+* [CI] Add Vagrant box for running tests against OpenLDAP locally [#55](https://github.com/github/github-ldap/pull/55)
+* Run all tests, including those in subdirectories [#54](https://github.com/github/github-ldap/pull/54)
+* Add ActiveDirectory membership validator [#52](https://github.com/github/github-ldap/pull/52)
+* Merge dev-v2 branch into master [#50](https://github.com/github/github-ldap/pull/50)
+* Pass through search options for GitHub::Ldap::Domain#user? [#51](https://github.com/github/github-ldap/pull/51)
+* Fix membership validation tests [#49](https://github.com/github/github-ldap/pull/49)
+* Add CI build for OpenLDAP integration [#48](https://github.com/github/github-ldap/pull/48)
+* Membership Validators [#45](https://github.com/github/github-ldap/pull/45)
diff --git a/README.md b/README.md
@@ -130,3 +130,15 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Releasing
+
+This section is for gem maintainers to cut a new version of the gem. See
+[jch/release-scripts](https://github.com/jch/release-scripts) for original
+source of release scripts.
+
+* Create a new branch from `master` named `release-x.y.z`, where `x.y.z` is the version to be released
+* Update `github-ldap.gemspec` to x.y.z following [semver](http://semver.org)
+* Run `script/changelog` and paste the draft into `CHANGELOG.md`. Edit as needed
+* Create pull request to solict feedback
+* After merging the pull request, on the master branch, run `script/release`
diff --git a/github-ldap.gemspec b/github-ldap.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "github-ldap"
-  spec.version       = "1.3.6"
+  spec.version       = "1.4.0"
   spec.authors       = ["David Calavera"]
   spec.email         = ["david.calavera@gmail.com"]
   spec.description   = %q{Ldap authentication for humans}
diff --git a/script/changelog b/script/changelog
@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+# Usage: script/changelog [-r <repo>] [-b <base>] [-h <head>]
+#
+#  repo: base string of GitHub repository url. e.g. "user_or_org/repository". Defaults to git remote url.
+#  base: git ref to compare from. e.g. "v1.3.1". Defaults to latest git tag.
+#  head: git ref to compare to. Defaults to "HEAD".
+#
+# Generate a changelog preview from pull requests merged between `base` and
+# `head`.
+#
+set -e
+
+[ $# -eq 0 ] && set -- --help
+
+# parse args
+repo=$(git remote -v | grep push | awk '{print $2}' | cut -d'/' -f4-)
+base=$(git tag -l | sort -n | tail -n 1)
+head="HEAD"
+api_url="https://api.github.com"
+
+echo "# $base..$head"
+echo
+
+# get merged PR's. Better way is to query the API for these, but this is easier
+for pr in $(git log --oneline v1.3.6..HEAD | grep "Merge pull request" | awk '{gsub("#",""); print $5}')
+do
+  # frustrated with trying to pull out the right values, fell back to ruby
+  curl -s "$api_url/repos/$repo/pulls/$pr" | ruby -rjson -e 'pr=JSON.parse(STDIN.read); puts "* #{pr[%q(title)]} [##{pr[%q(number)]}](#{pr[%q(html_url)]})"'
+done
diff --git a/script/package b/script/package
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Usage: script/package
+# Updates the gemspec and builds a new gem in the pkg directory.
+
+mkdir -p pkg
+gem build *.gemspec
+mv *.gem pkg
diff --git a/script/release b/script/release
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Usage: script/release
+# Build the package, tag a commit, push it to origin, and then release the
+# package publicly.
+
+set -e
+
+version="$(script/package | grep Version: | awk '{print $2}')"
+[ -n "$version" ] || exit 1
+
+echo $version
+git commit --allow-empty -a -m "Release $version"
+git tag "v$version"
+git push origin
+git push origin "v$version"
+gem push pkg/*-${version}.gem
