1
0
зеркало из https://github.com/glebtv/telegram-bot.git synced 2026-09-03 09:46:17 +03:00

Сравнить коммиты

...

4 Коммитов

Автор SHA1 Сообщение Дата
Max Melentiev
da31cd148a v0.14.3 2019-08-24 19:34:34 +03:00
Max Melentiev
552f3b3353 Update to Bot API 4.4 2019-08-24 19:33:46 +03:00
Max Melentiev
e5f93f608b Merge pull request #121 from telegram-bot-rb/rails_60
Require tests against rails 6.0, run tests against rails 6.1.alpha
2019-08-19 22:10:50 +03:00
Max Melentiev
7e823b4354 Require tests against rails 6.0, run tests against rails 6.1.alpha
Rails 6.0 requires ruby >= 2.5, so ruby 2.4 is not tested by default
and replaced with 2.6
2019-08-19 11:06:48 +03:00
12 изменённых файлов: 66 добавлений и 32 удалений

Просмотреть файл

@@ -1,27 +1,31 @@
language: ruby language: ruby
cache: bundler cache: bundler
rvm: rvm:
- 2.6
- 2.5 - 2.5
- 2.4
gemfile: gemfile:
- gemfiles/rails_60.gemfile
- gemfiles/rails_52.gemfile - gemfiles/rails_52.gemfile
- gemfiles/rails_51.gemfile
matrix: matrix:
include: include:
# old rails # old rails
- rvm: 2.5
gemfile: gemfiles/rails_51.gemfile
- rvm: 2.5 - rvm: 2.5
gemfile: gemfiles/rails_50.gemfile gemfile: gemfiles/rails_50.gemfile
- rvm: 2.5 - rvm: 2.5
gemfile: gemfiles/rails_42.gemfile gemfile: gemfiles/rails_42.gemfile
# old rubies # old rubies
- rvm: 2.4
gemfile: gemfiles/rails_52.gemfile
- rvm: 2.3 - rvm: 2.3
gemfile: gemfiles/rails_52.gemfile gemfile: gemfiles/rails_52.gemfile
# future rails # future rails
- rvm: 2.5 - rvm: 2.5
gemfile: gemfiles/rails_60.gemfile gemfile: gemfiles/rails_61.gemfile
# Allow rails 6 to fail while master branch is used # Allow rails 6.1 to fail while master branch is used
allow_failures: allow_failures:
- rvm: 2.5 - rvm: 2.5
gemfile: gemfiles/rails_60.gemfile gemfile: gemfiles/rails_61.gemfile
notifications: notifications:
email: false email: false

Просмотреть файл

@@ -1,26 +1,31 @@
appraise 'rails-60' do appraise 'rails-61' do
git 'https://github.com/rails/rails.git' do git 'https://github.com/rails/rails.git' do
gem 'actionpack', '~> 6.0.0.alpha' gem 'actionpack', '~> 6.1.0.alpha'
gem 'railties', '~> 6.0.0.alpha' gem 'railties', '~> 6.1.0.alpha'
end end
end end
appraise 'rails-60' do
gem 'actionpack', '~> 6.0.0'
gem 'railties', '~> 6.0.0'
end
appraise 'rails-52' do appraise 'rails-52' do
gem 'actionpack', '~> 5.2.0.beta2' gem 'actionpack', '~> 5.2.0'
gem 'railties', '~> 5.2.0.beta2' gem 'railties', '~> 5.2.0'
end end
appraise 'rails-51' do appraise 'rails-51' do
gem 'actionpack', '~> 5.1' gem 'actionpack', '~> 5.1.0'
gem 'railties', '~> 5.1' gem 'railties', '~> 5.1.0'
end end
appraise 'rails-50' do appraise 'rails-50' do
gem 'actionpack', '~> 5.0' gem 'actionpack', '~> 5.0.0'
gem 'railties', '~> 5.0' gem 'railties', '~> 5.0.0'
end end
appraise 'rails-42' do appraise 'rails-42' do
gem 'actionpack', '~> 4.2' gem 'actionpack', '~> 4.2.0'
gem 'railties', '~> 4.2' gem 'railties', '~> 4.2.0'
end end

Просмотреть файл

@@ -1,5 +1,8 @@
# Unreleased # Unreleased
- Rails 6.0 support.
- Update to Bot API 4.4.
# 0.14.2 # 0.14.2
- Add reply helpers: `answer_pre_checkout_query`, `answer_shipping_query`. - Add reply helpers: `answer_pre_checkout_query`, `answer_shipping_query`.

Просмотреть файл

@@ -2,8 +2,8 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "actionpack", "~> 4.2" gem "actionpack", "~> 4.2.0"
gem "railties", "~> 4.2" gem "railties", "~> 4.2.0"
group :development do group :development do
gem "appraisal", "~> 2.2" gem "appraisal", "~> 2.2"

Просмотреть файл

@@ -2,8 +2,8 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "actionpack", "~> 5.0" gem "actionpack", "~> 5.0.0"
gem "railties", "~> 5.0" gem "railties", "~> 5.0.0"
group :development do group :development do
gem "appraisal", "~> 2.2" gem "appraisal", "~> 2.2"

Просмотреть файл

@@ -2,8 +2,8 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "actionpack", "~> 5.1" gem "actionpack", "~> 5.1.0"
gem "railties", "~> 5.1" gem "railties", "~> 5.1.0"
group :development do group :development do
gem "appraisal", "~> 2.2" gem "appraisal", "~> 2.2"

Просмотреть файл

@@ -2,8 +2,8 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "actionpack", "~> 5.2.0.beta2" gem "actionpack", "~> 5.2.0"
gem "railties", "~> 5.2.0.beta2" gem "railties", "~> 5.2.0"
group :development do group :development do
gem "appraisal", "~> 2.2" gem "appraisal", "~> 2.2"

Просмотреть файл

@@ -2,10 +2,8 @@
source "https://rubygems.org" source "https://rubygems.org"
git "https://github.com/rails/rails.git" do gem "actionpack", "~> 6.0.0"
gem "actionpack", "~> 6.0.0.alpha" gem "railties", "~> 6.0.0"
gem "railties", "~> 6.0.0.alpha"
end
group :development do group :development do
gem "appraisal", "~> 2.2" gem "appraisal", "~> 2.2"

23
gemfiles/rails_61.gemfile Обычный файл
Просмотреть файл

@@ -0,0 +1,23 @@
# This file was generated by Appraisal
source "https://rubygems.org"
git "https://github.com/rails/rails.git" do
gem "actionpack", "~> 6.1.0.alpha"
gem "railties", "~> 6.1.0.alpha"
end
group :development do
gem "appraisal", "~> 2.2"
gem "pry", "~> 0.10.1"
gem "pry-byebug", "~> 3.2.0"
gem "sdoc", "~> 0.4.1"
gem "telegram-bot-types", "~> 0.6.0"
gem "rspec", "~> 3.5.0"
gem "rspec-its", "~> 1.1.0"
gem "rspec-rails", "~> 3.5.0"
gem "rubocop", "~> 0.52.1"
gem "coveralls", "~> 0.8.2", require: false
end
gemspec path: "../"

Просмотреть файл

@@ -1,5 +1,5 @@
# Generated with bin/fetch-telegram-methods # Generated with bin/fetch-telegram-methods
# Bot API 4.3 # Bot API 4.4
getUpdates getUpdates
setWebhook setWebhook
@@ -30,6 +30,7 @@ kickChatMember
unbanChatMember unbanChatMember
restrictChatMember restrictChatMember
promoteChatMember promoteChatMember
setChatPermissions
exportChatInviteLink exportChatInviteLink
setChatPhoto setChatPhoto
deleteChatPhoto deleteChatPhoto

Просмотреть файл

@@ -1,6 +1,6 @@
module Telegram module Telegram
module Bot module Bot
VERSION = '0.14.2'.freeze VERSION = '0.14.3'.freeze
def self.gem_version def self.gem_version
Gem::Version.new VERSION Gem::Version.new VERSION

Просмотреть файл

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '~> 2.0' spec.required_ruby_version = '~> 2.0'
spec.add_dependency 'actionpack', '>= 4.0', '< 6.0' spec.add_dependency 'actionpack', '>= 4.0', '< 6.1'
spec.add_dependency 'activesupport', '>= 4.0', '< 6.0' spec.add_dependency 'activesupport', '>= 4.0', '< 6.1'
spec.add_dependency 'httpclient', '~> 2.7' spec.add_dependency 'httpclient', '~> 2.7'
spec.add_development_dependency 'bundler', '> 1.16' spec.add_development_dependency 'bundler', '> 1.16'