pact_broker-client 1.27.11 → 1.27.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554cb53fbdc14d887b07e5ab46b58626e7925c6284f40a0b02562cbcc33a9846
-  data.tar.gz: a9d5183cb1895f59e1f1ea8df2f4a54722faae632ccbb095dd6b1d83d75bf9b0
+  metadata.gz: be99c65fb0f020c24b223d89af4aa585442bb94eef3875b3dab865a2970b69de
+  data.tar.gz: f92a8775213ecd55356415f6463d7b2ebe219573b734423004bb39a28e1828fb
 SHA512:
-  metadata.gz: 5c384c29a6e02f677542a2a77432cf21c8917c1ca02cf5eaa7671db2b890553215d7bc7dbd723a9188a93e0148748fe6e05af356b6dc4990718866e9d227e17c
-  data.tar.gz: dc543e449c4fe6019aae6eca24d86f93801b211e07342b6ebf3216e50c39df8c23f6a48faac77686b1278adc39eff657fb8e9272e5ad1bff72636456bf5372f9
+  metadata.gz: 37c63f70dcb2bd21fa49b6abbcf699035109f2c58ac2c43f84bf62d3e60e2c6065ea167a34ba60b2609640722d0f982f0823531302b435b503e70420118153be
+  data.tar.gz: b0aacabc99ed0c0eb20dc4933485eef0b845e00e6cf503c98e57a635fb168f4dcc01bdbf7a1a4caddb291e304db3a624ebf2a17746353b57fea4eb978c758f70

data/.github/workflows/release_gem.yml

@@ -31,10 +31,11 @@ jobs:
     - name: Release gem
       run: |
         touch ~/.gem/credentials
-        # chmod 0600 ~/.gem/credentials
         script/release-gem.sh
       env:
         GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
+    - name: Prepare Github Release
+      run: script/prepare-github-release.sh
     - name: Create Github Release
       uses: actions/create-release@v1
       env:
@@ -42,3 +43,10 @@ jobs:
       with:
         tag_name: ${{ env.TAG }}
         release_name: ${{ env.TAG }}
+        body_path: tmp/RELEASE_NOTES.md
+    - name: Trigger release of pact-cli Docker image
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
+        repository: pact-foundation/pact-ruby-cli
+        event-type: gem-released

data/.github/workflows/release_gem_2.yml

@@ -0,0 +1,17 @@
+name: Release gem 2
+
+on:
+  repository_dispatch:
+    types:
+      - release-patch-2
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: pact-foundation/release-gem@master
+      env:
+        GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
   - 2.2.4
-  - 2.3.1
   - 2.4.1
 
-before_install:
-  - (git show-ref | grep $(git log --pretty=%h -1) | sed 's|.*/\(.*\)|\1|' | sort -u | grep -v HEAD) || true
-  - (git show -s --pretty=%d HEAD) || true
-  - (git for-each-ref --format='%(objectname) %(refname:short)' refs/heads | awk "/^$(git rev-parse HEAD)/ {print \$2}") || true
-  - (git show -s --pretty=%D HEAD | tr -s ', ' '\n' | grep -v HEAD | head -n1) || true
-  - (git name-rev --name-only HEAD) || true
+# before_install:
+#   - (git show-ref | grep $(git log --pretty=%h -1) | sed 's|.*/\(.*\)|\1|' | sort -u | grep -v HEAD) || true
+#   - (git show -s --pretty=%d HEAD) || true
+#   - (git for-each-ref --format='%(objectname) %(refname:short)' refs/heads | awk "/^$(git rev-parse HEAD)/ {print \$2}") || true
+#   - (git show -s --pretty=%D HEAD | tr -s ', ' '\n' | grep -v HEAD | head -n1) || true
+#   - (git name-rev --name-only HEAD) || true

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="v1.27.20"></a>
+### v1.27.20 (2020-07-12)
+
+
+#### Bug Fixes
+
+* testing release notes	 ([1f38fdd](/../../commit/1f38fdd))
+
+
+<a name="v1.27.14"></a>
+### v1.27.14 (2020-07-11)
+
+
+#### Bug Fixes
+
+* not a real fix, just testing release notes	 ([1fabb8b](/../../commit/1fabb8b))
+
+
+<a name="v1.27.13"></a>
+### v1.27.13 (2020-07-11)
+
 <a name="v1.27.1"></a>
 ### v1.27.1 (2020-07-10)
 

data/Dockerfile

@@ -0,0 +1,15 @@
+FROM ruby:2.6-alpine3.12
+
+RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing hub
+RUN apk add --update --no-cache git openssh bash
+RUN gem update --system
+
+RUN mkdir -p home
+WORKDIR home
+ADD release-image /
+ENV BUNDLE_GEMFILE=/release/Gemfile
+RUN bundle install
+RUN git config --global user.email "beth@bethesque.com"
+RUN git config --global user.name "Beth Skurrie via Github Actions"
+
+ENTRYPOINT [/entrypoint.sh]

data/Rakefile

@@ -1,4 +1,8 @@
 require "bundler/gem_tasks"
+
+# When running the release action, we don't want to load all the 'prod' gems
+# because they're not installed on the release Docker image
+
 require 'rspec/core/rake_task'
 require 'conventional_changelog'
 
@@ -31,4 +35,4 @@ task 'pact:list_provider_states' do
     puts pact_file
     JSON.parse(File.read(pact_file))['interactions'].collect{ | interaction| interaction['providerState'] }
   }.flatten.compact.sort.uniq
-end
+end

data/action.yml

@@ -0,0 +1,6 @@
+# action.yml
+name: 'Release gem'
+description: 'Release gem to rubygems, generate changelog, create release notes'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'

data/appveyor.yml

@@ -16,7 +16,7 @@ before_test:
 test_script:
   - bundle exec rake
 
-notifications:
-  - provider: Slack
-    incoming_webhook:
-      secure: zUujuzaZFqpFndOFkoIMkXMFTniWWi0ZtR58PN63c796EcWHJEyOf+XBi81LPrBBKzQYiY1auI1gkNt+ESnJXLxSzY+Q1bbncwN35hc2J84=
+# notifications:
+#   - provider: Slack
+#     incoming_webhook:
+#       secure: zUujuzaZFqpFndOFkoIMkXMFTniWWi0ZtR58PN63c796EcWHJEyOf+XBi81LPrBBKzQYiY1auI1gkNt+ESnJXLxSzY+Q1bbncwN35hc2J84=

data/lib/pact_broker/client/version.rb

@@ -1,5 +1,5 @@
 module PactBroker
   module Client
-    VERSION = '1.27.11'
+    VERSION = '1.27.20'
   end
 end

data/release-image/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Hello"

data/release-image/release/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'bump', git: 'https://github.com/bethesque/bump.git'
+gem 'conventional-changelog', '~>1.3'
+gem 'rake', '~>13.0'

data/release-image/release/Rakefile

@@ -0,0 +1,5 @@
+require "rake/clean"
+CLOBBER.include "pkg"
+
+require "bundler/gem_helper"
+Bundler::GemHelper.install_tasks(dir: File.absolute_path(".."))

data/release-image/usr/local/bin/prepare-release

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo "::group::Internal logs"
+set -ex
+
+# Because the BUNDLE_GEMFILE is set on the docker image, everything
+# runs in the context of the
+
+increment=${INCREMENT:-patch}
+bundle exec bump ${increment} --no-commit
+bundle exec ruby -e "
+require 'conventional_changelog'
+require 'bump'
+ConventionalChangelog::Generator.new.generate! version: \"v#{Bump::Bump.current}\"
+"
+version_file=$(bundle exec bump file --value-only)
+version=$(bundle exec bump current --value-only)
+git add CHANGELOG.md "${version_file}"
+git commit -m "chore(release): version ${version}"
+
+echo "::endgroup::"

data/release-image/usr/local/bin/release-gem

@@ -0,0 +1,24 @@
+#!/bin/sh
+set -ex
+
+# Set up .netrc file with GitHub credentials
+git_setup() {
+    cat <<-EOF >$HOME/.netrc
+        machine github.com
+        login $GITHUB_ACTOR
+        password $GITHUB_TOKEN
+        machine api.github.com
+        login $GITHUB_ACTOR
+        password $GITHUB_TOKEN
+EOF
+    chmod 600 $HOME/.netrc
+}
+
+git_setup
+
+# Overzealous validation stops rake release from running without a credentials file
+touch ~/.gem/credentials
+mkdir -p tmp
+cp /release/Rakefile tmp/Rakefile
+cd tmp
+bundle exec rake release

data/script/prepare-github-release.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+tag=$(git describe)
+mkdir -p tmp
+git diff CHANGELOG.md | grep "^+" | grep -v "b/CHANGELOG.md" | sed 's/^+//g' > tmp/RELEASE_NOTES.md
+echo "::set-env name=TAG::${tag}"

data/script/prepare-release.sh

@@ -9,5 +9,4 @@ version_file=$(bundle exec bump file --value-only)
 version=$(bundle exec bump current --value-only)
 git add CHANGELOG.md "${version_file}"
 git commit -m "chore(release): version ${version}"
-tag=$(cat CHANGELOG.md  | grep "#" | head -n 1 | cut -d' ' -f2)
-echo "::set-env name=TAG::${tag}"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact_broker-client
 version: !ruby/object:Gem::Version
-  version: 1.27.11
+  version: 1.27.20
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -146,16 +146,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/release_gem.yml"
-- ".github/workflows/trigger_pact_cli_release.yml"
+- ".github/workflows/release_gem_2.yml"
 - ".github/workflows/trigger_pact_docs_update.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - README.md
 - RELEASING.md
 - Rakefile
+- action.yml
 - appveyor.yml
 - bin/pact-broker
 - ci.sh
@@ -216,8 +218,14 @@ files:
 - lib/pact_broker/client/webhooks/test.rb
 - lib/pact_broker_client.rb
 - pact-broker-client.gemspec
+- release-image/entrypoint.sh
+- release-image/release/Gemfile
+- release-image/release/Rakefile
+- release-image/usr/local/bin/prepare-release
+- release-image/usr/local/bin/release-gem
 - script/api_key_test.rb
 - script/generate-cli-usage.sh
+- script/prepare-github-release.sh
 - script/prepare-release.sh
 - script/publish-pact.sh
 - script/release-gem.sh

data/.github/workflows/trigger_pact_cli_release.yml

@@ -1,15 +0,0 @@
-name: Trigger release of the pact-cli Docker image
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
-          repository: pact-foundation/pact-ruby-cli
-          event-type: gem-released