From ae9a6a501db43d064b87f294e46a9b6ff51714e6 Mon Sep 17 00:00:00 2001 From: Nmerey Date: Mon, 28 Aug 2023 11:32:01 +0600 Subject: [PATCH 1/3] Add new methods available at API 6.8 --- lib/telegram/bot/client/api_methods.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/telegram/bot/client/api_methods.txt b/lib/telegram/bot/client/api_methods.txt index 470b83a..42e42e3 100644 --- a/lib/telegram/bot/client/api_methods.txt +++ b/lib/telegram/bot/client/api_methods.txt @@ -1,5 +1,5 @@ # Generated with bin/fetch-telegram-methods -# Bot API 6.6 +# Bot API 6.8 getUpdates setWebhook @@ -68,10 +68,13 @@ closeGeneralForumTopic reopenGeneralForumTopic hideGeneralForumTopic unhideGeneralForumTopic +unpinAllGeneralForumTopicMessages answerCallbackQuery setMyCommands deleteMyCommands getMyCommands +setMyName +getMyName setMyDescription getMyDescription setMyShortDescription From 83bc13bac6e0ce553083248d1fb932ae949b2dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20P=C3=A9rez?= Date: Fri, 27 Oct 2023 19:43:17 +0200 Subject: [PATCH 2/3] Allow installation in Rails 7.1 --- .github/workflows/ci.yml | 2 ++ Appraisals | 5 +++++ Gemfile | 6 +++--- gemfiles/rails_42.gemfile | 6 +++--- gemfiles/rails_50.gemfile | 6 +++--- gemfiles/rails_51.gemfile | 6 +++--- gemfiles/rails_52.gemfile | 6 +++--- gemfiles/rails_60.gemfile | 6 +++--- gemfiles/rails_61.gemfile | 6 +++--- gemfiles/rails_70.gemfile | 6 +++--- gemfiles/rails_71.gemfile | 21 +++++++++++++++++++++ telegram-bot.gemspec | 4 ++-- 12 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 gemfiles/rails_71.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd2bebf..b692391 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,8 @@ jobs: - gemfiles/rails_52.gemfile include: # ruby 3.x + - ruby: '3.2' + gemfile: gemfiles/rails_71.gemfile - ruby: '3.0' gemfile: gemfiles/rails_61.gemfile - ruby: '3.0' diff --git a/Appraisals b/Appraisals index 9ebddfd..4bb525f 100644 --- a/Appraisals +++ b/Appraisals @@ -1,3 +1,8 @@ +appraise 'rails-71' do + gem 'actionpack', '~> 7.1.0' + gem 'railties', '~> 7.1.0' +end + appraise 'rails-70' do gem 'actionpack', '~> 7.0.0' gem 'railties', '~> 7.0.0' diff --git a/Gemfile b/Gemfile index 1c7b9db..7499052 100644 --- a/Gemfile +++ b/Gemfile @@ -4,13 +4,13 @@ gemspec group :development do gem 'appraisal', '~> 2.2' - gem 'pry', '~> 0.13.1' - gem 'pry-byebug', '~> 3.9.0' + gem 'pry', '~> 0.14.1' + gem 'pry-byebug', '~> 3.10.1' gem 'sdoc', '~> 2.0.3' gem 'telegram-bot-types', '~> 0.6.3' - gem 'rspec', '~> 3.10.0' + gem 'rspec', '~> 3.12.0' gem 'rspec-its', '~> 1.3.0' gem 'rspec-rails', '~> 4.0.2' diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile index f44e79f..73af28c 100644 --- a/gemfiles/rails_42.gemfile +++ b/gemfiles/rails_42.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 4.2.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_50.gemfile b/gemfiles/rails_50.gemfile index b9852d2..70ebbce 100644 --- a/gemfiles/rails_50.gemfile +++ b/gemfiles/rails_50.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 5.0.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile index 3b44533..e3292cb 100644 --- a/gemfiles/rails_51.gemfile +++ b/gemfiles/rails_51.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 5.1.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile index 88d2966..a174335 100644 --- a/gemfiles/rails_52.gemfile +++ b/gemfiles/rails_52.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 5.2.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_60.gemfile b/gemfiles/rails_60.gemfile index e7433c6..c593cde 100644 --- a/gemfiles/rails_60.gemfile +++ b/gemfiles/rails_60.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 6.0.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_61.gemfile b/gemfiles/rails_61.gemfile index 487ce96..ac9af36 100644 --- a/gemfiles/rails_61.gemfile +++ b/gemfiles/rails_61.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 6.1.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_70.gemfile b/gemfiles/rails_70.gemfile index 015766b..f9aead7 100644 --- a/gemfiles/rails_70.gemfile +++ b/gemfiles/rails_70.gemfile @@ -7,11 +7,11 @@ gem "railties", "~> 7.0.0" group :development do gem "appraisal", "~> 2.2" - gem "pry", "~> 0.13.1" - gem "pry-byebug", "~> 3.9.0" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" gem "sdoc", "~> 2.0.3" gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.10.0" + gem "rspec", "~> 3.12.0" gem "rspec-its", "~> 1.3.0" gem "rspec-rails", "~> 4.0.2" gem "rubocop", "~> 0.52.1" diff --git a/gemfiles/rails_71.gemfile b/gemfiles/rails_71.gemfile new file mode 100644 index 0000000..bd9e185 --- /dev/null +++ b/gemfiles/rails_71.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "actionpack", "~> 7.1.0" +gem "railties", "~> 7.1.0" + +group :development do + gem "appraisal", "~> 2.2" + gem "pry", "~> 0.14.1" + gem "pry-byebug", "~> 3.10.1" + gem "sdoc", "~> 2.0.3" + gem "telegram-bot-types", "~> 0.6.3" + gem "rspec", "~> 3.12.0" + gem "rspec-its", "~> 1.3.0" + gem "rspec-rails", "~> 4.0.2" + gem "rubocop", "~> 0.52.1" + gem "coveralls", "~> 0.8.23", require: false +end + +gemspec path: "../" diff --git a/telegram-bot.gemspec b/telegram-bot.gemspec index a1d47ca..a71ca53 100644 --- a/telegram-bot.gemspec +++ b/telegram-bot.gemspec @@ -19,8 +19,8 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.4' - spec.add_dependency 'actionpack', '>= 4.0', '< 7.1' - spec.add_dependency 'activesupport', '>= 4.0', '< 7.1' + spec.add_dependency 'actionpack', '>= 4.0', '< 7.2' + spec.add_dependency 'activesupport', '>= 4.0', '< 7.2' spec.add_dependency 'httpclient', '~> 2.7' spec.add_development_dependency 'bundler', '> 1.16' From 6f8565fbd59ba5b0f351197c1db2381f0aaabda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eloy=20P=C3=A9rez?= Date: Sun, 5 Nov 2023 10:23:40 +0100 Subject: [PATCH 3/3] Update testing matrix --- .github/workflows/ci.yml | 11 ++--------- Appraisals | 10 ---------- gemfiles/rails_42.gemfile | 21 --------------------- gemfiles/rails_50.gemfile | 21 --------------------- 4 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 gemfiles/rails_42.gemfile delete mode 100644 gemfiles/rails_50.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b692391..d9f39b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,12 @@ jobs: strategy: matrix: ruby: - - '2.5' - - '2.6' + - '2.7' gemfile: - gemfiles/rails_61.gemfile - gemfiles/rails_60.gemfile - gemfiles/rails_52.gemfile + - gemfiles/rails_51.gemfile include: # ruby 3.x - ruby: '3.2' @@ -32,13 +32,6 @@ jobs: gemfile: gemfiles/rails_61.gemfile - ruby: '3.0' gemfile: gemfiles/rails_60.gemfile - # old rails - - ruby: '2.5' - gemfile: gemfiles/rails_51.gemfile - - ruby: '2.5' - gemfile: gemfiles/rails_50.gemfile - - ruby: '2.5' - gemfile: gemfiles/rails_42.gemfile env: BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }} steps: diff --git a/Appraisals b/Appraisals index 4bb525f..019d01b 100644 --- a/Appraisals +++ b/Appraisals @@ -27,13 +27,3 @@ appraise 'rails-51' do gem 'actionpack', '~> 5.1.0' gem 'railties', '~> 5.1.0' end - -appraise 'rails-50' do - gem 'actionpack', '~> 5.0.0' - gem 'railties', '~> 5.0.0' -end - -appraise 'rails-42' do - gem 'actionpack', '~> 4.2.0' - gem 'railties', '~> 4.2.0' -end diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile deleted file mode 100644 index 73af28c..0000000 --- a/gemfiles/rails_42.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "actionpack", "~> 4.2.0" -gem "railties", "~> 4.2.0" - -group :development do - gem "appraisal", "~> 2.2" - gem "pry", "~> 0.14.1" - gem "pry-byebug", "~> 3.10.1" - gem "sdoc", "~> 2.0.3" - gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.12.0" - gem "rspec-its", "~> 1.3.0" - gem "rspec-rails", "~> 4.0.2" - gem "rubocop", "~> 0.52.1" - gem "coveralls", "~> 0.8.23", require: false -end - -gemspec path: "../" diff --git a/gemfiles/rails_50.gemfile b/gemfiles/rails_50.gemfile deleted file mode 100644 index 70ebbce..0000000 --- a/gemfiles/rails_50.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "actionpack", "~> 5.0.0" -gem "railties", "~> 5.0.0" - -group :development do - gem "appraisal", "~> 2.2" - gem "pry", "~> 0.14.1" - gem "pry-byebug", "~> 3.10.1" - gem "sdoc", "~> 2.0.3" - gem "telegram-bot-types", "~> 0.6.3" - gem "rspec", "~> 3.12.0" - gem "rspec-its", "~> 1.3.0" - gem "rspec-rails", "~> 4.0.2" - gem "rubocop", "~> 0.52.1" - gem "coveralls", "~> 0.8.23", require: false -end - -gemspec path: "../"