lita-gitlab 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad156c35c3d7dd7b6d4764c15ad2913cc0def71
-  data.tar.gz: 32f707f59610d78ddb44a52de90cf9de123b5369
+  metadata.gz: c0cb4c7e98cb5e2a1b5db2425979af203a10c8fe
+  data.tar.gz: 7bf90c8a2f3453d8f3c567bf92b4a75b1b30bbb1
 SHA512:
-  metadata.gz: 59007d8ec14d94743c1f890d448ba5e8c645b49ecff446af1ebb59ebb5585a59ac16f70f169a9fc7c95e76a8afeab4f48d22fa1cc303ba6a29739b9b3bd5e9f5
-  data.tar.gz: e54cd0ca9228fea7314730f6e11c9ce6453b6b8f8eb1dc5895e736be7999a73150219cd34838a16ccde46ca64b7a34fa608d76b48b90daa10d9f7a1208b795a1
+  metadata.gz: d5d62f466bfee6b6916b39c39b666abe28e045383777e6042449b3b93a8ac21ebb6cfe42e89de6f64d35248c69ed1daf4c2955c876a12f0355fea15015a408a6
+  data.tar.gz: 99b85bd8c00d17709a1444566fa160f7c225286027b7ba5cfa12775ef80667a405286c8ddb604a3808da45f0eb5e21ef80dc626cf7ab6293fef49b071c2a9f36

data/README.md

@@ -21,11 +21,19 @@ gem "lita-gitlab"
 * `default_room` (String) - A channel idenitifier.
 ie: `#general`.
 
+* `url` (String) - The Gitlab repository location.
+ie: `http://gitlab.mycompany.com/`.
+
+* `group_name` (String) - Your group identifier.
+ie: `my_team`.
+
 ### Example
 
 ``` ruby
 Lita.configure do |config|
   config.handlers.gitlab.default_room = '#general'
+  config.url = 'http://example.gitlab/'
+  config.group = 'group_name'
 end
 ```
 

data/lib/lita/handlers/gitlab.rb

@@ -4,6 +4,8 @@ module Lita
 
       def self.default_config(config)
         config.default_room = '#general'
+        config.url = 'http://example.gitlab/'
+        config.group = 'group_name'
       end
 
       http.post '/lita/gitlab', :receive
@@ -11,15 +13,18 @@ module Lita
       def receive(request, response)
         json_body = request.params['payload'] || extract_json_from_request(request)
         data = symbolize parse_payload(json_body)
+        data[:project] = request.params['project']
         message = format_message(data)
-        targets = request.params['targets'] || '#general'
-        rooms = []
-        targets.split(',').each do |param_target|
-          rooms << param_target
-        end
-        rooms.each do |room|
-          target = Source.new(room: room)
-          robot.send_message(target, message)
+        if message
+          targets = request.params['targets'] || self.config.default_room
+          rooms = []
+          targets.split(',').each do |param_target|
+            rooms << param_target
+          end
+          rooms.each do |room|
+            target = Source.new(room: room)
+            robot.send_message(target, message)
+          end
         end
       end
 
@@ -44,7 +49,9 @@ module Lita
         if data.key? :object_kind
           if data[:object_attributes].key? :target_branch
             # Merge request
-            data[:object_attributes][:link] = "#{data[:object_attributes][:target_branch]}/#{data[:object_attributes][:iid]}"
+            url = "#{self.config.url}"
+            url += data[:project] ? "#{self.config.group}/#{data[:project]}/merge_requests/#{data[:object_attributes][:iid]}" : "groups/#{self.config.group}"
+            data[:object_attributes][:link] =  "<#{url}|#{data[:title]}>"
             build_message "web.#{data[:object_kind]}.#{data[:object_attributes][:state]}", data[:object_attributes]
           else
             # Issue
@@ -53,7 +60,7 @@ module Lita
         else
           # Push has no object kind
           branch = data[:ref].split('/').drop(2).join('/')
-          data[:link] = data[:repository][:name]
+          data[:link] = "<#{data[:repository][:homepage]}|#{data[:repository][:name]}>"
           if data[:before] =~ /^0+$/
             build_message 'web.push.new_branch', data
           else

data/lita-gitlab.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-gitlab'
-  spec.version       = '1.0.1'
+  spec.version       = '1.0.2'
   spec.authors       = ['Emilio Figueroa']
   spec.email         = ['emiliofigueroatorres@gmail.com']
   spec.description   = %q{A Lita handler that will display GitLab messages in the channel}

data/locales/en.yml

@@ -15,9 +15,11 @@ en:
             reopened: "The issue '%{title}' has been reopened."
             closed: "The issue '%{title}' is now closed"
           merge_request:
-            opened: "New merge-request: %{title} to %{link}"
-            reopened: "The merge-request '%{title}' has been reopened."
+            opened: "New merge-request: %{link}"
+            reopened: "The merge-request '%{link}' has been reopened."
             closed: "The merge-request '%{title}' is now closed."
+            locked: ""
+            merged: "Yay! The merge-request '%{link}' is has been merged."
           push:
             new_branch: "%{user_name} created the new branch '%{link}'"
             add_to_branch: "%{user_name} added %{total_commits_count} commits to branch '%{link}'"

data/spec/lita/handlers/gitlab_spec.rb

@@ -20,6 +20,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
   let(:response) { Rack::Response.new }
   let(:params) { {} }
   let(:targets) { '#baz' }
+  let(:project) { 'test_project' }
   let(:matchers) {
     {
       new_team_member: 'join',
@@ -31,6 +32,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
   describe '#receive' do
     before :each do
       allow(params).to receive(:[]).with('targets').and_return(targets)
+      allow(params).to receive(:[]).with('project').and_return(project)
     end
 
     context 'with system hook' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-gitlab
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Emilio Figueroa