slack-smart-bot 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8df140b707c4449949790ee4aec06123d702f7e504d9181d17ab28ce4907d50
-  data.tar.gz: cb3b7b350309de0f3597f1349138f1532324377ee51b0340a5d95478a7ef10ef
+  metadata.gz: 2fc056a8adf65b10b17f3b644ffa63117ce88287c3dfe405d5d5bda9e9c6a446
+  data.tar.gz: ec761cdf4a8b1ff4cd693f952349db588dee7606cc80ee51c640914da61f4b79
 SHA512:
-  metadata.gz: 945db84827a120c3cd07c301f15f0de822628060d65ac75d4856f97f19e2af8640a4fe9c7c6290541e2541d89fd6794e90e03170e229f16a2d0fcc6e150632e0
-  data.tar.gz: de406836aeb262ef22fc468add1a7dc8a0bdd02f2003e94d28e5965f22333a0d6d87bf11efc1062604a83b4ba776aec2ac98616a6d04e2f1d5bffc4da2ff73d8
+  metadata.gz: 74d836ba0dd429f20eb44d3172457d1bd4c9fedbfdfda2fda2211d983260986109d8e24719cb1fd05a0a8a9b3f84ff595c00e77e3300343d812b6503c83faf46
+  data.tar.gz: 7b02dd37ebad852d730f942efac3af1bc585ed439dd51389a430c7a678c1ad66b54482ff6d4636d5a54e98872a2b585be582394e90a36f53d148e1ae8f077167

data/lib/slack-smart-bot.rb

@@ -283,8 +283,10 @@ class SlackSmartBot
       begin
         case text
         when /^Bot has been (closed|killed) by/i
-          @logger.info "#{nick}: #{text}"
-          exit!
+          if CHANNEL == @channels_name[dchannel]
+            @logger.info "#{nick}: #{text}"
+            exit!
+          end
         when /^Changed status on (.+) to :(.+)/i
           channel_name = $1
           status = $2
@@ -472,7 +474,7 @@ class SlackSmartBot
       #helpadmin:    The bot stops running and also stops all the bots created from this master channel
       #helpadmin:    You can use this command only if you are an admin user and you are on the master channel
       #helpadmin:
-    when /^exit\sbot/i, /^quit\sbot/i, /^close\sbot/i
+    when /^exit\sbot\s*$/i, /^quit\sbot\s*$/i, /^close\sbot\s*$/i
       if ON_MASTER_BOT
         if ADMIN_USERS.include?(from) #admin user
           unless @questions.keys.include?(from)
@@ -672,7 +674,7 @@ class SlackSmartBot
       #helpmaster:    kills the bot on the specified channel
       #helpmaster:    Only works if you are on Master channel and you created that bot or you are an admin user
       #helpmaster:
-    when /^kill\sbot\son\s<#C\w+\|(.+)>\s*/i, /^kill\sbot\son\s(.+)\s*/i
+    when /^kill\sbot\son\s<#C\w+\|(.+)>\s*$/i, /^kill\sbot\son\s(.+)\s*$/i
       if ON_MASTER_BOT
         channel = $1
 
@@ -735,6 +737,8 @@ class SlackSmartBot
           end
           update_rules_imported() if ON_MASTER_BOT
           respond "I'm using now the rules from <##{channel_found.id}>", dest
+          def git_project() "" end
+          def project_folder() "" end
         else
           respond "You need to join the channel <##{channel_found.id}> to be able to use the rules.", dest
         end
@@ -760,6 +764,8 @@ class SlackSmartBot
             @rules_imported[user.id].delete(dchannel)
             update_rules_imported() if ON_MASTER_BOT
             respond "You won't be using those rules from now on.", dest
+            def git_project() "" end
+            def project_folder() "" end
           end
         else
           respond "You were not using those rules.", dest
@@ -772,6 +778,8 @@ class SlackSmartBot
             @rules_imported[user.id].delete(user.id)
             update_rules_imported() if ON_MASTER_BOT
             respond "You won't be using those rules from now on.", dest
+            def git_project() "" end
+            def project_folder() "" end
           end
         else
           respond "You were not using those rules.", dest
@@ -790,6 +798,7 @@ class SlackSmartBot
       else
         specific = false
       end
+      help_message_rules = ''
       if !specific
         help_message = IO.readlines(__FILE__).join
         if ADMIN_USERS.include?(from) #admin user
@@ -816,14 +825,18 @@ class SlackSmartBot
         end
       end
       if specific
-        unless defined?(rules) or rules_file.empty?
+        unless rules_file.empty?
           begin
             eval(File.new(rules_file).read) if File.exist?(rules_file)
           end
         end
-        if defined?(git_project)
+        if defined?(git_project) and git_project.to_s!='' and help_message_rules != ''
           respond "Git project: #{git_project}", dest
+        else
+          def git_project() '' end
+          def project_folder() '' end
         end
+        
       else
         respond "Slack Smart Bot Github project: https://github.com/MarioRuiz/slack-smart-bot", dest
       end
@@ -1010,7 +1023,12 @@ class SlackSmartBot
 
           begin
             ruby = "ruby -e \"#{code.gsub('"', '\"')}\""
-            ruby = ("cd #{project_folder} &&" + ruby) if defined?(project_folder)
+            if defined?(project_folder) and project_folder.to_s!='' and Dir.exist?(project_folder)
+              ruby = ("cd #{project_folder} &&" + ruby)
+            else
+              def project_folder() '' end
+            end
+    
             stdout, stderr, status = Open3.capture3(ruby)
             if stderr == ""
               if stdout == ""

data/lib/slack-smart-bot_rules.rb

@@ -1,3 +1,16 @@
+
+#path to the project folder
+# for example "#{`eval echo ~$USER`.chop}/projects/the_project"
+def project_folder()
+  "#{`eval echo ~$USER`.chop}/"
+end
+
+#link to the project
+def git_project()
+  ""
+end
+
+
 #for the case of testing, just run this file adding in the end a call to rules with the parameters you want
 if defined?(respond)
   @testing = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client