dialog_ruby 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50b52161687990f23ad7cff84999068743836e72ac832d43071b46c19b724518
-  data.tar.gz: 2c4085bbe8b9b1cc4303a3013090e8be6bae7a54d2f8ff724b85bde4531ad23c
+  metadata.gz: de8a1266c971e423750e588c68386da28060d0f111e273925acfeac6fd53fdf2
+  data.tar.gz: bf7448b451fe7963009e2b1323d3be6fc28e9f05d53750c1ca939492a7f50b20
 SHA512:
-  metadata.gz: 684b298d0a10b2f839ae392b5ced57a2947c64797c7597f7c38dca8477b86e297cc40dc2b2f466700b615cc542f3173eae1b5bc6637e745a61bb2774d07377bb
-  data.tar.gz: 0b5fdb43a58eaba5995fdcb7946043b1577602da46b438671926dd9287bb472204b4d5556a1aa434609d3663abaca4994bb65229341ef42a5d921cef9600102d
+  metadata.gz: ce6bc8eafa36ce596ac2e7a4d5a1d36e2df955ea18fc5cf2e7f47a27ec8ba4c2a5b55978af936a88de1e0bf68c46055993e30f47fb3d170dfb652960072f7822
+  data.tar.gz: 31078ef9e5041b07f23777cbc936683e7381f4a1bcf978dfc40c059486771f285bbecc50cc2d91812381cb12dbee37eeb00300238e47d4eabbe58b0dcced4dbb

data/LICENSE

@@ -0,0 +1,7 @@
+########    #######    ########    #######    ########    ########
+##     / / / /    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/
+########    #######    ########    #######    ########    ########

data/exec/systemd/{dialog_bot@.service → dialog_runMode@.service}

@@ -7,7 +7,7 @@ Type=simple
 WorkingDirectory=<%=Dialog.config.path.dialog%>
 EnvironmentFile=<%=Dialog.config.path.dialog%>/_env/%i
 Environment=runScope=start
-Environment=runMode=bot
+Environment=runMode=<%=mode%>
 Environment=BotFullname=%i
 
 # Greatly reduce Ruby memory fragmentation and heap usage
@@ -20,7 +20,7 @@ TimeoutStopSec=5
 Restart=on-failure
 StandardOutput=syslog
 StandardError=syslog
-SyslogIdentifier=dialog_%i
+SyslogIdentifier=dialog_<%=mode%>_%i
 
 [Install]
 WantedBy=multi-user.target

data/lib/configuration.rb

@@ -98,7 +98,7 @@ module Dialog
   
   setting :log do
     setting :base,  Dialog.checkEnv('LogLevel', 'info')
-    setting :tdlib, Dialog.checkEnv('TdlibLoglevel', 1)
+    setting :tdlib, Dialog.checkEnv('TdlibLoglevel', 9)
   end  
   
   setting :monitoring do

data/lib/dialog_ruby.rb

@@ -17,7 +17,7 @@ module Dialog
       version = RUBY_VERSION.split('.').map { |x| x.to_i }
       if (version <=> [2, 5, 0]) >= 1
         require_relative './require.rb'
-        _require
+        _require_min
         send("trigger_#{Dialog.config.run.scope}".to_sym)
       else
         puts "Minimum required Ruby version - 2.5.0"

data/lib/require.rb

@@ -13,21 +13,31 @@
 module Dialog  
   class << self
     
-    def _require
+  def _require_min
       ### SYSTEM
       require 'pp'
       require 'timeout'
       require 'logger'
       require 'socket'
       require 'fileutils'
-      require 'uri'
       require 'open3'
+
+      ### DRY
+      require 'dry-configurable'
+      require_relative './version.rb'
+      require_relative './configuration.rb'
+      Dir.glob(File.join("#{File.dirname(__FILE__)}/triggers/**", "*.rb")).each{|f| require f}      
+    end
+    
+    
+    def _require
+      ### SYSTEM
+      require 'uri'
       require 'erb'
       require 'shellwords'
 
       ### GEMS
       require 'dialect_lookup'
-      require 'tdlib-ruby'
       require 'telegram/bot'
       require 'i18n'
       require 'redis'
@@ -38,7 +48,6 @@ module Dialog
       #lazy_object
 
       ### DRY
-      require 'dry-configurable'
       # require 'dry-monads'
       # require 'dry-matcher'
       # require 'dry-transaction'

data/lib/tdlib/init.rb

@@ -15,13 +15,13 @@ module Dialog
 
       def tdlibInit(name)
         
-        FileUtils.mkdir_p("#{Dialog.config.path.data}/tdlib/#{name}")        
+        FileUtils.mkdir_p("#{Dialog.config.path.dialogData}/tdlib/#{name}")        
         config = {
             api_id: Dialog.config.api.id,
             api_hash: Dialog.config.api.hash_s,
             device_model: Dialog.config.naming.app,
-            database_directory: "#{Dialog.config.path.data}/tdlib/#{name}",
-            files_directory:    "#{Dialog.config.path.data}/tdlib/#{name}",
+            database_directory: "#{Dialog.config.path.dialogData}/tdlib/#{name}",
+            files_directory:    "#{Dialog.config.path.dialogData}/tdlib/#{name}",
           }
                 
         TD.configure do |config|

data/lib/triggers/deploy/deploy.rb

@@ -14,11 +14,13 @@ module Dialog
   class << self    
     
     def trigger_deploy
+      require 'erb'
       deploy_redis
       deploy_bot
+      deploy_binaries
     end
     
-    def erb(erbFile, dst)
+    def erb(erbFile, dst, mode='')
       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         
@@ -26,23 +28,40 @@ module Dialog
     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')
+      if File.file?('/usr/sbin/redis-server')
+        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')
+      else
+        Dialog.logger.error "Please install Redis binary"
+        Dialog.logger.info "openSUSE: zypper --no-gpg-checks --non-interactive in redis"
+        exit(false)
+      end
     end
 
 
     def deploy_bot
-      erb('systemd/dialog_bot@.service', "#{Dir.home}/.config/systemd/user/dialog_bot@.service")
+      erb('systemd/dialog_runMode@.service', "#{Dir.home}/.config/systemd/user/dialog_bot_pre@.service", 'check')
       systemd("dialog_bot@#{Dialog.config.naming.full}")
+      
+      erb('systemd/dialog_runMode@.service', "#{Dir.home}/.config/systemd/user/dialog_bot@.service", Dialog.config.run.mode)
+      systemd("dialog_bot@#{Dialog.config.naming.full}")      
     end    
 
     def deploy_tdlib
+      erb('systemd/dialog_runMode@.service', "#{Dir.home}/.config/systemd/user/dialog_tdlib@.service", Dialog.config.run.mode)
+      systemd("dialog_tdlib@#{Dialog.config.naming.full}")      
     end    
     
+    def deploy_binaries
+        Dialog.logger.info "openSUSE: zypper ar -cf https://download.opensuse.org/repositories/home:/in4ops:/4wrap/openSUSE_Leap_15.0/home:in4ops:4wrap.repo"
+        #will be 'home:in4ops:Innosense:libs'
+        Dialog.logger.info "openSUSE: zypper --no-gpg-checks --non-interactive in zbar tdlib"      
+    end
+    
     def deploy_devenv
     end     
 
@@ -51,7 +70,8 @@ module Dialog
     
     def systemd(service)
       Open3.popen3('/usr/bin/systemctl', '--user', 'daemon-reload')
-      Open3.popen3('/usr/bin/systemctl', '--user', 'restart', service)
+#       Open3.popen3('/usr/bin/systemctl', '--user', 'restart', service)
+      #enable
     end
     
   end

data/lib/triggers/start/{start.rb → _main.rb}

@@ -17,17 +17,23 @@ module Dialog
       args = {}
       case Dialog.config.common.mode
       when 'check'
+        _require
         jsonDriven(args, :check)
       when 'bot'
+        _require
         jsonDriven(args, :prod)
         bot(args)
       when 'dev'
+        _require
         dialectDriven(args)
         jsonDriven(args, :prod)
         bot(args)
       when 'dev_offline'
+        _require
         dialectDriven(args)
-        jsonDriven(args, :check)  
+        jsonDriven(args, :check) 
+      when 'tdlib'
+        start_tdlib(args) 
       else
          Dialog.logger.error "ERROR: no such mode - '#{Dialog.config.common.mode}'"
       end      

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

@@ -13,32 +13,13 @@
 module Dialog  
   class << self  
     
-    def tdlibInit(args)
-      inits = ['cli']
-      args[:tdlib] = {}
-      inits.each do |init|
-        unless File.exists?("#{Dialog.config.path.data}/tdlib/#{init}/td.binlog")
-          Dialog.logger.error "ERROR: please make init of the '#{init}' using 'ruby dialog.rb init #{init}"
-          exit(false)
-        end
-        args[:tdlib][init.to_sym] = Dialog::TDLib.tdlibInit(init)        
-      end
-      args[:tdlib].freeze
-    end
-        
     
     def bot(args)
       args[:globals] = {}
       
       ### LANG
       i18n = Dialog::Lang.initial
-      
-      ## 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

data/lib/triggers/start/tdlib.rb

@@ -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 = ruby
+##    Indent = space;    2 chars;
+########    #######    ########    #######    ########    ########
+
+module Dialog  
+  class << self  
+    
+    def start_tdlib(args)
+      require 'tdlib-ruby'
+      args[:globals] = {}
+      Dir.glob(File.join("#{Dialog.config.path.dialog_rubyLib}/tdlib/**", "*.rb")).each{|f| require f}      
+      tdlibInit(args)
+      args[:tdlib][:cli].on_ready do |client|
+        a = client.fetch('@type' => 'getMe')
+        args[:globals][:cliId] = a['id'].to_i
+      end        
+    end
+    
+    
+    def tdlibInit(args)
+      inits = ['cli']
+      args[:tdlib] = {}
+      inits.each do |init|
+        unless File.exists?("#{Dialog.config.path.dialogData}/tdlib/#{init}/td.binlog")
+          Dialog.logger.error "ERROR: please make init of the '#{init}' using 'ruby dialog.rb init #{init}"
+          exit(false)
+        end
+        args[:tdlib][init.to_sym] = Dialog::TDLib.tdlibInit(init)        
+      end
+      args[:tdlib].freeze
+    end
+    
+  end
+end

data/lib/version.rb

@@ -11,5 +11,5 @@
 ########    #######    ########    #######    ########    ########
 
 module Dialog
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dialog_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Eugene Istomin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dialect_lookup
@@ -173,6 +173,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
 - _dev/get_full_botapi.rb
 - _dev/inlinekb_pubsub.rb
 - _dev/main.rb
@@ -189,13 +190,11 @@ files:
 - 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/_fix/dialog_bot@.path
+- exec/systemd/_fix/dialog_bot_dev@.path
+- exec/systemd/_fix/dialog_bot_dev_pre@.service
 - exec/systemd/dialog_redis.service
+- exec/systemd/dialog_runMode@.service
 - lang/global_ru.yml
 - lib/configuration.rb
 - lib/dialect/canvas/canvas.rb
@@ -254,10 +253,10 @@ files:
 - lib/metamess/event/notify_o.rb
 - lib/metamess/event_c.rb
 - lib/metamess/func.rb
+- lib/metamess/naming.rb
 - lib/metamess/service/service_o-callback_f.rb
 - 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
@@ -274,9 +273,10 @@ files:
 - 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/triggers/start/_main.rb
+- lib/triggers/start/_pre_bot.rb
+- lib/triggers/start/bot.rb
+- lib/triggers/start/tdlib.rb
 - lib/version.rb
 - logo.png
 homepage: https://gitlab.com/Innosense/MVP/dialog_ruby

data/exec/systemd/deploy.sh

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