slackbot_frd 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3e60209947c6f28fbfa5f9bf98973d90b652e2
-  data.tar.gz: 4050aaa31b96245ca6c8280bee433eef2b692e79
+  metadata.gz: 2ea34ae19d44e102d85572f5047d4c6e75cca914
+  data.tar.gz: 3bc04597f27bb93bb6b7eae91e2cd8c8eedcb758
 SHA512:
-  metadata.gz: a04dede3892daf4426b31a7f98e3146d5e3671513abcf9a6df94d4898720b79ea4b80643de52201a996841bc9aec4ec13bb5f02291c523759bd4ebaf02ccbb0e
-  data.tar.gz: f44cc2a3427bdac3aea7150e376e7fd7b6aca9cd37f5bfdadd77f13f7584cb9b4dc173bfced189ae2942c4ffb549c7f60fac2acff0570f87a9e4066567a73160
+  metadata.gz: 1b462425254baf94e0ae5720a2cf562e5379415711b8ea2306110d5d6a936dfaa61cec70cdf63fd1423a9b61e23eb7d77a28df5223c267f378f9e95a7dc1577f
+  data.tar.gz: df9f9716ab50dabe50149e8e541fa264ee2582b625757ec24c693ec496001732b19dc034f78211a4ad4ac4b2edf9e3aba38e405bb2f113faa5bd7980eecacf27

data/bin/slackbot-frd

@@ -8,6 +8,7 @@ require 'active_support/core_ext/string'
 require 'slackbot_frd/initializer/bot_starter'
 require 'slackbot_frd/lib/slack_connection'
 require 'slackbot_frd/lib/bot'
+require 'slackbot_frd/lib/version'
 
 begin
   require 'byebug'
@@ -120,8 +121,7 @@ class SlackbotFrdBin < Thor
 
     config_file = options['config-file']
     config_file = config_file_location unless config_file
-    $slackbotfrd_conf = config_file_json(config_file) if config_file
-    $slackbotfrd_conf ||= {}
+    $slackbotfrd_conf = build_slackbotfrd_conf(config_file)
     $slackbotfrd_conf.freeze
 
     daemonize = false
@@ -218,6 +218,12 @@ class SlackbotFrdBin < Thor
     stop
     start(set_bots)
   end
+
+  desc 'version', 'Check current installed version of slackbot_frd'
+  def version
+    puts "SlackbotFrd - Version: #{SlackbotFrd::VERSION}"
+  end
+
   private
   def config_file_location
     "#{Dir.pwd}/#{DEFAULT_CONFIG_FILE}"
@@ -345,6 +351,37 @@ class SlackbotFrdBin < Thor
       end
     EXAMPLE_BOT
   end
+
+  private
+  def slackbotfrd_conf_key_to_keys(key)
+    ["SLACKBOT_FRD_#{key.upcase}", key.upcase]
+  end
+
+  private
+  def build_slackbotfrd_conf(config_file)
+    slackbotfrd_conf = config_file_json(config_file) if config_file
+    slackbotfrd_conf ||= {}
+    slackbotfrd_conf.keys.inject(slackbotfrd_conf) do |acc, key|
+      slackbotfrd_conf_key_to_keys(key).each do |k|
+        acc[k] = 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]
+      end
+      acc
+    end
+    slackbotfrd_conf
+  end
 end
 
-SlackbotFrdBin.start(ARGV)
+if !ARGV.empty? && %w[-v --version].include?(ARGV.first)
+  puts "SlackbotFrd - Version: #{SlackbotFrd::VERSION}"
+else
+  SlackbotFrdBin.start(ARGV)
+end

data/lib/slackbot_frd/lib/version.rb

@@ -0,0 +1,4 @@
+module SlackbotFrd
+  VERSION = '0.2.6'
+  DATE    = '2016-07-15'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,6 +172,7 @@ files:
 - lib/slackbot_frd/lib/log.rb
 - lib/slackbot_frd/lib/slack_connection.rb
 - lib/slackbot_frd/lib/user_channel_callbacks.rb
+- lib/slackbot_frd/lib/version.rb
 - lib/slackbot_frd/slack_methods/channels_info.rb
 - lib/slackbot_frd/slack_methods/channels_invite.rb
 - lib/slackbot_frd/slack_methods/channels_list.rb