bender-bot 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e516ad8b6f747483302fc79ab811a8cccf2368
-  data.tar.gz: bd931995c92e814c96bbcea6f305534c2941cede
+  metadata.gz: 39a23282811b3e535eed1c40660ab4d3038c2759
+  data.tar.gz: 1c4d67b9740cfde6671ea41697cc17e745ca50c7
 SHA512:
-  metadata.gz: b43003dffdf9a21bb11877116e287e04b80a84618a3d2743b7a83a030025d7c0303d6842a5d478c048c49680e9a0955576de7497ae0275e08baa26540701abe5
-  data.tar.gz: 23de30730b6a02d26c1e71603966bb6811ef7ef4a7037c978f4dc69e75e6d3afe4abccafdd8d4eae6c9afd0d40eae674d3a47f470e52a8cffc56d14e1d9c07e9
+  metadata.gz: 4d9e6af21a110702f2f33ab2c872562657569e152042e5bc4d9fc88b0d5eda00bead8ddc636f0af6be23f3001909ab593b4437eb4e069800b7a3fd1acece899e
+  data.tar.gz: 733651b2f64a53e739ae94bb9a4623dbc420ded8f92350b8564a118c27bb8e12f6dc32bfc6bafb71ad6f3fe1617c0b42b1462b41833e06baac385443a0c1645f

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/bender/bot.rb

@@ -221,38 +221,50 @@ class BenderBot
 
     # /inc resolve NUM - Resolve an incident
     when /^\s*\/inc\s+resolve\s+(\d+)\s*$/
-      incident = select_incident $1
-      if incident
-        reply_html *resolve_incident(incident)
+      unless allowed?
+        reply_html "You're not allowed to do that!", :red
       else
-        reply_html 'Sorry, no such incident!', :red
+        incident = select_incident $1
+        if incident
+          reply_html *resolve_incident(incident)
+        else
+          reply_html 'Sorry, no such incident!', :red
+        end
       end
 
     # /inc close NUM - Close an incident
     when /^\s*\/inc\s+close\s+(\d+)\s*$/
-      incident = select_incident $1
-      if incident
-        reply_html *close_incident(incident)
+      unless allowed?
+        reply_html "You're not allowed to do that!", :red
       else
-        reply_html 'Sorry, no such incident!', :red
+        incident = select_incident $1
+        if incident
+          reply_html *close_incident(incident)
+        else
+          reply_html 'Sorry, no such incident!', :red
+        end
       end
 
     # /inc open SEVERITY SUMMARY - File a new incident
     when /^\s*\/inc\s+open\s+(severity|sev|s|p)?(\d+)\s+(.*?)\s*$/i
-      user = user_where name: sender
-      data = {
-        fields: {
-          project: { key: options.jira_project },
-          issuetype: { name: options.jira_type },
-          reporter: { name: user[:nick] },
-          summary: $3,
-          SHOW_FIELDS.key('Severity') => {
-            id: SEVERITIES[$2.to_i]
+      unless allowed?
+        reply_html "You're not allowed to do that!", :red
+      else
+        user = user_where name: sender
+        data = {
+          fields: {
+            project: { key: options.jira_project },
+            issuetype: { name: options.jira_type },
+            reporter: { name: user[:nick] },
+            summary: $3,
+            SHOW_FIELDS.key('Severity') => {
+              id: SEVERITIES[$2.to_i]
+            }
           }
         }
-      }
 
-      reply_html *file_incident(data)
+        reply_html *file_incident(data)
+      end
 
 
     # /inc comment [INCIDENT_NUMBER] [COMMENT_TEXT]
@@ -432,4 +444,10 @@ private
     end
   end
 
-end
+
+  def allowed?
+    user = user_where name: @sender
+    store['group'].include? user[:name]
+  end
+
+end

data/lib/bender/main.rb

@@ -111,6 +111,11 @@ module Bender
       aliases: %w[ -J ],
       desc: 'Set JIRA project',
       required: true
+    option :jira_group, \
+      type: :string,
+      aliases: %w[ -G ],
+      desc: 'Set JIRA group for write mode',
+      required: true
     option :jira_type, \
       type: :string,
       aliases: %w[ -T ],
@@ -126,9 +131,20 @@ module Bender
       aliases: %w[ -S ],
       desc: 'Set JIRA issue refresh rate',
       default: 5
+    option :group_refresh, \
+      type: :numeric,
+      aliases: %w[ -T ],
+      desc: 'Set JIRA group refresh rate',
+      default: 60
+    option :order, \
+      type: :boolean,
+      aliases: %w[ -O ],
+      desc: 'Reverse order of HipChat API loading (hack)',
+      default: false
     include_common_options
     def start
       bot = start_bot
+      periodically_refresh_group bot
       periodically_refresh_users bot
       periodically_refresh_incidents bot
       serve_web bot
@@ -168,7 +184,7 @@ module Bender
       @room_name  ||= bot.store['primary_room_name']  || new_room['name']
       @room_topic ||= bot.store['primary_room_topic'] || new_room['topic']
 
-      @open = false unless defined? @open
+      @open = 0 unless defined? @open
 
       log.info \
         primary_room_name: bot.store['primary_room_name'],
@@ -186,42 +202,52 @@ module Bender
           room.update_room(new_room)
         end
 
-        @open = false
+        @open = 0
 
       else
-        unless @open
+        if @open.zero?
           @room_name = new_room['name']
           @room_topic = new_room['topic']
-          bot.store['primary_room_name'] = @room_name
-          bot.store['primary_room_topic'] = @room_topic
+        end
+
+        unless @open == open_incidents.size
           new_room['name'] = 'DANGER WILL ROBINSON'
           new_room['topic'] = '%d open incicents!' % open_incidents.size
           room.update_room(new_room)
         end
 
-        @open = true
+        @open = open_incidents.size
       end
+
+      bot.store['primary_room_name'] = @room_name
+      bot.store['primary_room_topic'] = @room_topic
     end
 
 
     def periodically_refresh_incidents bot
       Thread.new do
-        hipchat_v2 = HipChat::Client.new \
-          options.hipchat_v2_token, api_version: 'v2'
-
-        hipchat_v1 = HipChat::Client.new \
-          options.hipchat_token, api_version: 'v1'
+        if options.order
+          hipchat_v1 = HipChat::Client.new \
+            options.hipchat_token, api_version: 'v1'
+          hipchat_v2 = HipChat::Client.new \
+            options.hipchat_v2_token, api_version: 'v2'
+        else
+          hipchat_v2 = HipChat::Client.new \
+            options.hipchat_v2_token, api_version: 'v2'
+          hipchat_v1 = HipChat::Client.new \
+            options.hipchat_token, api_version: 'v1'
+        end
 
         room_id = options.primary_room_id
 
         loop do
           is = refresh_incidents bot
-          begin
+          # begin
             set_room_name_and_topic room_id, is, hipchat_v2, bot
             sleep options.issue_refresh
-          rescue NoMethodError
-            sleep 1
-          end
+          # rescue NoMethodError
+          #   sleep 1
+          # end
         end
       end
     end
@@ -245,7 +271,8 @@ module Bender
       Thread.new do
         loop do
           resp = http.request req
-          users = JSON.parse(resp.body).inject({}) do |h, user|
+          data = JSON.parse(resp.body)
+          users = data.inject({}) do |h, user|
             h[user['key']] = {
               nick: user['key'],
               name: user['displayName'],
@@ -261,6 +288,32 @@ module Bender
     end
 
 
+    def periodically_refresh_group bot
+      req_path = '/rest/api/2/group'
+      req_params = QueryParams.encode \
+        groupname: options.jira_group,
+        expand: 'users'
+
+      uri = URI(options.jira_site + req_path + '?' + req_params)
+      http = Net::HTTP.new uri.hostname, uri.port
+
+      req = Net::HTTP::Get.new uri
+      req.basic_auth options.jira_user, options.jira_pass
+      req['Content-Type'] = 'application/json'
+      req['Accept'] = 'application/json'
+
+      Thread.new do
+        loop do
+          resp = http.request req
+          data = JSON.parse(resp.body)
+          user_names = data['users']['items'].map { |u| u['displayName'] }
+          bot.store['group'] = user_names
+          sleep options.group_refresh
+        end
+      end
+    end
+
+
     def serve_web bot
       Web.set :environment, options.environment
       Web.set :port, options.port

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bender-bot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sean Clemmer