slackbot_frd 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bb68aca99439d177c185daf2ca3009ed2926868
-  data.tar.gz: 8d35953ceec1d879df5d1cd0735cbef50b63f439
+  metadata.gz: fd42f15c6b386a233d064d8dd584806014af4435
+  data.tar.gz: 0d7fa366f7141f126df3aa80316dabea78f1ae1c
 SHA512:
-  metadata.gz: a6e04365893893331d10d2a7f4c31cf9f23e78d9a9d18263b051d41a889ad5760133bf376aa28f8816f6518aae187166f8302ec5b658a4066bf69af9fba86177
-  data.tar.gz: f34fed3e5bb0ff20ac207834f17838160322cdc295c52cbc342992319806b597b39751184966e7695b865bdddb7918905e599c99b6217db36c300aa441c1129c
+  metadata.gz: da8f260a9cb49e4506e14a7f3eca4ac994fbb1c24a7312427a65f61d80424a13cb8f1a9df45d645e3b13a2ca965dd803be19a615670fe02e96c9ceba0e6c17da
+  data.tar.gz: 82d2a87547f7ef172814b67b5b694ec88b14aa438395cf5e396f81601aa6998c22c70b5a98a2bc1aa5c2b554aa245b3f58e39537282216c7fa6f88250bcb5c93

data/bin/slackbot-frd

@@ -85,7 +85,8 @@ class SlackbotFrdBin < Thor
           "token" : "<put-token-here>",
           "botdir" : ".",
           "daemonize" : false,
-          "bots" : []
+          "bots" : [],
+          "my_bots_config_option" : "<bot-specific-option>"
       }
     CONFIG_FILE_SKELETON
   end
@@ -117,27 +118,28 @@ class SlackbotFrdBin < Thor
 
     config_file = options['config-file']
     config_file = config_file_location unless config_file
-    json = config_file_json(config_file) if config_file
-    json ||= {}
+    $slackbotfrd_conf = config_file_json(config_file) if config_file
+    $slackbotfrd_conf ||= {}
+    $slackbotfrd_conf.freeze
 
     daemonize = false
-    daemonize = json["daemonize"] if json["daemonize"]
+    daemonize = $slackbotfrd_conf["daemonize"] if $slackbotfrd_conf["daemonize"]
     daemonize = ENV["SLACKBOT_FRD_DAEMONIZE"] if ENV["SLACKBOT_FRD_DAEMONIZE"]
     daemonize = options[:daemonize] if options[:daemonize]
 
     botdir = Dir.pwd
-    botdir = json["botdir"] if json["botdir"]
+    botdir = $slackbotfrd_conf["botdir"] if $slackbotfrd_conf["botdir"]
     botdir = ENV["SLACKBOT_FRD_BOTDIR"] 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 = json["log_file"] if json["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 = options["log-file"] if options['log-file']
 
     SlackbotFrd::Log.level = :info
-    SlackbotFrd::Log.level = json["log_level"] if json["log_level"]
+    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 = options["log-level"] if options['log-level']
 
@@ -161,7 +163,7 @@ class SlackbotFrdBin < Thor
     SlackbotFrd::Log.warn("Logging to file '#{SlackbotFrd::Log.logfile}'")
     SlackbotFrd::Log.warn("Logging level set to '#{SlackbotFrd::Log.level}'")
 
-    token = json["token"]
+    token = $slackbotfrd_conf["token"]
     token = ENV["SLACKBOT_FRD_TOKEN"] if ENV["SLACKBOT_FRD_TOKEN"]
     token = options[:token] if options[:token]
     unless token

data/lib/slackbot_frd/slack_methods/channels_info.rb

@@ -24,10 +24,13 @@ module SlackbotFrd
       end
 
       def members
-        @response["channel"]["members"]
+        if @response["channel"]
+          @response["channel"]["members"]
+        else
+          []
+        end
       end
       alias_method :users, :members
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slackbot_frd
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement