zabbirc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa6b2a62b76aecb1541a8608444b54aa0435258a
-  data.tar.gz: cd3e76f12c22caed15cf276cf4518dac82160946
+  metadata.gz: df680508aa555565efa407d3e430ab753a9eb4b4
+  data.tar.gz: 74e9be479d72a9f44a347af645a4e7b62ee6937e
 SHA512:
-  metadata.gz: ec786a1141cff5e769b91cefe1ca45b9e2fa97b7f4a15ad70f5fa13c614acfb63c4674f606f365d473e2f92938589fc154703ea2cad767b661f8869196141be9
-  data.tar.gz: 3a0b23a5017ceb2f8aabdcc73af0a300bb2795595a2f813a77d1ff054a35d0ed469b7b44869c9a2dfd5071777eca7269b20af4d07651cb9bc907098fb5748a4a
+  metadata.gz: c83af7f1d8f025023bf7d96dc3b36b0218894aabe663014df01e6bea4a250eeaa4c09656b60458a557e534be2aa41b2850bef5abb59df564506874f475434127
+  data.tar.gz: f714c131e9e43ec77bd52c4507cc5e48cd596c4f62e35d695b3c8a2292604bc3d47e1d37aff0ed682ef00728966621ba3ca774cf1504c4aa91c8103a61700128

data/config/config.rb

@@ -2,4 +2,7 @@ Zabbirc.configure do |config|
   config.zabbix_api_url = ENV['ZABBIX_API_URL']
   config.zabbix_login = ENV['ZABBIX_LOGIN']
   config.zabbix_password = ENV['ZABBIX_PASSWORD']
+
+  config.irc_server = "irc.devel.redhat.com"
+  config.irc_channels = ["#libra-zabbix"]
 end

data/lib/zabbirc/irc/plugin.rb

@@ -9,12 +9,16 @@ module Zabbirc
       listen_to :join, method: :sync_ops
       listen_to :leaving, method: :sync_ops
 
+      match "zabbirc status", method: :zabbirc_status
       match "settings", method: :show_settings
       match /settings set ([#_a-zA-Z0-9]+)( ([#\-_a-zA-Z0-9]+))?/, method: :set_setting
+      match /settings set\s*$/, method: :set_setting_help
       match "events", method: :list_events
       match /status ([a-zA-Z0-9\-.]+)/, method: :host_status
       match /latest ([a-zA-Z0-9\-.]+)( (\d+))?/, method: :host_latest
       match /ack (\d+) (.*)/, method: :acknowledge_event
+      match /ack\s*$/, method: :acknowledge_event_usage
+      match /ack ([^ ]+)\s*$/, method: :acknowledge_event_usage
     end
   end
 end

data/lib/zabbirc/irc/plugin_methods.rb

@@ -2,8 +2,20 @@ module Zabbirc
   module Irc
     module PluginMethods
 
+      def zabbirc_status m
+        ops_msg = ops.collect{|o| "#{o.nick} as #{o.login}"}
+        m.reply("#{m.user.nick}: Identified ops: #{ops_msg.join(", ")}")
+      end
+
+      def acknowledge_event_usage m
+        return unless authenticate m
+        op = get_op m
+        usage = "Usage: !ack <event-id> <ack-message>"
+        m.reply("#{op.nick}: #{usage}")
+      end
+
       def acknowledge_event m, eventid, message
-        return unless authenticate m.user.nick
+        return unless authenticate m
         op = get_op m
         event = find_event m, eventid
         return unless event
@@ -16,7 +28,7 @@ module Zabbirc
       end
 
       def host_status m, host
-        return unless authenticate m.user.nick
+        return unless authenticate m
         op = get_op m
         host = find_host m, host
         return unless host
@@ -37,7 +49,7 @@ module Zabbirc
 
       def host_latest m, host, _rest, limit
         limit ||= 8
-        return unless authenticate m.user.nick
+        return unless authenticate m
         op = get_op m
         host = find_host m, host
         return unless host
@@ -62,13 +74,20 @@ module Zabbirc
 
       ### Settings
       def show_settings m
-        return unless authenticate m.user.nick
+        return unless authenticate m
         op = get_op m
         m.reply "#{op.nick}: #{op.setting}"
       end
 
+      def set_setting_help m
+        return unless authenticate m
+        op = get_op m
+        usage = "Usage: !setting set <setting-name> <setting-value>"
+        m.reply("#{op.nick}: #{usage}")
+      end
+
       def set_setting m, key, _rest, value
-        return unless authenticate m.user.nick
+        return unless authenticate m
         op = get_op m
         case key
         when "notify"
@@ -133,7 +152,7 @@ module Zabbirc
 
       ### Events
       def list_events m
-        return unless authenticate m.user.nick
+        return unless authenticate m
         events = Zabbix::Event.recent
         msg = if events.any?
                 events.collect do |e|
@@ -151,13 +170,13 @@ module Zabbirc
 
       ### Authentication and helpers
       def authenticate obj
-        nick = get_nick obj
-        ops.authenticate nick
+        login = get_login obj
+        ops.authenticate login
       end
 
       def get_op obj
-        nick = get_nick obj
-        ops.get nick
+        login = get_login obj
+        ops.get login
       end
 
       def get_nick obj
@@ -171,6 +190,17 @@ module Zabbirc
         end
       end
 
+      def get_login obj
+        case obj
+        when Cinch::Message
+          obj.user.user.sub("~","")
+        when Cinch::User
+          obj.user.user.sub("~","")
+        when String
+          obj
+        end
+      end
+
       private
 
       def find_host m, host

data/lib/zabbirc/op.rb

@@ -1,11 +1,12 @@
 module Zabbirc
   class Op
 
-    attr_reader :channels, :setting, :nick
+    attr_reader :channels, :setting, :nick, :login
     def initialize zabbix_user: nil, irc_user: nil
       raise ArgumentError, 'zabbix_user' if zabbix_user.nil?
       raise ArgumentError, 'irc_user' if irc_user.nil?
-      @nick = zabbix_user.alias
+      @login= zabbix_user.alias
+      @nick = irc_user.nick
       @zabbix_user = zabbix_user
       @irc_user = irc_user
 

data/lib/zabbirc/op_list.rb

@@ -22,10 +22,10 @@ module Zabbirc
     end
 
     def add op
-      if exists? op.nick
-        return get(op.nick)
+      if exists? op.login
+        return get(op.login)
       end
-      @ops[op.nick] = op
+      @ops[op.login] = op
     end
 
     def each &block

data/lib/zabbirc/services/ops.rb

@@ -11,17 +11,17 @@ module Zabbirc
 
       private
 
-      def channel_nicks channel
-        channel.users.keys.collect(&:nick)
+      def channel_logins channel
+        channel.users.keys.collect{|u| u.user.sub("~","") }
       end
 
-      def channel_find_user channel, nick
-        channel.users.keys.find { |irc_user| irc_user.nick == nick }
+      def channel_find_user channel, login
+        channel.users.keys.find { |irc_user| irc_user.user.sub("~","") == login }
       end
 
       def sync_ops channel
-        nicks = channel_nicks channel
-        zabbix_users = Zabbix::User.get filter: { alias: nicks }
+        logins = channel_logins channel
+        zabbix_users = Zabbix::User.get filter: { alias: logins }
         zabbix_users.each do |zabbix_user|
           irc_user = channel_find_user channel, zabbix_user.alias
           op = @service.ops.add(Op.new(zabbix_user: zabbix_user, irc_user: irc_user))
@@ -29,7 +29,7 @@ module Zabbirc
         end
 
         @service.ops.each do |op|
-          op.remove_channel channel unless nicks.include? op.nick
+          op.remove_channel channel unless logins.include? op.login
         end
         true
       end

data/spec/bot_spec.rb

@@ -1,9 +1,10 @@
 describe Zabbirc::Irc::PluginMethods do
   # let(:service) { Zabbirc::ServiceMock.new }
   let(:mock_message) { double("Cinch::Message", user: mock_user) }
-  let(:mock_user) { double("Cinch::User", nick: mock_nick) }
+  let(:mock_user) { double("Cinch::User", nick: mock_nick, login: mock_login) }
   let(:bot) { Zabbirc::MockBot.new }
   let(:mock_nick) { "op1" }
+  let(:mock_login) { "op1" }
   let(:mock_user_settings) { nil }
 
   before do

data/spec/support/mock_bot.rb

@@ -1,6 +1,7 @@
 module Zabbirc
   class MockBot
     include Zabbirc::Irc::PluginMethods
+    include RSpec::Mocks::ExampleMethods
 
     def initialize
       @ops = OpList.new
@@ -16,10 +17,17 @@ module Zabbirc
       return get_nick(obj.user) if obj.respond_to? :user
     end
 
+    def get_login obj
+      return obj if obj.is_a? String
+      return obj.login if obj.respond_to? :login
+      return get_login(obj.user) if obj.respond_to? :user
+    end
+
     def setup_op name, settings=nil
       @@op_ids ||= 0
       zabbix_user = Zabbix::User.new(alias: name, userid: (@@op_ids+=1))
-      op = Op.new(zabbix_user: zabbix_user, irc_user: Object.new)
+      irc_user = double "IrcUser", nick: name, user: name
+      op = Op.new(zabbix_user: zabbix_user, irc_user: irc_user)
       settings.each do |key, value|
         op.setting.set key, value
       end if settings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbirc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Filip Zachar
@@ -141,7 +141,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/mock_bot.rb
 - templates/zabbirc_config.rb
-- thread_test.rb
 - tmp/playground.rb
 homepage: http://rubygems.org/gems/zabbirc
 licenses:
@@ -153,9 +152,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/thread_test.rb

@@ -1,46 +0,0 @@
-require 'pry'
-StopError = Object.new
-$f = File.open("thread.log", "w")
-
-def lg msg
-  $f.puts msg
-  $f.flush
-end
-main_thread = Thread.current
-
-def make_thread
-  Thread.new do
-    begin
-      loop do
-        Thread.handle_interrupt(StopError => :never) do
-          lg "Start - critical"
-          sleep 5
-          lg "Stop - critical"
-
-          Thread.handle_interrupt(StopError => :immediate) do
-            lg "Start - interruptibly"
-            sleep 10
-            lg "Stop - interruptibly"
-          end
-        end
-      end
-    rescue => e
-      puts "Chyba: #{e}"
-      main_thread.raise e
-    end
-  end
-end
-
-def start
-  $t = make_thread
-end
-
-def stop
-  $t.raise StopError
-end
-
-def q
-  $t.raise StandardError
-end
-
-binding.pry