Skip to content

Commit

Permalink
Merge pull request ruby-ldap#219 from ruby-ldap/release-v0.12
Browse files Browse the repository at this point in the history
Release v0.12
  • Loading branch information
jch committed Sep 21, 2015
2 parents 10446bf + 9e35942 commit b2a0ac7
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 4 deletions.
13 changes: 13 additions & 0 deletions History.rdoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
=== Net::LDAP 0.12.0

* Correctly set BerIdentifiedString values to UTF-8 {#212}[https://github.com/ruby-ldap/ruby-net-ldap/pull/212]
* Raise Net::LDAP::ConnectionRefusedError when new connection is refused. {#213}[https://github.com/ruby-ldap/ruby-net-ldap/pull/213]
* obscure auth password upon #inspect, added test, closes #216 {#217}[https://github.com/ruby-ldap/ruby-net-ldap/pull/217]
* Fixing incorrect error class name {#207}[https://github.com/ruby-ldap/ruby-net-ldap/pull/207]
* Travis update {#205}[https://github.com/ruby-ldap/ruby-net-ldap/pull/205]
* Remove obsolete rbx-19mode from Travis {#204}[https://github.com/ruby-ldap/ruby-net-ldap/pull/204]
* mv "sudo" from script/install-openldap to .travis.yml {#199}[https://github.com/ruby-ldap/ruby-net-ldap/pull/199]
* Remove meaningless shebang {#200}[https://github.com/ruby-ldap/ruby-net-ldap/pull/200]
* Fix Travis CI build {#202}[https://github.com/ruby-ldap/ruby-net-ldap/pull/202]
* README.rdoc: fix travis link {#195}[https://github.com/ruby-ldap/ruby-net-ldap/pull/195]

=== Net::LDAP 0.11
* Major enhancements:
* #183 Specific errors subclassing Net::LDAP::Error
Expand Down
7 changes: 4 additions & 3 deletions README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ To run the integration tests against an LDAP server:

This section is for gem maintainers to cut a new version of the gem.

* Check out a new branch `release-VERSION`
* Update lib/net/ldap/version.rb to next version number X.X.X following {semver}(http://semver.org/).
* Update `History.rdoc`. Get latest changes with `git log --oneline vLAST_RELEASE..HEAD | grep Merge`

* On the master branch, run `script/release`
* Update `History.rdoc`. Get latest changes with `script/changelog`
* Open a pull request with these changes for review
* After merging, on the master branch, run `script/release`

:include: Contributors.rdoc

Expand Down
2 changes: 1 addition & 1 deletion lib/net/ldap/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Net
class LDAP
VERSION = "0.11"
VERSION = "0.12.0"
end
end
47 changes: 47 additions & 0 deletions script/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#!/bin/bash
# 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`.
#
# https://github.com/jch/release-scripts/blob/master/changelog
set -e

[ $# -eq 0 ] && set -- --help
while [[ $# > 1 ]]
do
key="$1"
case $key in
-r|--repo)
repo="$2"
shift
;;
-b|--base)
base="$2"
shift
;;
-h|--head)
head="$2"
shift
;;
*)
;;
esac
shift
done

repo="${repo:-$(git remote -v | grep push | awk '{print $2}' | cut -d'/' -f4- | sed 's/\.git//')}"
base="${base:-$(git tag -l | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n 1)}"
head="${head:-HEAD}"
api_url="https://api.github.com"

# get merged PR's. Better way is to query the API for these, but this is easier
for pr in $(git log --oneline $base..$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

0 comments on commit b2a0ac7

Please sign in to comment.