telepost 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0831c6d5e4388551579018345287cc6bc869610795abb994815ca530601c1eb3'
-  data.tar.gz: a90e179dc5b4241bb4ff3279542e8c3fc63dfc9bfbaa0313e3314ea392faf110
+  metadata.gz: b1bfc2471b076fe6343687400f3c9d199f4ba2c01fce7751e5b13d1db31ed29c
+  data.tar.gz: 94a7397bcf43afa770452170c918d672f0fbe47a59bff68d7842e9f3c94a9e45
 SHA512:
-  metadata.gz: 3736347a28810f3433c4319b16c46dc1d550e4ee85e9885a7540cd9c7b98fa1a9fca5da1b3ab4cdcc4631d121d591cc233f0f19d3cc68c08c8ab073eee24e4c5
-  data.tar.gz: 4fcc75ad584f8161de7bcf59dd18cee662f49840e3e2ebbdd9a80483225d7661ce02bc1db0cf3e874369c475a5ae6cc99b99ebe4a442bbe3390d477e64865285
+  metadata.gz: 51fae734e3ab3403eaaa3b8d21ed201a3cbee2a10c9802905061fc2551c83063109ca76134a8fc0cd7ad921ce1d6ddd4d40c9774af7d783e7589a552b3bd37a6
+  data.tar.gz: ec5bb310af82d8ea9aaf82f5465fa7ce5fa7b7ba8559a4404f8dbaa5246e673b1d4300acf8f3d75e5a5aec257669f1ff7646cb314e9686542e3e55694496c2ec

data/.github/workflows/actionlint.yml

@@ -28,7 +28,7 @@ name: actionlint
       - master
 jobs:
   actionlint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Download actionlint

data/.github/workflows/codecov.yml

@@ -25,7 +25,7 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

data/.github/workflows/copyrights.yml

@@ -24,7 +24,7 @@ name: copyrights
   pull_request:
 jobs:
   copyrights:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: yegor256/copyrights-action@0.0.4
+      - uses: yegor256/copyrights-action@0.0.5

data/.github/workflows/markdown-lint.yml

@@ -32,7 +32,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   markdown-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: articulate/actions-markdownlint@v1

data/.github/workflows/pdd.yml

@@ -28,7 +28,7 @@ on:
       - master
 jobs:
   pdd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -31,7 +31,7 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2022]
+        os: [ubuntu-24.04, macos-12, windows-2022]
         ruby: [3.2, 3.3]
     runs-on: ${{ matrix.os }}
     steps:

data/.github/workflows/xcop.yml

@@ -24,7 +24,7 @@ on:
   pull_request:
 jobs:
   xcop:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.rultor.yml

@@ -21,7 +21,7 @@
 # SOFTWARE.
 ---
 docker:
-  image: yegor256/rultor-image:1.23.1
+  image: yegor256/rultor-ruby
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |-

data/Gemfile

@@ -23,9 +23,9 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.24.1', require: false
+gem 'minitest', '5.25.1', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rubocop', '1.65.0', require: false
-gem 'rubocop-rspec', '3.0.2', require: false
+gem 'rubocop', '1.66.1', require: false
+gem 'rubocop-rspec', '3.0.5', require: false
 gem 'simplecov', '0.22.0', require: false
-gem 'yard', '0.9.36', require: false
+gem 'yard', '0.9.37', require: false

data/Gemfile.lock

@@ -2,109 +2,102 @@ PATH
   remote: .
   specs:
     telepost (0.0.0)
-      telebot (= 0.1.2)
+      telegram-bot-ruby (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.4.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    docile (1.4.1)
+    dry-core (1.0.1)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.1.0)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-struct (1.6.0)
+      dry-core (~> 1.0, < 2)
+      dry-types (>= 1.7, < 2)
+      ice_nine (~> 0.11)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-net_http (3.3.0)
+      net-http
     ice_nine (0.11.2)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.24.1)
+    logger (1.6.1)
+    minitest (5.25.1)
     multipart-post (2.4.1)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    net-http (0.4.1)
+      uri
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    racc (1.8.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
-    rubocop (1.65.0)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
-    rubocop-rspec (3.0.2)
+    rubocop-rspec (3.0.5)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    strscan (3.1.0)
-    telebot (0.1.2)
-      faraday
-      faraday_middleware
-      virtus
-    thread_safe (0.3.6)
-    unicode-display_width (2.5.0)
-    virtus (2.0.0)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-    yard (0.9.36)
+    telegram-bot-ruby (1.0.0)
+      dry-struct (~> 1.6)
+      faraday (~> 2.0)
+      faraday-multipart (~> 1.0)
+      zeitwerk (~> 2.6)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
+    yard (0.9.37)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   arm64-darwin-22
   ruby
 
 DEPENDENCIES
-  minitest (= 5.24.1)
+  minitest (= 5.25.1)
   rake (= 13.2.1)
-  rubocop (= 1.65.0)
-  rubocop-rspec (= 3.0.2)
+  rubocop (= 1.66.1)
+  rubocop-rspec (= 3.0.5)
   simplecov (= 0.22.0)
   telepost!
-  yard (= 0.9.36)
+  yard (= 0.9.37)
 
 BUNDLED WITH
-   2.5.6
+   2.5.18

data/lib/telepost.rb

@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'telebot'
+require 'telegram/bot'
 
 # Telepost is a simple gateway to Telegram, which can post messages and
 # respond to primitive requests:
@@ -71,25 +71,16 @@ class Telepost
   # to the @BotFather in Telegram.
   def initialize(token, chats: [])
     @token = token
-    @client = Telebot::Client.new(token)
     @chats = chats
+    @bot = Telegram::Bot::Client.new(@token)
   end
 
   # You can run a chat bot to listen to the messages coming to it, in
   # a separate thread.
   def run
-    Telebot::Bot.new(@token).run do |chat, message|
-      if block_given?
-        yield(chat, message)
-      elsif !chat.nil?
-        id = message.chat.id
-        if id.positive?
-          post(
-            message.chat.id,
-            "This is your chat ID: `#{message.chat.id}`."
-          )
-        end
-      end
+    raise 'Block must be given' unless block_given?
+    @bot.listen do |message|
+      yield(message.chat.id, message.text)
     end
   rescue Net::OpenTimeout
     retry
@@ -110,14 +101,11 @@ class Telepost
   # be the admin there). The lines provided will be
   # concatenated with a space between them.
   def post(chat, *lines)
-    msg = lines.join(' ')
-    @client.send_message(
+    @bot.api.send_message(
       chat_id: chat,
       parse_mode: 'Markdown',
       disable_web_page_preview: true,
-      text: msg
+      text: lines.join(' ')
     )
-  rescue Telebot::Error => e
-    raise CantPost, "#{e.message}, can't post this message: \"#{msg}\""
   end
 end

data/telepost.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.2'
   s.name = 'telepost'
-  s.version = '0.4.0'
+  s.version = '0.5.1'
   s.license = 'MIT'
   s.summary = 'Simple Telegram posting Ruby gem'
   s.description = 'Simple Telegram posting Ruby gem'
@@ -38,6 +38,6 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md']
-  s.add_dependency 'telebot', '0.1.2'
+  s.add_dependency 'telegram-bot-ruby', '~> 1.0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/test_telepost.rb

@@ -23,6 +23,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'yaml'
 require_relative '../lib/telepost'
 
 # Telepost test.
@@ -38,11 +39,13 @@ class TelepostTest < Minitest::Test
   end
 
   def test_real_posting
-    skip
+    cfg = '/code/home/assets/zerocracy/baza.yml'
+    skip unless File.exist?(cfg)
+    yaml = YAML.safe_load_file(cfg)
     tp = Telepost.new(
-      '1088589765:...',
-      chats: [-1_001_438_256_738] # codexia channel
+      yaml['tg']['token'],
+      chats: [yaml['tg']['admin_chat'].to_i]
     )
-    tp.spam('This is just a test message')
+    tp.spam('This is just a test message from telepost test')
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: telepost
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: telebot
+  name: telegram-bot-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '1.0'
 description: Simple Telegram posting Ruby gem
 email: yegor256@gmail.com
 executables: []
@@ -58,7 +58,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple Telegram posting Ruby gem
 test_files: []