dialog_ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30155becff2a9f39d3d1c827c6c63d31ded0b9197884501f224cce0cf20fa42
-  data.tar.gz: '095776832dcc0af93bf076f7e4dfa79da9551e2ae20c428b58da63bfc3cbd8c4'
+  metadata.gz: 50b52161687990f23ad7cff84999068743836e72ac832d43071b46c19b724518
+  data.tar.gz: 2c4085bbe8b9b1cc4303a3013090e8be6bae7a54d2f8ff724b85bde4531ad23c
 SHA512:
-  metadata.gz: 5ed7b3240d5ec6c6deba9b3cda0e155bace016fcbcd317b0723179ccdfceceba8c67f007aeef6031a39b1b30bd9d3ccfbbdd0951978e8ebbc9b2b452179512bb
-  data.tar.gz: 60c766700b3f958441ad542e8430ec7f4feffc7fa3139730f98acc591a39b2449d10f924252e55e9f8ae15471ecccc005e15e62a54a4fbc39e1479d9e78daff2
+  metadata.gz: 684b298d0a10b2f839ae392b5ced57a2947c64797c7597f7c38dca8477b86e297cc40dc2b2f466700b615cc542f3173eae1b5bc6637e745a61bb2774d07377bb
+  data.tar.gz: 0b5fdb43a58eaba5995fdcb7946043b1577602da46b438671926dd9287bb472204b4d5556a1aa434609d3663abaca4994bb65229341ef42a5d921cef9600102d

data/exec/conf/redis_global.conf

@@ -0,0 +1,49 @@
+daemonize no
+port 0
+unixsocketperm 700
+loglevel notice
+syslog-enabled yes
+syslog-facility local1
+databases 2
+save 600 1
+save 300 5
+save 180 10
+save 60 50
+save 10 100
+
+stop-writes-on-bgsave-error yes
+rdbcompression yes
+rdbchecksum yes
+dbfilename dump.rdb
+appendonly no
+appendfsync everysec
+no-appendfsync-on-rewrite no
+maxclients 1000
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+aof-rewrite-incremental-fsync yes
+
+
+aof-load-truncated yes
+lua-time-limit 5000
+slowlog-log-slower-than 10000
+slowlog-max-len 128
+latency-monitor-threshold 0
+notify-keyspace-events ""
+
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+set-max-intset-entries 512
+
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+hll-sparse-max-bytes 3000
+activerehashing yes
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+hz 10

data/exec/conf/redis_local.conf

@@ -0,0 +1,4 @@
+include 'redis_global.conf'
+unixsocket 'redis.sock'
+syslog-ident dialog_redis
+dir './'

data/exec/dev/run_dev.sh

@@ -0,0 +1,42 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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 = bash
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+set -e 
+
+
+#####
+DialogBotExec() (
+  systemctl --user restart dialog_redis@${BotFullname}
+  systemctl --user restart dialog_bot@${BotFullname}
+
+  case $Mode in
+    'prod')
+      echo "Ready!"
+      systemctl --user enable dialog_redis@${BotFullname}
+      systemctl --user enable dialog_bot@${BotFullname}      
+    ;;
+    'dev')    
+      mkdir -p  /tmp/_render    
+
+      inotifywait -r -e DELETE --format '%w %f' -m ./engine |\
+      (
+      while read; do
+        echo "Bot restarting"
+        systemctl --user restart dialog_bot@${BotFullname}
+      done
+      )
+
+      systemctl --user stop dialog_bot@${BotFullname}
+      systemctl --user stop dialog_redis@${BotFullname}
+      ;;
+  esac      
+)
+#####

data/exec/dev/tmpfiles.conf

@@ -0,0 +1,5 @@
+# See tmpfiles.d(5) for details
+d /tmp/in4/dialog 0770 in4 in4 2d
+d /tmp/in4/dialog/render 0770 in4 in4 1d
+
+

data/exec/dialog.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+########    #######    ########    #######    ########    ########
+##     / / / /    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 = bash
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+set -e
+
+## PRE - ENV ##
+# . ./engine/exec.sh
+
+if [[ -z $RunMethod ]]; then
+    DialogMsg="Please specify run method"
+    echo $DialogMsg; select RunMethod in console systemd;  do  break ; done
+fi
+
+if [[ -z $BotFullname ]]; then
+    DialogMsg="Please specify BotFullname"
+    echo $DialogMsg; select BotFullname in `ls ./_env/*|grep -v tmpl|sed -e 's/.*.\///'`;  do  break ; done
+fi
+
+case $RunMethod in 
+'sytemd')
+;;
+
+'console')
+
+  if [[ -z $runScope ]]; then
+      DialogMsg="Please specify scope"
+      echo $DialogMsg; select runScope in init start stop;  do  break ; done
+  fi
+  
+  if [[ -z $runMode ]]; then
+      DialogMsg="Please specify mode: "
+      echo $DialogMsg; select runMode in check bot dev dev_offline;  do  break ; done
+  fi  
+  
+  export $(grep -v '^#' ./_env/$BotFullname | xargs)
+  ruby ./dialog.rb
+
+;;
+
+*)
+echo 'Wrong run method!'
+;;
+esac

data/exec/git_sync/dialog__sync.service

@@ -0,0 +1,14 @@
+[Unit]
+Description= Dialog sync
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+WorkingDirectory={RunPath}
+ExecStart=/usr/bin/git pull
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=dialog_sync
+
+[Install]
+WantedBy=multi-user.target

data/exec/git_sync/dialog__sync.timer

@@ -0,0 +1,11 @@
+[Unit]
+Description=Timer for dialog__sync
+After=syslog.target network.target
+[Install]
+WantedBy=multi-user.target
+
+[Timer]
+OnBootSec=2min
+OnUnitActiveSec=1min
+Unit=dialog__sync.service 
+ 

data/exec/git_sync/post-merge

@@ -0,0 +1,5 @@
+cd ./_env
+
+find . -mindepth 1 -not -path './_tmpl.bot' -print0 | while IFS= read -r -d $'\0' line; do
+  systemctl --user restart dialog_bot_pre@`echo $line|sed 's/^.\///'`.service
+done

data/exec/systemd/deploy.sh

@@ -0,0 +1,31 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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 = bash
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+set -e 
+
+runInitMain() (
+  if [ ! -f ~/.config/systemd/user/dialog_bot@.service ] || [ ! -f ~/.config/systemd/user/dialog_redis@.service ] ; then 
+    cp dialog*@.service ~/.config/systemd/user
+    sed -i "s#{RunPath}#`echo $PWD`#" ~/.config/systemd/user/dialog*@.service
+  fi
+  systemctl --user daemon-reload
+)
+
+botRunInit() (
+  mkdir -p ~/.config/systemd/user ./_data/${BotFullname}
+  runInitMain
+
+  if [ ! -f ./_data/${BotFullname}/redis.conf ]; then 
+    cp ../conf/redis_local.conf ./_data/${BotFullname}/redis.conf 
+    sed -i "s/{INSTANCE}/${BotFullname}/" ./_data/${BotFullname}/redis.conf 
+  fi
+  systemctl --user daemon-reload
+)

data/exec/systemd/dialog_bot@.path

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

data/exec/systemd/dialog_bot@.service

@@ -0,0 +1,26 @@
+[Unit]
+Description= Dialog (Telegram Bot abstraction layer) - instance %i
+After=syslog.target network.target
+
+[Service]
+Type=simple
+WorkingDirectory=<%=Dialog.config.path.dialog%>
+EnvironmentFile=<%=Dialog.config.path.dialog%>/_env/%i
+Environment=runScope=start
+Environment=runMode=bot
+Environment=BotFullname=%i
+
+# Greatly reduce Ruby memory fragmentation and heap usage
+# https://www.mikeperham.com/2018/04/25/taming-rails-memory-bloat/
+Environment=MALLOC_ARENA_MAX=2
+
+ExecStart=/usr/bin/ruby ./dialog.rb
+RestartSec=5
+TimeoutStopSec=5
+Restart=on-failure
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=dialog_%i
+
+[Install]
+WantedBy=multi-user.target

data/exec/systemd/dialog_bot_dev@.path

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

data/exec/systemd/dialog_bot_dev_pre@.service

@@ -0,0 +1,16 @@
+[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

data/exec/systemd/dialog_bot_pre@.service

@@ -0,0 +1,16 @@
+[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 check %i
+ExecStart=/usr/bin/systemctl --user restart dialog_bot@%i
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=dialog_pre_%i
+
+[Install]
+WantedBy=multi-user.target

data/exec/systemd/dialog_redis.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Redis
+After=network.target
+PartOf=redis.target
+
+[Service]
+Type=simple
+#PrivateTmp=true
+WorkingDirectory=<%=Dialog.config.path.dialogData%>/redis
+PIDFile=<%=Dialog.config.path.dialogData%>/redis/redis.pid
+ExecStart=/usr/sbin/redis-server ./redis_local.conf
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

data/lib/configuration.rb

@@ -13,6 +13,10 @@
 module Dialog
   extend Dry::Configurable
   
+  require_relative './tooling/log.rb'
+  def self.getDialogPath; return @dialogPath;  end
+  def self.getDialog_rubyPath; return File.dirname(__FILE__);  end
+  
   def self.checkEnv(env, val, err=[])
     if ENV[env].nil?
       case val
@@ -21,33 +25,30 @@ module Dialog
         else        res = val 
       end
     else res = ENV[env]; end
+      puts err
     return res
   end    
   
-
   err = []
-  app = 'Dialog'
-  ARGV[0] ? scope      = ARGV[0] : err << "There is no scope  as ARGV[0]" && scope = false
-  ARGV[1] ? mode       = ARGV[1] : err << "There is no mode   as ARGV[1]" && mode  = false    
+  app = 'Dialog'  
   
   setting :api do
-    setting :id,   Dialog.checkEnv('ApiID', false, err)
+    setting :id,     Dialog.checkEnv('ApiID',   false, err)
     setting :hash_s, Dialog.checkEnv('ApiHash', false, err)
   end
   
   setting :run do
-    setting :scope, scope 
-    setting :mode, mode
+    setting :scope, Dialog.checkEnv('runScope', false, err) 
+    setting :mode,  Dialog.checkEnv('runMode',  false, err)
   end  
   
   setting :naming do
     setting :app, app
   end
 
-  unless scope == 'init'
-    ARGV[2] ? namingFull = ARGV[2] : err << "There is no naming as ARGV[2]"
-    
-    token = Dialog.checkEnv('BotToken',  false, err)
+  unless Dialog.checkEnv('runScope', false, err) == 'init'
+    namingFull = Dialog.checkEnv('BotFullname',  false, err)
+    token = Dialog.checkEnv('BotToken',  false, err)    
     
     setting :naming do    
       setting :app, app
@@ -58,7 +59,7 @@ module Dialog
       else
         err << "Error in naming!"
       end
-      setting :id, token.split(':')[0].to_i
+      setting :id, token.split(':')[0].to_i unless token == false
     end  
     
     setting :dialect do
@@ -67,7 +68,7 @@ module Dialog
     end    
     
     setting :db do
-      setting :redis_url,  "./_data/#{namingFull}/redis.sock"
+      setting :redis_url,  "./_data/redis/redis.sock"
     end    
     
     setting :secure do
@@ -84,13 +85,15 @@ module Dialog
   end
   
   setting :path do
-    setting :run,   "#{Dir.pwd}/engine"
-    setting :data,  "#{Dir.pwd}/_data"    
-    setting :render,"#{Dir.pwd}/_render"    
+    setting :dialog_ruby,   "#{Dialog.getDialog_rubyPath}/../"
+    setting :dialog_rubyLib,"#{Dialog.getDialog_rubyPath}"
+    setting :dialog,        "#{Dialog.getDialogPath}"        
+    setting :dialogData,    "#{Dialog.getDialogPath}/_data"    
+    setting :dialogRender,  "#{Dialog.getDialogPath}/_render"    
   end 
   
   setting :common do
-    setting :mode,   mode 
+    setting :mode,   Dialog.checkEnv('runMode', false, err) 
   end
   
   setting :log do
@@ -109,6 +112,11 @@ module Dialog
     setting :web_hook_url, "https://#{botInstanceHostName}/telegram/api/web_hook"    
   end 
   
+  if Dialog.checkEnv('runScope', false, err) == false and Dialog.checkEnv('runMode', false, err) == false 
+   FileUtils.cp "#{Dialog.getDialog_rubyPath}/../exec/dialog.sh", "#{Dialog.getDialogPath}/" if not File.file?("#{Dialog.getDialogPath}/dialog.sh")
+   Dialog.logger.info "dialog.sh is copied to your dialog folder, please use it for correct ENV exports!"
+  end
+  
   unless err.empty?
     err << "EXITING!"
     puts err

data/lib/dialect/codegen/codegen.rb

@@ -42,7 +42,7 @@ module Dialog
       
     
       def makeAErb(args, type, stage)
-        FileUtils.mkdir_p("#{Dialog.config.path.render}/code_#{type}/")
+        FileUtils.mkdir_p("#{Dialog.config.path.dialogRender}/code_#{type}/")
         
         args[:tmp][:stages][stage].each do |runProps|  
           nameSym = runProps[:name].to_sym        
@@ -54,9 +54,9 @@ module Dialog
                 fullName = "#{runProps[:order]}_#{runProps[:name]}_#{viewId}"
                 fullNameSym = fullName.to_sym
               
-                tmpl = ERB.new(File.read("#{Dialog.config.path.run}/lib/dialect/codegen/erb/#{stage}/#{runProps[:order]}.#{runProps[:name]}.erb")).result(binding)             
+                tmpl = ERB.new(File.read("#{File.dirname(__FILE__)}/erb/#{stage}/#{runProps[:order]}.#{runProps[:name]}.erb")).result(binding)
                 runProps.has_key?(:erb_order) ? rname = "#{runProps[:erb_order]}_#{fullName}" : rname = fullName              
-                File.open("#{Dialog.config.path.render}/code_#{type}/#{stage}__#{rname}.rb", 'w') do |f| f.write tmpl; end   
+                File.open("#{Dialog.config.path.dialogRender}/code_#{type}/#{stage}__#{rname}.rb", 'w') do |f| f.write tmpl; end   
               end
             end  
           end

data/lib/dialog_ruby.rb

@@ -10,41 +10,20 @@
 ##    Indent = space;    2 chars;
 ########    #######    ########    #######    ########    ########
 
-### SYSTEM
-require 'pp'
-require 'timeout'
-require 'logger'
-require 'socket'
-require 'fileutils'
-require 'uri'
-require 'open3'
-require 'erb'
-
-### GEMS
-require 'dialect_lookup'
-require 'tdlib-ruby'
-require 'telegram/bot'
-require 'i18n'
-require 'redis'
-require 'concurrent'
-require 'oj'
-require 'sidekiq-cron'
-require 'sidekiq-rate-limiter'
-#lazy_object
-
-### DRY
-require 'dry-configurable'
-# require 'dry-monads'
-# require 'dry-matcher'
-# require 'dry-transaction'
-# require 'dry/inflector'
-# require 'dry-validation'
-# require 'dry-struct'
-# require 'dry-types'
-
-#dry-events - pub/sub
-
-### CODE
-require_relative './configuration.rb'
-require_relative './dialogStart.rb'
-Dir.glob(File.join("#{Dialog.config.path.run}/**", "*.rb")).each{|f| require f}
+module Dialog  
+  class << self
+    
+    def create
+      version = RUBY_VERSION.split('.').map { |x| x.to_i }
+      if (version <=> [2, 5, 0]) >= 1
+        require_relative './require.rb'
+        _require
+        send("trigger_#{Dialog.config.run.scope}".to_sym)
+      else
+        puts "Minimum required Ruby version - 2.5.0"
+      end
+    end
+       
+  end
+end
+    

data/lib/require.rb

@@ -0,0 +1,58 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self
+    
+    def _require
+      ### SYSTEM
+      require 'pp'
+      require 'timeout'
+      require 'logger'
+      require 'socket'
+      require 'fileutils'
+      require 'uri'
+      require 'open3'
+      require 'erb'
+      require 'shellwords'
+
+      ### GEMS
+      require 'dialect_lookup'
+      require 'tdlib-ruby'
+      require 'telegram/bot'
+      require 'i18n'
+      require 'redis'
+      require 'concurrent'
+      require 'oj'
+      require 'sidekiq-cron'
+      require 'sidekiq-rate-limiter'
+      #lazy_object
+
+      ### DRY
+      require 'dry-configurable'
+      # require 'dry-monads'
+      # require 'dry-matcher'
+      # require 'dry-transaction'
+      # require 'dry/inflector'
+      # require 'dry-validation'
+      # require 'dry-struct'
+      # require 'dry-types'
+
+      #dry-events - pub/sub
+
+      ### CODE
+      Dir.glob(File.join("#{File.dirname(__FILE__)}/**", "*.rb")).each{|f| require f}
+    end
+    
+  end
+end
+    

data/lib/tooling/lang.rb

@@ -14,7 +14,8 @@ module Dialog
     class << self
     
       def initial
-          I18n.load_path = Dir["#{Dialog.config.path.run}/lang/*.yml"]
+          I18n.load_path = Dir["#{Dialog.config.path.dialog_ruby}/lang/*.yml"]
+          I18n.available_locales = [:en, :ru]
           I18n.default_locale = :ru    
           I18n.backend.load_translations
       end

data/lib/triggers/_meta/full.rb

@@ -0,0 +1,21 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self    
+    
+    def trigger_full
+      
+    end
+    
+  end
+end

data/lib/triggers/deploy/deploy.rb

@@ -0,0 +1,58 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self    
+    
+    def trigger_deploy
+      deploy_redis
+      deploy_bot
+    end
+    
+    def erb(erbFile, dst)
+      if not File.file?(dst)
+        tmpl = ERB.new(File.read("#{Dialog.config.path.dialog_ruby}/exec/#{erbFile}")).result(binding)
+        File.open(dst, 'w') do |f| f.write tmpl; end         
+      end
+    end
+    
+    def deploy_redis
+      redisDir = "#{Dialog.config.path.dialogData}/redis"
+      FileUtils.mkdir_p redisDir
+      erb('systemd/dialog_redis.service', "#{Dir.home}/.config/systemd/user/dialog_redis.service")
+      erb('conf/redis_local.conf', "#{redisDir}/redis_local.conf")
+      erb('conf/redis_global.conf', "#{redisDir}/redis_global.conf")
+      systemd('dialog_redis')
+    end
+
+
+    def deploy_bot
+      erb('systemd/dialog_bot@.service', "#{Dir.home}/.config/systemd/user/dialog_bot@.service")
+      systemd("dialog_bot@#{Dialog.config.naming.full}")
+    end    
+
+    def deploy_tdlib
+    end    
+    
+    def deploy_devenv
+    end     
+
+    def deploy_gitsync
+    end  
+    
+    def systemd(service)
+      Open3.popen3('/usr/bin/systemctl', '--user', 'daemon-reload')
+      Open3.popen3('/usr/bin/systemctl', '--user', 'restart', service)
+    end
+    
+  end
+end

data/lib/triggers/false.rb

@@ -0,0 +1,21 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self    
+    
+    def trigger_false
+      Dialog.logger.error "Something wrong in runtime scenario"
+    end
+  
+  end
+end

data/lib/triggers/init.rb

@@ -0,0 +1,27 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self    
+    
+    def trigger_init
+      Dialog.tdlibAuth
+    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/start/start.rb

@@ -0,0 +1,68 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self
+    
+    def trigger_start
+      args = {}
+      case Dialog.config.common.mode
+      when 'check'
+        jsonDriven(args, :check)
+      when 'bot'
+        jsonDriven(args, :prod)
+        bot(args)
+      when 'dev'
+        dialectDriven(args)
+        jsonDriven(args, :prod)
+        bot(args)
+      when 'dev_offline'
+        dialectDriven(args)
+        jsonDriven(args, :check)  
+      else
+         Dialog.logger.error "ERROR: no such mode - '#{Dialog.config.common.mode}'"
+      end      
+    end    
+    
+  
+    
+    def dialectDriven(args)
+      require 'dialect_lookup'
+      state = {
+        dialectFolder:  Dialog.config.dialect.folder, 
+        myAppName:      Dialog.config.naming.app, 
+        sqlite:         Dialog.config.dialect.sqlite, 
+        jsonFolder:  "#{Dialog.config.path.dialogRender}/json/"
+      }
+      ::Dialect::Lookup.new.run(state)
+#       File.delete(Dialog.config.dialect.sqlite)
+    end
+    
+    
+    def jsonDriven(args, type)
+      FileUtils.rm_rf(Dir.glob("#{Dialog.config.path.dialogRender}/code_#{type}/*.rb"))     
+      args[:dialect] = {}      
+      
+      json = "#{Dialog.config.path.dialogRender}/json/#{Dialog.config.dialect.folder}_#{Dialog.config.naming.app}.json"
+      jsonLoad = Oj.load(File.read(json), symbol_keys: true)
+      args[:dialect] = jsonLoad[:stages][Dialog.config.dialect.folder.to_sym]
+      Dialog::Dialect.run(args, type)
+  
+      args[:dialect] ={} 
+      args[:tmp] = {}      
+      Dir.glob(File.join("#{Dialog.config.path.dialogRender}/code_#{type}/**", "*.rb")).sort.each{|f| require f}
+      Dialog.logger.info "Rendered bot code is ok"      
+    end
+
+    
+  end
+end

data/lib/{dialogStart.rb → triggers/start/start_bot.rb}

@@ -11,73 +11,7 @@
 ########    #######    ########    #######    ########    ########
 
 module Dialog  
-  class << self
-  
-    def redis
-      @redis ||= Redis.new(path: Dialog.config.db.redis_url)
-    end
-    
-    def clear(args)
-      args[:x] = {metamess: {}, redis: {}, data: {}, labels: {}, send: {}, exec: {}}
-      args[:smsg] = {}
-    end
-    
-    def clearRedis(args)
-      args[:x][:redis] = {}
-    end     
-    
-    def clearApi(args)
-      args[:api] = {}
-    end    
-    
-    def start
-      args = {}
-      case Dialog.config.common.mode
-      when 'check'
-        jsonDriven(args, :check)
-      when 'bot'
-        jsonDriven(args, :prod)
-        bot(args)
-      when 'dev'
-        dialectDriven(args)
-        jsonDriven(args, :prod)
-        bot(args)
-      when 'dev_offline'
-        dialectDriven(args)
-        jsonDriven(args, :check)  
-      else
-         Dialog.logger.error "ERROR: no such mode - '#{Dialog.config.common.mode}'"
-      end      
-    end
-    
-    
-    def dialectDriven(args)
-      state = {
-        dialectFolder:  Dialog.config.dialect.folder, 
-        myAppName:      Dialog.config.naming.app, 
-        sqlite:         Dialog.config.dialect.sqlite, 
-        jsonFolder:  "#{Dialog.config.path.render}/json/"
-      }
-      ::Dialect::Lookup.new.run(state)
-      File.delete(Dialog.config.dialect.sqlite)
-    end
-    
-    
-    def jsonDriven(args, type)
-      FileUtils.rm_rf(Dir.glob("#{Dialog.config.path.render}/code_#{type}/*.rb"))     
-      args[:dialect] = {}      
-      
-      json = "#{Dialog.config.path.render}/json/#{Dialog.config.dialect.folder}_#{Dialog.config.naming.app}.json"
-      jsonLoad = Oj.load(File.read(json), symbol_keys: true)
-      args[:dialect] = jsonLoad[:stages][Dialog.config.dialect.folder.to_sym]
-      Dialog::Dialect.run(args, type)
-  
-      args[:dialect] ={} 
-      args[:tmp] = {}      
-      Dir.glob(File.join("#{Dialog.config.path.render}/code_#{type}/**", "*.rb")).sort.each{|f| require f}
-      Dialog.logger.info "Rendered bot code is ok"      
-    end
-
+  class << self  
     
     def tdlibInit(args)
       inits = ['cli']
@@ -93,25 +27,25 @@ module Dialog
     end
         
     
-    
-    def tdlibAuth
-      sess = Dialog::TDLib.tdlibInit(Dialog.config.run.mode)
-      Dialog::TDLib.tdlibAuth(Dialog.config.run.mode, sess)
-    end
-    
-    
     def bot(args)
       args[:globals] = {}
       
       ### LANG
       i18n = Dialog::Lang.initial
       
-      tdlibInit(args)
-      args[:tdlib][:cli].on_ready do |client|
-        a = client.fetch('@type' => 'getMe')
-        args[:globals][:cliId] = a['id'].to_i
-      end        
-          
+      ## BUG - TEMPORARY DISABLE
+#       tdlibInit(args)
+#       args[:tdlib][:cli].on_ready do |client|
+#         a = client.fetch('@type' => 'getMe')
+#         args[:globals][:cliId] = a['id'].to_i
+#       end        
+      begin    
+        Dialog::redis.call(['info', 'clients'])
+      rescue
+        Dialog.logger.error "No Redis connection!"
+        sleep(2) 
+        retry
+      end
       Telegram::Bot::Client.run Dialog.config.secure.token do |bot|
         args[:bot]= bot; args[:bot].freeze
         
@@ -177,13 +111,7 @@ module Dialog
           raise
         end
     end
-    
-    def perf(perf)
-    a = []
-    a << "mmsg: #{perf[:metamess] - perf[:init]}s" if perf.has_key?(:metamess)
-    a << "preApiAction: #{perf[:preApiAction] - perf[:init]}s" if perf.has_key?(:preApiAction)
-    a << "full: #{perf[:fullend] - perf[:init]}s"  
-    end
+
     
   end
 end

data/lib/triggers/start/start_pre.rb

@@ -0,0 +1,43 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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  
+  class << self
+    
+  
+    def redis
+      @redis ||= Redis.new(path: Dialog.config.db.redis_url)
+    end
+    
+    def clear(args)
+      args[:x] = {metamess: {}, redis: {}, data: {}, labels: {}, send: {}, exec: {}}
+      args[:smsg] = {}
+    end
+    
+    def clearRedis(args)
+      args[:x][:redis] = {}
+    end     
+    
+    def clearApi(args)
+      args[:api] = {}
+    end    
+    
+    
+    def perf(perf)
+    a = []
+    a << "mmsg: #{perf[:metamess] - perf[:init]}s" if perf.has_key?(:metamess)
+    a << "preApiAction: #{perf[:preApiAction] - perf[:init]}s" if perf.has_key?(:preApiAction)
+    a << "full: #{perf[:fullend] - perf[:init]}s"  
+    end
+    
+  end
+end

data/lib/version.rb

@@ -1,3 +1,15 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dialog_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Eugene Istomin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dialect_lookup
@@ -181,6 +181,21 @@ files:
 - _dev/sidekiq.rb
 - _dev/tdlib.rb
 - dialog_ruby.gemspec
+- exec/conf/redis_global.conf
+- exec/conf/redis_local.conf
+- exec/dev/run_dev.sh
+- exec/dev/tmpfiles.conf
+- exec/dialog.sh
+- exec/git_sync/dialog__sync.service
+- exec/git_sync/dialog__sync.timer
+- exec/git_sync/post-merge
+- exec/systemd/deploy.sh
+- exec/systemd/dialog_bot@.path
+- exec/systemd/dialog_bot@.service
+- exec/systemd/dialog_bot_dev@.path
+- exec/systemd/dialog_bot_dev_pre@.service
+- exec/systemd/dialog_bot_pre@.service
+- exec/systemd/dialog_redis.service
 - lang/global_ru.yml
 - lib/configuration.rb
 - lib/dialect/canvas/canvas.rb
@@ -225,7 +240,6 @@ files:
 - lib/dialect/codegen/repack/functional/5.2.Element2ModSend.rb
 - lib/dialect/codegen/repack/functional/7.ElementChains.rb
 - lib/dialect/codegen/run.rb
-- lib/dialogStart.rb
 - lib/dialog_ruby.rb
 - lib/metamess/_run.rb
 - lib/metamess/content/content_o-command_f.rb
@@ -244,6 +258,7 @@ files:
 - lib/metamess/service/service_o-inline_f.rb
 - lib/metamess/service/service_o.rb
 - lib/naming.rb
+- lib/require.rb
 - lib/storage/redis/redisPubSub.rb
 - lib/storage/redis/rediscached.rb
 - lib/tdlib/auth.rb
@@ -255,6 +270,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/triggers/false.rb
+- lib/triggers/init.rb
+- lib/triggers/start/start.rb
+- lib/triggers/start/start_bot.rb
+- lib/triggers/start/start_pre.rb
 - lib/version.rb
 - logo.png
 homepage: https://gitlab.com/Innosense/MVP/dialog_ruby
@@ -277,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Communication prototyping platform