Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
578cd5b
PAMv3 implementation
bartk Sep 27, 2021
2023fba
Move parse_token to pubnub instance
kleewho Oct 26, 2021
b3e22fa
Looking for sdk-specifications
kleewho Oct 26, 2021
12340aa
Looking for sdk-specifications
kleewho Oct 26, 2021
8ff7b6f
Degunning workflow
kleewho Oct 26, 2021
76f4643
use featureSet as a filter
kleewho Oct 26, 2021
80a50bb
Address PR comments
kleewho Oct 27, 2021
c329748
Change the parent of GrantToken to SingleEvent
kleewho Oct 27, 2021
15e2617
Combine reports - maybe ;)
kleewho Oct 28, 2021
3367182
Expose separate artifacts
kleewho Oct 28, 2021
3353a6b
Add posibility to run acceptance tests against production pubnub
kleewho Oct 28, 2021
fc44c09
Do not uri escape grant token message
kleewho Oct 28, 2021
ea70fda
Add uuids field in event
kleewho Oct 28, 2021
6ee7af7
CBOR on strings
kleewho Nov 2, 2021
f234a18
Basic cbor implementation works
kleewho Nov 3, 2021
4c17fc2
CBOR implementation uses byte arrays internally
kleewho Nov 4, 2021
c0864e5
Remove cbor from Gemfile.lock
kleewho Nov 4, 2021
da95767
Remove cbor, this time for real?
kleewho Nov 4, 2021
0fc11f6
Drop 2.4.10 tests
kleewho Nov 4, 2021
e539ece
Move cbor. Fix acceptance tests
kleewho Nov 4, 2021
b8817f3
Do not use due to ruby 2.5.8 compat
kleewho Nov 5, 2021
e487db8
Fixed vcr tests
kleewho Nov 5, 2021
9ad87ec
Remove to strict validation
kleewho Nov 5, 2021
4e85f4e
Address PR comments
kleewho Nov 9, 2021
b335928
Return sum from calculate_bitmask :facepalm:
kleewho Nov 9, 2021
bf6118e
Merge branch 'master' into pamv3
parfeon Nov 9, 2021
dee0e5e
PubNub SDK v4.7.0 release.
Nov 9, 2021
39a3937
build: fix versions
parfeon Nov 9, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .github/workflows/run_acceptance_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: run_acceptance_tests

on: [push]

jobs:
build:
name: Perform Acceptance BDD tests
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@v2
- name: Checkout mock-server action
uses: actions/checkout@v2
with:
repository: pubnub/client-engineering-deployment-tools
ref: github-actions
token: ${{ secrets.GH_TOKEN }}
path: client-engineering-deployment-tools
- name: Run mock server action
uses: ./client-engineering-deployment-tools/actions/mock-server
with:
token: ${{ secrets.GH_TOKEN }}
- name: Install dependencies
run: |
sudo gem install bundler &&
bundle install
- name: Run acceptance tests (optional)
run: bundle exec cucumber sdk-specifications/features/ -p mock -p run_beta -p report_beta
continue-on-error: true
- name: Run acceptance tests (required)
run: bundle exec cucumber sdk-specifications/features/ -p mock -p run_main -p report_main
- name: Combine test results
if: always()
run: |
sudo npm install -g junit-report-merger &&
jrm ./main.xml "./main/**/*.xml" &&
jrm ./beta.xml "./beta/**/*.xml"
- name: Expose main report
uses: actions/upload-artifact@v2
if: always()
with:
name: acceptance-test-reports
path: |
main.xml
beta.xml
retention-days: 7
16 changes: 15 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,18 @@ dev_scripts

# GitHub Actions #
##################
.github/.release
.github/.release
.bundle/ruby

.travis/README.md
.travis/scripts

deployment_keys
deployment_keys-private
deployment_keys.tar

.travis/github-labels-policy.json
.travis/github-labels.json
/.rvmrc
/.bundle/
/features/*.feature
13 changes: 9 additions & 4 deletions .pubnub.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
---
version: "4.6.2"
version: "4.7.0"
changelog:
- date: 2021-11-09
version: v4.7.0
changes:
- type: feature
text: "Grant_token allows generation of signed token with permissions for channels, channel groups and uuids."
-
changes:
-
Expand Down Expand Up @@ -600,7 +605,7 @@ sdks:
- x86-64
- distribution-type: package
distribution-repository: RubyGems
package-name: pubnub-4.6.1.gem
package-name: pubnub-4.7.0.gem
location: https://rubygems.org/gems/pubnub
requires:
- name: addressable
Expand Down Expand Up @@ -705,8 +710,8 @@ sdks:
- x86-64
- distribution-type: library
distribution-repository: GitHub release
package-name: pubnub-4.6.1.gem
location: https://github.com/pubnub/ruby/releases/download/v4.6.2/pubnub-4.6.1.gem
package-name: pubnub-v4.7.0.gem
location: https://github.com/pubnub/ruby/releases/download/v4.7.0/pubnub-4.7.0.gem
requires:
- name: addressable
min-version: 2.0.0
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ stages:

jobs:
include:
- stage: "test"
name: 'Ruby 2.4.10'
rvm: '2.4.10'
script: bundle exec rspec
- name: 'Ruby 2.5.8'
rvm: '2.5.8'
script: bundle exec rspec
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## v4.7.0
November 09 2021

#### Added
- Grant_token allows generation of signed token with permissions for channels, channel groups and uuids.

##### v4.6.2

- Add new `sdks` section to `.pubnub.yml` with information about available artifacts and distribution variants.
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ group :test do
gem 'rr'
gem 'rspec'
gem 'rspec-retry'
gem 'rspec-expectations'
gem 'rubocop'
gem 'simplecov', '>= 0.12', require: false
gem 'vcr'
gem 'webmock'
gem 'cucumber'
end

group :development, :test do
Expand Down
43 changes: 42 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
pubnub (4.6.2)
pubnub (4.7.0)
addressable (>= 2.0.0)
concurrent-ruby (~> 1.1.5)
concurrent-ruby-edge (~> 0.5.0)
Expand All @@ -19,6 +19,7 @@ GEM
awesome_print (1.8.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
codacy-coverage (2.2.1)
simplecov
coderay (1.1.3)
Expand All @@ -27,6 +28,37 @@ GEM
concurrent-ruby (~> 1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
cucumber (7.0.0)
builder (~> 3.2, >= 3.2.4)
cucumber-core (~> 10.0, >= 10.0.1)
cucumber-create-meta (~> 6.0, >= 6.0.1)
cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
cucumber-gherkin (~> 20.0, >= 20.0.1)
cucumber-html-formatter (~> 16.0, >= 16.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-wire (~> 6.0, >= 6.0.1)
diff-lcs (~> 1.4, >= 1.4.4)
mime-types (~> 3.3, >= 3.3.1)
multi_test (~> 0.1, >= 0.1.2)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-core (10.0.1)
cucumber-gherkin (~> 20.0, >= 20.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-tag-expressions (~> 3.0, >= 3.0.1)
cucumber-create-meta (6.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
sys-uname (~> 1.2, >= 1.2.2)
cucumber-cucumber-expressions (12.1.3)
cucumber-gherkin (20.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-html-formatter (16.0.1)
cucumber-messages (~> 17.0, >= 17.0.1)
cucumber-messages (17.1.1)
cucumber-tag-expressions (3.0.1)
cucumber-wire (6.1.1)
cucumber-core (~> 10.0, >= 10.0.1)
cucumber-cucumber-expressions (~> 12.1, >= 12.1.2)
cucumber-messages (~> 17.0, >= 17.0.1)
debug_inspector (0.0.3)
diff-lcs (1.4.4)
docile (1.3.2)
Expand Down Expand Up @@ -68,13 +100,18 @@ GEM
dry-equalizer (~> 0.2)
dry-initializer (~> 3.0)
dry-schema (~> 1.5)
ffi (1.13.1)
ffi (1.13.1-java)
hashdiff (1.0.1)
httpclient (2.8.3)
interception (0.5)
json (2.3.1)
json (2.3.1-java)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901)
multi_test (0.1.2)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
Expand Down Expand Up @@ -130,6 +167,8 @@ GEM
simplecov-html (0.12.2)
spoon (0.0.6)
ffi
sys-uname (1.2.2)
ffi (~> 1.1)
timers (4.3.0)
unicode-display_width (1.7.0)
vcr (6.0.0)
Expand All @@ -145,12 +184,14 @@ PLATFORMS
DEPENDENCIES
awesome_print
codacy-coverage
cucumber
pry
pry-rescue
pry-stack_explorer
pubnub!
rr
rspec
rspec-expectations
rspec-retry
rubocop
simplecov (>= 0.12)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.2
4.7.0
7 changes: 7 additions & 0 deletions config/cucumber.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
default: -p mock -p run_main
run_main: -t "not @skip and not @na=ruby and not @beta"
report_main: -f junit --out main
run_beta: -t "not @skip and not @na=ruby and @beta"
report_beta: -f junit --out beta
mock: SERVER_MOCK=true PAM_SUB_KEY=subKey PAM_PUB_KEY=pubKey PAM_SEC_KEY=secKey SERVER_HOST=localhost SERVER_PORT=8090
prod: SERVER_MOCK=false
Loading