shamebot 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26da6e6c4cbaf5c0a5fb4841993418e84c9430a9
-  data.tar.gz: c3e8cdc7e23e98a26fdb3f2d05ba04a2d5a2e3c4
+  metadata.gz: f83fb7908bfd3f14054f70ab6c1ea71b42721c58
+  data.tar.gz: a375e607f8453d107e6f28fa88cf8e8bd22db538
 SHA512:
-  metadata.gz: 25c55617c299cd2a631a57dd0362fc0c7c1594f1ad52951f0a948120d4df0f125af52956bad793c554d4837d0d20802c379cadbdf7e5e2983359a0ccd25d1b27
-  data.tar.gz: 307b3b94f5e9cb1ed650b5f34ebc0056a1a8f812b97bd5d1d181594a5dfb221b1dd540dd8ed32550841253791725df76d225d2268b2ac445e182597f07124159
+  metadata.gz: ac399f2ee74bf0c01b81657ede3baded908c4b7bd5c1af88cf826416a0cc7d09a412235f6944f91b293b0a1547f9bcde5bf66c2e3fb774c109d1732b4e908c1d
+  data.tar.gz: 73251e56c83168cb725881fa977dd7501917dbcb9a91ebf3d6b185f8e5b7fd23562c8b4fa7118c47abe5b5dce97149f8e414210cffa2a3308fc580085b8a0a12

data/.gitignore

@@ -5,6 +5,7 @@
 *.swp
 *.json
 *.log
+*.lock
 .chef
 .kitchen
 .vagrant

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/bin/shamebot

@@ -98,91 +98,95 @@ end
 
 
 # Part 3. Take requests from Gitlab WebHooks
-require 'sinatra'
-
-set :port, Opts[:port]
-set :environment, Opts[:env]
-set :bind, Opts[:bind]
-set :raise_errors, true
-set :dump_errors, true
-set :show_exceptions, true
-set :logging, ::Logger::DEBUG if DEBUG
-
-get '/' do
-  content_type :text
-  "shamebot #{Shamebot::VERSION}"
-end
+require 'sinatra/base'
+
+class Shamebot::App < Sinatra::Application
+  set :port, Opts[:port]
+  set :environment, Opts[:env]
+  set :bind, Opts[:bind]
+  set :raise_errors, true
+  set :dump_errors, true
+  set :show_exceptions, true
+  set :logging, ::Logger::DEBUG if DEBUG
+
+  get '/' do
+    content_type :text
+    "shamebot #{Shamebot::VERSION}"
+  end
 
-post '/' do
-  now = Time.now
-  last_half_hour = now - 30 * 60
-  request.body.rewind
-  data = JSON.parse request.body.read
-
-  # Bad commits don't contain JIRA tags...
-  # And they aren't merge commits
-  commits = data['commits'].delete_if { |c| c['message'] =~ MERGE_COMMIT }
-  good_commits, bad_commits = commits.partition { |c| c['message'] =~ JIRA_TAG }
-
-  # Good commits might contain bogus JIRA tags
-  bad_commits += good_commits.keep_if do |c|
-    good_tag = false
-    c['message'].scan(JIRA_TAG).each do |(project, number)|
-      tag      = '%s-%d' % [project.upcase, number.to_i]
-      tag_page = `curl --silent http://jira.bluejeansnet.com/browse/#{tag}` rescue ''
-      next if tag_page =~ /The issue you are trying to view does not exist/i
-      good_tag = true
-      break
+  post '/' do
+    now = Time.now
+    last_half_hour = now - 30 * 60
+    request.body.rewind
+    data = JSON.parse request.body.read
+
+    # Bad commits don't contain JIRA tags...
+    # And they aren't merge commits
+    commits = data['commits'].delete_if { |c| c['message'] =~ MERGE_COMMIT }
+    good_commits, bad_commits = commits.partition { |c| c['message'] =~ JIRA_TAG }
+
+    # Good commits might contain bogus JIRA tags
+    bad_commits += good_commits.keep_if do |c|
+      good_tag = false
+      c['message'].scan(JIRA_TAG).each do |(project, number)|
+        tag      = '%s-%d' % [project.upcase, number.to_i]
+        tag_page = `curl --silent http://jira.bluejeansnet.com/browse/#{tag}` rescue ''
+        next if tag_page =~ /The issue you are trying to view does not exist/i
+        good_tag = true
+        break
+      end
+      !good_tag
     end
-    !good_tag
-  end
 
-  # Grab user info from Gitlab
-  begin
-    user = Gitlab.user(data['user_id'].to_i)
-  rescue
-    $stderr.puts "Warning: Gitlab user for commit author not found"
-    return
-  end
+    # Grab user info from Gitlab
+    begin
+      user = Gitlab.user(data['user_id'].to_i)
+    rescue
+      $stderr.puts "Warning: Gitlab user for commit author not found"
+      return
+    end
 
-  # For whatever reason we get a lot of duplicate POSTs, so we need to
-  # keep track of which commits have already triggered shamings so we
-  # don't end up repeatedly shaming users for the same mistake. We also
-  # make sure the commits aren't too old.
-  new_bad_commits = []
-  bad_commits.each do |commit|
-    unless DEBUG
-      next if DB.has_key? commit['id']
-      commit_time = DateTime.strptime(commit['timestamp']).to_time
-      next unless commit_time >= last_half_hour
+    # For whatever reason we get a lot of duplicate POSTs, so we need to
+    # keep track of which commits have already triggered shamings so we
+    # don't end up repeatedly shaming users for the same mistake. We also
+    # make sure the commits aren't too old.
+    new_bad_commits = []
+    bad_commits.each do |commit|
+      unless DEBUG
+        next if DB.has_key? commit['id']
+        commit_time = DateTime.strptime(commit['timestamp']).to_time
+        next unless commit_time >= last_half_hour
+      end
+      new_bad_commits << commit
+      DB[commit['id']] = true
     end
-    new_bad_commits << commit
-    DB[commit['id']] = true
-  end
 
-  # Shame the user with a random template
-  commit_ids  = new_bad_commits.map { |c| c['id']  }
-  commit_urls = new_bad_commits.map { |c| c['url'] }
-  puts "%s: %s" % [ user.username, commit_ids.inspect ]
+    # Shame the user with a random template
+    commit_ids  = new_bad_commits.map { |c| c['id']  }
+    commit_urls = new_bad_commits.map { |c| c['url'] }
+    puts "%s: %s" % [ user.username, commit_ids.inspect ]
 
-  hipchat_users = []
-  0.upto(5) do |i|
-    hipchat_users += HTTParty.get("https://api.hipchat.com/v2/user", :query => { 'start-index' => 100 * i, :start_index => 100 * i, 'max-results' => 100, :max_results => 1000, :auth_token => CONFIG['hipchat']['auth_token_v2'] })['items']
-  end
+    hipchat_users = []
+    0.upto(5) do |i|
+      hipchat_users += HTTParty.get("https://api.hipchat.com/v2/user", :query => { 'start-index' => 100 * i, :start_index => 100 * i, 'max-results' => 100, :max_results => 1000, :auth_token => CONFIG['hipchat']['auth_token_v2'] })['items']
+    end
 
-  hipchat_user = hipchat_users.select { |u| u['name'] =~ /#{user.name}/i }
-  $stderr.puts hipchat_user
+    hipchat_user = hipchat_users.select { |u| u['name'] =~ /#{user.name}/i }
+    $stderr.puts hipchat_user
 
-  if hipchat_user.empty?
-    hipchat_user = user.name
-  else
-    hipchat_user = '@' + hipchat_user.first['mention_name']
-  end
+    if hipchat_user.empty?
+      hipchat_user = user.name
+    else
+      hipchat_user = '@' + hipchat_user.first['mention_name']
+    end
 
-  shame_user(random_template, {
-    :name => hipchat_user,
-    :nick => user.username,
-    :urls => commit_urls.join(' ')
-  }, ROOM, HIPCHAT, BOTNAME) unless commit_ids.empty? || DEBUG
-  return commit_ids.inspect
+    shame_user(random_template, {
+      :name => hipchat_user,
+      :nick => user.username,
+      :urls => commit_urls.join(' ')
+    }, ROOM, HIPCHAT, BOTNAME) unless commit_ids.empty? || DEBUG
+    return commit_ids.inspect
+  end
 end
+
+Shamebot::App.run!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shamebot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Sean Clemmer
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - Readme.md
 - VERSION

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    shamebot (1.0.0)
-      gitlab (~> 3.1.0)
-      hipchat (~> 1)
-      sinatra (~> 1)
-      sys-proctable (~> 0)
-      trollop (~> 2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.0)
-    gitlab (3.1.0)
-      httparty
-      terminal-table
-    hipchat (1.4.0)
-      httparty
-    httparty (0.13.3)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    json (1.8.1)
-    method_source (0.8.2)
-    minitest (5.5.0)
-    multi_xml (0.5.5)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    rake (10.4.2)
-    rubygems-tasks (0.2.4)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.6.0)
-    sys-proctable (0.9.4)
-    terminal-table (1.4.5)
-    tilt (1.4.1)
-    trollop (2.0)
-    version (1.0.0)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  minitest
-  pry
-  rake
-  rubygems-tasks
-  shamebot!
-  version
-  yard