Skip to content

Commit e9c8e36

Browse files
APPS-7761 Ruby Upgrade v3.1.0 (#425)
* Ruby version upgrade to 3.1.0
1 parent 31bc7fd commit e9c8e36

File tree

9 files changed

+15
-18
lines changed

9 files changed

+15
-18
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ jobs:
1313
strategy:
1414
matrix:
1515
ruby-version:
16-
- "2.7.5"
17-
- "2.6.10"
18-
- "2.6.9"
19-
- "2.6.8"
16+
- "3.1.0"
17+
- "3.1.5"
2018
steps:
2119
- uses: zendesk/checkout@v3
2220
- uses: zendesk/setup-ruby@v1
@@ -30,7 +28,6 @@ jobs:
3028
key: ${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-lock-${{ hashFiles('Gemfile.lock') }}
3129
restore-keys: |
3230
${{ runner.os }}-vendor-ruby-${{ matrix.ruby-version }}-
33-
${{ runner.os }}-vendor-
3431
- name: before_script
3532
run: |
3633
gem update --system 3.3.22

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.10
1+
3.1.0

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PATH
1313
sinatra-cross_origin (~> 0.3.1)
1414
thin (~> 1.8.0)
1515
thor (~> 0.19.4)
16-
zendesk_apps_support (~> 4.38.2)
16+
zendesk_apps_support (~> 4.39.0)
1717

1818
GEM
1919
remote: https://rubygems.org/
@@ -167,9 +167,9 @@ GEM
167167
websocket-driver (0.7.5)
168168
websocket-extensions (>= 0.1.0)
169169
websocket-extensions (0.1.5)
170-
zendesk_apps_support (4.38.2)
170+
zendesk_apps_support (4.39.0)
171171
erubis
172-
i18n
172+
i18n (>= 1.7.1)
173173
image_size (~> 2.0.2)
174174
ipaddress_2 (~> 0.13.0)
175175
json

lib/zendesk_apps_tools/command.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def download_scaffold(app_dir)
301301
begin
302302
require 'open-uri'
303303
require 'zip'
304-
download = open(scaffold_url)
304+
download = URI.open(scaffold_url)
305305
IO.copy_stream(download, tmp_download_name)
306306
zip_file = Zip::File.open(tmp_download_name)
307307
zip_file.each do |entry|

lib/zendesk_apps_tools/settings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def parse_settings(filepath, contents)
8181
JSON.load(contents)
8282
else
8383
require 'yaml'
84-
YAML.load(contents)
84+
YAML.safe_load(contents)
8585
end
8686
settings_data.each do |index, setting|
8787
if setting.is_a?(Hash) || setting.is_a?(Array)

lib/zendesk_apps_tools/translate.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def en_yaml
205205
@en_yaml ||= begin
206206
path = "#{destination_root}/translations/en.yml"
207207
require 'yaml'
208-
YAML.load_file(path) if File.exist? path
208+
YAML.safe_load_file(path, permitted_classes: [Date]) if File.exist? path
209209
end
210210
end
211211

spec/lib/zendesk_apps_tools/settings_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
'not_required_with_default' => '789'
8080
}
8181

82-
allow(@user_input).to receive(:ask).with("Enter a value for required parameter 'required':\n", default: nil).and_return('xyz')
83-
allow(@user_input).to receive(:ask).with("Enter a value for optional parameter 'not_required' or press 'Return' to skip:\n", default: nil).and_return('456')
82+
allow(@user_input).to receive(:ask).with("Enter a value for required parameter 'required':\n", { default: nil }).and_return('xyz')
83+
allow(@user_input).to receive(:ask).with("Enter a value for optional parameter 'not_required' or press 'Return' to skip:\n", { default: nil }).and_return('456')
8484
expect(@context.get_settings_from_user_input(parameters)).to eq(settings)
8585
end
8686
end

spec/lib/zendesk_apps_tools/translate_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
it 'fetches default locales, translations and generates json files for each' do
8686
translate = ZendeskAppsTools::Translate.new
8787
allow(translate).to receive(:say)
88-
allow(translate).to receive(:ask).with('What is the package name for this app? (without leading app_)', default: nil).and_return('my_app')
88+
allow(translate).to receive(:ask).with('What is the package name for this app? (without leading app_)', { default: nil }).and_return('my_app')
8989
allow(translate).to receive(:create_file)
9090

9191
expect(translate).to receive(:nest_translations_hash).once.and_return({})
@@ -103,7 +103,7 @@
103103
it 'fetches locales from a given locales file, translations and generates json files for each' do
104104
translate = ZendeskAppsTools::Translate.new
105105
allow(translate).to receive(:say)
106-
allow(translate).to receive(:ask).with('What is the package name for this app? (without leading app_)', default: nil).and_return('my_app')
106+
allow(translate).to receive(:ask).with('What is the package name for this app? (without leading app_)', { default: nil }).and_return('my_app')
107107
allow(translate).to receive(:create_file)
108108
allow(translate).to receive(:options) { { locales: './locales.json' } }
109109
allow(translate).to receive(:read_file).and_return('["en-ca.c68cff07da3c07bed9849e29aa7566d7"]')

zendesk_apps_tools.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
1212
s.summary = 'Tools to help you develop Zendesk Apps.'
1313
s.description = s.summary
1414

15-
s.required_ruby_version = '>= 2.6'
15+
s.required_ruby_version = '>= 3.1.0'
1616
s.required_rubygems_version = '>= 3.0.0'
1717

1818
s.add_runtime_dependency 'thor', '~> 0.19.4'
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
2222
s.add_runtime_dependency 'faraday', '~> 0.17.5'
2323
s.add_runtime_dependency 'execjs', '~> 2.7.0'
2424
s.add_runtime_dependency 'nokogiri', '~> 1.13.10'
25-
s.add_runtime_dependency 'zendesk_apps_support', '~> 4.38.2'
25+
s.add_runtime_dependency 'zendesk_apps_support', '~> 4.39.0'
2626
s.add_runtime_dependency 'sinatra-cross_origin', '~> 0.3.1'
2727
s.add_runtime_dependency 'listen', '~> 2.10'
2828
s.add_runtime_dependency 'rack-livereload', '0.3.17'

0 commit comments

Comments
 (0)