tegawa 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e45c931b802282c0f2c7fdbc24e5150c36133f3e58c9032926020f577205948
-  data.tar.gz: 3bd6f2a73033766028ae6dcdaded21cd4ea19f62e2726cfd2f290de82ecd9709
+  metadata.gz: 72984eb44391704a815c1bca822a1d35990743c037a37453e971447e327d6803
+  data.tar.gz: 4532fb57183c614ddc27b5354f57ee7d190f5f5441360296a4f575946329de9b
 SHA512:
-  metadata.gz: 89752c96958d392350d58761a92fdcfdac4de29ecd9e02cb66c88f380714458775e910fbb4d30208e307dbca65957cb62d888454e2d3fdc8aa071b8308b774ce
-  data.tar.gz: 821ec615d76d44112a6c5f3a5d9b6709631cb18cfba8362ef66bf7af355d8033a43e42c3c702a47b28eacc2f6f15fb93271f79e29cf9248db0e7e9ebee1cb2eb
+  metadata.gz: 82168fad5c05271a7d7797b3df15982cdec17c53d0d9aaf4f4900369bd638715fb95e4207d7c117ab0eaeca409f06103866b753a8133f9dfc4d73113982adef7
+  data.tar.gz: 07725eda7e3dfdab2762abe89627c4e7e70191822b1f4c62b6bd79071adf7309036f0c82bd4a0e70c2413c401c308436897e8afbf740578bb28d300a77a036a2

data/lib/tegawa.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 require "logger"
-require "byebug"
 
 require "tegawa/version"
 require "tegawa/core"
 require "tegawa/mail_server"
+require "tegawa/watcher"
 require "tegawa/bot"
 
 module Tegawa
   class Error < StandardError; end
   # Your code goes here...
   # try to gracefully shutdown on Ctrl-C
-  trap('INT') do
+  trap("INT") do
     puts "#{Time.now}: Interrupted, exit now..."
     exit 0
   end

data/lib/tegawa/bot.rb

@@ -10,15 +10,15 @@ module Tegawa
       @queue = Tegawa.queue
       @logger = Tegawa.logger
 
-      @bot ||= Telegram::Bot::Client.new(@token)
+      @bot = Telegram::Bot::Client.new(@token)
       @logger.info "Ready to forward messages to channel: #{@channel_id}"
     end
 
     def run
       # FIXME: needs a thread pool to stop flooding
-      while msg = @queue.pop
+      while (message = @queue.pop)
         @logger.info "Forwarding message to telegram"
-        @bot.api.send_message(chat_id: @channel_id, text: msg, parse_mode: "markdown")
+        @bot.api.send_message(chat_id: @channel_id, text: message)
       end
     end
   end

data/lib/tegawa/cli.rb

@@ -5,6 +5,7 @@ require "optparse"
 require "tegawa"
 require "tegawa/bot"
 require "tegawa/mail_server"
+require "tegawa/watcher"
 
 module Tegawa
   module Cli
@@ -24,7 +25,20 @@ module Tegawa
 
           # opt_parser = OptionParser.new do |opts|
           opt_parser = OptionParser.new { |opts|
-            opts.banner = "Usage: tegawa [options]"
+            opts.banner = <<~EOF
+              Usage: tegawa [options]
+
+              TeGaWa stands for Telegram GateWay. This tool is supposed to be run
+              as a daemon and accept local mail as well as watch a directory for
+              text files. It then forwards these mails and files to a Telegram
+              channel so you can easily stay informed about what is happening on
+              your systems.
+
+              It expects $TEGAWA_TOKEN to contain your telegram bot token and it
+              needs the channel_id to which it forwards the information.
+
+            EOF
+
             opts.on("-cCHANNEL", "--channel=CHANNEL", "The id of the telegram channel that should get the forwarded messages. Make sure your bot is a member first.") do |v|
               args[:channel] = v
             end
@@ -37,18 +51,18 @@ module Tegawa
             opts.on("-lLOG", "--logfile=LOG", "Where to write logging output. Default is STDOUT.") do |v|
               args[:log_file] = make_log_file(v)
             end
-            # opts.on("-wWATCH", "--watch=WATCH", "Which directory to watch for files to forward") do |v|
-            #   unless File.directory?(v)
-            #     puts "Watch dir not a directory."
-            #     exit
-            #   end
-            #   args[:watch_dir] = v
-            # end
+            opts.on("-wWATCH", "--watch=WATCH", "Which directory to watch for files to forward") do |v|
+              unless File.directory?(v)
+                puts "Watch dir not a directory."
+                exit
+              end
+              args[:watch_dir] = v
+            end
             opts.on("-h", "--help", "Prints this help") do
               puts opts
               exit
             end
-            opts.on("", "--version", "Show version") do
+            opts.on("--version", "Show version") do
               puts "Telegram GateWay Version #{Tegawa::VERSION}"
               exit
             end
@@ -65,7 +79,6 @@ module Tegawa
           setup(args)
         end
 
-
         private
 
         def make_log_file(log_file)
@@ -87,9 +100,9 @@ module Tegawa
           Tegawa.mail_server = @mail_server
           @mail_server.start
 
-          # unless args[:watch_dir].nil?
-          #   @watcher = Tegawa::Watcher.new(watch_dir)
-          # end
+          unless args[:watch_dir].nil?
+            @watcher = Tegawa::Watcher.new(args[:watch_dir])
+          end
 
           # the bot contains the main loop
           @bot = Tegawa::Bot.new(args[:token], args[:channel])

data/lib/tegawa/core.rb

@@ -22,4 +22,3 @@ module Tegawa
     @mail_server = mail_server
   end
 end
-

data/lib/tegawa/mail_server.rb

@@ -9,8 +9,6 @@ module Tegawa
       super(port, addr)
       @queue = Tegawa.queue
       @logger = Tegawa.logger
-
-      @logger.info "Mailserver running on #{addr}:#{port}"
     end
 
     def on_message_data_event(ctx)
@@ -23,7 +21,7 @@ module Tegawa
       # handle incoming mail, just show the message source
       @logger.info "You've got mail! From: #{@mail.from}"
 
-      message = "**Mail-From:** #{@mail.from}\r\n**Subject:** #{@mail.subject}\r\n\r\n#{@mail.body}"
+      message = "Mail-From: #{@mail.from}\r\nSubject: #{@mail.subject}\r\n\r\n#{@mail.body}"
       @queue << message
     end
   end

data/lib/tegawa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tegawa
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/tegawa/watcher.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "listen"
+
+module Tegawa
+  class Watcher
+    def initialize(watch_dir)
+      @queue = Tegawa.queue
+      @logger = Tegawa.logger
+
+      @logger.info "Watching #{watch_dir} for files"
+
+      # TODO: maybe allow to specify extension and recursion?
+      # listener = Listen.to("watch_dir", only: /.message$/) { |_modified, created, _removed|
+      @listener = Listen.to(watch_dir) { |_modified, created, _removed|
+        next if created.empty?
+
+        consume_file(created)
+      }
+      @listener.start # not blocking
+    end
+
+    def consume_file(paths)
+      paths.each do |path|
+        next unless File.exist?(path)
+
+        # FIXME: thread pool
+        Thread.new {
+          content = File.read(path)[0..4095]
+          message = "File: #{path}\r\n\r\n#{content}"
+          @queue << message
+          File.delete(path)
+        }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tegawa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Otto Strassen
@@ -33,6 +33,7 @@ files:
 - lib/tegawa/core.rb
 - lib/tegawa/mail_server.rb
 - lib/tegawa/version.rb
+- lib/tegawa/watcher.rb
 - tegawa.gemspec
 homepage: https://github.com/to-str/tegawa
 licenses: