Skip to content

Commit

Permalink
3.1.0 (#90)
Browse files Browse the repository at this point in the history
* parity update
* github workflows
* fix ruby requirements
* correct port
* fix test cases, adjust port
  • Loading branch information
ADandyGuyInSpace committed Feb 27, 2024
1 parent 73bedd9 commit 7767a7d
Show file tree
Hide file tree
Showing 204 changed files with 81,012 additions and 737 deletions.
14 changes: 1 addition & 13 deletions .github/scripts/before_install.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
# Telnyx mock deprecation in favor of prism-mock server

# gem install bundler -v "~> 1.0"
# if [ ! -d "telnyx-mock/telnyx-mock_${TELNYX_MOCK_VERSION}" ]; then
# mkdir -p telnyx-mock/${TELNYX_MOCK_VERSION}/
# curl -L "https://github.com/team-telnyx/telnyx-mock/releases/download/v${TELNYX_MOCK_VERSION}/telnyx-mock_${TELNYX_MOCK_VERSION}_linux_amd64.tar.gz" -o "telnyx-mock/telnyx-mock_${TELNYX_MOCK_VERSION}_linux_amd64.tar.gz"
# tar -zxf "telnyx-mock/telnyx-mock_${TELNYX_MOCK_VERSION}_linux_amd64.tar.gz" -C "telnyx-mock/${TELNYX_MOCK_VERSION}/"
# fi
# telnyx-mock/${TELNYX_MOCK_VERSION}/telnyx-mock > /dev/null &
# TELNYX_MOCK_PID=$!
# export PATH="${PATH}:${PWD}/telnyx-mock/${TELNYX_MOCK_VERSION}"

npm install -g @stoplight/prism-cli

echo "Starting up Prism Mock Server with spec file at ${TELNYX_MOCK_OPEN_API_URI}"
Expand All @@ -19,4 +7,4 @@ git clone https://github.com/team-telnyx/telnyx-prism-mock.git
cd telnyx-prism-mock/proxy
npm install
node index.js > /dev/null &
cd -
cd -
8 changes: 3 additions & 5 deletions .github/workflows/publish-gem-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ on:

jobs:
test:
env:
TELNYX_MOCK_VERSION: 0.8.13
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ '2.5', '2.6', '2.7', '3.0' ]
ruby: [ '3.0', '3.1', '3.2' ]
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
Expand All @@ -36,10 +34,10 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v2
- name: Set up Ruby 2.6
- name: Set up Ruby 3.0
uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
with:
ruby-version: 2.6
ruby-version: 3.0
- run: bundle install
- name: Publish to RubyGems
run: |
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby: [ '2.5', '2.6', '2.7', '3.0' ]
ruby: [ '3.0', '3.1', '3.2' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Ruby
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
# change this to (see https://github.com/ruby/setup-ruby#versioning):
# uses: ruby/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
# - name: Run Setup Script to install prism mock
# run: source ./.github/scripts/before_install.sh
# shell: bash
# - name: Install dependencies
# run: bundle install
# - name: Run tests
# run: bundle exec rake
- name: Run Setup Script to install prism mock
run: source ./.github/scripts/before_install.sh
shell: bash
- name: Install dependencies
run: bundle install
- name: Run tests
run: bundle exec rake
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ inherit_from: .rubocop_todo.yml

AllCops:
DisplayCopNames: true
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
NewCops: disable

Layout/CaseIndentation:
Expand Down
13 changes: 6 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ gemspec

group :development do
gem "coveralls_reborn", require: false
gem "faraday", "~> 1.0"
gem "faraday", "~> 2.5.0"
gem "faraday-multipart"
gem "faraday-net_http_persistent"
gem "faraday-retry"
gem "mocha", "~> 0.13.2"
gem "rake"
gem "shoulda-context"
Expand All @@ -22,7 +25,7 @@ group :development do
gem "guard"
gem "guard-rake"
gem "guard-rubocop"
gem "rubocop", "~> 1.6"
gem "rubocop", "~> 1.60.2"

# debugging
# gem 'httplog' # when included logs all http requests
Expand All @@ -31,11 +34,7 @@ group :development do
# Rack 2.0+ requires Ruby >= 2.2.2 which is problematic for the test suite on
# older Ruby versions. Check Ruby the version here and put a maximum
# constraint on Rack if necessary.
if RUBY_VERSION >= "2.2.2"
gem "rack", ">= 2.1.4"
else
gem "rack", ">= 1.6.11", "< 2.0" # rubocop:disable Bundler/DuplicatedGem
end
gem "rack", ">= 2.2.8.1"

platforms :mri do
# gem "byebug"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you want to build the gem from source:

### Requirements

* Ruby 2.1.0+
* Ruby 3.0.0+

### Bundler

Expand Down
Loading

0 comments on commit 7767a7d

Please sign in to comment.