gitlab_exception_notification 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05e350f92a0ff8559200fa1bd5340a686c3febf9
-  data.tar.gz: a2801371fe60a17f629e28c5a2281543eefed19b
+  metadata.gz: e50cdaeeea3ed9e989d8d904e3b9b4a1ab7b8a66
+  data.tar.gz: a76c1afbc2e1d32ae9dfe308c0103c39750ec1db
 SHA512:
-  metadata.gz: 9ec68a6254205a729627d3f779e3b2b89dd595f361ab289dc08120df6d206d69c5185c0b3b7c173ec0e5f6699c5ca5299c51e22e9eedb334cd9faf4f21d0f549
-  data.tar.gz: 21562ad1b2070b0ca0467c14c0584d433514d1ba1c4738ba605b38fd780bab8df9159271025f1bf6c8527d4c2fe49399d10bb340a4d9e23f2b6b1c883b615705
+  metadata.gz: 9eaece63cd52733ed35a9693c89b3dbecde2e30deba07d6dc6001c5a850ded29b98787d79b575f943e30edb2e2e297834ff387df6ac4585697562f5669e3ac3c
+  data.tar.gz: 7e4efa688a4450cc7bcbdc59298a17bbd9d978016bd1c0fac143619a9db064d43529df5ddab92e496b1708f12a8dabd7aa6d43a1052390d3a02ed8e6ab0e543c

data/lib/gitlab_exception_notification.rb

@@ -1,11 +1,10 @@
-module GitlabExceptionNotification
+require "gitlab"
+require "digest"
 
-  require "gitlab"
-  require 'digest'
+module GitlabExceptionNotification
 
   REJECT_HEADERS = /HTTP_COOKIE|(rack.*)|(action_dispatch.*)/
-  SLINE = "
-  "
+  SLINE = "\n"
   STAB = SLINE + "    "
 
   PER_PAGE = 40

data/lib/gitlab_exception_notification/gitlab_notifier.rb

@@ -3,6 +3,7 @@
 module ExceptionNotifier
   class GitlabNotifier
     def initialize(options)
+      puts "On init, options => #{options.inspect}"
       @options = options
     end
 
@@ -17,8 +18,9 @@ module ExceptionNotifier
     end
 
     def call(exception, options={})
+      puts "On call, exception => #{exception.inspect}, options => #{options.inspect}"
       env = options[:env] || {}
       exception_notification(env, exception, @options.merge(options))
     end
   end
-end
+end

data/lib/gitlab_exception_notification/issue.rb

@@ -1,7 +1,7 @@
 module GitlabExceptionNotification
 
   class Issue
-    
+
     def initialize(env, exception, options={})
       @env        = env
       @exception  = exception
@@ -10,13 +10,14 @@ module GitlabExceptionNotification
       @request    = ActionDispatch::Request.new(env)
       @data       = (env['exception_notifier.exception_data'] || {}).merge(options[:data] || {})
       @digest     = digest
-      @client = Gitlab.client(endpoint: 'http://gitlab.42.fr/api/v3', private_token: options[:private_token])
+      @client = Gitlab.client(endpoint: options[:gitlab_url], private_token: options[:private_token])
       @project_id = @client.project_search(options[:project_name]).first.id
       @issues     = self.all
     end
 
     def create
-      @client.create_issue(@project_id, title, {description: description})
+      puts "create_issue with labels: #{[Rails.env, 'bug'].join(',').inspect}"
+      @client.create_issue(@project_id, title, {description: description, labels: [Rails.env, 'bug'].join(',')})
     end
 
     def update(id)
@@ -24,7 +25,7 @@ module GitlabExceptionNotification
       last = issue.updated_at.to_date
       if last < 1.hour.ago
         begin
-          @client.edit_issue(@project_id, id, {state_event: "reopen"})
+          @client.edit_issue(@project_id, id, {state_event: "reopen", labels: [Rails.env, 'bug'].join(',')})
           iss = @client.edit_issue(@project_id, id, {title: increment_title(issue)})
         rescue Exception => e
           p "An error occured: #{e.inspect}"
@@ -41,7 +42,7 @@ module GitlabExceptionNotification
 
     def is_same_exception? issue
       return false if issue.nil? or issue.description.nil?
-      issue.description.split(SLINE).last.strip == @digest
+      issue.description.split(SLINE).last && issue.description.split(SLINE).last.strip == @digest
     end
 
     def exists?
@@ -54,10 +55,10 @@ module GitlabExceptionNotification
 
     def all
       page = 1
-      i = @client.issues(@project_id, per_page: PER_PAGE, page: page, order_by: :updated_at)
+      i = @client.issues(@project_id, per_page: PER_PAGE, page: page, order_by: :updated_at, labels: [Rails.env, 'bug'].join(','))
       @issues = i
       while i.count == PER_PAGE
-        i = @client.issues(@project_id, per_page: PER_PAGE, page: page, order_by: :updated_at)
+        i = @client.issues(@project_id, per_page: PER_PAGE, page: page, order_by: :updated_at, labels: [Rails.env, 'bug'].join(','))
         @issues += i
         page += 1
       end
@@ -72,8 +73,6 @@ module GitlabExceptionNotification
     # The issue title
     def title
       t = []
-      t << "#{@kontroller.controller_name}##{@kontroller.action_name}" if @kontroller
-      t << "(#{@exception.class})"
       t << (@exception.message.length > 120 ? @exception.message[0..120] + "..." : @exception.message)
       t.join(' ')
     end
@@ -98,9 +97,12 @@ module GitlabExceptionNotification
 
       # Get the concerned file
       file = @exception.backtrace.first
+      repo_file = file.gsub(/.*\/#{@options[:project_name]}\/([^:]*):(\d*)(:in.*)/, '\1#L\2')
+
+      d = ["> (#{@exception.class}) #{@exception.message} #{@kontroller ? 'in controller ' + @kontroller.controller_name + '#' + @kontroller.action_name : ''}"]
 
-      d = ["#{@exception.message} #{@kontroller ? 'in controller ' + @kontroller.controller_name + '#' + @kontroller.action_name : ''}"]
-      d << "File: #{file}"
+      d << "\n**Full path**: #{file}"
+      d << "\n**File**: [#{repo_file}](#{repo_file})"
       {
         'Summary': summary.map { |k, v|  "- #{k}: #{v}"}.join(SLINE),
         'session id': @request.ssl? ? "[FILTERED]" : (@request.session['session_id'] || (@request.env["rack.session.options"] and @request.env["rack.session.options"][:id])).inspect,
@@ -109,8 +111,8 @@ module GitlabExceptionNotification
         'request headers': md_hash(@request.headers),
         'environment': md_hash(@env.reject{|k, v| (REJECT_HEADERS =~ k).nil? })
       }.reject{|k, v| v.nil? or v.blank?}.each do |k, v|
-        d << "--------------------------------"
-        d << "#### #{k.to_s.humanize}: "
+        d << "\n--------------------------------\n"
+        d << "#### #{k.to_s.humanize}:\n"
         d << v.to_s
       end
       d << @digest
@@ -132,11 +134,14 @@ module GitlabExceptionNotification
     def md_hash hash, pre = ""
       hash.map { |k, v|  "#{pre}- **#{k}**: `#{v}`"}.join(SLINE)
     end
-    
+
     def digest
+      puts "Creating digest with: "
+      puts "- #{@exception.to_s}"
+      puts "- #{@exception.backtrace.first.split(":in").first.to_s}"
       "EXC" + Digest::SHA256.hexdigest(@exception.to_s + @exception.backtrace.first.split(":in").first.to_s)
     end
 
 
   end
-end
+end

data/lib/gitlab_exception_notification/version.rb

@@ -1,3 +1,3 @@
 module GitlabExceptionNotification
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_exception_notification
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andre Aubin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
 description: Automatically create, open and updates Gitlab issues on rails exceptions.
 email:
 - andre.aubin@lambdaweb.fr
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Gitlab plugin for the exception_notification gem.