slackbot_frd 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7556cdfe493b4f528cba8227e391ff9451feb83c
-  data.tar.gz: 218c8755f1730b986970078c0313a2b3f92d47f5
+  metadata.gz: 7ffc381e9ce6ec71a7454fc1b5149467b68f0735
+  data.tar.gz: 492ee45b4ecf16b697c64c1179429286f18ac3e7
 SHA512:
-  metadata.gz: ac2790ee9f222f722ff3508d7b0d8d6653057eb829092cb302af0078f725a1cee5ac079124e43734f5957cd04033c210e03c4d84ee34a776ac9f5c50dbc59d16
-  data.tar.gz: 52da196a510039cf41ef40f0cac55d99f25485183c82e0f3b3c4707433735b2f5726c202863fabfd096107b9dcad8c94d9bff81b6c824b8beddd1c77aa9db540
+  metadata.gz: 6ea3381601043e30939c03363fe0c82a17946a2cbff891f71d7bc9e4f12dbec92aaee0a709b2860c3a2d61f5916e75d6613798d5c51aa118e01bbb16b2b37962
+  data.tar.gz: 6cab09aa37ce70ec106458da6da16c0982321f4959c0db08d4328237ce9aa12cfcaa62b4ac2f2712418fb4c63c185cb9378dbe3e461fb507d2302d8c9beca65e

data/bin/slackbot-frd

@@ -127,25 +127,25 @@ class SlackbotFrdBin < Thor
     daemonize = false
     daemonize = $slackbotfrd_conf['daemonize'] if $slackbotfrd_conf['daemonize']
     if ENV['SLACKBOT_FRD_DAEMONIZE']
-      daemonize = ENV['SLACKBOT_FRD_DAEMONIZE']
+      daemonize = ENV['SLACKBOT_FRD_DAEMONIZE'].chomp
       daemonize = daemonize == 'true' || daemonize == '1'
     end
     daemonize = options[:daemonize] if options[:daemonize]
 
     botdir = Dir.pwd
     botdir = $slackbotfrd_conf['botdir'] if $slackbotfrd_conf['botdir']
-    botdir = ENV['SLACKBOT_FRD_BOTDIR'] if ENV['SLACKBOT_FRD_BOTDIR']
+    botdir = ENV['SLACKBOT_FRD_BOTDIR'].chomp if ENV['SLACKBOT_FRD_BOTDIR']
     botdir = options[:botdir] if options[:botdir]
     botdir = File.expand_path(botdir)
 
     SlackbotFrd::Log.logfile = "#{botdir}/#{LOG_FILE}"
     SlackbotFrd::Log.logfile = $slackbotfrd_conf['log_file'] if $slackbotfrd_conf['log_file']
-    SlackbotFrd::Log.logfile = ENV['SLACKBOT_FRD_LOG_FILE'] if ENV['SLACKBOT_FRD_LOG_FILE']
+    SlackbotFrd::Log.logfile = ENV['SLACKBOT_FRD_LOG_FILE'].chomp if ENV['SLACKBOT_FRD_LOG_FILE']
     SlackbotFrd::Log.logfile = options['log-file'] if options['log-file']
 
     SlackbotFrd::Log.level = :info
     SlackbotFrd::Log.level = $slackbotfrd_conf['log_level'] if $slackbotfrd_conf['log_level']
-    SlackbotFrd::Log.level = ENV['SLACKBOT_FRD_LOG_LEVEL'] if ENV['SLACKBOT_FRD_LOG_LEVEL']
+    SlackbotFrd::Log.level = ENV['SLACKBOT_FRD_LOG_LEVEL'].chomp if ENV['SLACKBOT_FRD_LOG_LEVEL']
     SlackbotFrd::Log.level = options['log-level'] if options['log-level']
 
     # If we got a number for log level that is valid, just use that
@@ -366,21 +366,27 @@ class SlackbotFrdBin < Thor
     slackbotfrd_conf ||= {}
     slackbotfrd_conf.keys.inject(slackbotfrd_conf) do |acc, key|
       slackbotfrd_conf_key_to_keys(key).each do |k|
-        acc[k] = acc[key]
+        acc[k] = chomp_if_string(acc[key])
       end
       acc
     end
     # Copy env vars into the config so they can be used easily
     ENV.keys.inject(slackbotfrd_conf) do |acc, key|
       if key =~ /^SLACKBOT_FRD/i
-        acc[key] = ENV[key]
-        acc[key.downcase] = ENV[key]
-        acc[key.gsub(/SLACKBOT_FRD_?/i, '').downcase] = ENV[key]
+        acc[key] = chomp_if_string(ENV[key])
+        acc[key.downcase] = chomp_if_string(ENV[key])
+        acc[key.gsub(/SLACKBOT_FRD_?/i, '').downcase] = chomp_if_string(ENV[key])
       end
       acc
     end
     slackbotfrd_conf
   end
+
+  private
+  def chomp_if_string(str)
+    return str.chomp if str.is_a?(String)
+    str
+  end
 end
 
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)

data/lib/slackbot_frd/lib/version.rb

@@ -1,4 +1,4 @@
 module SlackbotFrd
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
   DATE    = '2016-07-19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Ben Porter