dialog_ruby 0.1.10 → 0.1.11

data/lib/triggers/false.rb

@@ -10,12 +10,14 @@
 ##    Indent = space;    2 chars;
 ########    #######    ########    #######    ########    ########
 
-module Dialog  
-  class << self    
-    
-    def trigger_false
-      Dialog.logger.error "Something wrong in runtime scenario"
-    end
+module Dialog
+  module Triggers
+    class << self    
+      
+      def trigger_false
+        Dialog.logger.error "Something wrong in runtime scenario, please use dialog.sh"
+      end
   
+    end
   end
 end

data/lib/triggers/init.rb

@@ -10,18 +10,31 @@
 ##    Indent = space;    2 chars;
 ########    #######    ########    #######    ########    ########
 
-module Dialog  
-  class << self    
+module Dialog
+  module Triggers
+    class << self  
     
-    def trigger_init
-      Dialog.tdlibAuth
-    end
+      def trigger_init
+        require 'erb'      
+        send("trigger_init_#{Dialog.config.run.mode.to_sym}", Dialog.config.run.mode)
+        Dialog.logger.info "#{Dialog.config.run.mode} init finished successfully!"                          
+      end
+      
+      def trigger_init_tdlib(mode)
+        require 'tdlib-ruby'
+        Dir.glob(File.join("#{Dialog.config.path.dialog_rubyLib}/tdlib/**", "*.rb")).each{|f| require f}         
+        sess = Dialog::TDLib.tdlibInit
+        Dialog::TDLib.tdlibAuth('user', sess)
+      end
+      
+      def trigger_init_bot(mode)
+        true
+      end
+      
+      def trigger_init_bot_dev(mode)
+        true
+      end   
     
-    def tdlibAuth
-      sess = Dialog::TDLib.tdlibInit(Dialog.config.run.mode)
-      Dialog::TDLib.tdlibAuth(Dialog.config.run.mode, sess)
     end
-    
-    
   end
 end

data/lib/triggers/systemd_start.rb

@@ -0,0 +1,24 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    License    \ \ \ \ 
+##    Copyleft culture, Copyright (C) is prohibited here
+##    This work is licensed under a CC BY-SA 4.0
+##    Creative Commons Attribution-ShareAlike 4.0 License
+##    Refer to the http://creativecommons.org/licenses/by-sa/4.0/
+########    #######    ########    #######    ########    ########
+##    / / / /    Code Climate    \ \ \ \ 
+##    Language = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog
+  module Triggers
+    class << self       
+    
+      def trigger_systemd_start
+        systemd("dialog_#{Dialog.config.run.mode}@#{Dialog.config.naming.instance}", 'enstart')
+        systemd("dialog_#{Dialog.config.run.mode}_pre@#{Dialog.config.naming.instance}.path", 'enstart')                    
+      end
+    
+    end
+  end
+end

data/lib/version.rb

@@ -11,5 +11,5 @@
 ########    #######    ########    #######    ########    ########
 
 module Dialog
-  VERSION = '0.1.10'.freeze
+  VERSION = '0.1.11'.freeze
 end

metadata

@@ -1,141 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: dialog_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Eugene Istomin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dialect_lookup
+  name: tdlib-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dialog_bot_ruby
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: tdlib-ruby
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: sidekiq-cron
+  name: sidekiq-batch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: sidekiq-status
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq-rate-limiter
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: redis-dump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: Communication prototyping platform
 email:
 - info@innosense.org
@@ -172,15 +200,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - LICENSE
 - _dev/get_full_botapi.rb
 - _dev/inlinekb_pubsub.rb
 - _dev/main.rb
+- _dev/redisPubSub.rb
 - _dev/restriction.rb
 - _dev/ru.yml
-- _dev/sidekiq.rb
 - _dev/tdlib.rb
+- background/_init.rb
+- background/batch.rb
+- background/redis.rb
 - dialog_ruby.gemspec
 - exec/conf/redis_global.conf
 - exec/conf/redis_local.conf
@@ -191,17 +223,22 @@ files:
 - exec/git_sync/dialog__sync.timer
 - exec/git_sync/post-merge
 - exec/prereq.sh
-- exec/systemd/_fix/dialog_bot@.path
-- exec/systemd/_fix/dialog_bot_dev@.path
-- exec/systemd/_fix/dialog_bot_dev_pre@.service
+- exec/systemd/dialog_background.service
 - exec/systemd/dialog_redis.service
 - exec/systemd/dialog_runMode@.service
+- exec/systemd/dialog_runner@.path
 - lang/global_ru.yml
+- lib/begin/_main.rb
+- lib/begin/_pre_bot.rb
+- lib/begin/background.rb
+- lib/begin/bot.rb
+- lib/begin/tdlib.rb
 - lib/configuration.rb
 - lib/dialect/canvas/canvas.rb
 - lib/dialect/canvas/element/convert/SearchBaloo.rb
 - lib/dialect/canvas/element/data/search.rb
 - lib/dialect/canvas/element/send/Inline_query_result.rb
+- lib/dialect/canvas/element/send/background.rb
 - lib/dialect/canvas/element/send/bot_message.rb
 - lib/dialect/canvas/element/send/keyboards.rb
 - lib/dialect/canvas/element/send/recognize.rb
@@ -243,6 +280,7 @@ files:
 - lib/dialog_ruby.rb
 - lib/metamess/_run.rb
 - lib/metamess/content/content_o-command_f.rb
+- lib/metamess/content/content_o-contact_f.rb
 - lib/metamess/content/content_o-media_f.rb
 - lib/metamess/content/content_o-simple_f.rb
 - lib/metamess/content/content_o.rb
@@ -259,8 +297,13 @@ files:
 - lib/metamess/service/service_o-inline_f.rb
 - lib/metamess/service/service_o.rb
 - lib/require.rb
-- lib/storage/redis/redisPubSub.rb
-- lib/storage/redis/rediscached.rb
+- lib/statistics/func.rb
+- lib/statistics/general.rb
+- lib/statistics/redisDump.rb
+- lib/storage/redis/cached/pullpush.rb
+- lib/storage/redis/cached/pushPreproc.rb
+- lib/storage/redis/func.rb
+- lib/storage/redis/stat/push.rb
 - lib/tdlib/auth.rb
 - lib/tdlib/func.rb
 - lib/tdlib/init.rb
@@ -270,14 +313,13 @@ files:
 - lib/tooling/lang.rb
 - lib/tooling/log.rb
 - lib/tooling/ruby.rb
-- lib/triggers/_meta/full.rb
-- lib/triggers/deploy/deploy.rb
+- lib/tooling/strings.rb
+- lib/triggers/_func.rb
+- lib/triggers/console_start.rb
+- lib/triggers/deploy.rb
 - lib/triggers/false.rb
 - lib/triggers/init.rb
-- lib/triggers/start/_main.rb
-- lib/triggers/start/_pre_bot.rb
-- lib/triggers/start/bot.rb
-- lib/triggers/start/tdlib.rb
+- lib/triggers/systemd_start.rb
 - lib/version.rb
 - logo.png
 homepage: https://gitlab.com/Innosense/MVP/dialog_ruby

data/_dev/sidekiq.rb

@@ -1,28 +0,0 @@
-class TelegramHandlerWorker
-  include Sidekiq::Worker
-  sidekiq_options queue: :telegram
-
-  TYPES = %w(inline_query
-              chosen_inline_result
-              callback_query
-              edited_message
-              message
-              channel_post
-              edited_channel_post)
-
-  def perform(params)
-    update = Telegram::Bot::Types::Update.new(params)
-    message = TYPES.reduce(nil) { |m, t| m || update.public_send(t) }
-
-    if message.present?
-      RedmineBots::Telegram.update_manager.handle_message(message)
-    else
-      logger.fatal "Can't find message: #{params.to_json}"
-    end
-  end
-
-  def logger
-    @logger ||= Logger.new(Rails.root.join('log/redmine_bots',
-                                           'telegram-handler.log'))
-  end
-end

data/exec/systemd/_fix/dialog_bot@.path

@@ -1,6 +0,0 @@
-[Unit]
-Description=Monitor /tmp/ready
-
-[Path]
-Unit=dialog_bot_pre@%i.service
-PathChanged=/tmp/ready_%i

data/exec/systemd/_fix/dialog_bot_dev@.path

@@ -1,6 +0,0 @@
-[Unit]
-Description=Monitor sqlite export
-
-[Path]
-Unit=dialog_bot_dev_pre@%i.service
-PathChanged={RunPath}/_data/Dialect.sqlite

data/exec/systemd/_fix/dialog_bot_dev_pre@.service

@@ -1,16 +0,0 @@
-[Unit]
-Description= Dialog (Telegram Bot abstraction layer) - instance %i
-After=syslog.target network.target
-
-[Service]
-Type=oneshot
-WorkingDirectory={RunPath}
-EnvironmentFile={RunPath}/_env/%i
-ExecStartPre=/usr/bin/ruby.ruby2.5 ./dialog.rb start dev_offline %i
-ExecStart=/usr/bin/systemctl --user restart dialog_bot@%i
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=dialog_dev_pre_%i
-
-[Install]
-WantedBy=multi-user.target