pact-message 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44fac4a872e57e964a935d228261c50773a4f90249bcdd979420b390b057b73
-  data.tar.gz: ea1c430bf254ae94970eaedb568d578cab98d1e68d6ad9e0dcd16322e0775eb1
+  metadata.gz: 78d08c5d0ff1f47c7645c15116d76899e296609e415a2bd7c316aecb2f3ab350
+  data.tar.gz: c306cdc07c7ec261cdb6908d0c5528a934055d71bfd4ca64cddede5d960d698b
 SHA512:
-  metadata.gz: 4c9e77894059e089b6f3239727abe57425b2256d203b2ed6d66a6ee3b94f6ba063b9871198c18ace55dfb74a7d8c1d509f9ee17076df4d89c87657999a26b2fd
-  data.tar.gz: 0230fe4dde29531395c5a8153ecf6e718669c412e0088e4eb957131d5c55a64ea4d7eaffc441816b7a8d9c1fa838ee798ee4148a7857e53736534616bc3ef8d5
+  metadata.gz: e96ced52250984fefe42525d870ef3257bbaf16c6021f6b6426cf49eea83b5d31683e481357ceae672833e58fe930cb7b2cab410d8f0d4f1186bd3013153d443
+  data.tar.gz: 20ef30518e2cf57b1f21e3f2540f4a48858781752318dbe3b2d4dff743830510e83d0335cc59c224a995aacda5860c8a8383bb7c0aa25f60cfde704260ea75da

data/.github/workflows/release_gem.yml

@@ -0,0 +1,58 @@
+name: Release gem
+
+on:
+  repository_dispatch:
+    types:
+      - release-triggered
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: '2.6'
+    - run: |
+        gem install bundler -v 2.1
+        bundle install
+    - name: Test
+      run: bundle exec rake
+
+  release:
+    needs: test
+    runs-on: ubuntu-latest
+    outputs:
+      gem_name: ${{ steps.release.outputs.gem_name }}
+      version: ${{ steps.release.outputs.version }}
+      increment: ${{ steps.release.outputs.increment }}
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: pact-foundation/release-gem@v0.0.11
+      id: release
+      env:
+        GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_API_KEY }}'
+        GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+        INCREMENT: '${{ github.event.client_payload.increment }}'
+
+  notify-gem-released:
+    needs: release
+    strategy:
+      matrix:
+        repository: [pact-foundation/pact-ruby-standalone]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify ${{ matrix.repository }} of gem release
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.GHTOKENFORPACTCLIRELEASE }}
+          repository: ${{ matrix.repository }}
+          event-type: gem-released
+          client-payload: |
+              {
+                "name": "${{ needs.release.outputs.gem_name }}",
+                "version": "${{ needs.release.outputs.version }}",
+                "increment": "${{ needs.release.outputs.increment }}"
+              }

data/.travis.yml

@@ -11,23 +11,23 @@ script:
 - rvm use @global
 - bundle exec rake
 jobs:
-  include:
-  - stage: gem release
-    rvm: 2.2.4
-    script: echo "Deploying to rubygems.org ..."
-    deploy:
-      provider: rubygems
-      api_key:
-        secure: NEA7BYENheSN8qF/6BP52uQjTS5U43MXsyxBeqxbp1JOkJxVSNzQw14xy41aXX0gphT7wEVHinnWS+1slLKXvu4OzGKKzcUsnekYFZoGW7eTyKUx7lh/XtFejQ/Mm4P5t75GBgMoaIi+Pa1rD4fcE7zYGrgCvTwIrOGb/SPIKILj0yT8UXMFod8yDDmxzivSSKYe4rgWYlq8aiidDZr2M5ypBR4WcOptCrkBCF8XxXzhFMY4QtrXLsLFRyCzCrDHmosCfC/bLJQltlJjLXfB5ksgaImWAD7wZ6Q4uC5QqmPShonQiPlLEh53Q5nkEWPIcsV7FVZqzXUjPN3LYHlRv+7D3AvbHmJggSt7fXr8YxbzVUkviBlKqNmc9cqM6CSO++QT3UShNgH5b03YKI8rRjFMWYKn1DrN5F5rFNDoGFcZtQSjFN5g/fEiSYsdkNsIeTp4YFxMkTztAYT8TxgcBvCnfXox6xDaLaPWh13UrUL2VL7O7uDK06xWUCp9Hm3/AXz0wRzya1tK9dCWamE5BOzk2ScOiLOgmpgwNHFVA1U93rkHq7Ixr11wazP3Dcinv0kWcW7hdMcI7VA0DUesxLKw6mkcQpd3NLgSU4mWtpoVFcmdERQUGsNM1d5NjGjBeyVMpC0I9NXM1Wv6cLENSX9b4GR7lkwGG/IHRFNciHk=
-      gem: pact-message
-      on:
-        tags: true
-        repo: pact-foundation/pact-message-ruby
-notifications:
-  webhooks:
-    urls:
-    - https://webhooks.gitter.im/e/6523128341fad111ed79
-    on_success: change
-    on_failure: always
-    on_start: never
+  # include:
+  # - stage: gem release
+  #   rvm: 2.2.4
+  #   script: echo "Deploying to rubygems.org ..."
+  #   deploy:
+  #     provider: rubygems
+  #     api_key:
+  #       secure: NEA7BYENheSN8qF/6BP52uQjTS5U43MXsyxBeqxbp1JOkJxVSNzQw14xy41aXX0gphT7wEVHinnWS+1slLKXvu4OzGKKzcUsnekYFZoGW7eTyKUx7lh/XtFejQ/Mm4P5t75GBgMoaIi+Pa1rD4fcE7zYGrgCvTwIrOGb/SPIKILj0yT8UXMFod8yDDmxzivSSKYe4rgWYlq8aiidDZr2M5ypBR4WcOptCrkBCF8XxXzhFMY4QtrXLsLFRyCzCrDHmosCfC/bLJQltlJjLXfB5ksgaImWAD7wZ6Q4uC5QqmPShonQiPlLEh53Q5nkEWPIcsV7FVZqzXUjPN3LYHlRv+7D3AvbHmJggSt7fXr8YxbzVUkviBlKqNmc9cqM6CSO++QT3UShNgH5b03YKI8rRjFMWYKn1DrN5F5rFNDoGFcZtQSjFN5g/fEiSYsdkNsIeTp4YFxMkTztAYT8TxgcBvCnfXox6xDaLaPWh13UrUL2VL7O7uDK06xWUCp9Hm3/AXz0wRzya1tK9dCWamE5BOzk2ScOiLOgmpgwNHFVA1U93rkHq7Ixr11wazP3Dcinv0kWcW7hdMcI7VA0DUesxLKw6mkcQpd3NLgSU4mWtpoVFcmdERQUGsNM1d5NjGjBeyVMpC0I9NXM1Wv6cLENSX9b4GR7lkwGG/IHRFNciHk=
+  #     gem: pact-message
+  #     on:
+  #       tags: true
+  #       repo: pact-foundation/pact-message-ruby
+# notifications:
+#   webhooks:
+#     urls:
+#     - https://webhooks.gitter.im/e/6523128341fad111ed79
+#     on_success: change
+#     on_failure: always
+#     on_start: never
 

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="v0.8.0"></a>
+### v0.8.0 (2020-09-28)
+
+#### Features
+
+* reify message when yielding	 ([d7c0a4a](/../../commit/d7c0a4a))
+
+#### Bug Fixes
+
+* fix bug in Message.to_hash	 ([e354cd2](/../../commit/e354cd2))
+
 <a name="v0.7.0"></a>
 ### v0.7.0 (2020-02-10)
 

data/lib/pact/consumer_contract/message.rb

@@ -48,7 +48,7 @@ module Pact
           {
             description: description,
             provider_states: [{ name: provider_state }],
-            contents: contents.to_hash,
+            contents: contents.contents,
             metadata: metadata
           }
         end

data/lib/pact/consumer_contract/message/contents.rb

@@ -1,3 +1,4 @@
+require 'pact/reification'
 module Pact
   class ConsumerContract
     class Message
@@ -15,10 +16,18 @@ module Pact
         end
 
         def to_s
-          if @contents.is_a?(Hash) || @contents.is_a?(Array)
-            @contents.to_json
+          if contents.is_a?(Hash) || contents.is_a?(Array)
+            contents.to_json
           else
-            @contents.to_s
+            contents.to_s
+          end
+        end
+
+        def reified_contents_string
+          if contents.is_a?(Hash) || contents.is_a?(Array)
+            Pact::Reification.from_term(contents).to_json
+          else
+            Pact::Reification.from_term(contents).to_s
           end
         end
 

data/lib/pact/message/consumer/consumer_contract_builder.rb

@@ -21,12 +21,12 @@ module Pact
           interaction_builder.is_expected_to_send(provider_state)
         end
 
-        def send_message
-          # TODO handle matchers
-          yield @contents_string if block_given?
+        def send_message_string
+          yield contents.reified_contents_string if block_given?
         end
 
         def handle_interaction_fully_defined(interaction)
+          @contents = interaction.contents
           @contents_string = interaction.contents.to_s
           @interactions << interaction
           @interaction_builder = nil
@@ -42,7 +42,7 @@ module Pact
         private
 
         attr_writer :interaction_builder
-        attr_accessor :consumer_name, :provider_name, :consumer_contract_details
+        attr_accessor :consumer_name, :provider_name, :consumer_contract_details, :contents
 
         def interaction_builder
           @interaction_builder ||=

data/lib/pact/message/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Message
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/pact-message.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "pact-mock_service", "~> 3.1"
   spec.add_runtime_dependency "thor", "~> 0.20"
 
-  spec.add_development_dependency "bundler", "~> 1.17.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry-byebug"

data/script/trigger-release.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# Script to trigger release of gem via the pact-foundation/release-gem action
+# Requires a Github API token with repo scope stored in the
+# environment variable GITHUB_ACCESS_TOKEN_FOR_PF_RELEASES
+
+: "${GITHUB_ACCESS_TOKEN_FOR_PF_RELEASES:?Please set environment variable GITHUB_ACCESS_TOKEN_FOR_PF_RELEASES}"
+
+if [ -n "$1" ]; then
+  increment="\"${1}\""
+else
+  increment="null"
+fi
+
+repository_slug=$(git remote get-url $(git remote show) | cut -d':' -f2 | sed 's/\.git//')
+
+output=$(curl -v -X POST https://api.github.com/repos/${repository_slug}/dispatches \
+      -H 'Accept: application/vnd.github.everest-preview+json' \
+      -H "Authorization: Bearer $GITHUB_ACCESS_TOKEN_FOR_PF_RELEASES" \
+      -d "{\"event_type\": \"release-triggered\", \"client_payload\": {\"increment\": ${increment}}}" 2>&1)
+
+if  ! echo "${output}" | grep "HTTP\/1.1 204" > /dev/null; then
+  echo "$output" | sed  "s/${GITHUB_ACCESS_TOKEN_FOR_PF_RELEASES}/********/g"
+  echo "Failed to trigger release"
+  exit 1
+else
+  echo "Release workflow triggered"
+fi
+
+echo "See https://github.com/${repository_slug}/actions?query=workflow%3A%22Release+gem%22"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact-message
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Beth Skurrie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pact-support
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +132,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release_gem.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -187,6 +174,7 @@ files:
 - script/release.sh
 - script/release/bump-version.sh
 - script/release/generate-changelog.sh
+- script/trigger-release.sh
 - script/update-pact.sh
 - tasks/release.rake
 homepage: http://pact.io
@@ -209,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Consumer contract library for messages