enerbot-slack 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd9030df69e73980c92158b45d884e250c0829c2f38a4eb2fbe29c25b15561e2
-  data.tar.gz: a5f9540078e64269bb8249a98c4d2e1f1fe72fee16a390bb01d65cc875cc9212
+  metadata.gz: 7060b6859b55907fa4ab9fc489418b4dd878e4d5c8fd3647f256e8f19cbb7187
+  data.tar.gz: b31f59335f87d506d4c41dd91f820c9e47854789b0a006ddb536578267671811
 SHA512:
-  metadata.gz: 6eaf009cb4278106508a16ae012d16536d429ec28a3f45af3dbf2e213e54b06ce9261db870902ce998353cf00deee247adc01cf050aaf4f6fad8b3ccdfd84d6c
-  data.tar.gz: 401484f57ec4878d4742a9ff5f5a4f200ef951b8a17b067a02f89aab345b4ba91ad96afe7a785158ec72f1efd553c702044d8a4a650e6fbf431b97a73e2312f5
+  metadata.gz: f6e5283a3068ec99b480e6382ac1c46d3caffe3cb9a2d5a5f1dd4abe20b0ff70ccc22f7087ef137b9a0cb0084dcc0c4bb5470ed2a116e5a64e74d75b855fb950
+  data.tar.gz: 93691d4af630bbdea879029486d8ae04cb9474d93733a44fb2172cbea4f2d201abcd3b3816f584eeeb621102c7b3a4541010c1059f0234f084978de0262505ca

data/lib/enerbot-slack.rb

@@ -4,7 +4,7 @@ require_relative 'modules/slack_message'
 require_relative 'modules/slack_search'
 require_relative 'modules/slack_image'
 require_relative 'modules/slack_format'
-require_relative 'credentials'
+require_relative 'modules/credentials'
 
 # Groups client initialization with instance parameters
 class EnerbotSlack < Credentials
@@ -15,7 +15,7 @@ class EnerbotSlack < Credentials
   include SlackSearch
 
   def initialize(name: '', image: '', token: nil, as_user: false)
-    set_credentials
+    set_defaults
 
     Slack.configure do |config|
       config.token = token.nil? ? @bot_token : token

data/lib/{credentials.rb → modules/credentials.rb}

@@ -1,5 +1,5 @@
 class Credentials
-  def set_credentials
+  def set_defaults
     @bot_token = ENV['SLACK_TOKEN']
     @bot_name = ENV['SLACK_NAME']
     @bot_icon = ENV['SLACK_ICON']

data/lib/modules/slack_client.rb

@@ -4,10 +4,10 @@ require 'slack-ruby-client'
 
 # Client initialization that powers the rest of interactions
 module SlackClient
-  def configure_client(type = 'web', token = @bot_token)
+  def configure_client(type = 'web', token = ENV['SLACK_TOKEN'])
     Slack.configure do |config|
       config.token = token
-      config.raise 'Missing Bot token' unless config.token
+      config.raise 'Missing Bot token 2' unless config.token
     end
 
     case type

data/lib/modules/slack_message.rb

@@ -26,8 +26,8 @@ module SlackMessage
     destination_points(data, ts)
     client.chat_postMessage channel: @channel,
                             text: text,
-                            icon_url: ENV['SLACK_BOT_ICON'],
-                            username: ENV['SLACK_BOT_NAME'],
+                            icon_url: ENV['SLACK_ICON'],
+                            username: ENV['SLACK_NAME'],
                             thread_ts: @thread,
                             as_user: false
   rescue Slack::Web::Api::Errors::SlackError => e
@@ -45,8 +45,8 @@ module SlackMessage
     destination_points(data, ts)
     client.chat_postMessage channel: @channel,
                             attachments: attachment,
-                            icon_url: ENV['SLACK_BOT_ICON'],
-                            username: ENV['SLACK_BOT_NAME'],
+                            icon_url: ENV['SLACK_ICON'],
+                            username: ENV['SLACK_NAME'],
                             thread_ts: @thread,
                             as_user: false
   rescue Slack::Web::Api::Errors::SlackError => e
@@ -60,8 +60,8 @@ module SlackMessage
     client.chat_postEphemeral channel: @channel,
                               text: text,
                               user: user,
-                              icon_url: ENV['SLACK_BOT_ICON'],
-                              username: ENV['SLACK_BOT_NAME'],
+                              icon_url: ENV['SLACK_ICON'],
+                              username: ENV['SLACK_NAME'],
                               as_user: false
   rescue Slack::Web::Api::Errors::SlackError => e
     print e.message
@@ -81,8 +81,8 @@ module SlackMessage
     client.reactions_add channel: channel,
                          name: icon,
                          timestamp: thread,
-                         icon_url: ENV['SLACK_BOT_ICON'],
-                         username: ENV['SLACK_BOT_NAME'],
+                         icon_url: ENV['SLACK_ICON'],
+                         username: ENV['SLACK_NAME'],
                          as_user: false
   rescue Slack::Web::Api::Errors::SlackError => e
     print e.message
@@ -94,8 +94,8 @@ module SlackMessage
     client = configure_client
     destination_points(data, ts)
     client.files_upload channels: @channel,
-                        icon_url: ENV['SLACK_BOT_ICON'],
-                        username: ENV['SLACK_BOT_NAME'],
+                        icon_url: ENV['SLACK_ICON'],
+                        username: ENV['SLACK_NAME'],
                         thread_ts: @thread,
                         file: Faraday::UploadIO.new(file, 'text'),
                         title: File.basename(file),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enerbot-slack
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Luciano Adonis
@@ -86,8 +86,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/credentials.rb
 - lib/enerbot-slack.rb
+- lib/modules/credentials.rb
 - lib/modules/slack_admin.rb
 - lib/modules/slack_client.rb
 - lib/modules/slack_console.rb