diff --git a/CHANGELOG.md b/CHANGELOG.md index 37870606..730da105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## 2.1.0 + +* Whitelist schemes for longdesc [#221](https://github.com/jch/html-pipeline/pull/221) +* Extract emoji image tag generation to own method [#195](https://github.com/jch/html-pipeline/pull/195) +* Update README.md [#211](https://github.com/jch/html-pipeline/pull/211) +* Add ImageFilter for image url to img tag conversion [#207](https://github.com/jch/html-pipeline/pull/207) + ## 2.0 **New** diff --git a/lib/html/pipeline/version.rb b/lib/html/pipeline/version.rb index 55562255..517bb7ed 100644 --- a/lib/html/pipeline/version.rb +++ b/lib/html/pipeline/version.rb @@ -1,5 +1,5 @@ module HTML class Pipeline - VERSION = "2.0" + VERSION = "2.1.0" end end diff --git a/script/changelog b/script/changelog index 03a639a1..1e1d7eea 100755 --- a/script/changelog +++ b/script/changelog @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/bash # Usage: script/changelog [-r ] [-b ] [-h ] # # repo: base string of GitHub repository url. e.g. "user_or_org/repository". Defaults to git remote url. @@ -8,23 +8,40 @@ # Generate a changelog preview from pull requests merged between `base` and # `head`. # -# https://github.com/jch/release-scripts +# 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 -# parse args -repo='jch/html-pipeline' -base=$(git tag -l | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n 1) -head="HEAD" +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" -echo "# $repo $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 $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)]}) @#{pr[%q(user)][%q(login)]}"' + 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