slack-smart-bot 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184f25cc7baddfde9859cabae8a25e1204fca24b3c85b509d00c5579d86233ff
-  data.tar.gz: '08e6e6e647f2ab67f6a56f7022c56469d56f8c768b5dc7f12d3f6cd2338a2334'
+  metadata.gz: 53175e003bbaf58181aecd71f350c0534f66541443bf486075197af040127e72
+  data.tar.gz: 7872fc51317b5501bb0ee7ec87595bafdcefbdcebbfa702159bbae282e24ee9b
 SHA512:
-  metadata.gz: 320e5c00e0acf8e79414cfb582c3be1009bb790374833fe109009df53dbfbe63739b6148d2499eeb83a0d60c277f1cedad59f4375fff39395e7ce7985406eb79
-  data.tar.gz: f21210b0dc5504a700a1f6c9265f42ff4e62a4d7502e5e3da662df76452ce67f7ade3a4d837f1178881ed5511c5f6c96c122239e010fe5d62ff0385696322b93
+  metadata.gz: f11099c6edbc90ff63ee1f5bf01154997386614d5e201a981a223ef4e73208cf2615ba1492bc0ca34f5b0c0ba318083205e2668518104e2d382d656d03cf7241
+  data.tar.gz: 69041e01eff53c3157702a47ee45501541bafffde9e5d2c3e082ba36ac7f4b77e1c53f2ed116ee8616b76faffade6414350ff025bbeaff212ed769144af51b2a

data/README.md

@@ -284,6 +284,17 @@ Example:
 `ES4799209592433480943244`  
 `ES8888795057132445752702`  
 
+In case you want to use a shortcut as a inline shortcut inside a command you can do it by adding a $:
+Example:
+>**_Peter>_** `!add shortcut cust1: 3488823-1233`
+>**_Smart-Bot>_** `shortcut added`  
+>**_Peter>_** `!add shortcut cust2: 1111555-6688`
+>**_Smart-Bot>_** `shortcut added`  
+>**_Peter>_** `!run tests $cust1`  
+>**_Smart-Bot>_** `Running tests for customers 3488823-1233`  
+>**_Peter>_** `!run tests $cust1 $cust2`
+>**_Smart-Bot>_** `Running tests for customers 3488823-1233 1111555-6688`  
+
 To see available shortcuts: **_`see shortcuts`_** and to delete a particular shortcut: **_`delete shortcut NAME`_**
 
 ### Routines

data/lib/slack/smart-bot/commands/on_bot/add_shortcut.rb

@@ -9,6 +9,7 @@ class SlackSmartBot
   # help: `shortcut for all NAME: COMMAND`
   # help:    It will add a shortcut that will execute the command we supply.
   # help:    In case we supply 'for all' then the shorcut will be available for everybody
+  # help:    If you want to use a shortcut as a inline shortcut inside a command you can do it by adding a $ fex: _!run tests $cust1_
   # help:    Example:
   # help:        _add shortcut for all Spanish account: code require 'iso/iban'; 10.times {puts ISO::IBAN.random('ES')}_
   # help:    Then to call this shortcut:

data/lib/slack/smart-bot/commands/on_bot/admin/add_routine.rb

@@ -67,6 +67,9 @@ class SlackSmartBot
             if !files.nil? && (files.size == 1)
               @logger.info files[0].inspect if config.testing
               file_path = "#{config.path}/routines/#{@channel_id}/#{name}#{files[0].name.scan(/[^\.]+(\.\w+$)/).join}"
+              if files[0].filetype == "ruby" and files[0].name.scan(/[^\.]+(\.\w+$)/).join == ''
+                file_path += ".rb"
+              end
               http = NiceHttp.new(host: "https://files.slack.com", headers: { "Authorization" => "Bearer #{config[:token]}" }, log_headers: :partial)
               http.get(files[0].url_private_download, save_data: file_path)
               system("chmod +x #{file_path}")

data/lib/slack/smart-bot/process_first.rb

@@ -85,6 +85,27 @@ class SlackSmartBot
       addexcl = false
       command = text.downcase.lstrip.rstrip
     end
+
+    if command.include?('$') #for adding shortcuts inside commands
+      command.scan(/\$([^\$]+)/i).flatten.each do |sc|
+        sc.strip!
+        if @shortcuts.key?(nick) and @shortcuts[nick].keys.include?(sc)
+          command.gsub!("$#{sc}", @shortcuts[nick][sc])
+        elsif @shortcuts.key?(:all) and @shortcuts[:all].keys.include?(sc)
+          command.gsub!("$#{sc}", @shortcuts[:all][sc])
+        end
+      end
+      command.scan(/\$([^\s]+)/i).flatten.each do |sc|
+        sc.strip!
+        if @shortcuts.key?(nick) and @shortcuts[nick].keys.include?(sc)
+          command.gsub!("$#{sc}", @shortcuts[nick][sc])
+        elsif @shortcuts.key?(:all) and @shortcuts[:all].keys.include?(sc)
+          command.gsub!("$#{sc}", @shortcuts[:all][sc])
+        end
+      end
+      text = command
+      text = "!" + text if addexcl and text[0] != "!"
+    end
     if command.scan(/^(shortcut|sc)\s+([^:]+)\s*$/i).any? or
        (@shortcuts.keys.include?(:all) and @shortcuts[:all].keys.include?(command)) or
        (@shortcuts.keys.include?(nick) and @shortcuts[nick].keys.include?(command))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-smart-bot
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mario Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -39,7 +39,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.21
+        version: 1.7.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.21
+        version: 1.7.24
 - !ruby/object:Gem::Dependency
   name: nice_hash
   requirement: !ruby/object:Gem::Requirement