bender-bot 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdfef5cbf0ddd778b5178707bf01a4d65075d511
-  data.tar.gz: 90c9a1769c9df6a05f1e4214d134f2c8d9417d7e
+  metadata.gz: 0c7feb7ff451b53acb7ea0171573c05e0658a217
+  data.tar.gz: f337922a2e8310c05de4ad7ab7e44bb743a22a6a
 SHA512:
-  metadata.gz: 9cffe3a50d72591c8eda388d9b533361b31085d8d82c5d63fbff498834064bff1271dfaaac5033c7544307739e5aae83af3ab47f2acf1e27a1907f4f86319610
-  data.tar.gz: 8f84826535441dbc0663d2304578e789d1d86977cf93152165c424f017df211efa4178038d0972a2e0dfefb5cb1790bfb2a93b0036b14a565e21f17b6f02802e
+  metadata.gz: 15069ef3e4408d5166023b7031bbbf7e810350687c77738fff83c3cbe8430717a1eb6f7f0095a0c8e47e29e7ae8b92a62059845e89b2d66dbe5416585c07e853
+  data.tar.gz: 6782aa69d9109eb06b92299f9246a552e80eef81f8cb5f80660ccb12c48fd6fac80d19d27116e362598d04e3af8509db59c48dcf877a7b17176a0a45d37dc3e6

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/bender/bot.rb

@@ -15,11 +15,11 @@ Bot = Robut # alias
 
 
 module Bot
-  def self.run! options, logger
-    hipchat = HipChat::Client.new(options.hipchat_token)
+  def self.run! config, logger
+    hipchat = HipChat::Client.new(config[:hipchat_token])
     BenderBot.class_variable_set :@@hipchat, hipchat
     BenderBot.class_variable_set :@@rooms, hipchat.rooms
-    BenderBot.class_variable_set :@@options, options
+    BenderBot.class_variable_set :@@config, config
     BenderBot.class_variable_set :@@logger, logger
     Bot::Plugin.plugins = [ BenderBot ]
     conn = Bot::Connection.new
@@ -36,39 +36,41 @@ class BenderBot
 
   JARO = FuzzyStringMatch::JaroWinkler.create :native
 
-  COMMANDS = {
-    help: {
-      desc: 'Display this help text',
-    },
-    list: {
-      cmd: '',
-      desc: 'List open incidents'
-    },
-    show: {
-      cmd: '',
-      fmt: 'INCIDENT_NUMBER',
-      desc: 'Display incident details'
-    },
-    resolve: {
-      fmt: 'INCIDENT_NUMBER',
-      desc: 'Resolve an incident',
-    },
-    close: {
-      fmt: 'INCIDENT_NUMBER',
-      desc: 'Close an incident',
-    },
-    open: {
-      fmt: "SEVERITY=#{SEVERITIES.keys.sort_by(&:to_i).join(',')} SUMMARY_TEXT",
-      desc: 'Open a new incident',
-    },
-    summary: {
-      desc: 'Summarize incidents from past 24 hours (open or closed)'
-    },
-    comment: {
-      fmt: 'INCIDENT_NUMBER COMMENT_TEXT',
-      desc: 'Add a comment to an incident'
+  def self.set_commands
+    BenderBot.const_set :COMMANDS, {
+      help: {
+        desc: 'Display this help text',
+      },
+      list: {
+        cmd: '',
+        desc: 'List open incidents'
+      },
+      show: {
+        cmd: '',
+        fmt: 'INCIDENT_NUMBER',
+        desc: 'Display incident details'
+      },
+      resolve: {
+        fmt: 'INCIDENT_NUMBER',
+        desc: 'Resolve an incident',
+      },
+      close: {
+        fmt: 'INCIDENT_NUMBER',
+        desc: 'Close an incident',
+      },
+      open: {
+        fmt: "SEVERITY=#{SEVERITIES.keys.sort_by(&:to_i).join(',')} SUMMARY_TEXT",
+        desc: 'Open a new incident',
+      },
+      summary: {
+        desc: 'Summarize incidents from past 24 hours (open or closed)'
+      },
+      comment: {
+        fmt: 'INCIDENT_NUMBER COMMENT_TEXT',
+        desc: 'Add a comment to an incident'
+      }
     }
-  }
+  end
 
 
 
@@ -104,7 +106,7 @@ class BenderBot
       @this_room = @@rooms.select { |r| r.xmpp_jid == jid }.first
       @@hipchat[@this_room.name].get_room # test
     rescue
-      @@hipchat  = HipChat::Client.new(@@options.hipchat_token)
+      @@hipchat  = HipChat::Client.new(@@config[:hipchat_token])
       @@rooms    = @@hipchat.rooms
       @this_room = @@rooms.select { |r| r.xmpp_jid == jid }.first
     end
@@ -252,7 +254,7 @@ class BenderBot
       else
         incident = select_incident $1
         if incident
-          reply_html *resolve_incident(incident)
+          reply_html(*resolve_incident(incident))
         else
           reply_html 'Sorry, no such incident!', :red
         end
@@ -265,7 +267,7 @@ class BenderBot
       else
         incident = select_incident $1
         if incident
-          reply_html *close_incident(incident)
+          reply_html(*close_incident(incident))
         else
           reply_html 'Sorry, no such incident!', :red
         end
@@ -279,8 +281,8 @@ class BenderBot
         user = user_where name: sender
         data = {
           fields: {
-            project: { key: options.jira_project },
-            issuetype: { name: options.jira_type },
+            project: { key: config[:jira_project] },
+            issuetype: { name: config[:jira_type] },
             reporter: { name: user[:nick] },
             summary: $3,
             SHOW_FIELDS.key('Severity') => {
@@ -289,7 +291,7 @@ class BenderBot
           }
         }
 
-        reply_html *file_incident(data)
+        reply_html(*file_incident(data))
       end
 
 
@@ -302,7 +304,7 @@ class BenderBot
       if !user
         reply_html "Couldn't find the associated user in JIRA", :red
       elsif incident
-        reply_html *comment_on_incident(incident, comment, user)
+        reply_html(*comment_on_incident(incident, comment, user))
       else
         reply_html 'Sorry, no such incident!', :red
       end
@@ -323,7 +325,7 @@ private
 
   def log ; @@logger end
 
-  def options ; @@options end
+  def config ; @@config end
 
   def user_where fields, threshold=0.85
     field, value = fields.to_a.shift
@@ -335,7 +337,7 @@ private
 
     user = distance < threshold ? nil : suggested_user
 
-    log.trace \
+    log.debug \
       action: 'user_where',
       fields: fields,
       threshold: threshold,
@@ -359,11 +361,11 @@ private
 
   def file_incident data
     req_path = '/rest/api/2/issue'
-    uri = URI(options.jira_site + req_path)
+    uri = URI(config[:jira_site] + req_path)
     http = Net::HTTP.new uri.hostname, uri.port
 
     req = Net::HTTP::Post.new uri
-    req.basic_auth options.jira_user, options.jira_pass
+    req.basic_auth config[:jira_user], config[:jira_pass]
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
     req.body = data.to_json
@@ -397,11 +399,11 @@ private
     req_path = '/rest/api/2/issue/%s/transitions?expand=transitions.fields' % [
       incident['key']
     ]
-    uri = URI(options.jira_site + req_path)
+    uri = URI(config[:jira_site] + req_path)
     http = Net::HTTP.new uri.hostname, uri.port
 
     req = Net::HTTP::Post.new uri
-    req.basic_auth options.jira_user, options.jira_pass
+    req.basic_auth config[:jira_user], config[:jira_pass]
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
 
@@ -439,11 +441,11 @@ private
     req_path = '/rest/api/2/issue/%s/transitions?expand=transitions.fields' % [
       incident['key']
     ]
-    uri = URI(options.jira_site + req_path)
+    uri = URI(config[:jira_site] + req_path)
     http = Net::HTTP.new uri.hostname, uri.port
 
     req = Net::HTTP::Post.new uri
-    req.basic_auth options.jira_user, options.jira_pass
+    req.basic_auth config[:jira_user], config[:jira_pass]
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
 
@@ -470,11 +472,11 @@ private
 
   def comment_on_incident incident, comment, user
     req_path = '/rest/api/2/issue/%s/comment' % incident['key']
-    uri = URI(options.jira_site + req_path)
+    uri = URI(config[:jira_site] + req_path)
     http = Net::HTTP.new uri.hostname, uri.port
 
     req = Net::HTTP::Post.new uri
-    req.basic_auth options.jira_user, options.jira_pass
+    req.basic_auth config[:jira_user], config[:jira_pass]
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
     req.body = { body: '_[~%s]_ says: %s' % [ user[:nick], comment ] }.to_json

data/lib/bender/helpers.rb

@@ -1,37 +1,27 @@
 module Helpers
-
-  RESOLVED_TRANSITIONS = %w[ 51 ]
-
-  RESOLVED_STATE = /resolve/i
-
-  CLOSED_TRANSITIONS = %w[ 61 71 ]
-
-  CLOSED_STATE = /close/i
-
-  SEVERITIES = {
-    1 => '10480',
-    2 => '10481',
-    3 => '10482',
-    4 => '10483',
-    5 => '10484'
-  }
-
-  SHOW_FIELDS = {
-    'summary' => 'Summary',
-    'description' => 'Description',
-    'customfield_11250' => 'Severity',
-    'customfield_11251' => 'Impact Started',
-    'customfield_11252' => 'Impact Ended',
-    'customfield_11253' => 'Reported By',
-    'customfield_11254' => 'Services Affected',
-    'customfield_11255' => 'Cause',
-    'status' => 'Status',
-    'created' => 'Created',
-    'updated' => 'Updated'
+  DEFAULT_CONFIG = {
+    hipchat_token: nil,
+    hipchat_v2_token: nil,
+    primary_room_id: nil,
+    jid: nil,
+    password: nil,
+    nick: nil,
+    mention: nil,
+    rooms: nil,
+    database: nil,
+    jira_user: nil,
+    jira_pass: nil,
+    jira_site: nil,
+    jira_project: nil,
+    jira_group: nil,
+    jira_type: nil,
+    user_refresh: 300,
+    issue_refresh: 5,
+    group_refresh: 60,
+    room_base_name: nil,
+    order: false
   }
 
-  SEVERITY_FIELD = SHOW_FIELDS.key('Severity')
-
   QUOTES = [
     'Bite my shiny metal ass!',
     'This is the worst kind of discrimination there is: the kind against me!',
@@ -55,16 +45,16 @@ module Helpers
   def refresh_incidents bot=self
     req_path = '/rest/api/2/search'
     req_params = QueryParams.encode \
-      jql: "project = #{options.jira_project} ORDER BY created ASC, priority DESC",
+      jql: "project = #{config[:jira_project]} ORDER BY created ASC, priority DESC",
       fields: SHOW_FIELDS.keys.join(','),
       startAt: 0,
       maxResults: 1_000_000
 
-    uri = URI(options.jira_site + req_path + '?' + req_params)
+    uri = URI(config[: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.basic_auth config[:jira_user], config[:jira_pass]
     req['Content-Type'] = 'application/json'
     req['Accept'] = 'application/json'
 
@@ -129,7 +119,7 @@ module Helpers
 
 
   def incident_url incident
-    options.jira_site + '/browse/' + incident['key']
+    config[:jira_site] + '/browse/' + incident['key']
   end
 
   def incident_link incident

data/lib/bender/main.rb

@@ -8,7 +8,6 @@ require 'queryparams'
 require_relative 'metadata'
 require_relative 'mjolnir'
 require_relative 'helpers'
-require_relative 'web'
 require_relative 'bot'
 
 Thread.abort_on_exception = true
@@ -31,130 +30,71 @@ module Bender
 
 
 
-    desc 'bot', 'Start Bender HipChat bot and Web server'
-    option :bind, \
-      type: :string,
-      aliases: %w[ -b ],
-      desc: 'Set Sinatra interface',
-      default: '0.0.0.0'
-    option :port, \
-      type: :numeric,
-      aliases: %w[ -o ],
-      desc: 'Set Sinatra port',
-      default: 4567
-    option :environment, \
-      type: :string,
-      aliases: %w[ -e ],
-      desc: 'Set Sinatra environment',
-      default: 'development'
-    option :hipchat_token, \
-      type: :string,
-      aliases: %w[ -t ],
-      desc: 'Set HipChat v1 API token',
-      required: true
-    option :hipchat_v2_token, \
+    desc 'start', 'Start Bender HipChat bot and Web server'
+    option :config, \
       type: :string,
       aliases: %w[ -c ],
-      desc: 'Set HipChat v2 API token',
-      required: true
-    option :primary_room_id, \
-      type: :string,
-      aliases: %w[ -i ],
-      desc: 'Set HipChat primary room ID',
-      required: true
-    option :jid, \
-      type: :string,
-      aliases: %w[ -j ],
-      desc: 'Set HipChat JID',
-      required: true
-    option :password, \
-      type: :string,
-      aliases: %w[ -p ],
-      desc: 'Set HipChat password',
-      required: true
-    option :nick, \
-      type: :string,
-      aliases: %w[ -n ],
-      desc: 'Set HipChat nick name',
-      required: true
-    option :mention, \
-      type: :string,
-      aliases: %w[ -m ],
-      desc: 'Set HipChat mention name',
-      required: true
-    option :rooms, \
-      type: :string,
-      aliases: %w[ -r ],
-      desc: 'Set HipChat rooms (comma-separated)',
-      required: true
-    option :database, \
-      type: :string,
-      aliases: %w[ -d ],
-      desc: 'Set path to application database',
-      required: true
-    option :jira_user, \
-      type: :string,
-      aliases: %w[ -U ],
-      desc: 'Set JIRA username',
-      required: true
-    option :jira_pass, \
-      type: :string,
-      aliases: %w[ -P ],
-      desc: 'Set JIRA password',
+      desc: 'Set path to config file',
       required: true
-    option :jira_site, \
-      type: :string,
-      aliases: %w[ -S ],
-      desc: 'Set JIRA site',
-      required: true
-    option :jira_project, \
-      type: :string,
-      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 ],
-      desc: 'Set JIRA issue type',
-      required: true
-    option :user_refresh, \
-      type: :numeric,
-      aliases: %w[ -R ],
-      desc: 'Set JIRA user refresh rate',
-      default: 300
-    option :issue_refresh, \
-      type: :numeric,
-      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
-    option :room_base_name, \
-      type: :string,
-      aliases: %w[ -N ],
-      desc: 'Base name for the primary room',
-      default: 'Production Indicent'
     include_common_options
     def start
+      raw_config = JSON.parse File.read(options.config), symbolize_names: true
+      @config = DEFAULT_CONFIG.merge! raw_config
+
+      BenderBot.const_set :RESOLVED_TRANSITIONS, %w[ 51 ]
+      Bender.const_set :RESOLVED_TRANSITIONS, BenderBot::RESOLVED_TRANSITIONS
+      Helpers.const_set :RESOLVED_TRANSITIONS, BenderBot::RESOLVED_TRANSITIONS
+
+      BenderBot.const_set :RESOLVED_STATE, /resolve/i
+      Bender.const_set :RESOLVED_STATE, BenderBot::RESOLVED_STATE
+      Helpers.const_set :RESOLVED_STATE, BenderBot::RESOLVED_STATE
+
+      BenderBot.const_set :CLOSED_TRANSITIONS, %w[ 61 71 ]
+      Bender.const_set :CLOSED_TRANSITIONS, BenderBot::CLOSED_TRANSITIONS
+      Helpers.const_set :CLOSED_TRANSITIONS, BenderBot::CLOSED_TRANSITIONS
+
+      BenderBot.const_set :CLOSED_STATE, /close/i
+      Bender.const_set :CLOSED_STATE, BenderBot::CLOSED_STATE
+      Helpers.const_set :CLOSED_STATE, BenderBot::CLOSED_STATE
+
+      BenderBot.const_set :SEVERITIES, {
+        1 => '10480',
+        2 => '10481',
+        3 => '10482',
+        4 => '10483',
+        5 => '10484'
+      }
+      Bender.const_set :SEVERITIES, BenderBot::SEVERITIES
+      Helpers.const_set :SEVERITIES, BenderBot::SEVERITIES
+
+      BenderBot.const_set :SHOW_FIELDS, {
+        'summary' => 'Summary',
+        'description' => 'Description',
+        'customfield_11250' => 'Severity',
+        'customfield_11251' => 'Impact Started',
+        'customfield_11252' => 'Impact Ended',
+        'customfield_11253' => 'Reported By',
+        'customfield_11254' => 'Services Affected',
+        'customfield_11255' => 'Cause',
+        'status' => 'Status',
+        'created' => 'Created',
+        'updated' => 'Updated'
+      }
+      Bender.const_set :SHOW_FIELDS, BenderBot::SHOW_FIELDS
+      Helpers.const_set :SHOW_FIELDS, BenderBot::SHOW_FIELDS
+
+      BenderBot.const_set :SEVERITY_FIELD, SHOW_FIELDS.key('Severity')
+      Bender.const_set :SEVERITY_FIELD, BenderBot::SEVERITY_FIELD
+      Helpers.const_set :SEVERITY_FIELD, BenderBot::SEVERITY_FIELD
+
+      BenderBot.set_commands
+
       bot = start_bot
       ts  = []
       ts << periodically_refresh_group(bot)
       ts << periodically_refresh_users(bot)
       ts << periodically_refresh_incidents(bot)
-      # serve_web bot
+
       ts.map(&:join)
     end
 
@@ -162,21 +102,24 @@ module Bender
 
   private
 
-    def start_bot
-      Bot::Connection.configure do |config|
-        config.jid = options.jid
-        config.password = options.password
-        config.nick = options.mention
-        config.mention_name = options.nick
-        config.rooms = options.rooms.split(',')
-
-        Bot::Storage::YamlStore.file = options.database
-        config.store = Bot::Storage::YamlStore
+    def config ; @config end
 
-        config.logger = log
+    def start_bot
+      Bot::Connection.configure do |conn|
+        conn.jid = config[:jid]
+        conn.password = config[:password]
+        conn.nick = config[:mention]
+        conn.mention_name = config[:nick]
+        conn.rooms = config[:rooms].is_a?(Array) ? \
+          config[:rooms] : config[:rooms].split(',')
+
+        Bot::Storage::YamlStore.file = config[:database]
+        conn.store = Bot::Storage::YamlStore
+
+        conn.logger = log
       end
 
-      Bot.run! options, log
+      Bot.run! config, log
     end
 
 
@@ -205,7 +148,7 @@ module Bender
 
       @open = nil unless defined? @open
 
-      log.trace \
+      log.debug \
         primary_room_name: bot.store['primary_room_name'],
         primary_room_topic: bot.store['primary_room_topic'],
         new_room_name: new_room['name'],
@@ -216,7 +159,7 @@ module Bender
 
       if open_incidents.empty?
         if @open.nil? || @open > 0
-          new_room['name'] = '[NONE] %s' % options.room_base_name
+          new_room['name'] = '[NONE] %s' % config[:room_base_name]
           new_room['topic'] = 'Good news everyone! No high-severity incidents at the moment'
           apply_room_name_and_topic new_room
         end
@@ -230,7 +173,7 @@ module Bender
         end
 
         unless @open == open_incidents.size
-          new_room['name'] = '[IN PROGRESS] %s' % options.room_base_name
+          new_room['name'] = '[IN PROGRESS] %s' % config[:room_base_name]
           tha_news = open_incidents.size == 1 ? "There's a high-severity incident" : "There are #{open_incidents.size} high-severity incidents"
           new_room['topic'] = "Terrible news everyone! #{tha_news}"
           apply_room_name_and_topic new_room
@@ -247,10 +190,10 @@ module Bender
     def apply_room_name_and_topic room
       uri = URI room['links']['self']
 
-      resp = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
         req = Net::HTTP::Put.new uri
         req['Content-Type'] = 'application/json'
-        req['Authorization'] = 'Bearer %s' % options.hipchat_v2_token
+        req['Authorization'] = 'Bearer %s' % config[:hipchat_v2_token]
         req.body = {
           name: room['name'],
           topic: room['topic'],
@@ -267,24 +210,24 @@ module Bender
 
     def periodically_refresh_incidents bot
       Thread.new do
-        if options.order
+        if config[:order]
           hipchat_v1 = HipChat::Client.new \
-            options.hipchat_token, api_version: 'v1'
+            config[:hipchat_token], api_version: 'v1'
           hipchat_v2 = HipChat::Client.new \
-            options.hipchat_v2_token, api_version: 'v2'
+            config[:hipchat_v2_token], api_version: 'v2'
         else
           hipchat_v2 = HipChat::Client.new \
-            options.hipchat_v2_token, api_version: 'v2'
+            config[:hipchat_v2_token], api_version: 'v2'
           hipchat_v1 = HipChat::Client.new \
-            options.hipchat_token, api_version: 'v1'
+            config[:hipchat_token], api_version: 'v1'
         end
 
-        room_id = options.primary_room_id
+        room_id = config[:primary_room_id]
 
         loop do
           is = refresh_incidents bot
           set_room_name_and_topic room_id, is, hipchat_v2, bot
-          sleep options.issue_refresh
+          sleep config[:issue_refresh]
         end
       end
     end
@@ -293,15 +236,15 @@ module Bender
     def periodically_refresh_users bot
       req_path = '/rest/api/2/user/assignable/search'
       req_params = QueryParams.encode \
-        project: options.jira_project,
+        project: config[:jira_project],
         startAt: 0,
         maxResults: 1_000_000
 
-      uri = URI(options.jira_site + req_path + '?' + req_params)
+      uri = URI(config[: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.basic_auth config[:jira_user], config[:jira_pass]
       req['Content-Type'] = 'application/json'
       req['Accept'] = 'application/json'
 
@@ -329,7 +272,7 @@ module Bender
 
           bot.store['users'] = users
 
-          sleep options.user_refresh
+          sleep config[:user_refresh]
         end
       end
     end
@@ -338,14 +281,14 @@ module Bender
     def periodically_refresh_group bot
       req_path = '/rest/api/2/group'
       req_params = QueryParams.encode \
-        groupname: options.jira_group,
+        groupname: config[:jira_group],
         expand: 'users'
 
-      uri = URI(options.jira_site + req_path + '?' + req_params)
+      uri = URI(config[: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.basic_auth config[:jira_user], config[:jira_pass]
       req['Content-Type'] = 'application/json'
       req['Accept'] = 'application/json'
 
@@ -364,29 +307,10 @@ module Bender
 
           user_names = data['users']['items'].map { |u| u['displayName'] }
           bot.store['group'] = user_names
-          sleep options.group_refresh
+          sleep config[:group_refresh]
         end
       end
     end
 
-
-    def serve_web bot
-      Web.set :environment, options.environment
-      Web.set :port, options.port
-      Web.set :bind, options.bind
-      Web.set :store, options.database
-
-      if log.level >= ::Logger::DEBUG
-        Web.set :raise_errors, true
-        Web.set :dump_errors, true
-        Web.set :show_exceptions, true
-        Web.set :logging, ::Logger::DEBUG
-      end
-
-      Web.set :bot, bot
-      Web.run!
-    end
-
-
   end
 end

data/lib/bender/metadata.rb

@@ -23,7 +23,6 @@ module Bender
   # Bundled extensions
   TRAVELING_RUBY_VERSION = '20150517-2.2.2'
   JSON_VERSION = '1.8.2'
-  THIN_VERSION = '1.6.3'
   FFI_VERSION = '1.9.6'
   EM_VERSION = '1.0.4'
 

data/lib/bender/mjolnir.rb

@@ -18,12 +18,6 @@ class Mjolnir < Thor
       aliases: %w[ -V ],
       desc: 'Enable DEBUG-level logging',
       default: ENV['BENDER_DEBUG'] || false
-    },
-    trace: {
-      type: :boolean,
-      aliases: %w[ -VV ],
-      desc: 'Enable TRACE-level logging',
-      default: ENV['BENDER_TRACE'] || false
     }
   }
 
@@ -42,7 +36,6 @@ class Mjolnir < Thor
       return @logger if defined? @logger
       level = :info
       level = :debug if options.debug?
-      level = :trace if options.trace?
       device = options.log || $stderr
       pretty = device.tty? rescue false
       @logger = Slog.new \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bender-bot
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sclemmer-robut
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -181,12 +153,6 @@ files:
 - lib/bender/main.rb
 - lib/bender/metadata.rb
 - lib/bender/mjolnir.rb
-- lib/bender/web.rb
-- web/app/bender.js
-- web/app/style/bender.css
-- web/public/favicon.ico
-- web/views/app.erb
-- web/views/layout.erb
 homepage: https://github.com/sczizzo/bender
 licenses:
 - ISC

data/lib/bender/web.rb

@@ -1,36 +0,0 @@
-require 'pathname'
-require 'thread'
-require 'json'
-
-require 'sinatra/base'
-
-require_relative 'metadata'
-
-Thread.abort_on_exception = true
-
-
-module Bender
-  class Web < Sinatra::Application
-    set :root, File.join(Bender::ROOT, 'web')
-
-    get '/v' do
-      content_type :text
-      VERSION
-    end
-
-    get '/' do
-      erb :app
-    end
-
-    get '/favicon.ico' do
-      send_file File.join(settings.root, 'favicon.ico'), \
-        disposition: 'inline'
-    end
-
-    get %r|/app/(.*)| do |fn|
-      send_file File.join(settings.root, 'app', fn), \
-        disposition: 'inline'
-    end
-
-  end
-end

data/web/app/bender.js

@@ -1,5 +0,0 @@
-;(function(){
-  jQuery(document).ready(function($){
-    // TODO
-  });
-})();

data/web/views/app.erb

@@ -1 +0,0 @@
-Heyo!

data/web/views/layout.erb

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Bender</title>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="description" content="Weave." />
-    <meta name="author" content="Sean Clemmer" />
-    <link rel="icon" href="/favicon.ico" />
-    <link href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.4/superhero/bootstrap.min.css" rel="stylesheet" />
-    <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet" />
-    <link href="/app/style/bender.css" rel="stylesheet" />
-  </head>
-  <body>
-    <%= yield %>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
-    <script src="/app/bender.js"></script>
-  </body>
-</html>